From 7c7d42b5f1c3c9cea62b4a73a97e07cea25f8d30 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 11 Mar 2010 10:18:11 -0500 Subject: [PATCH 001/730] enable tinymce editor --- plugins/TinyMCE/TinyMCEPlugin.php | 96 + plugins/TinyMCE/js/jquery.tinymce.js | 1 + plugins/TinyMCE/js/langs/en.js | 169 + plugins/TinyMCE/js/license.txt | 504 + .../TinyMCE/js/plugins/advhr/css/advhr.css | 5 + .../TinyMCE/js/plugins/advhr/editor_plugin.js | 1 + .../js/plugins/advhr/editor_plugin_src.js | 57 + plugins/TinyMCE/js/plugins/advhr/js/rule.js | 43 + .../TinyMCE/js/plugins/advhr/langs/en_dlg.js | 5 + plugins/TinyMCE/js/plugins/advhr/rule.htm | 57 + .../js/plugins/advimage/css/advimage.css | 13 + .../js/plugins/advimage/editor_plugin.js | 1 + .../js/plugins/advimage/editor_plugin_src.js | 50 + plugins/TinyMCE/js/plugins/advimage/image.htm | 232 + .../js/plugins/advimage/img/sample.gif | Bin 0 -> 1624 bytes .../TinyMCE/js/plugins/advimage/js/image.js | 443 + .../js/plugins/advimage/langs/en_dlg.js | 43 + .../js/plugins/advlink/css/advlink.css | 8 + .../js/plugins/advlink/editor_plugin.js | 1 + .../js/plugins/advlink/editor_plugin_src.js | 61 + .../TinyMCE/js/plugins/advlink/js/advlink.js | 528 + .../js/plugins/advlink/langs/en_dlg.js | 52 + plugins/TinyMCE/js/plugins/advlink/link.htm | 333 + .../js/plugins/advlist/editor_plugin.js | 1 + .../js/plugins/advlist/editor_plugin_src.js | 154 + .../js/plugins/autoresize/editor_plugin.js | 1 + .../plugins/autoresize/editor_plugin_src.js | 117 + .../js/plugins/autosave/editor_plugin.js | 1 + .../js/plugins/autosave/editor_plugin_src.js | 422 + .../TinyMCE/js/plugins/autosave/langs/en.js | 4 + .../js/plugins/bbcode/editor_plugin.js | 1 + .../js/plugins/bbcode/editor_plugin_src.js | 120 + .../js/plugins/contextmenu/editor_plugin.js | 1 + .../plugins/contextmenu/editor_plugin_src.js | 127 + .../plugins/directionality/editor_plugin.js | 1 + .../directionality/editor_plugin_src.js | 82 + .../js/plugins/emotions/editor_plugin.js | 1 + .../js/plugins/emotions/editor_plugin_src.js | 43 + .../TinyMCE/js/plugins/emotions/emotions.htm | 40 + .../js/plugins/emotions/img/smiley-cool.gif | Bin 0 -> 354 bytes .../js/plugins/emotions/img/smiley-cry.gif | Bin 0 -> 329 bytes .../emotions/img/smiley-embarassed.gif | Bin 0 -> 331 bytes .../emotions/img/smiley-foot-in-mouth.gif | Bin 0 -> 344 bytes .../js/plugins/emotions/img/smiley-frown.gif | Bin 0 -> 340 bytes .../plugins/emotions/img/smiley-innocent.gif | Bin 0 -> 336 bytes .../js/plugins/emotions/img/smiley-kiss.gif | Bin 0 -> 338 bytes .../plugins/emotions/img/smiley-laughing.gif | Bin 0 -> 344 bytes .../emotions/img/smiley-money-mouth.gif | Bin 0 -> 321 bytes .../js/plugins/emotions/img/smiley-sealed.gif | Bin 0 -> 325 bytes .../js/plugins/emotions/img/smiley-smile.gif | Bin 0 -> 345 bytes .../plugins/emotions/img/smiley-surprised.gif | Bin 0 -> 342 bytes .../emotions/img/smiley-tongue-out.gif | Bin 0 -> 328 bytes .../plugins/emotions/img/smiley-undecided.gif | Bin 0 -> 337 bytes .../js/plugins/emotions/img/smiley-wink.gif | Bin 0 -> 351 bytes .../js/plugins/emotions/img/smiley-yell.gif | Bin 0 -> 336 bytes .../js/plugins/emotions/js/emotions.js | 22 + .../js/plugins/emotions/langs/en_dlg.js | 20 + plugins/TinyMCE/js/plugins/example/dialog.htm | 22 + .../js/plugins/example/editor_plugin.js | 1 + .../js/plugins/example/editor_plugin_src.js | 84 + .../js/plugins/example/img/example.gif | Bin 0 -> 87 bytes .../TinyMCE/js/plugins/example/js/dialog.js | 19 + .../TinyMCE/js/plugins/example/langs/en.js | 3 + .../js/plugins/example/langs/en_dlg.js | 3 + .../js/plugins/fullpage/css/fullpage.css | 182 + .../js/plugins/fullpage/editor_plugin.js | 1 + .../js/plugins/fullpage/editor_plugin_src.js | 149 + .../TinyMCE/js/plugins/fullpage/fullpage.htm | 571 + .../js/plugins/fullpage/js/fullpage.js | 471 + .../js/plugins/fullpage/langs/en_dlg.js | 85 + .../js/plugins/fullscreen/editor_plugin.js | 1 + .../plugins/fullscreen/editor_plugin_src.js | 148 + .../js/plugins/fullscreen/fullscreen.htm | 109 + .../js/plugins/iespell/editor_plugin.js | 1 + .../js/plugins/iespell/editor_plugin_src.js | 54 + .../js/plugins/inlinepopups/editor_plugin.js | 1 + .../plugins/inlinepopups/editor_plugin_src.js | 635 + .../skins/clearlooks2/img/alert.gif | Bin 0 -> 818 bytes .../skins/clearlooks2/img/button.gif | Bin 0 -> 280 bytes .../skins/clearlooks2/img/buttons.gif | Bin 0 -> 1195 bytes .../skins/clearlooks2/img/confirm.gif | Bin 0 -> 915 bytes .../skins/clearlooks2/img/corners.gif | Bin 0 -> 911 bytes .../skins/clearlooks2/img/horizontal.gif | Bin 0 -> 769 bytes .../skins/clearlooks2/img/vertical.gif | Bin 0 -> 92 bytes .../inlinepopups/skins/clearlooks2/window.css | 90 + .../js/plugins/inlinepopups/template.htm | 387 + .../plugins/insertdatetime/editor_plugin.js | 1 + .../insertdatetime/editor_plugin_src.js | 83 + .../TinyMCE/js/plugins/layer/editor_plugin.js | 1 + .../js/plugins/layer/editor_plugin_src.js | 212 + .../js/plugins/legacyoutput/editor_plugin.js | 1 + .../plugins/legacyoutput/editor_plugin_src.js | 136 + .../TinyMCE/js/plugins/media/css/content.css | 6 + .../TinyMCE/js/plugins/media/css/media.css | 16 + .../TinyMCE/js/plugins/media/editor_plugin.js | 1 + .../js/plugins/media/editor_plugin_src.js | 414 + .../TinyMCE/js/plugins/media/img/flash.gif | Bin 0 -> 241 bytes .../js/plugins/media/img/flv_player.swf | Bin 0 -> 11668 bytes .../js/plugins/media/img/quicktime.gif | Bin 0 -> 303 bytes .../js/plugins/media/img/realmedia.gif | Bin 0 -> 439 bytes .../js/plugins/media/img/shockwave.gif | Bin 0 -> 387 bytes .../TinyMCE/js/plugins/media/img/trans.gif | Bin 0 -> 43 bytes .../js/plugins/media/img/windowsmedia.gif | Bin 0 -> 415 bytes plugins/TinyMCE/js/plugins/media/js/embed.js | 73 + plugins/TinyMCE/js/plugins/media/js/media.js | 630 + .../TinyMCE/js/plugins/media/langs/en_dlg.js | 103 + plugins/TinyMCE/js/plugins/media/media.htm | 817 + .../js/plugins/nonbreaking/editor_plugin.js | 1 + .../plugins/nonbreaking/editor_plugin_src.js | 53 + .../js/plugins/noneditable/editor_plugin.js | 1 + .../plugins/noneditable/editor_plugin_src.js | 90 + .../js/plugins/pagebreak/css/content.css | 1 + .../js/plugins/pagebreak/editor_plugin.js | 1 + .../js/plugins/pagebreak/editor_plugin_src.js | 77 + .../js/plugins/pagebreak/img/pagebreak.gif | Bin 0 -> 325 bytes .../js/plugins/pagebreak/img/trans.gif | Bin 0 -> 43 bytes .../TinyMCE/js/plugins/paste/editor_plugin.js | 1 + .../js/plugins/paste/editor_plugin_src.js | 929 ++ .../TinyMCE/js/plugins/paste/js/pastetext.js | 36 + .../TinyMCE/js/plugins/paste/js/pasteword.js | 51 + .../TinyMCE/js/plugins/paste/langs/en_dlg.js | 5 + .../TinyMCE/js/plugins/paste/pastetext.htm | 27 + .../TinyMCE/js/plugins/paste/pasteword.htm | 21 + .../js/plugins/preview/editor_plugin.js | 1 + .../js/plugins/preview/editor_plugin_src.js | 53 + .../TinyMCE/js/plugins/preview/example.html | 28 + .../js/plugins/preview/jscripts/embed.js | 73 + .../TinyMCE/js/plugins/preview/preview.html | 17 + .../TinyMCE/js/plugins/print/editor_plugin.js | 1 + .../js/plugins/print/editor_plugin_src.js | 34 + .../TinyMCE/js/plugins/save/editor_plugin.js | 1 + .../js/plugins/save/editor_plugin_src.js | 101 + .../searchreplace/css/searchreplace.css | 6 + .../js/plugins/searchreplace/editor_plugin.js | 1 + .../searchreplace/editor_plugin_src.js | 57 + .../plugins/searchreplace/js/searchreplace.js | 130 + .../js/plugins/searchreplace/langs/en_dlg.js | 16 + .../plugins/searchreplace/searchreplace.htm | 99 + .../js/plugins/spellchecker/css/content.css | 1 + .../js/plugins/spellchecker/editor_plugin.js | 1 + .../plugins/spellchecker/editor_plugin_src.js | 341 + .../js/plugins/spellchecker/img/wline.gif | Bin 0 -> 46 bytes .../TinyMCE/js/plugins/style/css/props.css | 13 + .../TinyMCE/js/plugins/style/editor_plugin.js | 1 + .../js/plugins/style/editor_plugin_src.js | 55 + plugins/TinyMCE/js/plugins/style/js/props.js | 641 + .../TinyMCE/js/plugins/style/langs/en_dlg.js | 63 + plugins/TinyMCE/js/plugins/style/props.htm | 728 + .../js/plugins/tabfocus/editor_plugin.js | 1 + .../js/plugins/tabfocus/editor_plugin_src.js | 112 + plugins/TinyMCE/js/plugins/table/cell.htm | 178 + plugins/TinyMCE/js/plugins/table/css/cell.css | 17 + plugins/TinyMCE/js/plugins/table/css/row.css | 25 + .../TinyMCE/js/plugins/table/css/table.css | 13 + .../TinyMCE/js/plugins/table/editor_plugin.js | 1 + .../js/plugins/table/editor_plugin_src.js | 1118 ++ plugins/TinyMCE/js/plugins/table/js/cell.js | 286 + .../js/plugins/table/js/merge_cells.js | 27 + plugins/TinyMCE/js/plugins/table/js/row.js | 237 + plugins/TinyMCE/js/plugins/table/js/table.js | 449 + .../TinyMCE/js/plugins/table/langs/en_dlg.js | 74 + .../TinyMCE/js/plugins/table/merge_cells.htm | 32 + plugins/TinyMCE/js/plugins/table/row.htm | 155 + plugins/TinyMCE/js/plugins/table/table.htm | 187 + plugins/TinyMCE/js/plugins/template/blank.htm | 12 + .../js/plugins/template/css/template.css | 23 + .../js/plugins/template/editor_plugin.js | 1 + .../js/plugins/template/editor_plugin_src.js | 159 + .../js/plugins/template/js/template.js | 106 + .../js/plugins/template/langs/en_dlg.js | 15 + .../TinyMCE/js/plugins/template/template.htm | 32 + .../js/plugins/visualchars/editor_plugin.js | 1 + .../plugins/visualchars/editor_plugin_src.js | 76 + .../js/plugins/wordcount/editor_plugin.js | 1 + .../js/plugins/wordcount/editor_plugin_src.js | 98 + .../TinyMCE/js/plugins/xhtmlxtras/abbr.htm | 141 + .../TinyMCE/js/plugins/xhtmlxtras/acronym.htm | 141 + .../js/plugins/xhtmlxtras/attributes.htm | 148 + .../TinyMCE/js/plugins/xhtmlxtras/cite.htm | 141 + .../js/plugins/xhtmlxtras/css/attributes.css | 11 + .../js/plugins/xhtmlxtras/css/popup.css | 9 + plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm | 161 + .../js/plugins/xhtmlxtras/editor_plugin.js | 1 + .../plugins/xhtmlxtras/editor_plugin_src.js | 144 + plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm | 161 + .../TinyMCE/js/plugins/xhtmlxtras/js/abbr.js | 28 + .../js/plugins/xhtmlxtras/js/acronym.js | 28 + .../js/plugins/xhtmlxtras/js/attributes.js | 126 + .../TinyMCE/js/plugins/xhtmlxtras/js/cite.js | 28 + .../TinyMCE/js/plugins/xhtmlxtras/js/del.js | 63 + .../plugins/xhtmlxtras/js/element_common.js | 231 + .../TinyMCE/js/plugins/xhtmlxtras/js/ins.js | 62 + .../js/plugins/xhtmlxtras/langs/en_dlg.js | 32 + plugins/TinyMCE/js/themes/advanced/about.htm | 54 + plugins/TinyMCE/js/themes/advanced/anchor.htm | 26 + .../TinyMCE/js/themes/advanced/charmap.htm | 53 + .../js/themes/advanced/color_picker.htm | 73 + .../js/themes/advanced/editor_template.js | 1 + .../js/themes/advanced/editor_template_src.js | 1204 ++ plugins/TinyMCE/js/themes/advanced/image.htm | 80 + .../js/themes/advanced/img/colorpicker.jpg | Bin 0 -> 3189 bytes .../TinyMCE/js/themes/advanced/img/icons.gif | Bin 0 -> 11794 bytes .../TinyMCE/js/themes/advanced/js/about.js | 72 + .../TinyMCE/js/themes/advanced/js/anchor.js | 37 + .../TinyMCE/js/themes/advanced/js/charmap.js | 335 + .../js/themes/advanced/js/color_picker.js | 253 + .../TinyMCE/js/themes/advanced/js/image.js | 245 + plugins/TinyMCE/js/themes/advanced/js/link.js | 156 + .../js/themes/advanced/js/source_editor.js | 62 + .../TinyMCE/js/themes/advanced/langs/en.js | 62 + .../js/themes/advanced/langs/en_dlg.js | 51 + plugins/TinyMCE/js/themes/advanced/link.htm | 58 + .../themes/advanced/skins/default/content.css | 35 + .../themes/advanced/skins/default/dialog.css | 117 + .../advanced/skins/default/img/buttons.png | Bin 0 -> 3274 bytes .../advanced/skins/default/img/items.gif | Bin 0 -> 70 bytes .../advanced/skins/default/img/menu_arrow.gif | Bin 0 -> 68 bytes .../advanced/skins/default/img/menu_check.gif | Bin 0 -> 70 bytes .../advanced/skins/default/img/progress.gif | Bin 0 -> 1787 bytes .../advanced/skins/default/img/tabs.gif | Bin 0 -> 1326 bytes .../js/themes/advanced/skins/default/ui.css | 215 + .../js/themes/advanced/skins/o2k7/content.css | 35 + .../js/themes/advanced/skins/o2k7/dialog.css | 116 + .../advanced/skins/o2k7/img/button_bg.png | Bin 0 -> 5859 bytes .../skins/o2k7/img/button_bg_black.png | Bin 0 -> 3736 bytes .../skins/o2k7/img/button_bg_silver.png | Bin 0 -> 5358 bytes .../js/themes/advanced/skins/o2k7/ui.css | 216 + .../themes/advanced/skins/o2k7/ui_black.css | 8 + .../themes/advanced/skins/o2k7/ui_silver.css | 5 + .../js/themes/advanced/source_editor.htm | 26 + .../js/themes/simple/editor_template.js | 1 + .../js/themes/simple/editor_template_src.js | 85 + .../TinyMCE/js/themes/simple/img/icons.gif | Bin 0 -> 1440 bytes plugins/TinyMCE/js/themes/simple/langs/en.js | 11 + .../themes/simple/skins/default/content.css | 25 + .../js/themes/simple/skins/default/ui.css | 32 + .../js/themes/simple/skins/o2k7/content.css | 17 + .../simple/skins/o2k7/img/button_bg.png | Bin 0 -> 5102 bytes .../js/themes/simple/skins/o2k7/ui.css | 35 + plugins/TinyMCE/js/tiny_mce.js | 1 + plugins/TinyMCE/js/tiny_mce_popup.js | 5 + plugins/TinyMCE/js/tiny_mce_src.js | 13067 ++++++++++++++++ plugins/TinyMCE/js/utils/editable_selects.js | 70 + plugins/TinyMCE/js/utils/form_utils.js | 200 + plugins/TinyMCE/js/utils/mctabs.js | 77 + plugins/TinyMCE/js/utils/validate.js | 220 + plugins/TinyMCE/locale/Sample.po | 56 + 247 files changed, 35717 insertions(+) create mode 100644 plugins/TinyMCE/TinyMCEPlugin.php create mode 100644 plugins/TinyMCE/js/jquery.tinymce.js create mode 100644 plugins/TinyMCE/js/langs/en.js create mode 100644 plugins/TinyMCE/js/license.txt create mode 100644 plugins/TinyMCE/js/plugins/advhr/css/advhr.css create mode 100644 plugins/TinyMCE/js/plugins/advhr/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/advhr/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/advhr/js/rule.js create mode 100644 plugins/TinyMCE/js/plugins/advhr/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/advhr/rule.htm create mode 100644 plugins/TinyMCE/js/plugins/advimage/css/advimage.css create mode 100644 plugins/TinyMCE/js/plugins/advimage/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/advimage/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/advimage/image.htm create mode 100644 plugins/TinyMCE/js/plugins/advimage/img/sample.gif create mode 100644 plugins/TinyMCE/js/plugins/advimage/js/image.js create mode 100644 plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/advlink/css/advlink.css create mode 100644 plugins/TinyMCE/js/plugins/advlink/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/advlink/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/advlink/js/advlink.js create mode 100644 plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/advlink/link.htm create mode 100644 plugins/TinyMCE/js/plugins/advlist/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/autosave/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/autosave/langs/en.js create mode 100644 plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/directionality/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/directionality/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/emotions/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/emotions/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/emotions/emotions.htm create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-cool.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-cry.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-embarassed.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-foot-in-mouth.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-frown.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-innocent.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-kiss.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-laughing.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-money-mouth.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-sealed.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-smile.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-surprised.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-tongue-out.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-undecided.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-wink.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/img/smiley-yell.gif create mode 100644 plugins/TinyMCE/js/plugins/emotions/js/emotions.js create mode 100644 plugins/TinyMCE/js/plugins/emotions/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/example/dialog.htm create mode 100644 plugins/TinyMCE/js/plugins/example/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/example/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/example/img/example.gif create mode 100644 plugins/TinyMCE/js/plugins/example/js/dialog.js create mode 100644 plugins/TinyMCE/js/plugins/example/langs/en.js create mode 100644 plugins/TinyMCE/js/plugins/example/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/fullpage/css/fullpage.css create mode 100644 plugins/TinyMCE/js/plugins/fullpage/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/fullpage/fullpage.htm create mode 100644 plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js create mode 100644 plugins/TinyMCE/js/plugins/fullpage/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/fullscreen/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/fullscreen/fullscreen.htm create mode 100644 plugins/TinyMCE/js/plugins/iespell/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/iespell/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/alert.gif create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/button.gif create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/corners.gif create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css create mode 100644 plugins/TinyMCE/js/plugins/inlinepopups/template.htm create mode 100644 plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/layer/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/media/css/content.css create mode 100644 plugins/TinyMCE/js/plugins/media/css/media.css create mode 100644 plugins/TinyMCE/js/plugins/media/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/media/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/media/img/flash.gif create mode 100644 plugins/TinyMCE/js/plugins/media/img/flv_player.swf create mode 100644 plugins/TinyMCE/js/plugins/media/img/quicktime.gif create mode 100644 plugins/TinyMCE/js/plugins/media/img/realmedia.gif create mode 100644 plugins/TinyMCE/js/plugins/media/img/shockwave.gif create mode 100644 plugins/TinyMCE/js/plugins/media/img/trans.gif create mode 100644 plugins/TinyMCE/js/plugins/media/img/windowsmedia.gif create mode 100644 plugins/TinyMCE/js/plugins/media/js/embed.js create mode 100644 plugins/TinyMCE/js/plugins/media/js/media.js create mode 100644 plugins/TinyMCE/js/plugins/media/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/media/media.htm create mode 100644 plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/pagebreak/css/content.css create mode 100644 plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/pagebreak/img/pagebreak.gif create mode 100644 plugins/TinyMCE/js/plugins/pagebreak/img/trans.gif create mode 100644 plugins/TinyMCE/js/plugins/paste/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/paste/js/pastetext.js create mode 100644 plugins/TinyMCE/js/plugins/paste/js/pasteword.js create mode 100644 plugins/TinyMCE/js/plugins/paste/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/paste/pastetext.htm create mode 100644 plugins/TinyMCE/js/plugins/paste/pasteword.htm create mode 100644 plugins/TinyMCE/js/plugins/preview/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/preview/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/preview/example.html create mode 100644 plugins/TinyMCE/js/plugins/preview/jscripts/embed.js create mode 100644 plugins/TinyMCE/js/plugins/preview/preview.html create mode 100644 plugins/TinyMCE/js/plugins/print/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/print/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/save/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/save/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/searchreplace/css/searchreplace.css create mode 100644 plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js create mode 100644 plugins/TinyMCE/js/plugins/searchreplace/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm create mode 100644 plugins/TinyMCE/js/plugins/spellchecker/css/content.css create mode 100644 plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/spellchecker/img/wline.gif create mode 100644 plugins/TinyMCE/js/plugins/style/css/props.css create mode 100644 plugins/TinyMCE/js/plugins/style/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/style/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/style/js/props.js create mode 100644 plugins/TinyMCE/js/plugins/style/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/style/props.htm create mode 100644 plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/table/cell.htm create mode 100644 plugins/TinyMCE/js/plugins/table/css/cell.css create mode 100644 plugins/TinyMCE/js/plugins/table/css/row.css create mode 100644 plugins/TinyMCE/js/plugins/table/css/table.css create mode 100644 plugins/TinyMCE/js/plugins/table/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/table/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/table/js/cell.js create mode 100644 plugins/TinyMCE/js/plugins/table/js/merge_cells.js create mode 100644 plugins/TinyMCE/js/plugins/table/js/row.js create mode 100644 plugins/TinyMCE/js/plugins/table/js/table.js create mode 100644 plugins/TinyMCE/js/plugins/table/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/table/merge_cells.htm create mode 100644 plugins/TinyMCE/js/plugins/table/row.htm create mode 100644 plugins/TinyMCE/js/plugins/table/table.htm create mode 100644 plugins/TinyMCE/js/plugins/template/blank.htm create mode 100644 plugins/TinyMCE/js/plugins/template/css/template.css create mode 100644 plugins/TinyMCE/js/plugins/template/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/template/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/template/js/template.js create mode 100644 plugins/TinyMCE/js/plugins/template/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/plugins/template/template.htm create mode 100644 plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/visualchars/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/wordcount/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/css/attributes.css create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/css/popup.css create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/js/abbr.js create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/js/acronym.js create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/js/cite.js create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/js/element_common.js create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js create mode 100644 plugins/TinyMCE/js/plugins/xhtmlxtras/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/themes/advanced/about.htm create mode 100644 plugins/TinyMCE/js/themes/advanced/anchor.htm create mode 100644 plugins/TinyMCE/js/themes/advanced/charmap.htm create mode 100644 plugins/TinyMCE/js/themes/advanced/color_picker.htm create mode 100644 plugins/TinyMCE/js/themes/advanced/editor_template.js create mode 100644 plugins/TinyMCE/js/themes/advanced/editor_template_src.js create mode 100644 plugins/TinyMCE/js/themes/advanced/image.htm create mode 100644 plugins/TinyMCE/js/themes/advanced/img/colorpicker.jpg create mode 100644 plugins/TinyMCE/js/themes/advanced/img/icons.gif create mode 100644 plugins/TinyMCE/js/themes/advanced/js/about.js create mode 100644 plugins/TinyMCE/js/themes/advanced/js/anchor.js create mode 100644 plugins/TinyMCE/js/themes/advanced/js/charmap.js create mode 100644 plugins/TinyMCE/js/themes/advanced/js/color_picker.js create mode 100644 plugins/TinyMCE/js/themes/advanced/js/image.js create mode 100644 plugins/TinyMCE/js/themes/advanced/js/link.js create mode 100644 plugins/TinyMCE/js/themes/advanced/js/source_editor.js create mode 100644 plugins/TinyMCE/js/themes/advanced/langs/en.js create mode 100644 plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js create mode 100644 plugins/TinyMCE/js/themes/advanced/link.htm create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/default/content.css create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/default/dialog.css create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/default/img/buttons.png create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/default/img/items.gif create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/default/img/menu_arrow.gif create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/default/img/menu_check.gif create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/default/img/progress.gif create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/default/img/tabs.gif create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/default/ui.css create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/o2k7/content.css create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/o2k7/dialog.css create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg.png create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_black.png create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_silver.png create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css create mode 100644 plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css create mode 100644 plugins/TinyMCE/js/themes/advanced/source_editor.htm create mode 100644 plugins/TinyMCE/js/themes/simple/editor_template.js create mode 100644 plugins/TinyMCE/js/themes/simple/editor_template_src.js create mode 100644 plugins/TinyMCE/js/themes/simple/img/icons.gif create mode 100644 plugins/TinyMCE/js/themes/simple/langs/en.js create mode 100644 plugins/TinyMCE/js/themes/simple/skins/default/content.css create mode 100644 plugins/TinyMCE/js/themes/simple/skins/default/ui.css create mode 100644 plugins/TinyMCE/js/themes/simple/skins/o2k7/content.css create mode 100644 plugins/TinyMCE/js/themes/simple/skins/o2k7/img/button_bg.png create mode 100644 plugins/TinyMCE/js/themes/simple/skins/o2k7/ui.css create mode 100644 plugins/TinyMCE/js/tiny_mce.js create mode 100644 plugins/TinyMCE/js/tiny_mce_popup.js create mode 100644 plugins/TinyMCE/js/tiny_mce_src.js create mode 100644 plugins/TinyMCE/js/utils/editable_selects.js create mode 100644 plugins/TinyMCE/js/utils/form_utils.js create mode 100644 plugins/TinyMCE/js/utils/mctabs.js create mode 100644 plugins/TinyMCE/js/utils/validate.js create mode 100644 plugins/TinyMCE/locale/Sample.po diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php new file mode 100644 index 0000000000..1d9d4a2882 --- /dev/null +++ b/plugins/TinyMCE/TinyMCEPlugin.php @@ -0,0 +1,96 @@ +. + * + * @category WYSIWYG + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Use TinyMCE library to allow rich text editing in the browser + * + * Converts the notice form in browser to a rich-text editor. + * + * @category WYSIWYG + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +class TinyMCEPlugin extends Plugin +{ + function onEndShowScripts($action) + { + if (common_logged_in()) { + $action->script(common_path('plugins/TinyMCE/js/jquery.tinymce.js')); + $action->inlineScript($this->_inlineScript()); + } + + return true; + } + + function onEndShowStyles($action) + { + $action->style('span#notice_data-text_container { float: left }'); + return true; + } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'TinyMCE', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:TinyMCE', + 'rawdescription' => + _m('Use TinyMCE library to allow rich text editing in the browser')); + return true; + } + + function _inlineScript() + { + $path = common_path('plugins/TinyMCE/js/tiny_mce.js'); + + $scr = <<0){if(l=tinyMCE.get(m[0].id)){return l.getContent()}}}}function h(m){var l=null;(m)&&(m.id)&&(c.tinymce)&&(l=tinyMCE.get(m.id));return l}function g(l){return !!((l)&&(l.length)&&(c.tinymce)&&(l.is(":tinymce")))}var j={};b.each(["text","html","val"],function(n,l){var o=j[l]=b.fn[l],m=(l==="text");b.fn[l]=function(r){var p=this;if(!g(p)){return o.call(p,r)}if(r!==e){k.call(p.filter(":tinymce"),r);o.call(p.not(":tinymce"),r);return p}else{var q="";(m?p:p.eq(0)).each(function(t,u){var s=h(u);q+=s?(m?s.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):s.getContent()):o.call(b(u),r)});return q}}});b.each(["append","prepend"],function(n,m){var o=j[m]=b.fn[m],l=(m==="prepend");b.fn[m]=function(q){var p=this;if(!g(p)){return o.call(p,q)}if(q!==e){p.filter(":tinymce").each(function(s,t){var r=h(t);r&&r.setContent(l?q+r.getContent():r.getContent()+q)});o.call(p.not(":tinymce"),q);return p}}});b.each(["remove","replaceWith","replaceAll","empty"],function(m,l){var n=j[l]=b.fn[l];b.fn[l]=function(){i.call(this,l);return n.apply(this,arguments)}});j.attr=b.fn.attr;b.fn.attr=function(n,q,o){var m=this;if((!n)||(n!=="value")||(!g(m))){return j.attr.call(m,n,q,o)}if(q!==e){k.call(m.filter(":tinymce"),q);j.attr.call(m.not(":tinymce"),n,q,o);return m}else{var p=m[0],l=h(p);return l?l.getContent():j.attr.call(b(p),n,q,o)}}}})(jQuery); \ No newline at end of file diff --git a/plugins/TinyMCE/js/langs/en.js b/plugins/TinyMCE/js/langs/en.js new file mode 100644 index 0000000000..075bef70db --- /dev/null +++ b/plugins/TinyMCE/js/langs/en.js @@ -0,0 +1,169 @@ +tinyMCE.addI18n({en:{ +common:{ +edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?", +apply:"Apply", +insert:"Insert", +update:"Update", +cancel:"Cancel", +close:"Close", +browse:"Browse", +class_name:"Class", +not_set:"-- Not set --", +clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?", +clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.", +popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.", +invalid_data:"Error: Invalid values entered, these are marked in red.", +more_colors:"More colors" +}, +contextmenu:{ +align:"Alignment", +left:"Left", +center:"Center", +right:"Right", +full:"Full" +}, +insertdatetime:{ +date_fmt:"%Y-%m-%d", +time_fmt:"%H:%M:%S", +insertdate_desc:"Insert date", +inserttime_desc:"Insert time", +months_long:"January,February,March,April,May,June,July,August,September,October,November,December", +months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec", +day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday", +day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun" +}, +print:{ +print_desc:"Print" +}, +preview:{ +preview_desc:"Preview" +}, +directionality:{ +ltr_desc:"Direction left to right", +rtl_desc:"Direction right to left" +}, +layer:{ +insertlayer_desc:"Insert new layer", +forward_desc:"Move forward", +backward_desc:"Move backward", +absolute_desc:"Toggle absolute positioning", +content:"New layer..." +}, +save:{ +save_desc:"Save", +cancel_desc:"Cancel all changes" +}, +nonbreaking:{ +nonbreaking_desc:"Insert non-breaking space character" +}, +iespell:{ +iespell_desc:"Run spell checking", +download:"ieSpell not detected. Do you want to install it now?" +}, +advhr:{ +advhr_desc:"Horizontal rule" +}, +emotions:{ +emotions_desc:"Emotions" +}, +searchreplace:{ +search_desc:"Find", +replace_desc:"Find/Replace" +}, +advimage:{ +image_desc:"Insert/edit image" +}, +advlink:{ +link_desc:"Insert/edit link" +}, +xhtmlxtras:{ +cite_desc:"Citation", +abbr_desc:"Abbreviation", +acronym_desc:"Acronym", +del_desc:"Deletion", +ins_desc:"Insertion", +attribs_desc:"Insert/Edit Attributes" +}, +style:{ +desc:"Edit CSS Style" +}, +paste:{ +paste_text_desc:"Paste as Plain Text", +paste_word_desc:"Paste from Word", +selectall_desc:"Select All" +}, +paste_dlg:{ +text_title:"Use CTRL+V on your keyboard to paste the text into the window.", +text_linebreaks:"Keep linebreaks", +word_title:"Use CTRL+V on your keyboard to paste the text into the window." +}, +table:{ +desc:"Inserts a new table", +row_before_desc:"Insert row before", +row_after_desc:"Insert row after", +delete_row_desc:"Delete row", +col_before_desc:"Insert column before", +col_after_desc:"Insert column after", +delete_col_desc:"Remove column", +split_cells_desc:"Split merged table cells", +merge_cells_desc:"Merge table cells", +row_desc:"Table row properties", +cell_desc:"Table cell properties", +props_desc:"Table properties", +paste_row_before_desc:"Paste table row before", +paste_row_after_desc:"Paste table row after", +cut_row_desc:"Cut table row", +copy_row_desc:"Copy table row", +del:"Delete table", +row:"Row", +col:"Column", +cell:"Cell" +}, +autosave:{ +unload_msg:"The changes you made will be lost if you navigate away from this page.", +restore_content: "Restore auto-saved content", +warning_message: "If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?" +}, +fullscreen:{ +desc:"Toggle fullscreen mode" +}, +media:{ +desc:"Insert / edit embedded media", +edit:"Edit embedded media" +}, +fullpage:{ +desc:"Document properties" +}, +template:{ +desc:"Insert predefined template content" +}, +visualchars:{ +desc:"Visual control characters on/off." +}, +spellchecker:{ +desc:"Toggle spellchecker", +menu:"Spellchecker settings", +ignore_word:"Ignore word", +ignore_words:"Ignore all", +langs:"Languages", +wait:"Please wait...", +sug:"Suggestions", +no_sug:"No suggestions", +no_mpell:"No misspellings found." +}, +pagebreak:{ +desc:"Insert page break." +}, +advlist : { + types : 'Types', + def : 'Default', + lower_alpha : "Lower alpha", + lower_greek : "Lower greek", + lower_roman : "Lower roman", + upper_alpha : "Upper alpha", + upper_roman : "Upper roman", + circle : "Circle", + disc : "Disc", + square : "Square" +} +}}); \ No newline at end of file diff --git a/plugins/TinyMCE/js/license.txt b/plugins/TinyMCE/js/license.txt new file mode 100644 index 0000000000..60d6d4c8f5 --- /dev/null +++ b/plugins/TinyMCE/js/license.txt @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/plugins/TinyMCE/js/plugins/advhr/css/advhr.css b/plugins/TinyMCE/js/plugins/advhr/css/advhr.css new file mode 100644 index 0000000000..0e22834985 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advhr/css/advhr.css @@ -0,0 +1,5 @@ +input.radio {border:1px none #000; background:transparent; vertical-align:middle;} +.panel_wrapper div.current {height:80px;} +#width {width:50px; vertical-align:middle;} +#width2 {width:50px; vertical-align:middle;} +#size {width:100px;} diff --git a/plugins/TinyMCE/js/plugins/advhr/editor_plugin.js b/plugins/TinyMCE/js/plugins/advhr/editor_plugin.js new file mode 100644 index 0000000000..4d3b062dee --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advhr/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.AdvancedHRPlugin",{init:function(a,b){a.addCommand("mceAdvancedHr",function(){a.windowManager.open({file:b+"/rule.htm",width:250+parseInt(a.getLang("advhr.delta_width",0)),height:160+parseInt(a.getLang("advhr.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("advhr",{title:"advhr.advhr_desc",cmd:"mceAdvancedHr"});a.onNodeChange.add(function(d,c,e){c.setActive("advhr",e.nodeName=="HR")});a.onClick.add(function(c,d){d=d.target;if(d.nodeName==="HR"){c.selection.select(d)}})},getInfo:function(){return{longname:"Advanced HR",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advhr",tinymce.plugins.AdvancedHRPlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/advhr/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/advhr/editor_plugin_src.js new file mode 100644 index 0000000000..0c652d3303 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advhr/editor_plugin_src.js @@ -0,0 +1,57 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.AdvancedHRPlugin', { + init : function(ed, url) { + // Register commands + ed.addCommand('mceAdvancedHr', function() { + ed.windowManager.open({ + file : url + '/rule.htm', + width : 250 + parseInt(ed.getLang('advhr.delta_width', 0)), + height : 160 + parseInt(ed.getLang('advhr.delta_height', 0)), + inline : 1 + }, { + plugin_url : url + }); + }); + + // Register buttons + ed.addButton('advhr', { + title : 'advhr.advhr_desc', + cmd : 'mceAdvancedHr' + }); + + ed.onNodeChange.add(function(ed, cm, n) { + cm.setActive('advhr', n.nodeName == 'HR'); + }); + + ed.onClick.add(function(ed, e) { + e = e.target; + + if (e.nodeName === 'HR') + ed.selection.select(e); + }); + }, + + getInfo : function() { + return { + longname : 'Advanced HR', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('advhr', tinymce.plugins.AdvancedHRPlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/advhr/js/rule.js b/plugins/TinyMCE/js/plugins/advhr/js/rule.js new file mode 100644 index 0000000000..b6cbd66c75 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advhr/js/rule.js @@ -0,0 +1,43 @@ +var AdvHRDialog = { + init : function(ed) { + var dom = ed.dom, f = document.forms[0], n = ed.selection.getNode(), w; + + w = dom.getAttrib(n, 'width'); + f.width.value = w ? parseInt(w) : (dom.getStyle('width') || ''); + f.size.value = dom.getAttrib(n, 'size') || parseInt(dom.getStyle('height')) || ''; + f.noshade.checked = !!dom.getAttrib(n, 'noshade') || !!dom.getStyle('border-width'); + selectByValue(f, 'width2', w.indexOf('%') != -1 ? '%' : 'px'); + }, + + update : function() { + var ed = tinyMCEPopup.editor, h, f = document.forms[0], st = ''; + + h = ' + + + {#advhr.advhr_desc} + + + + + + + +
+
+ +
+ +
+
+ + + + + + + + + + + + + +
+ + +
+
+
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/advimage/css/advimage.css b/plugins/TinyMCE/js/plugins/advimage/css/advimage.css new file mode 100644 index 0000000000..0a6251a696 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advimage/css/advimage.css @@ -0,0 +1,13 @@ +#src_list, #over_list, #out_list {width:280px;} +.mceActionPanel {margin-top:7px;} +.alignPreview {border:1px solid #000; width:140px; height:140px; overflow:hidden; padding:5px;} +.checkbox {border:0;} +.panel_wrapper div.current {height:305px;} +#prev {margin:0; border:1px solid #000; width:428px; height:150px; overflow:auto;} +#align, #classlist {width:150px;} +#width, #height {vertical-align:middle; width:50px; text-align:center;} +#vspace, #hspace, #border {vertical-align:middle; width:30px; text-align:center;} +#class_list {width:180px;} +input {width: 280px;} +#constrain, #onmousemovecheck {width:auto;} +#id, #dir, #lang, #usemap, #longdesc {width:200px;} diff --git a/plugins/TinyMCE/js/plugins/advimage/editor_plugin.js b/plugins/TinyMCE/js/plugins/advimage/editor_plugin.js new file mode 100644 index 0000000000..4c7a9c3a88 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advimage/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.AdvancedImagePlugin",{init:function(a,b){a.addCommand("mceAdvImage",function(){if(a.dom.getAttrib(a.selection.getNode(),"class").indexOf("mceItem")!=-1){return}a.windowManager.open({file:b+"/image.htm",width:480+parseInt(a.getLang("advimage.delta_width",0)),height:385+parseInt(a.getLang("advimage.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("image",{title:"advimage.image_desc",cmd:"mceAdvImage"})},getInfo:function(){return{longname:"Advanced image",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advimage",tinymce.plugins.AdvancedImagePlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/advimage/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/advimage/editor_plugin_src.js new file mode 100644 index 0000000000..2625dd2131 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advimage/editor_plugin_src.js @@ -0,0 +1,50 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.AdvancedImagePlugin', { + init : function(ed, url) { + // Register commands + ed.addCommand('mceAdvImage', function() { + // Internal image object like a flash placeholder + if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1) + return; + + ed.windowManager.open({ + file : url + '/image.htm', + width : 480 + parseInt(ed.getLang('advimage.delta_width', 0)), + height : 385 + parseInt(ed.getLang('advimage.delta_height', 0)), + inline : 1 + }, { + plugin_url : url + }); + }); + + // Register buttons + ed.addButton('image', { + title : 'advimage.image_desc', + cmd : 'mceAdvImage' + }); + }, + + getInfo : function() { + return { + longname : 'Advanced image', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('advimage', tinymce.plugins.AdvancedImagePlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/advimage/image.htm b/plugins/TinyMCE/js/plugins/advimage/image.htm new file mode 100644 index 0000000000..79cff3f19f --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advimage/image.htm @@ -0,0 +1,232 @@ + + + + {#advimage_dlg.dialog_title} + + + + + + + + + +
+
+ +
+ +
+
+
+ {#advimage_dlg.general} + + + + + + + + + + + + + + + + + + +
+ + + + +
 
+
+ +
+ {#advimage_dlg.preview} + +
+
+ +
+
+ {#advimage_dlg.tab_appearance} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ {#advimage_dlg.example_img} + Lorem ipsum, Dolor sit amet, consectetuer adipiscing loreum ipsum edipiscing elit, sed diam + nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.Loreum ipsum + edipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam + erat volutpat. +
+
+ x + px +
  + + + + +
+
+
+
+ +
+
+ {#advimage_dlg.swap_image} + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
 
+ + + + +
 
+
+ +
+ {#advimage_dlg.misc} + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + + + +
 
+
+
+
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/advimage/img/sample.gif b/plugins/TinyMCE/js/plugins/advimage/img/sample.gif new file mode 100644 index 0000000000000000000000000000000000000000..53bf6890b507741c10910c9e2217ad8247b98e8d GIT binary patch literal 1624 zcmV-e2B-N)Nk%w1VJ!eH0OkMy|NsB}{r&v>{Q3F$`1ttq^YifV@ayaA>FMd_=H}w! z;^5%m-rnBb-QC>W+}qpR+S=OL+1c3G*w@$B*4Eb4)YQ|{)zHw=&d$%x&CScp%gV~i z$;rvc$jHXV#>B+L!^6YE!otD9!N9=4zrVk|y}i7=yt})*y1Kf#xw*Hux3;#nwY9ah zw6wFcv$C?Xv9YnRu&}SMudc4Ht*x!BtgNf6tE#H1si~={sjjD|r>3T+rKP2$q@<&x zqobp!qN1Xqp`oFnrJ$goprE6lpP!zdp`MSWoSd7Ro12@UnwpxLnw^=MnV6WE zmzS58mX?*3mz9;3mX?*2l$4W`lai8@l9G~eg|M^H&l zLpBo?51@vfgB2q_TVh*dNP<;cR$Wg!vYsMHR!qvvOis>GNH`+ zJ3B|tqgANiBSy@x>Q#;x7+DuU7&rwlf#S04)VZvA$XoUy8Y&f7)SqP<}Lw@L# zA(@Cohl`6CZyedUu^BlmK|DG5$Kl2f8z@uCc)^k-3m7$G!njf7$;XhOW>^`rV#UFh zEN#eG;bP?tCs>{+)q)ceg9$aDAaTZ{MGK5rU8ty$qz8){MT#gHGX{#XEJHLonBXFa zj+#9GE&^pq!`qG`K5iiC!gq}sRY|1yD8?j++_^oR0g+)NNtZN`)08!0q=}AA4HhIo zFaa9NYu8%97=oos5f?O`lwre~4VfoIei+FyK|urxj@C(-q(sS(!$5uL3j&jg7&XY% zlr17;3GGL;2K8>CB87G97;W(2VZ((D+3Hz;L;bylfhf(kFNV8at)h;hdM z85WX(#*Hq@@BYePt3t_l{ zCL3|YVWydA0Fz{rTl65n00)c^)^-jJn1c zRVXtA6mkUMEDLU|v7{JK&_IJ2ciiCy7BOT1fdUBh8b=yrbYaCAchCU_7?H`b1`}4q zLB|_mI2!;7W4QCq6F1O+MW||6AwmKafUrReUA&QotxQZI8D$G)AuSVV@X<&A9v;~H zKnWjo&;bljq=29aCeV-t5GBYkL=Q}q(S~FLd2t39MyRmC%_GFHkPc7CfIt8P*emqV z0YK2j9A+kmW^!tn(ZmG+L=6DZR99W}8p9?Utr=#t@rE2=zxf3QQ(JBJ&<{Z2>8EUP zeX1B)2w_3gXV)D-0Tt+=#@cV-0f!PU#MglZ3m6b}0e08zK^x;9(u?Tga{%?&nNTXhcEuM_#J>yL>p*a zuZJ2pliCGSp!Ye8>YFq@)ZOW-uT~OrjFQK!)UyVGFt7ni'); + }, + + init : function(ed) { + var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode(); + + tinyMCEPopup.resizeToInnerSize(); + this.fillClassList('class_list'); + this.fillFileList('src_list', 'tinyMCEImageList'); + this.fillFileList('over_list', 'tinyMCEImageList'); + this.fillFileList('out_list', 'tinyMCEImageList'); + TinyMCE_EditableSelects.init(); + + if (n.nodeName == 'IMG') { + nl.src.value = dom.getAttrib(n, 'src'); + nl.width.value = dom.getAttrib(n, 'width'); + nl.height.value = dom.getAttrib(n, 'height'); + nl.alt.value = dom.getAttrib(n, 'alt'); + nl.title.value = dom.getAttrib(n, 'title'); + nl.vspace.value = this.getAttrib(n, 'vspace'); + nl.hspace.value = this.getAttrib(n, 'hspace'); + nl.border.value = this.getAttrib(n, 'border'); + selectByValue(f, 'align', this.getAttrib(n, 'align')); + selectByValue(f, 'class_list', dom.getAttrib(n, 'class'), true, true); + nl.style.value = dom.getAttrib(n, 'style'); + nl.id.value = dom.getAttrib(n, 'id'); + nl.dir.value = dom.getAttrib(n, 'dir'); + nl.lang.value = dom.getAttrib(n, 'lang'); + nl.usemap.value = dom.getAttrib(n, 'usemap'); + nl.longdesc.value = dom.getAttrib(n, 'longdesc'); + nl.insert.value = ed.getLang('update'); + + if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseover'))) + nl.onmouseoversrc.value = dom.getAttrib(n, 'onmouseover').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1'); + + if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseout'))) + nl.onmouseoutsrc.value = dom.getAttrib(n, 'onmouseout').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1'); + + if (ed.settings.inline_styles) { + // Move attribs to styles + if (dom.getAttrib(n, 'align')) + this.updateStyle('align'); + + if (dom.getAttrib(n, 'hspace')) + this.updateStyle('hspace'); + + if (dom.getAttrib(n, 'border')) + this.updateStyle('border'); + + if (dom.getAttrib(n, 'vspace')) + this.updateStyle('vspace'); + } + } + + // Setup browse button + document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image'); + if (isVisible('srcbrowser')) + document.getElementById('src').style.width = '260px'; + + // Setup browse button + document.getElementById('onmouseoversrccontainer').innerHTML = getBrowserHTML('overbrowser','onmouseoversrc','image','theme_advanced_image'); + if (isVisible('overbrowser')) + document.getElementById('onmouseoversrc').style.width = '260px'; + + // Setup browse button + document.getElementById('onmouseoutsrccontainer').innerHTML = getBrowserHTML('outbrowser','onmouseoutsrc','image','theme_advanced_image'); + if (isVisible('outbrowser')) + document.getElementById('onmouseoutsrc').style.width = '260px'; + + // If option enabled default contrain proportions to checked + if (ed.getParam("advimage_constrain_proportions", true)) + f.constrain.checked = true; + + // Check swap image if valid data + if (nl.onmouseoversrc.value || nl.onmouseoutsrc.value) + this.setSwapImage(true); + else + this.setSwapImage(false); + + this.changeAppearance(); + this.showPreviewImage(nl.src.value, 1); + }, + + insert : function(file, title) { + var ed = tinyMCEPopup.editor, t = this, f = document.forms[0]; + + if (f.src.value === '') { + if (ed.selection.getNode().nodeName == 'IMG') { + ed.dom.remove(ed.selection.getNode()); + ed.execCommand('mceRepaint'); + } + + tinyMCEPopup.close(); + return; + } + + if (tinyMCEPopup.getParam("accessibility_warnings", 1)) { + if (!f.alt.value) { + tinyMCEPopup.confirm(tinyMCEPopup.getLang('advimage_dlg.missing_alt'), function(s) { + if (s) + t.insertAndClose(); + }); + + return; + } + } + + t.insertAndClose(); + }, + + insertAndClose : function() { + var ed = tinyMCEPopup.editor, f = document.forms[0], nl = f.elements, v, args = {}, el; + + tinyMCEPopup.restoreSelection(); + + // Fixes crash in Safari + if (tinymce.isWebKit) + ed.getWin().focus(); + + if (!ed.settings.inline_styles) { + args = { + vspace : nl.vspace.value, + hspace : nl.hspace.value, + border : nl.border.value, + align : getSelectValue(f, 'align') + }; + } else { + // Remove deprecated values + args = { + vspace : '', + hspace : '', + border : '', + align : '' + }; + } + + tinymce.extend(args, { + src : nl.src.value, + width : nl.width.value, + height : nl.height.value, + alt : nl.alt.value, + title : nl.title.value, + 'class' : getSelectValue(f, 'class_list'), + style : nl.style.value, + id : nl.id.value, + dir : nl.dir.value, + lang : nl.lang.value, + usemap : nl.usemap.value, + longdesc : nl.longdesc.value + }); + + args.onmouseover = args.onmouseout = ''; + + if (f.onmousemovecheck.checked) { + if (nl.onmouseoversrc.value) + args.onmouseover = "this.src='" + nl.onmouseoversrc.value + "';"; + + if (nl.onmouseoutsrc.value) + args.onmouseout = "this.src='" + nl.onmouseoutsrc.value + "';"; + } + + el = ed.selection.getNode(); + + if (el && el.nodeName == 'IMG') { + ed.dom.setAttribs(el, args); + } else { + ed.execCommand('mceInsertContent', false, '', {skip_undo : 1}); + ed.dom.setAttribs('__mce_tmp', args); + ed.dom.setAttrib('__mce_tmp', 'id', ''); + ed.undoManager.add(); + } + + tinyMCEPopup.close(); + }, + + getAttrib : function(e, at) { + var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2; + + if (ed.settings.inline_styles) { + switch (at) { + case 'align': + if (v = dom.getStyle(e, 'float')) + return v; + + if (v = dom.getStyle(e, 'vertical-align')) + return v; + + break; + + case 'hspace': + v = dom.getStyle(e, 'margin-left') + v2 = dom.getStyle(e, 'margin-right'); + + if (v && v == v2) + return parseInt(v.replace(/[^0-9]/g, '')); + + break; + + case 'vspace': + v = dom.getStyle(e, 'margin-top') + v2 = dom.getStyle(e, 'margin-bottom'); + if (v && v == v2) + return parseInt(v.replace(/[^0-9]/g, '')); + + break; + + case 'border': + v = 0; + + tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) { + sv = dom.getStyle(e, 'border-' + sv + '-width'); + + // False or not the same as prev + if (!sv || (sv != v && v !== 0)) { + v = 0; + return false; + } + + if (sv) + v = sv; + }); + + if (v) + return parseInt(v.replace(/[^0-9]/g, '')); + + break; + } + } + + if (v = dom.getAttrib(e, at)) + return v; + + return ''; + }, + + setSwapImage : function(st) { + var f = document.forms[0]; + + f.onmousemovecheck.checked = st; + setBrowserDisabled('overbrowser', !st); + setBrowserDisabled('outbrowser', !st); + + if (f.over_list) + f.over_list.disabled = !st; + + if (f.out_list) + f.out_list.disabled = !st; + + f.onmouseoversrc.disabled = !st; + f.onmouseoutsrc.disabled = !st; + }, + + fillClassList : function(id) { + var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl; + + if (v = tinyMCEPopup.getParam('theme_advanced_styles')) { + cl = []; + + tinymce.each(v.split(';'), function(v) { + var p = v.split('='); + + cl.push({'title' : p[0], 'class' : p[1]}); + }); + } else + cl = tinyMCEPopup.editor.dom.getClasses(); + + if (cl.length > 0) { + lst.options.length = 0; + lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), ''); + + tinymce.each(cl, function(o) { + lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']); + }); + } else + dom.remove(dom.getParent(id, 'tr')); + }, + + fillFileList : function(id, l) { + var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl; + + l = window[l]; + lst.options.length = 0; + + if (l && l.length > 0) { + lst.options[lst.options.length] = new Option('', ''); + + tinymce.each(l, function(o) { + lst.options[lst.options.length] = new Option(o[0], o[1]); + }); + } else + dom.remove(dom.getParent(id, 'tr')); + }, + + resetImageData : function() { + var f = document.forms[0]; + + f.elements.width.value = f.elements.height.value = ''; + }, + + updateImageData : function(img, st) { + var f = document.forms[0]; + + if (!st) { + f.elements.width.value = img.width; + f.elements.height.value = img.height; + } + + this.preloadImg = img; + }, + + changeAppearance : function() { + var ed = tinyMCEPopup.editor, f = document.forms[0], img = document.getElementById('alignSampleImg'); + + if (img) { + if (ed.getParam('inline_styles')) { + ed.dom.setAttrib(img, 'style', f.style.value); + } else { + img.align = f.align.value; + img.border = f.border.value; + img.hspace = f.hspace.value; + img.vspace = f.vspace.value; + } + } + }, + + changeHeight : function() { + var f = document.forms[0], tp, t = this; + + if (!f.constrain.checked || !t.preloadImg) { + return; + } + + if (f.width.value == "" || f.height.value == "") + return; + + tp = (parseInt(f.width.value) / parseInt(t.preloadImg.width)) * t.preloadImg.height; + f.height.value = tp.toFixed(0); + }, + + changeWidth : function() { + var f = document.forms[0], tp, t = this; + + if (!f.constrain.checked || !t.preloadImg) { + return; + } + + if (f.width.value == "" || f.height.value == "") + return; + + tp = (parseInt(f.height.value) / parseInt(t.preloadImg.height)) * t.preloadImg.width; + f.width.value = tp.toFixed(0); + }, + + updateStyle : function(ty) { + var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value}); + + if (tinyMCEPopup.editor.settings.inline_styles) { + // Handle align + if (ty == 'align') { + dom.setStyle(img, 'float', ''); + dom.setStyle(img, 'vertical-align', ''); + + v = getSelectValue(f, 'align'); + if (v) { + if (v == 'left' || v == 'right') + dom.setStyle(img, 'float', v); + else + img.style.verticalAlign = v; + } + } + + // Handle border + if (ty == 'border') { + dom.setStyle(img, 'border', ''); + + v = f.border.value; + if (v || v == '0') { + if (v == '0') + img.style.border = '0'; + else + img.style.border = v + 'px solid black'; + } + } + + // Handle hspace + if (ty == 'hspace') { + dom.setStyle(img, 'marginLeft', ''); + dom.setStyle(img, 'marginRight', ''); + + v = f.hspace.value; + if (v) { + img.style.marginLeft = v + 'px'; + img.style.marginRight = v + 'px'; + } + } + + // Handle vspace + if (ty == 'vspace') { + dom.setStyle(img, 'marginTop', ''); + dom.setStyle(img, 'marginBottom', ''); + + v = f.vspace.value; + if (v) { + img.style.marginTop = v + 'px'; + img.style.marginBottom = v + 'px'; + } + } + + // Merge + dom.get('style').value = dom.serializeStyle(dom.parseStyle(img.style.cssText), 'img'); + } + }, + + changeMouseMove : function() { + }, + + showPreviewImage : function(u, st) { + if (!u) { + tinyMCEPopup.dom.setHTML('prev', ''); + return; + } + + if (!st && tinyMCEPopup.getParam("advimage_update_dimensions_onchange", true)) + this.resetImageData(); + + u = tinyMCEPopup.editor.documentBaseURI.toAbsolute(u); + + if (!st) + tinyMCEPopup.dom.setHTML('prev', ''); + else + tinyMCEPopup.dom.setHTML('prev', ''); + } +}; + +ImageDialog.preInit(); +tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog); diff --git a/plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js new file mode 100644 index 0000000000..f493d196fa --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js @@ -0,0 +1,43 @@ +tinyMCE.addI18n('en.advimage_dlg',{ +tab_general:"General", +tab_appearance:"Appearance", +tab_advanced:"Advanced", +general:"General", +title:"Title", +preview:"Preview", +constrain_proportions:"Constrain proportions", +langdir:"Language direction", +langcode:"Language code", +long_desc:"Long description link", +style:"Style", +classes:"Classes", +ltr:"Left to right", +rtl:"Right to left", +id:"Id", +map:"Image map", +swap_image:"Swap image", +alt_image:"Alternative image", +mouseover:"for mouse over", +mouseout:"for mouse out", +misc:"Miscellaneous", +example_img:"Appearance preview image", +missing_alt:"Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.", +dialog_title:"Insert/edit image", +src:"Image URL", +alt:"Image description", +list:"Image list", +border:"Border", +dimensions:"Dimensions", +vspace:"Vertical space", +hspace:"Horizontal space", +align:"Alignment", +align_baseline:"Baseline", +align_top:"Top", +align_middle:"Middle", +align_bottom:"Bottom", +align_texttop:"Text top", +align_textbottom:"Text bottom", +align_left:"Left", +align_right:"Right", +image_list:"Image list" +}); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/advlink/css/advlink.css b/plugins/TinyMCE/js/plugins/advlink/css/advlink.css new file mode 100644 index 0000000000..14364316a1 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advlink/css/advlink.css @@ -0,0 +1,8 @@ +.mceLinkList, .mceAnchorList, #targetlist {width:280px;} +.mceActionPanel {margin-top:7px;} +.panel_wrapper div.current {height:320px;} +#classlist, #title, #href {width:280px;} +#popupurl, #popupname {width:200px;} +#popupwidth, #popupheight, #popupleft, #popuptop {width:30px;vertical-align:middle;text-align:center;} +#id, #style, #classes, #target, #dir, #hreflang, #lang, #charset, #type, #rel, #rev, #tabindex, #accesskey {width:200px;} +#events_panel input {width:200px;} diff --git a/plugins/TinyMCE/js/plugins/advlink/editor_plugin.js b/plugins/TinyMCE/js/plugins/advlink/editor_plugin.js new file mode 100644 index 0000000000..983fe5a9ca --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advlink/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.AdvancedLinkPlugin",{init:function(a,b){this.editor=a;a.addCommand("mceAdvLink",function(){var c=a.selection;if(c.isCollapsed()&&!a.dom.getParent(c.getNode(),"A")){return}a.windowManager.open({file:b+"/link.htm",width:480+parseInt(a.getLang("advlink.delta_width",0)),height:400+parseInt(a.getLang("advlink.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("link",{title:"advlink.link_desc",cmd:"mceAdvLink"});a.addShortcut("ctrl+k","advlink.advlink_desc","mceAdvLink");a.onNodeChange.add(function(d,c,f,e){c.setDisabled("link",e&&f.nodeName!="A");c.setActive("link",f.nodeName=="A"&&!f.name)})},getInfo:function(){return{longname:"Advanced link",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlink",tinymce.plugins.AdvancedLinkPlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/advlink/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/advlink/editor_plugin_src.js new file mode 100644 index 0000000000..14e46a7629 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advlink/editor_plugin_src.js @@ -0,0 +1,61 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.AdvancedLinkPlugin', { + init : function(ed, url) { + this.editor = ed; + + // Register commands + ed.addCommand('mceAdvLink', function() { + var se = ed.selection; + + // No selection and not in link + if (se.isCollapsed() && !ed.dom.getParent(se.getNode(), 'A')) + return; + + ed.windowManager.open({ + file : url + '/link.htm', + width : 480 + parseInt(ed.getLang('advlink.delta_width', 0)), + height : 400 + parseInt(ed.getLang('advlink.delta_height', 0)), + inline : 1 + }, { + plugin_url : url + }); + }); + + // Register buttons + ed.addButton('link', { + title : 'advlink.link_desc', + cmd : 'mceAdvLink' + }); + + ed.addShortcut('ctrl+k', 'advlink.advlink_desc', 'mceAdvLink'); + + ed.onNodeChange.add(function(ed, cm, n, co) { + cm.setDisabled('link', co && n.nodeName != 'A'); + cm.setActive('link', n.nodeName == 'A' && !n.name); + }); + }, + + getInfo : function() { + return { + longname : 'Advanced link', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('advlink', tinymce.plugins.AdvancedLinkPlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/advlink/js/advlink.js b/plugins/TinyMCE/js/plugins/advlink/js/advlink.js new file mode 100644 index 0000000000..b78e82f76b --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advlink/js/advlink.js @@ -0,0 +1,528 @@ +/* Functions for the advlink plugin popup */ + +tinyMCEPopup.requireLangPack(); + +var templates = { + "window.open" : "window.open('${url}','${target}','${options}')" +}; + +function preinit() { + var url; + + if (url = tinyMCEPopup.getParam("external_link_list_url")) + document.write(''); +} + +function changeClass() { + var f = document.forms[0]; + + f.classes.value = getSelectValue(f, 'classlist'); +} + +function init() { + tinyMCEPopup.resizeToInnerSize(); + + var formObj = document.forms[0]; + var inst = tinyMCEPopup.editor; + var elm = inst.selection.getNode(); + var action = "insert"; + var html; + + document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink'); + document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink'); + document.getElementById('linklisthrefcontainer').innerHTML = getLinkListHTML('linklisthref','href'); + document.getElementById('anchorlistcontainer').innerHTML = getAnchorListHTML('anchorlist','href'); + document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target'); + + // Link list + html = getLinkListHTML('linklisthref','href'); + if (html == "") + document.getElementById("linklisthrefrow").style.display = 'none'; + else + document.getElementById("linklisthrefcontainer").innerHTML = html; + + // Resize some elements + if (isVisible('hrefbrowser')) + document.getElementById('href').style.width = '260px'; + + if (isVisible('popupurlbrowser')) + document.getElementById('popupurl').style.width = '180px'; + + elm = inst.dom.getParent(elm, "A"); + if (elm != null && elm.nodeName == "A") + action = "update"; + + formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true); + + setPopupControlsDisabled(true); + + if (action == "update") { + var href = inst.dom.getAttrib(elm, 'href'); + var onclick = inst.dom.getAttrib(elm, 'onclick'); + + // Setup form data + setFormValue('href', href); + setFormValue('title', inst.dom.getAttrib(elm, 'title')); + setFormValue('id', inst.dom.getAttrib(elm, 'id')); + setFormValue('style', inst.dom.getAttrib(elm, "style")); + setFormValue('rel', inst.dom.getAttrib(elm, 'rel')); + setFormValue('rev', inst.dom.getAttrib(elm, 'rev')); + setFormValue('charset', inst.dom.getAttrib(elm, 'charset')); + setFormValue('hreflang', inst.dom.getAttrib(elm, 'hreflang')); + setFormValue('dir', inst.dom.getAttrib(elm, 'dir')); + setFormValue('lang', inst.dom.getAttrib(elm, 'lang')); + setFormValue('tabindex', inst.dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : "")); + setFormValue('accesskey', inst.dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : "")); + setFormValue('type', inst.dom.getAttrib(elm, 'type')); + setFormValue('onfocus', inst.dom.getAttrib(elm, 'onfocus')); + setFormValue('onblur', inst.dom.getAttrib(elm, 'onblur')); + setFormValue('onclick', onclick); + setFormValue('ondblclick', inst.dom.getAttrib(elm, 'ondblclick')); + setFormValue('onmousedown', inst.dom.getAttrib(elm, 'onmousedown')); + setFormValue('onmouseup', inst.dom.getAttrib(elm, 'onmouseup')); + setFormValue('onmouseover', inst.dom.getAttrib(elm, 'onmouseover')); + setFormValue('onmousemove', inst.dom.getAttrib(elm, 'onmousemove')); + setFormValue('onmouseout', inst.dom.getAttrib(elm, 'onmouseout')); + setFormValue('onkeypress', inst.dom.getAttrib(elm, 'onkeypress')); + setFormValue('onkeydown', inst.dom.getAttrib(elm, 'onkeydown')); + setFormValue('onkeyup', inst.dom.getAttrib(elm, 'onkeyup')); + setFormValue('target', inst.dom.getAttrib(elm, 'target')); + setFormValue('classes', inst.dom.getAttrib(elm, 'class')); + + // Parse onclick data + if (onclick != null && onclick.indexOf('window.open') != -1) + parseWindowOpen(onclick); + else + parseFunction(onclick); + + // Select by the values + selectByValue(formObj, 'dir', inst.dom.getAttrib(elm, 'dir')); + selectByValue(formObj, 'rel', inst.dom.getAttrib(elm, 'rel')); + selectByValue(formObj, 'rev', inst.dom.getAttrib(elm, 'rev')); + selectByValue(formObj, 'linklisthref', href); + + if (href.charAt(0) == '#') + selectByValue(formObj, 'anchorlist', href); + + addClassesToList('classlist', 'advlink_styles'); + + selectByValue(formObj, 'classlist', inst.dom.getAttrib(elm, 'class'), true); + selectByValue(formObj, 'targetlist', inst.dom.getAttrib(elm, 'target'), true); + } else + addClassesToList('classlist', 'advlink_styles'); +} + +function checkPrefix(n) { + if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_email'))) + n.value = 'mailto:' + n.value; + + if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external'))) + n.value = 'http://' + n.value; +} + +function setFormValue(name, value) { + document.forms[0].elements[name].value = value; +} + +function parseWindowOpen(onclick) { + var formObj = document.forms[0]; + + // Preprocess center code + if (onclick.indexOf('return false;') != -1) { + formObj.popupreturn.checked = true; + onclick = onclick.replace('return false;', ''); + } else + formObj.popupreturn.checked = false; + + var onClickData = parseLink(onclick); + + if (onClickData != null) { + formObj.ispopup.checked = true; + setPopupControlsDisabled(false); + + var onClickWindowOptions = parseOptions(onClickData['options']); + var url = onClickData['url']; + + formObj.popupname.value = onClickData['target']; + formObj.popupurl.value = url; + formObj.popupwidth.value = getOption(onClickWindowOptions, 'width'); + formObj.popupheight.value = getOption(onClickWindowOptions, 'height'); + + formObj.popupleft.value = getOption(onClickWindowOptions, 'left'); + formObj.popuptop.value = getOption(onClickWindowOptions, 'top'); + + if (formObj.popupleft.value.indexOf('screen') != -1) + formObj.popupleft.value = "c"; + + if (formObj.popuptop.value.indexOf('screen') != -1) + formObj.popuptop.value = "c"; + + formObj.popuplocation.checked = getOption(onClickWindowOptions, 'location') == "yes"; + formObj.popupscrollbars.checked = getOption(onClickWindowOptions, 'scrollbars') == "yes"; + formObj.popupmenubar.checked = getOption(onClickWindowOptions, 'menubar') == "yes"; + formObj.popupresizable.checked = getOption(onClickWindowOptions, 'resizable') == "yes"; + formObj.popuptoolbar.checked = getOption(onClickWindowOptions, 'toolbar') == "yes"; + formObj.popupstatus.checked = getOption(onClickWindowOptions, 'status') == "yes"; + formObj.popupdependent.checked = getOption(onClickWindowOptions, 'dependent') == "yes"; + + buildOnClick(); + } +} + +function parseFunction(onclick) { + var formObj = document.forms[0]; + var onClickData = parseLink(onclick); + + // TODO: Add stuff here +} + +function getOption(opts, name) { + return typeof(opts[name]) == "undefined" ? "" : opts[name]; +} + +function setPopupControlsDisabled(state) { + var formObj = document.forms[0]; + + formObj.popupname.disabled = state; + formObj.popupurl.disabled = state; + formObj.popupwidth.disabled = state; + formObj.popupheight.disabled = state; + formObj.popupleft.disabled = state; + formObj.popuptop.disabled = state; + formObj.popuplocation.disabled = state; + formObj.popupscrollbars.disabled = state; + formObj.popupmenubar.disabled = state; + formObj.popupresizable.disabled = state; + formObj.popuptoolbar.disabled = state; + formObj.popupstatus.disabled = state; + formObj.popupreturn.disabled = state; + formObj.popupdependent.disabled = state; + + setBrowserDisabled('popupurlbrowser', state); +} + +function parseLink(link) { + link = link.replace(new RegExp(''', 'g'), "'"); + + var fnName = link.replace(new RegExp("\\s*([A-Za-z0-9\.]*)\\s*\\(.*", "gi"), "$1"); + + // Is function name a template function + var template = templates[fnName]; + if (template) { + // Build regexp + var variableNames = template.match(new RegExp("'?\\$\\{[A-Za-z0-9\.]*\\}'?", "gi")); + var regExp = "\\s*[A-Za-z0-9\.]*\\s*\\("; + var replaceStr = ""; + for (var i=0; i'); + for (var i=0; i'; + html += ''; + + for (i=0; i' + name + ''; + } + + html += ''; + + return html; +} + +function insertAction() { + var inst = tinyMCEPopup.editor; + var elm, elementArray, i; + + elm = inst.selection.getNode(); + checkPrefix(document.forms[0].href); + + elm = inst.dom.getParent(elm, "A"); + + // Remove element if there is no href + if (!document.forms[0].href.value) { + tinyMCEPopup.execCommand("mceBeginUndoLevel"); + i = inst.selection.getBookmark(); + inst.dom.remove(elm, 1); + inst.selection.moveToBookmark(i); + tinyMCEPopup.execCommand("mceEndUndoLevel"); + tinyMCEPopup.close(); + return; + } + + tinyMCEPopup.execCommand("mceBeginUndoLevel"); + + // Create new anchor elements + if (elm == null) { + inst.getDoc().execCommand("unlink", false, null); + tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1}); + + elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';}); + for (i=0; i' + tinyMCELinkList[i][0] + ''; + + html += ''; + + return html; + + // tinyMCE.debug('-- image list start --', html, '-- image list end --'); +} + +function getTargetListHTML(elm_id, target_form_element) { + var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';'); + var html = ''; + + html += ''; + + return html; +} + +// While loading +preinit(); +tinyMCEPopup.onInit.add(init); diff --git a/plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js new file mode 100644 index 0000000000..c71ffbd0f1 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js @@ -0,0 +1,52 @@ +tinyMCE.addI18n('en.advlink_dlg',{ +title:"Insert/edit link", +url:"Link URL", +target:"Target", +titlefield:"Title", +is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?", +is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?", +list:"Link list", +general_tab:"General", +popup_tab:"Popup", +events_tab:"Events", +advanced_tab:"Advanced", +general_props:"General properties", +popup_props:"Popup properties", +event_props:"Events", +advanced_props:"Advanced properties", +popup_opts:"Options", +anchor_names:"Anchors", +target_same:"Open in this window / frame", +target_parent:"Open in parent window / frame", +target_top:"Open in top frame (replaces all frames)", +target_blank:"Open in new window", +popup:"Javascript popup", +popup_url:"Popup URL", +popup_name:"Window name", +popup_return:"Insert 'return false'", +popup_scrollbars:"Show scrollbars", +popup_statusbar:"Show status bar", +popup_toolbar:"Show toolbars", +popup_menubar:"Show menu bar", +popup_location:"Show location bar", +popup_resizable:"Make window resizable", +popup_dependent:"Dependent (Mozilla/Firefox only)", +popup_size:"Size", +popup_position:"Position (X/Y)", +id:"Id", +style:"Style", +classes:"Classes", +target_name:"Target name", +langdir:"Language direction", +target_langcode:"Target language", +langcode:"Language code", +encoding:"Target character encoding", +mime:"Target MIME type", +rel:"Relationship page to target", +rev:"Relationship target to page", +tabindex:"Tabindex", +accesskey:"Accesskey", +ltr:"Left to right", +rtl:"Right to left", +link_list:"Link list" +}); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/advlink/link.htm b/plugins/TinyMCE/js/plugins/advlink/link.htm new file mode 100644 index 0000000000..876669c6b3 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advlink/link.htm @@ -0,0 +1,333 @@ + + + + {#advlink_dlg.title} + + + + + + + + +
+
+ +
+ +
+
+
+ {#advlink_dlg.general_props} + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
 
+ +
+
+
+ + + +
+
+ {#advlink_dlg.advanced_props} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+
+
+
+
+ +
+
+ {#advlink_dlg.event_props} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/advlist/editor_plugin.js b/plugins/TinyMCE/js/plugins/advlist/editor_plugin.js new file mode 100644 index 0000000000..02d16971a1 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advlist/editor_plugin.js @@ -0,0 +1 @@ +(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square")},createControl:function(d,b){var f=this,e,h;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){h=f[d][0]}function c(i,k){var j=true;a(k.styles,function(m,l){if(f.editor.dom.getStyle(i,l)!=m){j=false;return false}});return j}function g(){var k,i=f.editor,l=i.dom,j=i.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,h)){i.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(h){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,h.styles);k.removeAttribute("_mce_style")}}}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){g()}});e.onRenderMenu.add(function(i,j){j.onShowMenu.add(function(){var m=f.editor.dom,l=m.getParent(f.editor.selection.getNode(),"ol,ul"),k;if(l||h){k=f[d];a(j.items,function(n){var o=true;n.setSelected(0);if(l&&!n.isDisabled()){a(k,function(p){if(p.id==n.id){if(!c(l,p)){o=false;return false}}});if(o){n.setSelected(1)}}});if(!l){j.items[h.id].setSelected(1)}}});j.add({id:f.editor.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle"}).setDisabled(1);a(f[d],function(k){k.id=f.editor.dom.uniqueId();j.add({id:k.id,title:k.title,onclick:function(){h=k;g()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js new file mode 100644 index 0000000000..a61887a922 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js @@ -0,0 +1,154 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + var each = tinymce.each; + + tinymce.create('tinymce.plugins.AdvListPlugin', { + init : function(ed, url) { + var t = this; + + t.editor = ed; + + function buildFormats(str) { + var formats = []; + + each(str.split(/,/), function(type) { + formats.push({ + title : 'advlist.' + (type == 'default' ? 'def' : type.replace(/-/g, '_')), + styles : { + listStyleType : type == 'default' ? '' : type + } + }); + }); + + return formats; + }; + + // Setup number formats from config or default + t.numlist = ed.getParam("advlist_number_styles") || buildFormats("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman"); + t.bullist = ed.getParam("advlist_bullet_styles") || buildFormats("default,circle,disc,square"); + }, + + createControl: function(name, cm) { + var t = this, btn, format; + + if (name == 'numlist' || name == 'bullist') { + // Default to first item if it's a default item + if (t[name][0].title == 'advlist.def') + format = t[name][0]; + + function hasFormat(node, format) { + var state = true; + + each(format.styles, function(value, name) { + // Format doesn't match + if (t.editor.dom.getStyle(node, name) != value) { + state = false; + return false; + } + }); + + return state; + }; + + function applyListFormat() { + var list, ed = t.editor, dom = ed.dom, sel = ed.selection; + + // Check for existing list element + list = dom.getParent(sel.getNode(), 'ol,ul'); + + // Switch/add list type if needed + if (!list || list.nodeName == (name == 'bullist' ? 'OL' : 'UL') || hasFormat(list, format)) + ed.execCommand(name == 'bullist' ? 'InsertUnorderedList' : 'InsertOrderedList'); + + // Append styles to new list element + if (format) { + list = dom.getParent(sel.getNode(), 'ol,ul'); + + if (list) { + dom.setStyles(list, format.styles); + list.removeAttribute('_mce_style'); + } + } + }; + + btn = cm.createSplitButton(name, { + title : 'advanced.' + name + '_desc', + 'class' : 'mce_' + name, + onclick : function() { + applyListFormat(); + } + }); + + btn.onRenderMenu.add(function(btn, menu) { + menu.onShowMenu.add(function() { + var dom = t.editor.dom, list = dom.getParent(t.editor.selection.getNode(), 'ol,ul'), fmtList; + + if (list || format) { + fmtList = t[name]; + + // Unselect existing items + each(menu.items, function(item) { + var state = true; + + item.setSelected(0); + + if (list && !item.isDisabled()) { + each(fmtList, function(fmt) { + if (fmt.id == item.id) { + if (!hasFormat(list, fmt)) { + state = false; + return false; + } + } + }); + + if (state) + item.setSelected(1); + } + }); + + // Select the current format + if (!list) + menu.items[format.id].setSelected(1); + } + }); + + menu.add({id : t.editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle'}).setDisabled(1); + + each(t[name], function(item) { + item.id = t.editor.dom.uniqueId(); + + menu.add({id : item.id, title : item.title, onclick : function() { + format = item; + applyListFormat(); + }}); + }); + }); + + return btn; + } + }, + + getInfo : function() { + return { + longname : 'Advanced lists', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('advlist', tinymce.plugins.AdvListPlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js new file mode 100644 index 0000000000..220b84ac47 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this;if(a.getParam("fullscreen_is_enabled")){return}function b(){var h=a.getDoc(),e=h.body,j=h.documentElement,g=tinymce.DOM,i=d.autoresize_min_height,f;f=tinymce.isIE?e.scrollHeight:j.offsetHeight;if(f>d.autoresize_min_height){i=f}g.setStyle(g.get(a.id+"_ifr"),"height",i+"px");if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=a.getElement().offsetHeight;a.onInit.add(function(f,e){f.setProgressState(true);d.throbbing=true;f.getBody().style.overflowY="hidden"});a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);a.onLoadContent.add(function(f,e){b();setTimeout(function(){b();f.setProgressState(false);d.throbbing=false},1250)});a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js new file mode 100644 index 0000000000..37709f5629 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js @@ -0,0 +1,117 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + /** + * Auto Resize + * + * This plugin automatically resizes the content area to fit its content height. + * It will retain a minimum height, which is the height of the content area when + * it's initialized. + */ + tinymce.create('tinymce.plugins.AutoResizePlugin', { + /** + * Initializes the plugin, this will be executed after the plugin has been created. + * This call is done before the editor instance has finished it's initialization so use the onInit event + * of the editor instance to intercept that event. + * + * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in. + * @param {string} url Absolute URL to where the plugin is located. + */ + init : function(ed, url) { + var t = this; + + if (ed.getParam('fullscreen_is_enabled')) + return; + + /** + * This method gets executed each time the editor needs to resize. + */ + function resize() { + var d = ed.getDoc(), b = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight; + + // Get height differently depending on the browser used + myHeight = tinymce.isIE ? b.scrollHeight : de.offsetHeight; + + // Don't make it smaller than the minimum height + if (myHeight > t.autoresize_min_height) + resizeHeight = myHeight; + + // Resize content element + DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px'); + + // if we're throbbing, we'll re-throb to match the new size + if (t.throbbing) { + ed.setProgressState(false); + ed.setProgressState(true); + } + }; + + t.editor = ed; + + // Define minimum height + t.autoresize_min_height = ed.getElement().offsetHeight; + + // Things to do when the editor is ready + ed.onInit.add(function(ed, l) { + // Show throbber until content area is resized properly + ed.setProgressState(true); + t.throbbing = true; + + // Hide scrollbars + ed.getBody().style.overflowY = "hidden"; + }); + + // Add appropriate listeners for resizing content area + ed.onChange.add(resize); + ed.onSetContent.add(resize); + ed.onPaste.add(resize); + ed.onKeyUp.add(resize); + ed.onPostRender.add(resize); + + ed.onLoadContent.add(function(ed, l) { + resize(); + + // Because the content area resizes when its content CSS loads, + // and we can't easily add a listener to its onload event, + // we'll just trigger a resize after a short loading period + setTimeout(function() { + resize(); + + // Disable throbber + ed.setProgressState(false); + t.throbbing = false; + }, 1250); + }); + + // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample'); + ed.addCommand('mceAutoResize', resize); + }, + + /** + * Returns information about the plugin as a name/value array. + * The current keys are longname, author, authorurl, infourl and version. + * + * @return {Object} Name/value array containing information about the plugin. + */ + getInfo : function() { + return { + longname : 'Auto Resize', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('autoresize', tinymce.plugins.AutoResizePlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/autosave/editor_plugin.js b/plugins/TinyMCE/js/plugins/autosave/editor_plugin.js new file mode 100644 index 0000000000..b33ebfb7c4 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/autosave/editor_plugin.js @@ -0,0 +1 @@ +(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent().replace(/\s| |<\/?p[^>]*>|]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();m.save("TinyMCE")},getItem:function(l){var m=i.getElement();m.load("TinyMCE");return m.getAttribute(l)},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent();if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,i=h.storage;if(i){content=i.getItem(h.key);if(content){h.editor.setContent(content);h.onRestoreDraft.dispatch(h,{content:content})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()]*>|]*>/gi, "").length > 0) { + // Show confirm dialog if the editor isn't empty + ed.windowManager.confirm( + PLUGIN_NAME + ".warning_message", + function(ok) { + if (ok) + self.restoreDraft(); + } + ); + } else + self.restoreDraft(); + } + }); + + // Enable/disable restoredraft button depending on if there is a draft stored or not + ed.onNodeChange.add(function() { + var controlManager = ed.controlManager; + + if (controlManager.get(RESTORE_DRAFT)) + controlManager.setDisabled(RESTORE_DRAFT, !self.hasDraft()); + }); + + ed.onInit.add(function() { + // Check if the user added the restore button, then setup auto storage logic + if (ed.controlManager.get(RESTORE_DRAFT)) { + // Setup storage engine + self.setupStorage(ed); + + // Auto save contents each interval time + setInterval(function() { + self.storeDraft(); + ed.nodeChanged(); + }, settings.autosave_interval); + } + }); + + /** + * This event gets fired when a draft is stored to local storage. + * + * @event onStoreDraft + * @param {tinymce.plugins.AutoSave} sender Plugin instance sending the event. + * @param {Object} draft Draft object containing the HTML contents of the editor. + */ + self.onStoreDraft = new Dispatcher(self); + + /** + * This event gets fired when a draft is restored from local storage. + * + * @event onStoreDraft + * @param {tinymce.plugins.AutoSave} sender Plugin instance sending the event. + * @param {Object} draft Draft object containing the HTML contents of the editor. + */ + self.onRestoreDraft = new Dispatcher(self); + + /** + * This event gets fired when a draft removed/expired. + * + * @event onRemoveDraft + * @param {tinymce.plugins.AutoSave} sender Plugin instance sending the event. + * @param {Object} draft Draft object containing the HTML contents of the editor. + */ + self.onRemoveDraft = new Dispatcher(self); + + // Add ask before unload dialog only add one unload handler + if (!unloadHandlerAdded) { + window.onbeforeunload = tinymce.plugins.AutoSave._beforeUnloadHandler; + unloadHandlerAdded = TRUE; + } + }, + + /** + * Returns information about the plugin as a name/value array. + * The current keys are longname, author, authorurl, infourl and version. + * + * @method getInfo + * @return {Object} Name/value array containing information about the plugin. + */ + getInfo : function() { + return { + longname : 'Auto save', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + /** + * Returns an expiration date UTC string. + * + * @method getExpDate + * @return {String} Expiration date UTC string. + */ + getExpDate : function() { + return new Date( + new Date().getTime() + this.editor.settings.autosave_retention + ).toUTCString(); + }, + + /** + * This method will setup the storage engine. If the browser has support for it. + * + * @method setupStorage + */ + setupStorage : function(ed) { + var self = this, testKey = PLUGIN_NAME + '_test', testVal = "OK"; + + self.key = PLUGIN_NAME + ed.id; + + // Loop though each storage engine type until we find one that works + tinymce.each([ + function() { + // Try HTML5 Local Storage + if (localStorage) { + localStorage.setItem(testKey, testVal); + + if (localStorage.getItem(testKey) === testVal) { + localStorage.removeItem(testKey); + + return localStorage; + } + } + }, + + function() { + // Try HTML5 Session Storage + if (sessionStorage) { + sessionStorage.setItem(testKey, testVal); + + if (sessionStorage.getItem(testKey) === testVal) { + sessionStorage.removeItem(testKey); + + return sessionStorage; + } + } + }, + + function() { + // Try IE userData + if (tinymce.isIE) { + ed.getElement().style.behavior = "url('#default#userData')"; + + // Fake localStorage on old IE + return { + autoExpires : TRUE, + + setItem : function(key, value) { + var userDataElement = ed.getElement(); + + userDataElement.setAttribute(key, value); + userDataElement.expires = self.getExpDate(); + userDataElement.save("TinyMCE"); + }, + + getItem : function(key) { + var userDataElement = ed.getElement(); + + userDataElement.load("TinyMCE"); + + return userDataElement.getAttribute(key); + }, + + removeItem : function(key) { + ed.getElement().removeAttribute(key); + } + }; + } + }, + ], function(setup) { + // Try executing each function to find a suitable storage engine + try { + self.storage = setup(); + + if (self.storage) + return false; + } catch (e) { + // Ignore + } + }); + }, + + /** + * This method will store the current contents in the the storage engine. + * + * @method storeDraft + */ + storeDraft : function() { + var self = this, storage = self.storage, editor = self.editor, expires, content; + + // Is the contents dirty + if (storage) { + // If there is no existing key and the contents hasn't been changed since + // it's original value then there is no point in saving a draft + if (!storage.getItem(self.key) && !editor.isDirty()) + return; + + // Store contents if the contents if longer than the minlength of characters + content = editor.getContent(); + if (content.length > editor.settings.autosave_minlength) { + expires = self.getExpDate(); + + // Store expiration date if needed IE userData has auto expire built in + if (!self.storage.autoExpires) + self.storage.setItem(self.key + "_expires", expires); + + self.storage.setItem(self.key, content); + self.onStoreDraft.dispatch(self, { + expires : expires, + content : content + }); + } + } + }, + + /** + * This method will restore the contents from the storage engine back to the editor. + * + * @method restoreDraft + */ + restoreDraft : function() { + var self = this, storage = self.storage; + + if (storage) { + content = storage.getItem(self.key); + + if (content) { + self.editor.setContent(content); + self.onRestoreDraft.dispatch(self, { + content : content + }); + } + } + }, + + /** + * This method will return true/false if there is a local storage draft available. + * + * @method hasDraft + * @return {boolean} true/false state if there is a local draft. + */ + hasDraft : function() { + var self = this, storage = self.storage, expDate, exists; + + if (storage) { + // Does the item exist at all + exists = !!storage.getItem(self.key); + if (exists) { + // Storage needs autoexpire + if (!self.storage.autoExpires) { + expDate = new Date(storage.getItem(self.key + "_expires")); + + // Contents hasn't expired + if (new Date().getTime() < expDate.getTime()) + return TRUE; + + // Remove it if it has + self.removeDraft(); + } else + return TRUE; + } + } + + return false; + }, + + /** + * Removes the currently stored draft. + * + * @method removeDraft + */ + removeDraft : function() { + var self = this, storage = self.storage, key = self.key, content; + + if (storage) { + // Get current contents and remove the existing draft + content = storage.getItem(key); + storage.removeItem(key); + storage.removeItem(key + "_expires"); + + // Dispatch remove event if we had any contents + if (content) { + self.onRemoveDraft.dispatch(self, { + content : content + }); + } + } + }, + + "static" : { + // Internal unload handler will be called before the page is unloaded + _beforeUnloadHandler : function(e) { + var msg; + + tinymce.each(tinyMCE.editors, function(ed) { + // Store a draft for each editor instance + if (ed.plugins.autosave) + ed.plugins.autosave.storeDraft(); + + // Never ask in fullscreen mode + if (ed.getParam("fullscreen_is_enabled")) + return; + + // Setup a return message if the editor is dirty + if (!msg && ed.isDirty() && ed.getParam("autosave_ask_before_unload")) + msg = ed.getLang("autosave.unload_msg"); + }); + + return msg; + } + } + }); + + tinymce.PluginManager.add('autosave', tinymce.plugins.AutoSave); +})(tinymce); diff --git a/plugins/TinyMCE/js/plugins/autosave/langs/en.js b/plugins/TinyMCE/js/plugins/autosave/langs/en.js new file mode 100644 index 0000000000..fce6bd3e1f --- /dev/null +++ b/plugins/TinyMCE/js/plugins/autosave/langs/en.js @@ -0,0 +1,4 @@ +tinyMCE.addI18n('en.autosave',{ +restore_content: "Restore auto-saved content", +warning_message: "If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?" +}); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js new file mode 100644 index 0000000000..930fdff0af --- /dev/null +++ b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/(.*?)<\/font>/gi,"$1");b(//gi,"[img]$1[/img]");b(/(.*?)<\/span>/gi,"[code]$1[/code]");b(/(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/(.*?)<\/span>/gi,"[u]$1[/u]");b(//gi,"[u]");b(/]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/
/gi,"\n");b(//gi,"\n");b(/
/gi,"\n");b(/

/gi,"");b(/<\/p>/gi,"\n");b(/ /gi," ");b(/"/gi,'"');b(/</gi,"<");b(/>/gi,">");b(/&/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"
");b(/\[b\]/gi,"");b(/\[\/b\]/gi,"");b(/\[i\]/gi,"");b(/\[\/i\]/gi,"");b(/\[u\]/gi,"");b(/\[\/u\]/gi,"");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'$2');b(/\[url\](.*?)\[\/url\]/gi,'$1');b(/\[img\](.*?)\[\/img\]/gi,'');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'$2');b(/\[code\](.*?)\[\/code\]/gi,'$1 ');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'$1 ');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js new file mode 100644 index 0000000000..5586637f33 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js @@ -0,0 +1,120 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.BBCodePlugin', { + init : function(ed, url) { + var t = this, dialect = ed.getParam('bbcode_dialect', 'punbb').toLowerCase(); + + ed.onBeforeSetContent.add(function(ed, o) { + o.content = t['_' + dialect + '_bbcode2html'](o.content); + }); + + ed.onPostProcess.add(function(ed, o) { + if (o.set) + o.content = t['_' + dialect + '_bbcode2html'](o.content); + + if (o.get) + o.content = t['_' + dialect + '_html2bbcode'](o.content); + }); + }, + + getInfo : function() { + return { + longname : 'BBCode Plugin', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + // Private methods + + // HTML -> BBCode in PunBB dialect + _punbb_html2bbcode : function(s) { + s = tinymce.trim(s); + + function rep(re, str) { + s = s.replace(re, str); + }; + + // example: to [b] + rep(/(.*?)<\/a>/gi,"[url=$1]$2[/url]"); + rep(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"); + rep(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"); + rep(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"); + rep(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"); + rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]"); + rep(/(.*?)<\/font>/gi,"[color=$1]$2[/color]"); + rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]"); + rep(/(.*?)<\/font>/gi,"$1"); + rep(//gi,"[img]$1[/img]"); + rep(/(.*?)<\/span>/gi,"[code]$1[/code]"); + rep(/(.*?)<\/span>/gi,"[quote]$1[/quote]"); + rep(/(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]"); + rep(/(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]"); + rep(/(.*?)<\/em>/gi,"[code][i]$1[/i][/code]"); + rep(/(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]"); + rep(/(.*?)<\/u>/gi,"[code][u]$1[/u][/code]"); + rep(/(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]"); + rep(/<\/(strong|b)>/gi,"[/b]"); + rep(/<(strong|b)>/gi,"[b]"); + rep(/<\/(em|i)>/gi,"[/i]"); + rep(/<(em|i)>/gi,"[i]"); + rep(/<\/u>/gi,"[/u]"); + rep(/(.*?)<\/span>/gi,"[u]$1[/u]"); + rep(//gi,"[u]"); + rep(/]*>/gi,"[quote]"); + rep(/<\/blockquote>/gi,"[/quote]"); + rep(/
/gi,"\n"); + rep(//gi,"\n"); + rep(/
/gi,"\n"); + rep(/

/gi,""); + rep(/<\/p>/gi,"\n"); + rep(/ /gi," "); + rep(/"/gi,"\""); + rep(/</gi,"<"); + rep(/>/gi,">"); + rep(/&/gi,"&"); + + return s; + }, + + // BBCode -> HTML from PunBB dialect + _punbb_bbcode2html : function(s) { + s = tinymce.trim(s); + + function rep(re, str) { + s = s.replace(re, str); + }; + + // example: [b] to + rep(/\n/gi,"
"); + rep(/\[b\]/gi,""); + rep(/\[\/b\]/gi,""); + rep(/\[i\]/gi,""); + rep(/\[\/i\]/gi,""); + rep(/\[u\]/gi,""); + rep(/\[\/u\]/gi,""); + rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2"); + rep(/\[url\](.*?)\[\/url\]/gi,"$1"); + rep(/\[img\](.*?)\[\/img\]/gi,""); + rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); + rep(/\[code\](.*?)\[\/code\]/gi,"$1 "); + rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"$1 "); + + return s; + } + }); + + // Register plugin + tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js new file mode 100644 index 0000000000..24ee2eb4a0 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js @@ -0,0 +1 @@ +(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(d){var f=this;f.editor=d;f.onContextMenu=new tinymce.util.Dispatcher(this);d.onContextMenu.add(function(g,h){if(!h.ctrlKey){f._getMenu(g).showMenu(h.clientX,h.clientY);a.add(g.getDoc(),"click",e);a.cancel(h)}});function e(){if(f._menu){f._menu.removeAll();f._menu.destroy();a.remove(d.getDoc(),"click",e)}}d.onMouseDown.add(e);d.onKeyDown.add(e)},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(h){var l=this,f=l._menu,i=h.selection,e=i.isCollapsed(),d=i.getNode()||h.getBody(),g,k,j;if(f){f.removeAll();f.destroy()}k=b.getPos(h.getContentAreaContainer());j=b.getPos(h.getContainer());f=h.controlManager.createDropMenu("contextmenu",{offset_x:k.x+h.getParam("contextmenu_offset_x",0),offset_y:k.y+h.getParam("contextmenu_offset_y",0),constrain:1});l._menu=f;f.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(e);f.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(e);f.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((d.nodeName=="A"&&!h.dom.getAttrib(d,"name"))||!e){f.addSeparator();f.add({title:"advanced.link_desc",icon:"link",cmd:h.plugins.advlink?"mceAdvLink":"mceLink",ui:true});f.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}f.addSeparator();f.add({title:"advanced.image_desc",icon:"image",cmd:h.plugins.advimage?"mceAdvImage":"mceImage",ui:true});f.addSeparator();g=f.addMenu({title:"contextmenu.align"});g.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});g.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});g.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});g.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});l.onContextMenu.dispatch(l,f,d,e);return f}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js new file mode 100644 index 0000000000..26e9ce2f8b --- /dev/null +++ b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js @@ -0,0 +1,127 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + var Event = tinymce.dom.Event, each = tinymce.each, DOM = tinymce.DOM; + + /** + * This plugin a context menu to TinyMCE editor instances. + * + * @class tinymce.plugins.ContextMenu + */ + tinymce.create('tinymce.plugins.ContextMenu', { + /** + * Initializes the plugin, this will be executed after the plugin has been created. + * This call is done before the editor instance has finished it's initialization so use the onInit event + * of the editor instance to intercept that event. + * + * @method init + * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in. + * @param {string} url Absolute URL to where the plugin is located. + */ + init : function(ed) { + var t = this; + + t.editor = ed; + + /** + * This event gets fired when the context menu is shown. + * + * @event onContextMenu + * @param {tinymce.plugins.ContextMenu} sender Plugin instance sending the event. + * @param {tinymce.ui.DropMenu} menu Drop down menu to fill with more items if needed. + */ + t.onContextMenu = new tinymce.util.Dispatcher(this); + + ed.onContextMenu.add(function(ed, e) { + if (!e.ctrlKey) { + t._getMenu(ed).showMenu(e.clientX, e.clientY); + Event.add(ed.getDoc(), 'click', hide); + Event.cancel(e); + } + }); + + function hide() { + if (t._menu) { + t._menu.removeAll(); + t._menu.destroy(); + Event.remove(ed.getDoc(), 'click', hide); + } + }; + + ed.onMouseDown.add(hide); + ed.onKeyDown.add(hide); + }, + + /** + * Returns information about the plugin as a name/value array. + * The current keys are longname, author, authorurl, infourl and version. + * + * @method getInfo + * @return {Object} Name/value array containing information about the plugin. + */ + getInfo : function() { + return { + longname : 'Contextmenu', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + _getMenu : function(ed) { + var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p1, p2; + + if (m) { + m.removeAll(); + m.destroy(); + } + + p1 = DOM.getPos(ed.getContentAreaContainer()); + p2 = DOM.getPos(ed.getContainer()); + + m = ed.controlManager.createDropMenu('contextmenu', { + offset_x : p1.x + ed.getParam('contextmenu_offset_x', 0), + offset_y : p1.y + ed.getParam('contextmenu_offset_y', 0), + constrain : 1 + }); + + t._menu = m; + + m.add({title : 'advanced.cut_desc', icon : 'cut', cmd : 'Cut'}).setDisabled(col); + m.add({title : 'advanced.copy_desc', icon : 'copy', cmd : 'Copy'}).setDisabled(col); + m.add({title : 'advanced.paste_desc', icon : 'paste', cmd : 'Paste'}); + + if ((el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) || !col) { + m.addSeparator(); + m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true}); + m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'}); + } + + m.addSeparator(); + m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true}); + + m.addSeparator(); + am = m.addMenu({title : 'contextmenu.align'}); + am.add({title : 'contextmenu.left', icon : 'justifyleft', cmd : 'JustifyLeft'}); + am.add({title : 'contextmenu.center', icon : 'justifycenter', cmd : 'JustifyCenter'}); + am.add({title : 'contextmenu.right', icon : 'justifyright', cmd : 'JustifyRight'}); + am.add({title : 'contextmenu.full', icon : 'justifyfull', cmd : 'JustifyFull'}); + + t.onContextMenu.dispatch(t, m, el, col); + + return m; + } + }); + + // Register plugin + tinymce.PluginManager.add('contextmenu', tinymce.plugins.ContextMenu); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/directionality/editor_plugin.js b/plugins/TinyMCE/js/plugins/directionality/editor_plugin.js new file mode 100644 index 0000000000..bce8e73995 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/directionality/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceDirectionLTR",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="ltr"){a.dom.setAttrib(d,"dir","ltr")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addCommand("mceDirectionRTL",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="rtl"){a.dom.setAttrib(d,"dir","rtl")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});a.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});a.onNodeChange.add(c._nodeChange,c)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/directionality/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/directionality/editor_plugin_src.js new file mode 100644 index 0000000000..4444959bf3 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/directionality/editor_plugin_src.js @@ -0,0 +1,82 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.Directionality', { + init : function(ed, url) { + var t = this; + + t.editor = ed; + + ed.addCommand('mceDirectionLTR', function() { + var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock); + + if (e) { + if (ed.dom.getAttrib(e, "dir") != "ltr") + ed.dom.setAttrib(e, "dir", "ltr"); + else + ed.dom.setAttrib(e, "dir", ""); + } + + ed.nodeChanged(); + }); + + ed.addCommand('mceDirectionRTL', function() { + var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock); + + if (e) { + if (ed.dom.getAttrib(e, "dir") != "rtl") + ed.dom.setAttrib(e, "dir", "rtl"); + else + ed.dom.setAttrib(e, "dir", ""); + } + + ed.nodeChanged(); + }); + + ed.addButton('ltr', {title : 'directionality.ltr_desc', cmd : 'mceDirectionLTR'}); + ed.addButton('rtl', {title : 'directionality.rtl_desc', cmd : 'mceDirectionRTL'}); + + ed.onNodeChange.add(t._nodeChange, t); + }, + + getInfo : function() { + return { + longname : 'Directionality', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + // Private methods + + _nodeChange : function(ed, cm, n) { + var dom = ed.dom, dir; + + n = dom.getParent(n, dom.isBlock); + if (!n) { + cm.setDisabled('ltr', 1); + cm.setDisabled('rtl', 1); + return; + } + + dir = dom.getAttrib(n, 'dir'); + cm.setActive('ltr', dir == "ltr"); + cm.setDisabled('ltr', 0); + cm.setActive('rtl', dir == "rtl"); + cm.setDisabled('rtl', 0); + } + }); + + // Register plugin + tinymce.PluginManager.add('directionality', tinymce.plugins.Directionality); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/emotions/editor_plugin.js b/plugins/TinyMCE/js/plugins/emotions/editor_plugin.js new file mode 100644 index 0000000000..dbdd8ffb58 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/emotions/editor_plugin.js @@ -0,0 +1 @@ +(function(a){a.create("tinymce.plugins.EmotionsPlugin",{init:function(b,c){b.addCommand("mceEmotion",function(){b.windowManager.open({file:c+"/emotions.htm",width:250+parseInt(b.getLang("emotions.delta_width",0)),height:160+parseInt(b.getLang("emotions.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("emotions",{title:"emotions.emotions_desc",cmd:"mceEmotion"})},getInfo:function(){return{longname:"Emotions",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("emotions",a.plugins.EmotionsPlugin)})(tinymce); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/emotions/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/emotions/editor_plugin_src.js new file mode 100644 index 0000000000..71d5416972 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/emotions/editor_plugin_src.js @@ -0,0 +1,43 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function(tinymce) { + tinymce.create('tinymce.plugins.EmotionsPlugin', { + init : function(ed, url) { + // Register commands + ed.addCommand('mceEmotion', function() { + ed.windowManager.open({ + file : url + '/emotions.htm', + width : 250 + parseInt(ed.getLang('emotions.delta_width', 0)), + height : 160 + parseInt(ed.getLang('emotions.delta_height', 0)), + inline : 1 + }, { + plugin_url : url + }); + }); + + // Register buttons + ed.addButton('emotions', {title : 'emotions.emotions_desc', cmd : 'mceEmotion'}); + }, + + getInfo : function() { + return { + longname : 'Emotions', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('emotions', tinymce.plugins.EmotionsPlugin); +})(tinymce); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/emotions/emotions.htm b/plugins/TinyMCE/js/plugins/emotions/emotions.htm new file mode 100644 index 0000000000..55a1d72fa7 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/emotions/emotions.htm @@ -0,0 +1,40 @@ + + + + {#emotions_dlg.title} + + + + +

+
{#emotions_dlg.title}:

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
{#emotions_dlg.cool}{#emotions_dlg.cry}{#emotions_dlg.embarassed}{#emotions_dlg.foot_in_mouth}
{#emotions_dlg.frown}{#emotions_dlg.innocent}{#emotions_dlg.kiss}{#emotions_dlg.laughing}
{#emotions_dlg.money_mouth}{#emotions_dlg.sealed}{#emotions_dlg.smile}{#emotions_dlg.surprised}
{#emotions_dlg.tongue-out}{#emotions_dlg.undecided}{#emotions_dlg.wink}{#emotions_dlg.yell}
+
+ + diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-cool.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-cool.gif new file mode 100644 index 0000000000000000000000000000000000000000..ba90cc36fb0415d0273d1cd206bff63fd9c91fde GIT binary patch literal 354 zcmV-o0iFIwNk%w1VG;lm0Mr!#3ke00dJfFY%i+lrhK7V(RutUQJhPY;?(XfrsZKgL z7WLQ^zPO&zzav{)SL^9nBOw~z(=orMEH5uC-P_gr`uhCnASMa|$-iRw?m_(dUwU8) zq>Kx}s1_F$4FCWDA^8LW0018VEC2ui01^Na000Hw;3tYzX_jM3Qpv$_M?zI9i5=0S zX-{-uv=l3%&P0s%m9Ox_a(m_c|u z01g3U0`Wll5)poVdma=N8y<3f0Sf~hXmTC}2oxMW4FdxUj+z4<0}lrX2nP=qkDRIt z9Ge*(qzMrj3jrIOjvI{`5eWzt3`G_T8yChG8w(a19SkK12@M(+799Zr9n=~PzBCmA z5)BU-)YKUd4H5!D9|!^o9kWIe9SH(WDHRk92}DZ?3})2$P@$55g90f0N)ZA8JID5J Aw*UYD literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-cry.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-cry.gif new file mode 100644 index 0000000000000000000000000000000000000000..74d897a4f6d22e814e2b054e98b8a75fb464b4be GIT binary patch literal 329 zcmV-P0k-}}Nk%w1VG;lm0Mr-&E)xPSit@9T3%;vR+|V+?t0A(pllJjXrMl7n=_A_a za^B+Su$LjvyC3@TIQZNZa##w=!k(SO^P#bO*w(eU#;{U83XFCU_V)J5wrb+;g2vkN z#>U24qVoOvY5)KLA^8LW0018VEC2ui01^Na000HX;3tY$X_jM3QUfCh%s^o(nF++< zc?Th6v=oL>*by8K!mhvwelUXuuW&&U9iGO3hM@>Njw{l^#0q9mWpcefdI;O$;efnY zkd~@r-o$*74FCWI1%d((4+jDz0va0>69^fI6%`W{8w!gU1pyL>prH>E0R<%k6Aq%H z4ij+^9TEwM5P}eh2@)L<~6+>@EpxfA0YrcPNsSu literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-embarassed.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-embarassed.gif new file mode 100644 index 0000000000000000000000000000000000000000..963a96b8a7593b1d8bcbab073abe5ee4e539dbf6 GIT binary patch literal 331 zcmV-R0kr-{Nk%w1VG;lm0MrryDh>j~yq&6%75dW~z^P39(NxsGDE{UkxtkIEq(S-a zRKlwv+S=Lr?>hbYY~sQ?c3T&ZcN_Nh_EU3s(>Io6B&>WW`@bsw**)Ocy1bht z{*G6|uwwqUQ2+n{A^8LW0018VEC2ui01^Na000HZ;3tYwX_jM3YQ!c88=*-m*&&bO zILd=`w3KAC;8hxpif*w9ek6oqV-Z0L77fROK$BSR@5BAv-%C>6y>>#+D4e#&nz^qMDItlpp zTG728+|V&?R13PIEBW(C`uh6d*t-1sZ^XQv;oDD}iYLOV7uVO;{`xl4#4tJ{0;h@! z>)kfFn;iS@Hvj+tA^8LW0018VEC2ui01^Na000Hm;3tYuX_jM3Mo7199TGt*Nf;R= zNmOPKwA8_2Q6MTDP6eT`I1VESVj-zGIG(JdB3U44kcdI@;AAq{Gv^^O%%ltj2GdB) z>vIL;d*~=0a|w1Bf^!cF9R~+vb94;_0}TxWlnMrlj2MuVoSYAreF`3(0|pHS8VLgr zi3bP_qZ;q#>Sw62=mns-On=0wransPVevT^YK{Dy(0YY zH)vE6x0?;Wqb>gZas1^OT0si>`ugD5y87}*#H$s=yq(wA*8cf7{`y+(+9J7|9QfT7 z`ROHiU=Y&6FaQ7mA^8LW0018VEC2ui01^Na000Hi;3tYvX_jM3N`@u~nju9hSuh^r zIEcp-wA7(NL0~2d#RP+(G!CPPA>o*KJjv_CkucCA5=K?AfF#RG2V*8BU@jL304|4P z2;PGRF@bj$et;Jf2pR_mVsIA<85|n}kQ*Bq42Ovqj*yy>6P0=h3X&9Z01yyk~2N4w%7#RW^55W%`0vQ+-6(y_*2pqz~90*;x9}yM}%$UI(7t#$D mK_3Se1{4HKM+6iG7EmeH6$V631{L5n)#CyC0qx-*Apkoyg?w!Q literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-innocent.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-innocent.gif new file mode 100644 index 0000000000000000000000000000000000000000..334d49e0e60f2997c9ba24071764f95d9e08a5cc GIT binary patch literal 336 zcmV-W0k8f?Nk%w1VG;lm0MrryI4TI-%dP0m5~*+Y`T~ z7Rth){q{I_X%*S48uRZ|(b3V&wIKTX`u+WJzo<^$#wuY;3W|Cf{O29IkTAcaE&lpe z+P*^H)-tknA^-pYA^8LW0018VEC2ui01^Na000He;3tYwX_n)75QgVvNQ`6#5gcMm zEEG~blgXokptKAJgCU?%JT?yos!R6cPtcQWh2siHlNI2L}ifQhgX02^InZ2?-ktkqVRyZJY^Trk|lv zovp437?1~d46O)?2(1i+2NDYk8<+_Kil!K!3njA^!I#dL8x<729}*B65mC=m5gHH@ iDi9P3f*VjB3KS4HDb_qqRul{0DIT=Nk%w1VG;lm0Mrx!QauaC#>Vb6G=_5=^YB^9wrc376Sb5I-qJGf@9vZ# z5WlKU(!eVB+7tfnDXp0zyB`?BZ5IChalob*`uh6d*t+@dKGHcU+L|83yq*5~IoH?L zy`?Gp<{bX|SpWb4A^8LW0018VEC2ui01^Na000Hg;3tYyX_jM3R?Bl7&r(q;SsVx< zNd$5fv{ZsKA$SlL3&KN~a1tZRf*~1Ltkx9~2uL3&z-yb0WJDRY082|tP literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-laughing.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-laughing.gif new file mode 100644 index 0000000000000000000000000000000000000000..1606c119e75678c4031f384e0d50849906e8f533 GIT binary patch literal 344 zcmV-e0jK^)Nk%w1VG;lm0MruzQauf>s;1-69HWK?p_PpF=Pd8~Ygtcnp*fHAL z**;z>w3iC}`fmL6IkKB1N;3zEa}&zKpsu1;_V)HocR5-{J~BcYvE`YXhBnc@CfU=! za(Ec zG>66zv=rqr;2j)}gKqE$ekcSD?}0=WLB?AWp85)qALd+P=4)6X4oXy{bw2>K^d$ z@6ERvva+(4ib~41YUkTEn1&#?rzrOHT>1I=Y*h`+%*@WtPUPg|!@EEI_d5LgZ>^Og z-qyCjsu$J9F8}}lA^8LW0018VEC2ui01^Na000HT;3tYxX_jM37RWXX8&XUv=@{Oj zX@_Sxw3H&!kzgQ?2LvPOL=>Y5VxieY9+_+eqFEql6OKWXd3Ze8Ggf2Zln@U|mI9d9 zGm^(wVUTA5cYs-V1`2#+a})^z6chrF5`~8k5e6@pmkW`GeGw<069yTQaGnH)s0suV zR|pCd0ZtRCsjM9VB^L+~7X%f*zyuc%2p3=#ycf#L%McYo9|{Z&5D^#_78qL%3{WW( X7Xb)FP6z?UH6ODVz!ev-DIowmgll^P literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-smile.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-smile.gif new file mode 100644 index 0000000000000000000000000000000000000000..e6a9e60d5ddd1243fbbf2197b4dc6cd9c1b58b93 GIT binary patch literal 345 zcmV-f0jB;(Nk%w1VG;lm0MrlwCJF+^#>SR<4C>Dj%C>6W(lWoQPVevT^YB^Fy&h6M z4YZgH{O~qtR1(Ci8T;lQ`uh6d*t-7xar*K{#Jrulo-Wtd*44u?{`oh#n;gQXGXDEo z_}UVAU=FH^0ssI2A^8LW0018VEC2ui01^Na000Hn;3tYuX_jM3Mn>j&nGr!MNh}v4 zNyxPjwA7*EKx`%q#$Vl9SM>N9ReH-cn1&^4jYXf0KotqjT;UWC94U(4-NtX4#i!%9}pHA2?&dg3>XLr r8Wuqx2Nnhn1xrT-4h9xbDb^GQ8V(K`1{C5o)#U;I0p5-K5CQ-@9%ySnDDC*4*{OcpiwransPVevTQacIr@mkQp zCf(06s)_=>r7UYx48o@u`uh6d*t-7rH~ji<`P&oj;5Wp)o!8ga`SV6TA_BIW5#ZWV z{`*+__>9}pJ}3JDSl85wB_3Jn)Q o9|so(4+|I^92g4^1{Y8%(iR3pP6ig=HPPY$`~mLZA3^{CJDB=?L;wH) literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-tongue-out.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-tongue-out.gif new file mode 100644 index 0000000000000000000000000000000000000000..2075dc16058f1f17912167675ce5cfb9986fc71d GIT binary patch literal 328 zcmV-O0k{4~Nk%w1VG;lm0Mrx!CJF+^#>SU@3-{U*rx+Q^wrc$ABfqLn@9*x?z8(4X zSW-O=@){bmmI~g|GQXoP);cvj3|f1M8e@{G*!tYaiCEujj1NGxRN#6#tiCETo+{x{Hkzt z5k-kPvcD=V2nbmjCgL6k{uF&2nP-t0s;w<385Nx2oxDb z9T5Pp7qJl?3Kkh9oe2sCr5F$p7zPSlsUH*@54w*83=9Or4;w)r2pcU95(FL|1Th;< aDaRQH4;Tal7#Y$v#?=Au0pHUfApkpvZg^t= literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-undecided.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-undecided.gif new file mode 100644 index 0000000000000000000000000000000000000000..bef7e257303f8243c89787e7a7f9955dd1f112e2 GIT binary patch literal 337 zcmV-X0j~Z>Nk%w1VG;lm0MroxDi#99#>R?y8~4}{%C>6#>?OadPVevTr-=vi@LATn z4rERY-qJF+n+?CCE&B3D{{3Shh?>WT0o%`b%*Voqm`dL;(4F35y zc485^n;g!+Bme*aA^8LW0018VEC2ui01^Na000Hf;3tYvX_jM3N=AnuogqakNi<9X zK?&0kwA8^tNn{?C$|IAYI1ZzT!2>}iuMddFK#NEkRl!7%6brJAnUs;)XcnA}TNBSP zxQ9;SvEfwYeSaGd2^|LqU~(QF1qBxr3Ii7x84ZVt8wCTKoSYAqc?p`G2onnpk`IOl z1`HLGj}riN2p1K12N4z&8IBDc6tEWs859;JtRB6>lf+xO9}yT19toMv8wnl`7(pKg j7zPv!OGgY81{hE&(iR3pP6ig;HPPS!_yOwPA0Yrc)=Yf3 literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-wink.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-wink.gif new file mode 100644 index 0000000000000000000000000000000000000000..9faf1aff8f4b28e02f4f414975fe1859c43b6b54 GIT binary patch literal 351 zcmV-l0igazNk%w1VG;lm0MrryC=CL}#>Sn03F^-g-qAA3wransPV?|t@9*x%vmQ`7 z4E*pcw3rOOq%3t@4*K#({N^40{c-yG`rz2Q!KfI-yq*61HrBop*VoqW<}&{JS@_x# zwwfH#!YTdnIsgCwA^8LW0018VEC2ui01^Na000Ht;3tYwX_jM3P6j6koH0o%Sun&A zMF+tYv=pL2IcOdp&qH&dG!P?+ArV0)J)O=Yk}%LD6Go&#@MJn3he8=)%%lWOM*#pN zEDD9iq9J$@90v~;83`GC4i0+{2OJ0pVtacF5E}yn8<`pmkCBv_pqZEtoPY-l0}P>= z3WE6cr`19U7DgF9{F}at6R35*Q5~ x2OgBy9tRx_7(pKh7zPvsOGgA01{hE&-4zBzP6id}HMp@0Krnzkbss_i06S`>cdh^c literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-yell.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-yell.gif new file mode 100644 index 0000000000000000000000000000000000000000..648e6e879123fe49beebbc1f3635141864a79a9c GIT binary patch literal 336 zcmV-W0k8f?Nk%w1VG;lm0MrryG8O{K#>IbS7WCB_mWF$+hzY-{PWkp(?(Xf;zbH~P z3jOdj?W+^YwrakfE8fyG&5jTBz!3WS`fgM_;MltQ+c}4GO8)(E`S3`@yq&d~5!ct& z)v79NObo)O7XSbNA^8LW0018VEC2ui01^Na000He;3tYwX_jM3QifI(nn6h_*=Wyk zUB{y}v=qYOIUF#R3dZPhAVv~H;(|a2yN_5FH&J0|$eJ3kw4gj1Y?v5d#>LMV12^6BYy$1)ZKA zga!|m2?POz0R)f>4+aPl8KD{gz`+G_9vLMFQU?RU!8uyH9}*i52|cC+7S0YEK_3Vk i1|APfM-Ltb8&4_H83sg61{vHn(cc000qNZzApkp + + + {#example_dlg.title} + + + + + +
+

Here is a example dialog.

+

Selected text:

+

Custom arg:

+ +
+ + +
+
+ + + diff --git a/plugins/TinyMCE/js/plugins/example/editor_plugin.js b/plugins/TinyMCE/js/plugins/example/editor_plugin.js new file mode 100644 index 0000000000..ec1f81ea40 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/example/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.PluginManager.requireLangPack("example");tinymce.create("tinymce.plugins.ExamplePlugin",{init:function(a,b){a.addCommand("mceExample",function(){a.windowManager.open({file:b+"/dialog.htm",width:320+parseInt(a.getLang("example.delta_width",0)),height:120+parseInt(a.getLang("example.delta_height",0)),inline:1},{plugin_url:b,some_custom_arg:"custom arg"})});a.addButton("example",{title:"example.desc",cmd:"mceExample",image:b+"/img/example.gif"});a.onNodeChange.add(function(d,c,e){c.setActive("example",e.nodeName=="IMG")})},createControl:function(b,a){return null},getInfo:function(){return{longname:"Example plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example",version:"1.0"}}});tinymce.PluginManager.add("example",tinymce.plugins.ExamplePlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/example/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/example/editor_plugin_src.js new file mode 100644 index 0000000000..9a0e7da15d --- /dev/null +++ b/plugins/TinyMCE/js/plugins/example/editor_plugin_src.js @@ -0,0 +1,84 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + // Load plugin specific language pack + tinymce.PluginManager.requireLangPack('example'); + + tinymce.create('tinymce.plugins.ExamplePlugin', { + /** + * Initializes the plugin, this will be executed after the plugin has been created. + * This call is done before the editor instance has finished it's initialization so use the onInit event + * of the editor instance to intercept that event. + * + * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in. + * @param {string} url Absolute URL to where the plugin is located. + */ + init : function(ed, url) { + // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample'); + ed.addCommand('mceExample', function() { + ed.windowManager.open({ + file : url + '/dialog.htm', + width : 320 + parseInt(ed.getLang('example.delta_width', 0)), + height : 120 + parseInt(ed.getLang('example.delta_height', 0)), + inline : 1 + }, { + plugin_url : url, // Plugin absolute URL + some_custom_arg : 'custom arg' // Custom argument + }); + }); + + // Register example button + ed.addButton('example', { + title : 'example.desc', + cmd : 'mceExample', + image : url + '/img/example.gif' + }); + + // Add a node change handler, selects the button in the UI when a image is selected + ed.onNodeChange.add(function(ed, cm, n) { + cm.setActive('example', n.nodeName == 'IMG'); + }); + }, + + /** + * Creates control instances based in the incomming name. This method is normally not + * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons + * but you sometimes need to create more complex controls like listboxes, split buttons etc then this + * method can be used to create those. + * + * @param {String} n Name of the control to create. + * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control. + * @return {tinymce.ui.Control} New control instance or null if no control was created. + */ + createControl : function(n, cm) { + return null; + }, + + /** + * Returns information about the plugin as a name/value array. + * The current keys are longname, author, authorurl, infourl and version. + * + * @return {Object} Name/value array containing information about the plugin. + */ + getInfo : function() { + return { + longname : 'Example plugin', + author : 'Some author', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example', + version : "1.0" + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('example', tinymce.plugins.ExamplePlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/example/img/example.gif b/plugins/TinyMCE/js/plugins/example/img/example.gif new file mode 100644 index 0000000000000000000000000000000000000000..1ab5da4461113d2af579898528246fdbe52ecd00 GIT binary patch literal 87 zcmZ?wbhEHb6k!lyn83&Y1dNP~ia%L^OhyJB5FaGNz@*pGzw+SQ`#f{}FJ-?!v#V)e mtsGNfpJeCKSAiOz**>0`XR2{OVa>-G_df0vaY/i);if(f&&f[1]){l=f[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);if(l){for(c=0,e=l.length;c",a);h.head=f.substring(0,a+1);j=f.indexOf("\n'}h.head+=d.getParam("fullpage_default_doctype",'');h.head+="\n\n\n"+d.getParam("fullpage_default_title","Untitled document")+"\n";if(g=d.getParam("fullpage_default_encoding")){h.head+='\n'}if(g=d.getParam("fullpage_default_font_family")){i+="font-family: "+g+";"}if(g=d.getParam("fullpage_default_font_size")){i+="font-size: "+g+";"}if(g=d.getParam("fullpage_default_text_color")){i+="color: "+g+";"}h.head+="\n\n";h.foot="\n\n"}},_getContent:function(a,c){var b=this;if(!c.source_view||!a.getParam("fullpage_hide_in_source_view")){c.content=tinymce.trim(b.head)+"\n"+tinymce.trim(c.content)+"\n"+tinymce.trim(b.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js new file mode 100644 index 0000000000..b7d51d58e1 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js @@ -0,0 +1,149 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.FullPagePlugin', { + init : function(ed, url) { + var t = this; + + t.editor = ed; + + // Register commands + ed.addCommand('mceFullPageProperties', function() { + ed.windowManager.open({ + file : url + '/fullpage.htm', + width : 430 + parseInt(ed.getLang('fullpage.delta_width', 0)), + height : 495 + parseInt(ed.getLang('fullpage.delta_height', 0)), + inline : 1 + }, { + plugin_url : url, + head_html : t.head + }); + }); + + // Register buttons + ed.addButton('fullpage', {title : 'fullpage.desc', cmd : 'mceFullPageProperties'}); + + ed.onBeforeSetContent.add(t._setContent, t); + ed.onSetContent.add(t._setBodyAttribs, t); + ed.onGetContent.add(t._getContent, t); + }, + + getInfo : function() { + return { + longname : 'Fullpage', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + // Private plugin internal methods + + _setBodyAttribs : function(ed, o) { + var bdattr, i, len, kv, k, v, t, attr = this.head.match(/body(.*?)>/i); + + if (attr && attr[1]) { + bdattr = attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g); + + if (bdattr) { + for(i = 0, len = bdattr.length; i < len; i++) { + kv = bdattr[i].split('='); + k = kv[0].replace(/\s/,''); + v = kv[1]; + + if (v) { + v = v.replace(/^\s+/,'').replace(/\s+$/,''); + t = v.match(/^["'](.*)["']$/); + + if (t) + v = t[1]; + } else + v = k; + + ed.dom.setAttrib(ed.getBody(), 'style', v); + } + } + } + }, + + _createSerializer : function() { + return new tinymce.dom.Serializer({ + dom : this.editor.dom, + apply_source_formatting : true + }); + }, + + _setContent : function(ed, o) { + var t = this, sp, ep, c = o.content, v, st = ''; + + if (o.source_view && ed.getParam('fullpage_hide_in_source_view')) + return; + + // Parse out head, body and footer + c = c.replace(/<(\/?)BODY/gi, '<$1body'); + sp = c.indexOf('', sp); + t.head = c.substring(0, sp + 1); + + ep = c.indexOf('\n'; + + t.head += ed.getParam('fullpage_default_doctype', ''); + t.head += '\n\n\n' + ed.getParam('fullpage_default_title', 'Untitled document') + '\n'; + + if (v = ed.getParam('fullpage_default_encoding')) + t.head += '\n'; + + if (v = ed.getParam('fullpage_default_font_family')) + st += 'font-family: ' + v + ';'; + + if (v = ed.getParam('fullpage_default_font_size')) + st += 'font-size: ' + v + ';'; + + if (v = ed.getParam('fullpage_default_text_color')) + st += 'color: ' + v + ';'; + + t.head += '\n\n'; + t.foot = '\n\n'; + } + }, + + _getContent : function(ed, o) { + var t = this; + + if (!o.source_view || !ed.getParam('fullpage_hide_in_source_view')) + o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot); + } + }); + + // Register plugin + tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/fullpage/fullpage.htm b/plugins/TinyMCE/js/plugins/fullpage/fullpage.htm new file mode 100644 index 0000000000..c32afaf2d9 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/fullpage/fullpage.htm @@ -0,0 +1,571 @@ + + + + {#fullpage_dlg.title} + + + + + + + +
+
+ +
+ +
+
+
+ {#fullpage_dlg.meta_props} + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
 
 
 
 
  + +
+
+ +
+ {#fullpage_dlg.langprops} + + + + + + + + + + + + + + + + + + + + + + +
+ +
  + +
 
+ +
 
+
+
+ +
+
+ {#fullpage_dlg.appearance_textprops} + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + + +
 
+
+
+ +
+ {#fullpage_dlg.appearance_bgprops} + + + + + + + + + + +
+ + + + + +
 
+
+ + + + + +
 
+
+
+ +
+ {#fullpage_dlg.appearance_marginprops} + + + + + + + + + + + + + + +
+
+ +
+ {#fullpage_dlg.appearance_linkprops} + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ 		+ + + + + +
 
+
+ + + + + +
 
+ 		  
+
+ +
+ {#fullpage_dlg.appearance_style} + + + + + + + + + + +
+ + + + +
 
+
+
+ +
+ + +
+ {#fullpage_dlg.head_elements} + +
+
+
+ + +
+
+ + +
+
+
+ +
+
+ +
+ {#fullpage_dlg.meta_element} + + + + + + + + + + + + + + +
+ + +
+ +
+ {#fullpage_dlg.title_element} + + + + + + +
+ + +
+ +
+ {#fullpage_dlg.script_element} + +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + +
+ + + + +
 
+
+ +
+ +
+
+ + +
+ +
+ {#fullpage_dlg.style_element} + +
+ +
+ +
+ +
+
+ + + + + + + + + +
+
+ +
+ +
+
+ + +
+ +
+ {#fullpage_dlg.base_element} + + + + + + + + + + +
+ + +
+ + + +
+ {#fullpage_dlg.comment_element} + + + + +
+
+
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js b/plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js new file mode 100644 index 0000000000..a1bb719a38 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js @@ -0,0 +1,471 @@ +/** + * fullpage.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +tinyMCEPopup.requireLangPack(); + +var doc; + +var defaultDocTypes = + 'XHTML 1.0 Transitional=,' + + 'XHTML 1.0 Frameset=,' + + 'XHTML 1.0 Strict=,' + + 'XHTML 1.1=,' + + 'HTML 4.01 Transitional=,' + + 'HTML 4.01 Strict=,' + + 'HTML 4.01 Frameset='; + +var defaultEncodings = + 'Western european (iso-8859-1)=iso-8859-1,' + + 'Central European (iso-8859-2)=iso-8859-2,' + + 'Unicode (UTF-8)=utf-8,' + + 'Chinese traditional (Big5)=big5,' + + 'Cyrillic (iso-8859-5)=iso-8859-5,' + + 'Japanese (iso-2022-jp)=iso-2022-jp,' + + 'Greek (iso-8859-7)=iso-8859-7,' + + 'Korean (iso-2022-kr)=iso-2022-kr,' + + 'ASCII (us-ascii)=us-ascii'; + +var defaultMediaTypes = + 'all=all,' + + 'screen=screen,' + + 'print=print,' + + 'tty=tty,' + + 'tv=tv,' + + 'projection=projection,' + + 'handheld=handheld,' + + 'braille=braille,' + + 'aural=aural'; + +var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings'; +var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px'; + +function init() { + var f = document.forms['fullpage'], el = f.elements, e, i, p, doctypes, encodings, mediaTypes, fonts, ed = tinyMCEPopup.editor, dom = tinyMCEPopup.dom, style; + + // Setup doctype select box + doctypes = ed.getParam("fullpage_doctypes", defaultDocTypes).split(','); + for (i=0; i 1) + addSelectValue(f, 'doctypes', p[0], p[1]); + } + + // Setup fonts select box + fonts = ed.getParam("fullpage_fonts", defaultFontNames).split(';'); + for (i=0; i 1) + addSelectValue(f, 'fontface', p[0], p[1]); + } + + // Setup fontsize select box + fonts = ed.getParam("fullpage_fontsizes", defaultFontSizes).split(','); + for (i=0; i 1) { + addSelectValue(f, 'element_style_media', p[0], p[1]); + addSelectValue(f, 'element_link_media', p[0], p[1]); + } + } + + // Setup encodings select box + encodings = ed.getParam("fullpage_encodings", defaultEncodings).split(','); + for (i=0; i 1) { + addSelectValue(f, 'docencoding', p[0], p[1]); + addSelectValue(f, 'element_script_charset', p[0], p[1]); + addSelectValue(f, 'element_link_charset', p[0], p[1]); + } + } + + document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor'); + document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color'); + //document.getElementById('hover_color_pickcontainer').innerHTML = getColorPickerHTML('hover_color_pick','hover_color'); + document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color'); + document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color'); + document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor'); + document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage'); + document.getElementById('link_href_pickcontainer').innerHTML = getBrowserHTML('link_href_browser','element_link_href','file','fullpage'); + document.getElementById('script_src_pickcontainer').innerHTML = getBrowserHTML('script_src_browser','element_script_src','file','fullpage'); + document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage'); + + // Resize some elements + if (isVisible('stylesheetbrowser')) + document.getElementById('stylesheet').style.width = '220px'; + + if (isVisible('link_href_browser')) + document.getElementById('element_link_href').style.width = '230px'; + + if (isVisible('bgimage_browser')) + document.getElementById('bgimage').style.width = '210px'; + + // Add iframe + dom.add(document.body, 'iframe', {id : 'documentIframe', src : 'javascript:""', style : {display : 'none'}}); + doc = dom.get('documentIframe').contentWindow.document; + h = tinyMCEPopup.getWindowArg('head_html'); + + // Preprocess the HTML disable scripts and urls + h = h.replace(/ + + + +
+ +
+ + + + + diff --git a/plugins/TinyMCE/js/plugins/iespell/editor_plugin.js b/plugins/TinyMCE/js/plugins/iespell/editor_plugin.js new file mode 100644 index 0000000000..e9cba106c6 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/iespell/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.IESpell",{init:function(a,b){var c=this,d;if(!tinymce.isIE){return}c.editor=a;a.addCommand("mceIESpell",function(){try{d=new ActiveXObject("ieSpell.ieSpellExtension");d.CheckDocumentNode(a.getDoc().documentElement)}catch(f){if(f.number==-2146827859){a.windowManager.confirm(a.getLang("iespell.download"),function(e){if(e){window.open("http://www.iespell.com/download.php","ieSpellDownload","")}})}else{a.windowManager.alert("Error Loading ieSpell: Exception "+f.number)}}});a.addButton("iespell",{title:"iespell.iespell_desc",cmd:"mceIESpell"})},getInfo:function(){return{longname:"IESpell (IE Only)",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("iespell",tinymce.plugins.IESpell)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/iespell/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/iespell/editor_plugin_src.js new file mode 100644 index 0000000000..1b2bb98460 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/iespell/editor_plugin_src.js @@ -0,0 +1,54 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.IESpell', { + init : function(ed, url) { + var t = this, sp; + + if (!tinymce.isIE) + return; + + t.editor = ed; + + // Register commands + ed.addCommand('mceIESpell', function() { + try { + sp = new ActiveXObject("ieSpell.ieSpellExtension"); + sp.CheckDocumentNode(ed.getDoc().documentElement); + } catch (e) { + if (e.number == -2146827859) { + ed.windowManager.confirm(ed.getLang("iespell.download"), function(s) { + if (s) + window.open('http://www.iespell.com/download.php', 'ieSpellDownload', ''); + }); + } else + ed.windowManager.alert("Error Loading ieSpell: Exception " + e.number); + } + }); + + // Register buttons + ed.addButton('iespell', {title : 'iespell.iespell_desc', cmd : 'mceIESpell'}); + }, + + getInfo : function() { + return { + longname : 'IESpell (IE Only)', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('iespell', tinymce.plugins.IESpell); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js new file mode 100644 index 0000000000..07ea477b7c --- /dev/null +++ b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js @@ -0,0 +1 @@ +(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(r,j){var y=this,i,k="",q=y.editor,g=0,s=0,h,m,n,o,l,v,x;r=r||{};j=j||{};if(!r.inline){return y.parent(r,j)}if(!r.type){y.bookmark=q.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();r.width=parseInt(r.width||320);r.height=parseInt(r.height||240)+(tinymce.isIE?8:0);r.min_width=parseInt(r.min_width||150);r.min_height=parseInt(r.min_height||100);r.max_width=parseInt(r.max_width||2000);r.max_height=parseInt(r.max_height||2000);r.left=r.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(r.width/2)));r.top=r.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(r.height/2)));r.movable=r.resizable=true;j.mce_width=r.width;j.mce_height=r.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=r.auto_focus;y.features=r;y.params=j;y.onOpen.dispatch(y,r,j);if(r.type){k+=" mceModal";if(r.type){k+=" mce"+r.type.substring(0,1).toUpperCase()+r.type.substring(1)}r.resizable=false}if(r.statusbar){k+=" mceStatusbar"}if(r.resizable){k+=" mceResizable"}if(r.minimizable){k+=" mceMinimizable"}if(r.maximizable){k+=" mceMaximizable"}if(r.movable){k+=" mceMovable"}y._addAll(d.doc.body,["div",{id:i,"class":q.settings.inlinepopups_skin||"clearlooks2",style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},r.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!r.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;s+=d.get(i+"_top").clientHeight;s+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:r.top,left:r.left,width:r.width+g,height:r.height+s});x=r.url||r.file;if(x){if(tinymce.relaxedDomain){x+=(x.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}x=tinymce._addVer(x)}if(!r.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:r.width,height:r.height});d.setAttrib(i+"_ifr","src",x)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(r.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",r.content.replace("\n","
"))}n=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=y.windows[i];y.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return y._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return y._startDrag(i,t,u.className.substring(13))}}}}}});o=a.add(i,"click",function(f){var p=f.target;y.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":y.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":r.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});v=y.windows[i]={id:i,mousedown_func:n,click_func:o,element:new b(i,{blocker:1,container:q.getContainer()}),iframeElement:new b(i+"_ifr"),features:r,deltaWidth:g,deltaHeight:s};v.iframeElement.on("focus",function(){y.focus(i)});if(y.count==0&&y.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(y.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:y.zIndex-1}});d.show("mceModalBlocker")}else{d.setStyle("mceModalBlocker","z-index",y.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}y.focus(i);y._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}y.count++;return v},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;gf){i=m;f=m.zIndex}});if(i){h.focus(i.id)}}},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js new file mode 100644 index 0000000000..e991683de4 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js @@ -0,0 +1,635 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + var DOM = tinymce.DOM, Element = tinymce.dom.Element, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is; + + tinymce.create('tinymce.plugins.InlinePopups', { + init : function(ed, url) { + // Replace window manager + ed.onBeforeRenderUI.add(function() { + ed.windowManager = new tinymce.InlineWindowManager(ed); + DOM.loadCSS(url + '/skins/' + (ed.settings.inlinepopups_skin || 'clearlooks2') + "/window.css"); + }); + }, + + getInfo : function() { + return { + longname : 'InlinePopups', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager', { + InlineWindowManager : function(ed) { + var t = this; + + t.parent(ed); + t.zIndex = 300000; + t.count = 0; + t.windows = {}; + }, + + open : function(f, p) { + var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u; + + f = f || {}; + p = p || {}; + + // Run native windows + if (!f.inline) + return t.parent(f, p); + + // Only store selection if the type is a normal window + if (!f.type) + t.bookmark = ed.selection.getBookmark(1); + + id = DOM.uniqueId(); + vp = DOM.getViewPort(); + f.width = parseInt(f.width || 320); + f.height = parseInt(f.height || 240) + (tinymce.isIE ? 8 : 0); + f.min_width = parseInt(f.min_width || 150); + f.min_height = parseInt(f.min_height || 100); + f.max_width = parseInt(f.max_width || 2000); + f.max_height = parseInt(f.max_height || 2000); + f.left = f.left || Math.round(Math.max(vp.x, vp.x + (vp.w / 2.0) - (f.width / 2.0))); + f.top = f.top || Math.round(Math.max(vp.y, vp.y + (vp.h / 2.0) - (f.height / 2.0))); + f.movable = f.resizable = true; + p.mce_width = f.width; + p.mce_height = f.height; + p.mce_inline = true; + p.mce_window_id = id; + p.mce_auto_focus = f.auto_focus; + + // Transpose +// po = DOM.getPos(ed.getContainer()); +// f.left -= po.x; +// f.top -= po.y; + + t.features = f; + t.params = p; + t.onOpen.dispatch(t, f, p); + + if (f.type) { + opt += ' mceModal'; + + if (f.type) + opt += ' mce' + f.type.substring(0, 1).toUpperCase() + f.type.substring(1); + + f.resizable = false; + } + + if (f.statusbar) + opt += ' mceStatusbar'; + + if (f.resizable) + opt += ' mceResizable'; + + if (f.minimizable) + opt += ' mceMinimizable'; + + if (f.maximizable) + opt += ' mceMaximizable'; + + if (f.movable) + opt += ' mceMovable'; + + // Create DOM objects + t._addAll(DOM.doc.body, + ['div', {id : id, 'class' : ed.settings.inlinepopups_skin || 'clearlooks2', style : 'width:100px;height:100px'}, + ['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt}, + ['div', {id : id + '_top', 'class' : 'mceTop'}, + ['div', {'class' : 'mceLeft'}], + ['div', {'class' : 'mceCenter'}], + ['div', {'class' : 'mceRight'}], + ['span', {id : id + '_title'}, f.title || ''] + ], + + ['div', {id : id + '_middle', 'class' : 'mceMiddle'}, + ['div', {id : id + '_left', 'class' : 'mceLeft'}], + ['span', {id : id + '_content'}], + ['div', {id : id + '_right', 'class' : 'mceRight'}] + ], + + ['div', {id : id + '_bottom', 'class' : 'mceBottom'}, + ['div', {'class' : 'mceLeft'}], + ['div', {'class' : 'mceCenter'}], + ['div', {'class' : 'mceRight'}], + ['span', {id : id + '_status'}, 'Content'] + ], + + ['a', {'class' : 'mceMove', tabindex : '-1', href : 'javascript:;'}], + ['a', {'class' : 'mceMin', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}], + ['a', {'class' : 'mceMax', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}], + ['a', {'class' : 'mceMed', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}], + ['a', {'class' : 'mceClose', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}], + ['a', {id : id + '_resize_n', 'class' : 'mceResize mceResizeN', tabindex : '-1', href : 'javascript:;'}], + ['a', {id : id + '_resize_s', 'class' : 'mceResize mceResizeS', tabindex : '-1', href : 'javascript:;'}], + ['a', {id : id + '_resize_w', 'class' : 'mceResize mceResizeW', tabindex : '-1', href : 'javascript:;'}], + ['a', {id : id + '_resize_e', 'class' : 'mceResize mceResizeE', tabindex : '-1', href : 'javascript:;'}], + ['a', {id : id + '_resize_nw', 'class' : 'mceResize mceResizeNW', tabindex : '-1', href : 'javascript:;'}], + ['a', {id : id + '_resize_ne', 'class' : 'mceResize mceResizeNE', tabindex : '-1', href : 'javascript:;'}], + ['a', {id : id + '_resize_sw', 'class' : 'mceResize mceResizeSW', tabindex : '-1', href : 'javascript:;'}], + ['a', {id : id + '_resize_se', 'class' : 'mceResize mceResizeSE', tabindex : '-1', href : 'javascript:;'}] + ] + ] + ); + + DOM.setStyles(id, {top : -10000, left : -10000}); + + // Fix gecko rendering bug, where the editors iframe messed with window contents + if (tinymce.isGecko) + DOM.setStyle(id, 'overflow', 'auto'); + + // Measure borders + if (!f.type) { + dw += DOM.get(id + '_left').clientWidth; + dw += DOM.get(id + '_right').clientWidth; + dh += DOM.get(id + '_top').clientHeight; + dh += DOM.get(id + '_bottom').clientHeight; + } + + // Resize window + DOM.setStyles(id, {top : f.top, left : f.left, width : f.width + dw, height : f.height + dh}); + + u = f.url || f.file; + if (u) { + if (tinymce.relaxedDomain) + u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain; + + u = tinymce._addVer(u); + } + + if (!f.type) { + DOM.add(id + '_content', 'iframe', {id : id + '_ifr', src : 'javascript:""', frameBorder : 0, style : 'border:0;width:10px;height:10px'}); + DOM.setStyles(id + '_ifr', {width : f.width, height : f.height}); + DOM.setAttrib(id + '_ifr', 'src', u); + } else { + DOM.add(id + '_wrapper', 'a', {id : id + '_ok', 'class' : 'mceButton mceOk', href : 'javascript:;', onmousedown : 'return false;'}, 'Ok'); + + if (f.type == 'confirm') + DOM.add(id + '_wrapper', 'a', {'class' : 'mceButton mceCancel', href : 'javascript:;', onmousedown : 'return false;'}, 'Cancel'); + + DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'}); + DOM.setHTML(id + '_content', f.content.replace('\n', '
')); + } + + // Register events + mdf = Event.add(id, 'mousedown', function(e) { + var n = e.target, w, vp; + + w = t.windows[id]; + t.focus(id); + + if (n.nodeName == 'A' || n.nodeName == 'a') { + if (n.className == 'mceMax') { + w.oldPos = w.element.getXY(); + w.oldSize = w.element.getSize(); + + vp = DOM.getViewPort(); + + // Reduce viewport size to avoid scrollbars + vp.w -= 2; + vp.h -= 2; + + w.element.moveTo(vp.x, vp.y); + w.element.resizeTo(vp.w, vp.h); + DOM.setStyles(id + '_ifr', {width : vp.w - w.deltaWidth, height : vp.h - w.deltaHeight}); + DOM.addClass(id + '_wrapper', 'mceMaximized'); + } else if (n.className == 'mceMed') { + // Reset to old size + w.element.moveTo(w.oldPos.x, w.oldPos.y); + w.element.resizeTo(w.oldSize.w, w.oldSize.h); + w.iframeElement.resizeTo(w.oldSize.w - w.deltaWidth, w.oldSize.h - w.deltaHeight); + + DOM.removeClass(id + '_wrapper', 'mceMaximized'); + } else if (n.className == 'mceMove') + return t._startDrag(id, e, n.className); + else if (DOM.hasClass(n, 'mceResize')) + return t._startDrag(id, e, n.className.substring(13)); + } + }); + + clf = Event.add(id, 'click', function(e) { + var n = e.target; + + t.focus(id); + + if (n.nodeName == 'A' || n.nodeName == 'a') { + switch (n.className) { + case 'mceClose': + t.close(null, id); + return Event.cancel(e); + + case 'mceButton mceOk': + case 'mceButton mceCancel': + f.button_func(n.className == 'mceButton mceOk'); + return Event.cancel(e); + } + } + }); + + // Add window + w = t.windows[id] = { + id : id, + mousedown_func : mdf, + click_func : clf, + element : new Element(id, {blocker : 1, container : ed.getContainer()}), + iframeElement : new Element(id + '_ifr'), + features : f, + deltaWidth : dw, + deltaHeight : dh + }; + + w.iframeElement.on('focus', function() { + t.focus(id); + }); + + // Setup blocker + if (t.count == 0 && t.editor.getParam('dialog_type', 'modal') == 'modal') { + DOM.add(DOM.doc.body, 'div', { + id : 'mceModalBlocker', + 'class' : (t.editor.settings.inlinepopups_skin || 'clearlooks2') + '_modalBlocker', + style : {zIndex : t.zIndex - 1} + }); + + DOM.show('mceModalBlocker'); // Reduces flicker in IE + } else + DOM.setStyle('mceModalBlocker', 'z-index', t.zIndex - 1); + + if (tinymce.isIE6 || /Firefox\/2\./.test(navigator.userAgent) || (tinymce.isIE && !DOM.boxModel)) + DOM.setStyles('mceModalBlocker', {position : 'absolute', left : vp.x, top : vp.y, width : vp.w - 2, height : vp.h - 2}); + + t.focus(id); + t._fixIELayout(id, 1); + + // Focus ok button + if (DOM.get(id + '_ok')) + DOM.get(id + '_ok').focus(); + + t.count++; + + return w; + }, + + focus : function(id) { + var t = this, w; + + if (w = t.windows[id]) { + w.zIndex = this.zIndex++; + w.element.setStyle('zIndex', w.zIndex); + w.element.update(); + + id = id + '_wrapper'; + DOM.removeClass(t.lastId, 'mceFocus'); + DOM.addClass(id, 'mceFocus'); + t.lastId = id; + } + }, + + _addAll : function(te, ne) { + var i, n, t = this, dom = tinymce.DOM; + + if (is(ne, 'string')) + te.appendChild(dom.doc.createTextNode(ne)); + else if (ne.length) { + te = te.appendChild(dom.create(ne[0], ne[1])); + + for (i=2; i ix) { + fw = w; + ix = w.zIndex; + } + }); + + if (fw) + t.focus(fw.id); + } + }, + + setTitle : function(w, ti) { + var e; + + w = this._findId(w); + + if (e = DOM.get(w + '_title')) + e.innerHTML = DOM.encode(ti); + }, + + alert : function(txt, cb, s) { + var t = this, w; + + w = t.open({ + title : t, + type : 'alert', + button_func : function(s) { + if (cb) + cb.call(s || t, s); + + t.close(null, w.id); + }, + content : DOM.encode(t.editor.getLang(txt, txt)), + inline : 1, + width : 400, + height : 130 + }); + }, + + confirm : function(txt, cb, s) { + var t = this, w; + + w = t.open({ + title : t, + type : 'confirm', + button_func : function(s) { + if (cb) + cb.call(s || t, s); + + t.close(null, w.id); + }, + content : DOM.encode(t.editor.getLang(txt, txt)), + inline : 1, + width : 400, + height : 130 + }); + }, + + // Internal functions + + _findId : function(w) { + var t = this; + + if (typeof(w) == 'string') + return w; + + each(t.windows, function(wo) { + var ifr = DOM.get(wo.id + '_ifr'); + + if (ifr && w == ifr.contentWindow) { + w = wo.id; + return false; + } + }); + + return w; + }, + + _fixIELayout : function(id, s) { + var w, img; + + if (!tinymce.isIE6) + return; + + // Fixes the bug where hover flickers and does odd things in IE6 + each(['n','s','w','e','nw','ne','sw','se'], function(v) { + var e = DOM.get(id + '_resize_' + v); + + DOM.setStyles(e, { + width : s ? e.clientWidth : '', + height : s ? e.clientHeight : '', + cursor : DOM.getStyle(e, 'cursor', 1) + }); + + DOM.setStyle(id + "_bottom", 'bottom', '-1px'); + + e = 0; + }); + + // Fixes graphics glitch + if (w = this.windows[id]) { + // Fixes rendering bug after resize + w.element.hide(); + w.element.show(); + + // Forced a repaint of the window + //DOM.get(id).style.filter = ''; + + // IE has a bug where images used in CSS won't get loaded + // sometimes when the cache in the browser is disabled + // This fix tries to solve it by loading the images using the image object + each(DOM.select('div,a', id), function(e, i) { + if (e.currentStyle.backgroundImage != 'none') { + img = new Image(); + img.src = e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/, '$1'); + } + }); + + DOM.get(id).style.filter = ''; + } + } + }); + + // Register plugin + tinymce.PluginManager.add('inlinepopups', tinymce.plugins.InlinePopups); +})(); + diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/alert.gif new file mode 100644 index 0000000000000000000000000000000000000000..94abd08763fffdaa0dd5c5afb470a97294f2b94d GIT binary patch literal 818 zcmV-21I_$LNk%w1VITk?0OkMyy?1uhZf>Is3*B5?sT&&Hqoc$;Jkrt6&k+&QHa5gV zL)l77I5;@fLqpYMWV+*+oUyj*ia`4%)P|vrSClaB!?EE7K$--(_XZ zOH0lO2-#9n!;Fik78a-!6wR}-yS%#378ch%J=j4(x@2V5*3{b0&C|=t(mFcQDJi8A z60bTsucxKY8XD3{O5bW~+gDfHP*AZbD54S)*gHGL#>A(co5`c08yg$Yzr7_TCCA9d zs-U0MFfhzxW4%d9s-K?K($LSkxy-Sz(7?Xdn3%wSe#oDmxL#e?qN1My0^C(q&nzt3 zjEvWFbJcly)5*uu)6w93eACp@*{!X#QBc56PRYv1%goBm&CA4*kj9vnyFxN00960|JK*lA^8LV00000EC2ui z03ZM$000O7fPaF6goTEOh>41ejE#5-A-Y zDMkRMg$FSdD>XGe76Lo4g8*}CUeivLI}B6rYIE)9Vh306CXDUKb=Dfx`}wT=u<6# zD$n)U&_b6YEgl901IUC4zyf`27&(S$$E;fb{Wx)wm4^u-0H zv*CdXLINn%=tH`+>C>qDxJcmTfS@*Z45S!AI|Ya#EOHOnP2`2|1;88Ju#tey5e=^) w9O1*fx%21Hn;(HtX3!cMK%gku&b_<$??7lEkM$&p`Sa-0r)T3DnWI1eJD_KQDgXcg literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/button.gif new file mode 100644 index 0000000000000000000000000000000000000000..e671094cb0eb210b756117f992cf5ca2caa698fd GIT binary patch literal 280 zcmZ?wbhEHb3}BFB*v!Ci>hy`^ZOqepYsb$*CnUiMCojPaU!rn5M;0h0LDv*_&)DBrWN@OfznH1FT4{BUps!wTd|YdJ0002^_xJYp^u)%)d3$)z&B_1&{{R30 z000000000000000A^8LW000^QEC2ui0CWH_000I5phk>jX`ZJhqHH^=Zk(=iEn-2g z?|i>wBOI?nEEih2q)UH?AHyg7~@-@+VH6!(;c_ zxnl@0-@$+5z5y6S@uA0c2rFuI7V_gjj3zt(raakjrMZ$WvB8W9atTdoP;NHMsS_E` zo&bQ*s1XAOQ5i;$x=5;&g^B@Cqe`7hmFm-~ShGUCs0c-^w)`cdp#12=eOP%eQY|sD1+r)(d#BVZMbAD~4*IvE#>(BS&T|xw7TPlrL+3 zoO$zRs18Dl9!)zw58wX%{rd5@fPehOCg6KeHK5@Cf($n3po0lM*gyda7AK*C5k5#^gBwbip@gwr zxFA#zlxU)fn3pyG@#n&{$-F`k&?i#Os}T#YskFu{;S5}9I=NKOD% zl13IcK>xnz`3B3WgWQ!)wLkXuHnZ0c5HvW}0r6=_Zpm`ce)8x0(|!A=bwNAx@Vw%7Dp(bgC44=paU%GsGm?BAnBx(R%)rGkzT6lrjlmL z>8F%>3M!~kDPZcUsHUnas#2}$>Z=O03hS(=%1Z03TZN@7Sh{A#Yp+%P3hY!W2w?27 z$R?|-vc)dz?6bx;3+=SXN=q&OwHg>}*IdYMD_6JPx&>~yY8|WCxyGKWSi0&O#%{ZU z8SB}+^3J(S<94K>q#ugahfi?d(AAt1bTp(;R8!O__ z4hjuog&|&Ow1y6L_~6nY!bY^QK&A*J1XR};BaJ(@)KE`%6)&h8Wq?g93 z?c|kAwoPS{a3?9ZmalP{H`@ZtDW{vp&e>*|d8!$>oy!S+xSFqx+4!8sJ}PKTu0Ct)uD=RDxVCHlB}`m%1))6x2zDYdq=`Kv|wmLm3t8~B<$_Jb3xuB^__&G?WTylN4utE$1m z!1=ILv9hrCi66PSxc~e2>z6G0pe^@^5&5A-&VntacS+opK(T{V_m()r#KOD0y0na8 z%goB5UmeoU$gX`!&(O}**3|y@@xQ>n(9zHMmpZewvaqqQx45?Js#L_q!_309tE{Tf zhBEo9Vadb0m3v>7ePP{-Blnp<{MWPlxL*0GU8$dvuduJ(k1^BK(#Ocgm{14%#gX`? zRrPxW_?tJVsi*s^Ih9Zd`n!Ms{rtGOx2&zJ_Iw2Oc>wp7H`dqHA^8LV00000EC2ui z03ZM$000O7fPaF6gntbM4p9Oi0#ObH4TX}Ee_sv)5lUSnX(L@q5dschl$1*XVQCp1 zeyy$<2VnwB5T%0+1Q8<=Os>AJM0j(~$f5C*s#Z5#}WQsM?UH3Y?cED>eUzkt6a5bO}dMvwr^Xb5l#@FPJS zeS!wHvEmgRmp@>-3c_NDJ)uzN1ZkynBnOke0ssw~U_pYYQEhN&DagSGI<2(wiP}L< z2e47_&4?6KK!XdoP`Bdkv!miI0SHd)Rj>ff-abVV5}Gn#$6lukSl~7CfghoAf$`$8 z5@&CbciebnJ`7g|k8#ol6q!Rhs*3^IC>>Kxp>@zA1EAR&LqLOw8f*9N5TStp1}s%3 zVM*boLJ~NtT^KPTcxVj-0|X>-(j+l5M`Wq2O|PlKt>1?^svPY_j#uua~0?Tgn$1%K*EI2i?jm zAoXC1c4Wxs^ZEJtUB4qT{UQ1HY%Uh+pQ*t&D_y59>e1Hjx9TtBow%m&!&jTd_f1dxIfK5J>hhd07SSo@U1ANej1zBgs@J)fS$HxTwj{ShgdWQ_Y8V1_h@vv!qzRzyB@+ z)6#Z?iW=a9&+kg`Kr%f7CfA71iK;1=LJ}Gy$VX4NJcj@#Eg2?3moI4LKhG1RIoI;k zR(9^*MkqfeXOWI?@z07&C`6+;+5U$r@?g~7SE`^9EI4NyQM);aP&a^Qu#OXmrWw+; zlBPWv*b`t#;?w$Wfug|f{7_}xnb%jXB(rC~MUS#+NW!T2av4Ypxp0F2N_qva>Vv^VISDi|>EX(%41 z@Cm688>Uf+QlLkXaIO#&z;q&UJDY-1!mg;(MFDCGS{6p8a!wVF{_rmktj70is)Xxc~qF literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif new file mode 100644 index 0000000000000000000000000000000000000000..c2a2ad454db194e428a7b9da40f62d5376a17428 GIT binary patch literal 769 zcmb7?=`WiB0LI^D)(HC`v6*aD4AW#LGRb0Oi$tH~CP=nb%N%8n zy02ceuewTUUDeW|RaMp*TlLV6R$o=rQOY{@AME+?`}QQiCwU%4Jq)?`{5B8=ECT1T z+wH!7{zji$)-UA>D9({)xO1SJGLHK54Mat(}s4_unMiKjB85EHng*~!Ddt+?(c5uHG4ZI zsc>jP#5Y6w6Wj5!Y=0^oK*&D+R;Yh@ze z7vfi;qFW{owiOfGqcB@XkwUZ0j?Km4{qjE- z6c!Z|O1!?5l~+^}tE#*^aCo0?lZ$rLKBwT;dI+nLO(UEMvb-ad9elEWPw8Xg(t zx$y<#6T+{PQ@$ecjAT|iC%dxnP5yoH$I`OLFU5*drPiz>bidcu^@a^2v}rP3-`?4^ z?Cl>M-Z(n8ot*x$0~Z|;ku35!-qAHSQN*GM3tW8AN#VWJNrHQD+6qXfO_zB^6eFVU zOjzupAb0*`W8} zQVeE5Djt<a0+Owme6r2OGio7DoTWqkhGKj0`0*1-*<$#uL5YH*kC8Z>wpCvYO~asp;G r-~A;>$wp)vkltB=c_?k6Zw*FUgrbAm;sB08O9+}m=}H3OFd*zN8L+JA literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif new file mode 100644 index 0000000000000000000000000000000000000000..43a735f22c81d6d7d99c1ba9f034f38bfdd1a92b GIT binary patch literal 92 zcmZ?wbhEHb&D4o4FLHO9PR)B literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css new file mode 100644 index 0000000000..5e6fd7d3cf --- /dev/null +++ b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css @@ -0,0 +1,90 @@ +/* Clearlooks 2 */ + +/* Reset */ +.clearlooks2, .clearlooks2 div, .clearlooks2 span, .clearlooks2 a {vertical-align:baseline; text-align:left; position:absolute; border:0; padding:0; margin:0; background:transparent; font-family:Arial,Verdana; font-size:11px; color:#000; text-decoration:none; font-weight:normal; width:auto; height:auto; overflow:hidden; display:block} + +/* General */ +.clearlooks2 {position:absolute; direction:ltr} +.clearlooks2 .mceWrapper {position:static} +.mceEventBlocker {position:fixed; left:0; top:0; background:url(img/horizontal.gif) no-repeat 0 -75px; width:100%; height:100%} +.clearlooks2 .mcePlaceHolder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50)} +.clearlooks2_modalBlocker {position:fixed; left:0; top:0; width:100%; height:100%; background:#FFF; opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60); display:none} + +/* Top */ +.clearlooks2 .mceTop, .clearlooks2 .mceTop div {top:0; width:100%; height:23px} +.clearlooks2 .mceTop .mceLeft {width:6px; background:url(img/corners.gif)} +.clearlooks2 .mceTop .mceCenter {right:6px; width:100%; height:23px; background:url(img/horizontal.gif) 12px 0; clip:rect(auto auto auto 12px)} +.clearlooks2 .mceTop .mceRight {right:0; width:6px; height:23px; background:url(img/corners.gif) -12px 0} +.clearlooks2 .mceTop span {width:100%; text-align:center; vertical-align:middle; line-height:23px; font-weight:bold} +.clearlooks2 .mceFocus .mceTop .mceLeft {background:url(img/corners.gif) -6px 0} +.clearlooks2 .mceFocus .mceTop .mceCenter {background:url(img/horizontal.gif) 0 -23px} +.clearlooks2 .mceFocus .mceTop .mceRight {background:url(img/corners.gif) -18px 0} +.clearlooks2 .mceFocus .mceTop span {color:#FFF} + +/* Middle */ +.clearlooks2 .mceMiddle, .clearlooks2 .mceMiddle div {top:0} +.clearlooks2 .mceMiddle {width:100%; height:100%; clip:rect(23px auto auto auto)} +.clearlooks2 .mceMiddle .mceLeft {left:0; width:5px; height:100%; background:url(img/vertical.gif) -5px 0} +.clearlooks2 .mceMiddle span {top:23px; left:5px; width:100%; height:100%; background:#FFF} +.clearlooks2 .mceMiddle .mceRight {right:0; width:5px; height:100%; background:url(img/vertical.gif)} + +/* Bottom */ +.clearlooks2 .mceBottom, .clearlooks2 .mceBottom div {height:6px} +.clearlooks2 .mceBottom {left:0; bottom:0; width:100%} +.clearlooks2 .mceBottom div {top:0} +.clearlooks2 .mceBottom .mceLeft {left:0; width:5px; background:url(img/corners.gif) -34px -6px} +.clearlooks2 .mceBottom .mceCenter {left:5px; width:100%; background:url(img/horizontal.gif) 0 -46px} +.clearlooks2 .mceBottom .mceRight {right:0; width:5px; background: url(img/corners.gif) -34px 0} +.clearlooks2 .mceBottom span {display:none} +.clearlooks2 .mceStatusbar .mceBottom, .clearlooks2 .mceStatusbar .mceBottom div {height:23px} +.clearlooks2 .mceStatusbar .mceBottom .mceLeft {background:url(img/corners.gif) -29px 0} +.clearlooks2 .mceStatusbar .mceBottom .mceCenter {background:url(img/horizontal.gif) 0 -52px} +.clearlooks2 .mceStatusbar .mceBottom .mceRight {background:url(img/corners.gif) -24px 0} +.clearlooks2 .mceStatusbar .mceBottom span {display:block; left:7px; font-family:Arial, Verdana; font-size:11px; line-height:23px} + +/* Actions */ +.clearlooks2 a {width:29px; height:16px; top:3px;} +.clearlooks2 .mceClose {right:6px; background:url(img/buttons.gif) -87px 0} +.clearlooks2 .mceMin {display:none; right:68px; background:url(img/buttons.gif) 0 0} +.clearlooks2 .mceMed {display:none; right:37px; background:url(img/buttons.gif) -29px 0} +.clearlooks2 .mceMax {display:none; right:37px; background:url(img/buttons.gif) -58px 0} +.clearlooks2 .mceMove {display:none;width:100%;cursor:move;background:url(img/corners.gif) no-repeat -100px -100px} +.clearlooks2 .mceMovable .mceMove {display:block} +.clearlooks2 .mceFocus .mceClose {right:6px; background:url(img/buttons.gif) -87px -16px} +.clearlooks2 .mceFocus .mceMin {right:68px; background:url(img/buttons.gif) 0 -16px} +.clearlooks2 .mceFocus .mceMed {right:37px; background:url(img/buttons.gif) -29px -16px} +.clearlooks2 .mceFocus .mceMax {right:37px; background:url(img/buttons.gif) -58px -16px} +.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px} +.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px} +.clearlooks2 .mceFocus .mceMin:hover {right:68px; background:url(img/buttons.gif) 0 -32px} +.clearlooks2 .mceFocus .mceMed:hover {right:37px; background:url(img/buttons.gif) -29px -32px} +.clearlooks2 .mceFocus .mceMax:hover {right:37px; background:url(img/buttons.gif) -58px -32px} + +/* Resize */ +.clearlooks2 .mceResize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.gif) no-repeat 0 -75px} +.clearlooks2 .mceResizable .mceResize {display:block} +.clearlooks2 .mceResizable .mceMin, .clearlooks2 .mceMax {display:none} +.clearlooks2 .mceMinimizable .mceMin {display:block} +.clearlooks2 .mceMaximizable .mceMax {display:block} +.clearlooks2 .mceMaximized .mceMed {display:block} +.clearlooks2 .mceMaximized .mceMax {display:none} +.clearlooks2 a.mceResizeN {top:0; left:0; width:100%; cursor:n-resize} +.clearlooks2 a.mceResizeNW {top:0; left:0; cursor:nw-resize} +.clearlooks2 a.mceResizeNE {top:0; right:0; cursor:ne-resize} +.clearlooks2 a.mceResizeW {top:0; left:0; height:100%; cursor:w-resize;} +.clearlooks2 a.mceResizeE {top:0; right:0; height:100%; cursor:e-resize} +.clearlooks2 a.mceResizeS {bottom:0; left:0; width:100%; cursor:s-resize} +.clearlooks2 a.mceResizeSW {bottom:0; left:0; cursor:sw-resize} +.clearlooks2 a.mceResizeSE {bottom:0; right:0; cursor:se-resize} + +/* Alert/Confirm */ +.clearlooks2 .mceButton {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.gif); line-height:30px; vertical-align:middle; text-align:center; outline:0} +.clearlooks2 .mceMiddle .mceIcon {left:15px; top:35px; width:32px; height:32px} +.clearlooks2 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal} +.clearlooks2 a:hover {font-weight:bold;} +.clearlooks2 .mceAlert .mceMiddle, .clearlooks2 .mceConfirm .mceMiddle {background:#D6D7D5} +.clearlooks2 .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px} +.clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif)} +.clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px} +.clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto} +.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)} \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/template.htm b/plugins/TinyMCE/js/plugins/inlinepopups/template.htm new file mode 100644 index 0000000000..f9ec64219d --- /dev/null +++ b/plugins/TinyMCE/js/plugins/inlinepopups/template.htm @@ -0,0 +1,387 @@ + + + +Template for dialogs + + + + +
+
+
+
+
+
+
+ Blured +
+ +
+
+ Content +
+
+ +
+
+
+
+ Statusbar text. +
+ + + + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+ Focused +
+ +
+
+ Content +
+
+ +
+
+
+
+ Statusbar text. +
+ + + + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+ Statusbar +
+ +
+
+ Content +
+
+ +
+
+
+
+ Statusbar text. +
+ + + + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+ Statusbar, Resizable +
+ +
+
+ Content +
+
+ +
+
+
+
+ Statusbar text. +
+ + + + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+ Resizable, Maximizable +
+ +
+
+ Content +
+
+ +
+
+
+
+ Statusbar text. +
+ + + + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+ Blurred, Maximizable, Statusbar, Resizable +
+ +
+
+ Content +
+
+ +
+
+
+
+ Statusbar text. +
+ + + + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+ Maximized, Maximizable, Minimizable +
+ +
+
+ Content +
+
+ +
+
+
+
+ Statusbar text. +
+ + + + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+ Blured +
+ +
+
+ Content +
+
+ +
+
+
+
+ Statusbar text. +
+ + + + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+ Alert +
+ +
+
+ + This is a very long error message. This is a very long error message. + This is a very long error message. This is a very long error message. + This is a very long error message. This is a very long error message. + This is a very long error message. This is a very long error message. + This is a very long error message. This is a very long error message. + This is a very long error message. This is a very long error message. + +
+
+
+ +
+
+
+
+
+ + + Ok + +
+
+ +
+
+
+
+
+
+ Confirm +
+ +
+
+ + This is a very long error message. This is a very long error message. + This is a very long error message. This is a very long error message. + This is a very long error message. This is a very long error message. + This is a very long error message. This is a very long error message. + This is a very long error message. This is a very long error message. + This is a very long error message. This is a very long error message. + +
+
+
+ +
+
+
+
+
+ + + Ok + Cancel + +
+
+
+ + + diff --git a/plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin.js b/plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin.js new file mode 100644 index 0000000000..938ce6b17d --- /dev/null +++ b/plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.InsertDateTime",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertDate",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_dateFormat",a.getLang("insertdatetime.date_fmt")));a.execCommand("mceInsertContent",false,d)});a.addCommand("mceInsertTime",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_timeFormat",a.getLang("insertdatetime.time_fmt")));a.execCommand("mceInsertContent",false,d)});a.addButton("insertdate",{title:"insertdatetime.insertdate_desc",cmd:"mceInsertDate"});a.addButton("inserttime",{title:"insertdatetime.inserttime_desc",cmd:"mceInsertTime"})},getInfo:function(){return{longname:"Insert date/time",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getDateTime:function(e,a){var c=this.editor;function b(g,d){g=""+g;if(g.length-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{if(g[c]>0){a[c].style.zIndex=g[c]-1}}}else{for(f=0;fg[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{a[c].style.zIndex=g[c]+1}}b.execCommand("mceRepaint")},_getParentLayer:function(a){return this.editor.dom.getParent(a,function(b){return b.nodeType==1&&/^(absolute|relative|static)$/i.test(b.style.position)})},_insertLayer:function(){var a=this.editor,b=a.dom.getPos(a.dom.getParent(a.selection.getNode(),"*"));a.dom.add(a.getBody(),"div",{style:{position:"absolute",left:b.x,top:(b.y>20?b.y:20),width:100,height:100},"class":"mceItemVisualAid"},a.selection.getContent()||a.getLang("layer.content"))},_toggleAbsolute:function(){var a=this.editor,b=this._getParentLayer(a.selection.getNode());if(!b){b=a.dom.getParent(a.selection.getNode(),"DIV,P,IMG")}if(b){if(b.style.position.toLowerCase()=="absolute"){a.dom.setStyles(b,{position:"",left:"",top:"",width:"",height:""});a.dom.removeClass(b,"mceItemVisualAid")}else{if(b.style.left==""){b.style.left=20+"px"}if(b.style.top==""){b.style.top=20+"px"}if(b.style.width==""){b.style.width=b.width?(b.width+"px"):"100px"}if(b.style.height==""){b.style.height=b.height?(b.height+"px"):"100px"}b.style.position="absolute";a.addVisual(a.getBody())}a.execCommand("mceRepaint");a.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js new file mode 100644 index 0000000000..d5aa86548c --- /dev/null +++ b/plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js @@ -0,0 +1,212 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.Layer', { + init : function(ed, url) { + var t = this; + + t.editor = ed; + + // Register commands + ed.addCommand('mceInsertLayer', t._insertLayer, t); + + ed.addCommand('mceMoveForward', function() { + t._move(1); + }); + + ed.addCommand('mceMoveBackward', function() { + t._move(-1); + }); + + ed.addCommand('mceMakeAbsolute', function() { + t._toggleAbsolute(); + }); + + // Register buttons + ed.addButton('moveforward', {title : 'layer.forward_desc', cmd : 'mceMoveForward'}); + ed.addButton('movebackward', {title : 'layer.backward_desc', cmd : 'mceMoveBackward'}); + ed.addButton('absolute', {title : 'layer.absolute_desc', cmd : 'mceMakeAbsolute'}); + ed.addButton('insertlayer', {title : 'layer.insertlayer_desc', cmd : 'mceInsertLayer'}); + + ed.onInit.add(function() { + if (tinymce.isIE) + ed.getDoc().execCommand('2D-Position', false, true); + }); + + ed.onNodeChange.add(t._nodeChange, t); + ed.onVisualAid.add(t._visualAid, t); + }, + + getInfo : function() { + return { + longname : 'Layer', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + // Private methods + + _nodeChange : function(ed, cm, n) { + var le, p; + + le = this._getParentLayer(n); + p = ed.dom.getParent(n, 'DIV,P,IMG'); + + if (!p) { + cm.setDisabled('absolute', 1); + cm.setDisabled('moveforward', 1); + cm.setDisabled('movebackward', 1); + } else { + cm.setDisabled('absolute', 0); + cm.setDisabled('moveforward', !le); + cm.setDisabled('movebackward', !le); + cm.setActive('absolute', le && le.style.position.toLowerCase() == "absolute"); + } + }, + + // Private methods + + _visualAid : function(ed, e, s) { + var dom = ed.dom; + + tinymce.each(dom.select('div,p', e), function(e) { + if (/^(absolute|relative|static)$/i.test(e.style.position)) { + if (s) + dom.addClass(e, 'mceItemVisualAid'); + else + dom.removeClass(e, 'mceItemVisualAid'); + } + }); + }, + + _move : function(d) { + var ed = this.editor, i, z = [], le = this._getParentLayer(ed.selection.getNode()), ci = -1, fi = -1, nl; + + nl = []; + tinymce.walk(ed.getBody(), function(n) { + if (n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position)) + nl.push(n); + }, 'childNodes'); + + // Find z-indexes + for (i=0; i -1) { + nl[ci].style.zIndex = z[fi]; + nl[fi].style.zIndex = z[ci]; + } else { + if (z[ci] > 0) + nl[ci].style.zIndex = z[ci] - 1; + } + } else { + // Move forward + + // Try find a higher one + for (i=0; i z[ci]) { + fi = i; + break; + } + } + + if (fi > -1) { + nl[ci].style.zIndex = z[fi]; + nl[fi].style.zIndex = z[ci]; + } else + nl[ci].style.zIndex = z[ci] + 1; + } + + ed.execCommand('mceRepaint'); + }, + + _getParentLayer : function(n) { + return this.editor.dom.getParent(n, function(n) { + return n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position); + }); + }, + + _insertLayer : function() { + var ed = this.editor, p = ed.dom.getPos(ed.dom.getParent(ed.selection.getNode(), '*')); + + ed.dom.add(ed.getBody(), 'div', { + style : { + position : 'absolute', + left : p.x, + top : (p.y > 20 ? p.y : 20), + width : 100, + height : 100 + }, + 'class' : 'mceItemVisualAid' + }, ed.selection.getContent() || ed.getLang('layer.content')); + }, + + _toggleAbsolute : function() { + var ed = this.editor, le = this._getParentLayer(ed.selection.getNode()); + + if (!le) + le = ed.dom.getParent(ed.selection.getNode(), 'DIV,P,IMG'); + + if (le) { + if (le.style.position.toLowerCase() == "absolute") { + ed.dom.setStyles(le, { + position : '', + left : '', + top : '', + width : '', + height : '' + }); + + ed.dom.removeClass(le, 'mceItemVisualAid'); + } else { + if (le.style.left == "") + le.style.left = 20 + 'px'; + + if (le.style.top == "") + le.style.top = 20 + 'px'; + + if (le.style.width == "") + le.style.width = le.width ? (le.width + 'px') : '100px'; + + if (le.style.height == "") + le.style.height = le.height ? (le.height + 'px') : '100px'; + + le.style.position = "absolute"; + ed.addVisual(ed.getBody()); + } + + ed.execCommand('mceRepaint'); + ed.nodeChanged(); + } + } + }); + + // Register plugin + tinymce.PluginManager.add('layer', tinymce.plugins.Layer); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js new file mode 100644 index 0000000000..33618e84d4 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js @@ -0,0 +1 @@ +(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.serializer;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"full"}},bold:{inline:"b"},italic:{inline:"i"},underline:{inline:"u"},strikethrough:{inline:"strike"},fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}},});d._setup();a.each("b,i,u,strike".split(","),function(f){var g=d.rules[f];if(!g){d.addRules(f)}});if(!d.rules.font){d.addRules("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.rules[f],g;if(h){a.each(h.attribs,function(j,i){if(i.name=="align"){g=true;return false}});if(!g){h.attribs.push({name:"align"})}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js new file mode 100644 index 0000000000..3673a4dd19 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js @@ -0,0 +1,136 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + * + * This plugin will force TinyMCE to produce deprecated legacy output such as font elements, u elements, align + * attributes and so forth. There are a few cases where these old items might be needed for example in email applications or with Flash + * + * However you should NOT use this plugin if you are building some system that produces web contents such as a CMS. All these elements are + * not apart of the newer specifications for HTML and XHTML. + */ + +(function(tinymce) { + // Override inline_styles setting to force TinyMCE to produce deprecated contents + tinymce.onAddEditor.addToTop(function(tinymce, editor) { + editor.settings.inline_styles = false; + }); + + // Create the legacy ouput plugin + tinymce.create('tinymce.plugins.LegacyOutput', { + init : function(editor) { + editor.onInit.add(function() { + var alignElements = 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', + fontSizes = tinymce.explode(editor.settings.font_size_style_values), + serializer = editor.serializer; + + // Override some internal formats to produce legacy elements and attributes + editor.formatter.register({ + // Change alignment formats to use the deprecated align attribute + alignleft : {selector : alignElements, attributes : {align : 'left'}}, + aligncenter : {selector : alignElements, attributes : {align : 'center'}}, + alignright : {selector : alignElements, attributes : {align : 'right'}}, + alignfull : {selector : alignElements, attributes : {align : 'full'}}, + + // Change the basic formatting elements to use deprecated element types + bold : {inline : 'b'}, + italic : {inline : 'i'}, + underline : {inline : 'u'}, + strikethrough : {inline : 'strike'}, + + // Change font size and font family to use the deprecated font element + fontname : {inline : 'font', attributes : {face : '%value'}}, + fontsize : { + inline : 'font', + attributes : { + size : function(vars) { + return tinymce.inArray(fontSizes, vars.value) + 1; + } + } + }, + + // Setup font elements for colors as well + forecolor : {inline : 'font', styles : {color : '%value'}}, + hilitecolor : {inline : 'font', styles : {backgroundColor : '%value'}}, + }); + + // Force parsing of the serializer rules + serializer._setup(); + + // Check that deprecated elements are allowed if not add them + tinymce.each('b,i,u,strike'.split(','), function(name) { + var rule = serializer.rules[name]; + + if (!rule) + serializer.addRules(name); + }); + + // Add font element if it's missing + if (!serializer.rules["font"]) + serializer.addRules("font[face|size|color|style]"); + + // Add the missing and depreacted align attribute for the serialization engine + tinymce.each(alignElements.split(','), function(name) { + var rule = serializer.rules[name], found; + + if (rule) { + tinymce.each(rule.attribs, function(name, attr) { + if (attr.name == 'align') { + found = true; + return false; + } + }); + + if (!found) + rule.attribs.push({name : 'align'}); + } + }); + + // Listen for the onNodeChange event so that we can do special logic for the font size and font name drop boxes + editor.onNodeChange.add(function(editor, control_manager) { + var control, fontElm, fontName, fontSize; + + // Find font element get it's name and size + fontElm = editor.dom.getParent(editor.selection.getNode(), 'font'); + if (fontElm) { + fontName = fontElm.face; + fontSize = fontElm.size; + } + + // Select/unselect the font name in droplist + if (control = control_manager.get('fontselect')) { + control.select(function(value) { + return value == fontName; + }); + } + + // Select/unselect the font size in droplist + if (control = control_manager.get('fontsizeselect')) { + control.select(function(value) { + var index = tinymce.inArray(fontSizes, value.fontSize); + + return index + 1 == fontSize; + }); + } + }); + }); + }, + + getInfo : function() { + return { + longname : 'LegacyOutput', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('legacyoutput', tinymce.plugins.LegacyOutput); +})(tinymce); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/media/css/content.css b/plugins/TinyMCE/js/plugins/media/css/content.css new file mode 100644 index 0000000000..1bf6a75869 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/media/css/content.css @@ -0,0 +1,6 @@ +.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc;} +.mceItemShockWave {background-image: url(../img/shockwave.gif);} +.mceItemFlash {background-image:url(../img/flash.gif);} +.mceItemQuickTime {background-image:url(../img/quicktime.gif);} +.mceItemWindowsMedia {background-image:url(../img/windowsmedia.gif);} +.mceItemRealMedia {background-image:url(../img/realmedia.gif);} diff --git a/plugins/TinyMCE/js/plugins/media/css/media.css b/plugins/TinyMCE/js/plugins/media/css/media.css new file mode 100644 index 0000000000..2d087944de --- /dev/null +++ b/plugins/TinyMCE/js/plugins/media/css/media.css @@ -0,0 +1,16 @@ +#id, #name, #hspace, #vspace, #class_name, #align { width: 100px } +#hspace, #vspace { width: 50px } +#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px } +#flash_base, #flash_flashvars { width: 240px } +#width, #height { width: 40px } +#src, #media_type { width: 250px } +#class { width: 120px } +#prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto } +.panel_wrapper div.current { height: 390px; overflow: auto } +#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none } +.mceAddSelectValue { background-color: #DDDDDD } +#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px } +#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume { width: 70px } +#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px } +#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px } +#qt_qtsrc { width: 200px } diff --git a/plugins/TinyMCE/js/plugins/media/editor_plugin.js b/plugins/TinyMCE/js/plugins/media/editor_plugin.js new file mode 100644 index 0000000000..4bbe367e36 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/media/editor_plugin.js @@ -0,0 +1 @@ +(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.MediaPlugin",{init:function(b,c){var e=this;e.editor=b;e.url=c;function f(g){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(g.className)}b.onPreInit.add(function(){b.serializer.addRules("param[name|value|_mce_value]")});b.addCommand("mceMedia",function(){b.windowManager.open({file:c+"/media.htm",width:430+parseInt(b.getLang("media.delta_width",0)),height:470+parseInt(b.getLang("media.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("media",{title:"media.desc",cmd:"mceMedia"});b.onNodeChange.add(function(h,g,i){g.setActive("media",i.nodeName=="IMG"&&f(i))});b.onInit.add(function(){var g={mceItemFlash:"flash",mceItemShockWave:"shockwave",mceItemWindowsMedia:"windowsmedia",mceItemQuickTime:"quicktime",mceItemRealMedia:"realmedia"};b.selection.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.selection.onBeforeSetContent.add(e._objectsToSpans,e);if(b.settings.content_css!==false){b.dom.loadCSS(c+"/css/content.css")}if(b.theme&&b.theme.onResolveName){b.theme.onResolveName.add(function(h,i){if(i.name=="img"){a(g,function(l,j){if(b.dom.hasClass(i.node,j)){i.name=l;i.title=b.dom.getAttrib(i.node,"title");return false}})}})}if(b&&b.plugins.contextmenu){b.plugins.contextmenu.onContextMenu.add(function(i,h,j){if(j.nodeName=="IMG"&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(j.className)){h.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});b.onBeforeSetContent.add(e._objectsToSpans,e);b.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.onPreProcess.add(function(g,i){var h=g.dom;if(i.set){e._spansToImgs(i.node);a(h.select("IMG",i.node),function(k){var j;if(f(k)){j=e._parse(k.title);h.setAttrib(k,"width",h.getAttrib(k,"width",j.width||100));h.setAttrib(k,"height",h.getAttrib(k,"height",j.height||100))}})}if(i.get){a(h.select("IMG",i.node),function(m){var l,j,k;if(g.getParam("media_use_script")){if(f(m)){m.className=m.className.replace(/mceItem/g,"mceTemp")}return}switch(m.className){case"mceItemFlash":l="d27cdb6e-ae6d-11cf-96b8-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="application/x-shockwave-flash";break;case"mceItemShockWave":l="166b1bca-3f9c-11cf-8075-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0";k="application/x-director";break;case"mceItemWindowsMedia":l=g.getParam("media_wmp6_compatible")?"05589fa1-c356-11ce-bf01-00aa0055595a":"6bf52a52-394a-11d3-b153-00c04f79faa6";j="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701";k="application/x-mplayer2";break;case"mceItemQuickTime":l="02bf25d5-8c17-4b23-bc80-d3488abddc6b";j="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0";k="video/quicktime";break;case"mceItemRealMedia":l="cfcdaa03-8be4-11cf-b84b-0020afbbccfa";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="audio/x-pn-realaudio-plugin";break}if(l){h.replace(e._buildObj({classid:l,codebase:j,type:k},m),m)}})}});b.onPostProcess.add(function(g,h){h.content=h.content.replace(/_mce_value=/g,"value=")});function d(g,h){h=new RegExp(h+'="([^"]+)"',"g").exec(g);return h?b.dom.decode(h[1]):""}b.onPostProcess.add(function(g,h){if(g.getParam("media_use_script")){h.content=h.content.replace(/]+>/g,function(j){var i=d(j,"class");if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(i)){at=e._parse(d(j,"title"));at.width=d(j,"width");at.height=d(j,"height");j=''; + } + + return im; + }); + } + }); + }, + + getInfo : function() { + return { + longname : 'Media', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + // Private methods + _objectsToSpans : function(ed, o) { + var t = this, h = o.content; + + h = h.replace(/]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) { + var o = t._parse(c); + + return '' + }); + + h = h.replace(/]*)>/gi, ''); + h = h.replace(/]*)\/?>/gi, ''); + h = h.replace(/]*)>/gi, ''); + h = h.replace(/<\/(object)([^>]*)>/gi, ''); + h = h.replace(/<\/embed>/gi, ''); + h = h.replace(/]*)>/gi, function(a, b) {return ''}); + h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam">'); + + o.content = h; + }, + + _buildObj : function(o, n) { + var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title), stc; + + stc = ed.getParam('media_strict', true) && o.type == 'application/x-shockwave-flash'; + + p.width = o.width = dom.getAttrib(n, 'width') || 100; + p.height = o.height = dom.getAttrib(n, 'height') || 100; + + if (p.src) + p.src = ed.convertURL(p.src, 'src', n); + + if (stc) { + ob = dom.create('span', { + id : p.id, + _mce_name : 'object', + type : 'application/x-shockwave-flash', + data : p.src, + style : dom.getAttrib(n, 'style'), + width : o.width, + height : o.height + }); + } else { + ob = dom.create('span', { + id : p.id, + _mce_name : 'object', + classid : "clsid:" + o.classid, + style : dom.getAttrib(n, 'style'), + codebase : o.codebase, + width : o.width, + height : o.height + }); + } + + each (p, function(v, k) { + if (!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(k)) { + // Use url instead of src in IE for Windows media + if (o.type == 'application/x-mplayer2' && k == 'src' && !p.url) + k = 'url'; + + if (v) + dom.add(ob, 'span', {_mce_name : 'param', name : k, '_mce_value' : v}); + } + }); + + if (!stc) + dom.add(ob, 'span', tinymce.extend({_mce_name : 'embed', type : o.type, style : dom.getAttrib(n, 'style')}, p)); + + return ob; + }, + + _spansToImgs : function(p) { + var t = this, dom = t.editor.dom, im, ci; + + each(dom.select('span', p), function(n) { + // Convert object into image + if (dom.getAttrib(n, 'class') == 'mceItemObject') { + ci = dom.getAttrib(n, "classid").toLowerCase().replace(/\s+/g, ''); + + switch (ci) { + case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000': + dom.replace(t._createImg('mceItemFlash', n), n); + break; + + case 'clsid:166b1bca-3f9c-11cf-8075-444553540000': + dom.replace(t._createImg('mceItemShockWave', n), n); + break; + + case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6': + case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95': + case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a': + dom.replace(t._createImg('mceItemWindowsMedia', n), n); + break; + + case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b': + dom.replace(t._createImg('mceItemQuickTime', n), n); + break; + + case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa': + dom.replace(t._createImg('mceItemRealMedia', n), n); + break; + + default: + dom.replace(t._createImg('mceItemFlash', n), n); + } + + return; + } + + // Convert embed into image + if (dom.getAttrib(n, 'class') == 'mceItemEmbed') { + switch (dom.getAttrib(n, 'type')) { + case 'application/x-shockwave-flash': + dom.replace(t._createImg('mceItemFlash', n), n); + break; + + case 'application/x-director': + dom.replace(t._createImg('mceItemShockWave', n), n); + break; + + case 'application/x-mplayer2': + dom.replace(t._createImg('mceItemWindowsMedia', n), n); + break; + + case 'video/quicktime': + dom.replace(t._createImg('mceItemQuickTime', n), n); + break; + + case 'audio/x-pn-realaudio-plugin': + dom.replace(t._createImg('mceItemRealMedia', n), n); + break; + + default: + dom.replace(t._createImg('mceItemFlash', n), n); + } + } + }); + }, + + _createImg : function(cl, n) { + var im, dom = this.editor.dom, pa = {}, ti = '', args; + + args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality', 'data']; + + // Create image + im = dom.create('img', { + src : this.url + '/img/trans.gif', + width : dom.getAttrib(n, 'width') || 100, + height : dom.getAttrib(n, 'height') || 100, + style : dom.getAttrib(n, 'style'), + 'class' : cl + }); + + // Setup base parameters + each(args, function(na) { + var v = dom.getAttrib(n, na); + + if (v) + pa[na] = v; + }); + + // Add optional parameters + each(dom.select('span', n), function(n) { + if (dom.hasClass(n, 'mceItemParam')) + pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_mce_value'); + }); + + // Use src not movie + if (pa.movie) { + pa.src = pa.movie; + delete pa.movie; + } + + // No src try data + if (!pa.src) { + pa.src = pa.data; + delete pa.data; + } + + // Merge with embed args + n = dom.select('.mceItemEmbed', n)[0]; + if (n) { + each(args, function(na) { + var v = dom.getAttrib(n, na); + + if (v && !pa[na]) + pa[na] = v; + }); + } + + delete pa.width; + delete pa.height; + + im.title = this._serialize(pa); + + return im; + }, + + _parse : function(s) { + return tinymce.util.JSON.parse('{' + s + '}'); + }, + + _serialize : function(o) { + return tinymce.util.JSON.serialize(o).replace(/[{}]/g, ''); + } + }); + + // Register plugin + tinymce.PluginManager.add('media', tinymce.plugins.MediaPlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/media/img/flash.gif b/plugins/TinyMCE/js/plugins/media/img/flash.gif new file mode 100644 index 0000000000000000000000000000000000000000..cb192e6ceda8d19ad8e7d08dd1cfde0aa72ead2a GIT binary patch literal 241 zcmVOzlLa+Za}7>m0&NpCfJ0FQc3~F7DE)S%o1)Qi1n@vxX46qnD4hRS-NE*Pw!4UvE=#^N( literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/media/img/flv_player.swf b/plugins/TinyMCE/js/plugins/media/img/flv_player.swf new file mode 100644 index 0000000000000000000000000000000000000000..042c2ab969e98a6fdbe08848c4a73bd2c41de906 GIT binary patch literal 11668 zcmV;FEo;(4S5pYUVE_PloV|PrTvNvr@V+F3a36As0Rb-#MGjBSfQpD35b>z>Admpj zkkAkitwp@*Rqv`rs-o69lDZ&@y{HKo3{JcK8Rt^ z72Hab0Fi(9n@~bYkV2y_)Fy`HtF#7{J|rojb4e1a7ekY%Jpqu!GtXQ6#>m0qvY zqk05XkPr<=DTomvJ9PBuQB+V+fX0s>j}|Rjgg*T6Llosb@Z|f-K0(8m{He?6zo^!s zgW%o|yBiCa{N=g3_eV+xKc?-B?2)mXBGanczVGz$;(Jq8W!}yB$#d7jwz;Cki@c`f zWnSDHobzK#aT@9u=8^8x_Ib_e#Xl4Y`Zer+8u>-bA6`uVXi-Ep^6uWh%d8KaJS&g= z)KA}qY1=qz((;kczfDdZmcI1pls2gC!tgBV;pBqfKiK7u7MDbR)&C>$gyc05A7uO} zTU6zl(L392O7^D-J^u?tL2G}Nl|dGb6UZS!lq5p+9>gp}0$|zy zkSG#qbPAfg3zp?lIyJ5j#n!UMW{%nE-W&j!ZI})Q-KC5ph&MP(<)Js zTB%fN`{MEmC|{-4pi+ZEZQoGP^zA& zLSxF+rRqEl+hmTqSfx>GRVc3zjiF2!xFY<5N}=@HB8fb_IYAXlu?mZ7o| zrNW>xk}{1xtqwkmRR+Z{LK(lMQ+^9H0Gff% zJX2#B5lWP0dWAs^!o=T2Duogl*TKM!LUG8TsxY9=AQJ=bIZ~7vbc1o5C@Ly0DylPi zB6X=;AxGtErAn8jC@Te$;}vQ{nof_KL}N>PDKwfqMgBNcpw_5zCX}d9MX?4f1q5BH zQjIf;K8tpwpGg@hdc9%-(x|kBAc=g9I)9w8e;9k(1AMm0;^LIo2w|sWvCp)nqQ>Q7OIBoG-c3dwN`BaqJ6M4 zOw%ihS>0nCrK&(trZKR9V0>jIgTY<~VtawF!NoeAp$Mx6j|!@8ZhRE#47wDpaxk_w zZ9bB#483$(tty`=BA>qE(!oTHNMSH2@{4Fs^2!PdRC?S%DtRNC0b9$_Vc`%-0KWsl z4tpyM3N%(xt|-mdt4j=V07SGG+5vUw2tQ$nS`eWC^bEjRP@go6ZIn-bkt%;2?kwgU zO4Mu->COPIH>?q}HbxaOMi1RbgUQ$i;+&MUN@8Pb=p;x%p_xEbqg59ZRT$-mKTO69 z!yNNKBTkW_Sd)Vd6GVm$l)xKwg@qbbTA4-zomHu{D2EgTnM#5}(?In_K|MQ0b&T%O zv0GG-P9IbR152e3=^iR;{1rz?#t z)>Wug`QQd3^L53YQGQveL060kl%kTdQtS=buB4W!HHLm#TBTH%Vl9C#4A_6@i(xPp z0H1>?=P*pb)mTQ;z)w9I8i3J zGPPErptgE+fycR@b$bnIc#*`@ZkZw?a&b6jjeW{^Wky@if#fot%>Nv=VB$=K+nQI}A85~NO@ z;yQJrXo!Rj&atr$y{rUU0DqzfQ5x9-^=WZ&iLR8b!m3t6j%Nl|TsjW-XP^RpW0y9R zhP+-d-V8_q17$oKlV7ICVlALkB!tps zE=VF0Ble%j&I#b{0T@Z_2zhaKCjMnF^;{`HJ&_4XA`*&3d`O3Er%bk5gd~pmH+)It znbiW+kwX*{M7GXJ?zGGS*{0%58U#Gx`7~4m%Z`L)7pW(%aUnJJTn)6*ft2iR7Iw3Z znpPZN@N|_gb3zg~qbxEpv+g2+$k8dl1mz*ez4H_aGEHSIXqm)a$}99Dg(4FOJVoT` zF71o?!4380A$b2cghV3(70zUH=6T58JY;@}r<@RyTD0u*Pmm=98RR|u-!^aAaUUze z8>@VclI3idkLdT(+Lr%Ko{SN}U&;q{HG$&s0FdcqSlJvH{+vyVLnPq?r*F@f zI(GNCT^@`l*P=*lge0iA*jh0`|H2;4^c3_8_W1AAc8TG87F^PSQ{+oVDu`nU;@iG8 z;vq}KLoA|{0}~NhXPUk|O<%OPAYVbc=K!GXi+oKrPI6A?=_HQVB5DyGY*<7n&muwz zb_bqCbdZ{0Y*|FGr9}i=TSTyJiwL%~i2wf{3jYe@=PgD%vZ``2+975(sa(J|3?zK`XS zCPH@M=z<8-?L@qnB$6O^CS9QKQF0gO01Oe$hwvg0F;ZM7;PSCftU5c9FPeN}92aNX zJ)&6AELQYC!iqIZVxz4R>u6(Q%}049n>O|k;1Y;#&B3~48`DlBDA67UcD5!;=cNR~ z5z5oqnHR9%RmAkAw8&i4s#egK;)3&KB;EQFr{9-OUIo1A6c~MXkx0^m^tGpyrtWc4 z5*?grbm+;BQz-F5X2{S`cS$@!iI!UM?vTwXBb|=$7L*zfFd>oFNN7!>)a)~f&L*o# zBu$o*Dpy)1BQ2!#BLIGAnzzNWWgo3FGz<}5Q=3N&Ld)DuR!&)>O6ir2rwgqaGZer$ zPe}GAC4I;C4(UcYG&kSQC*iq$#*dZPR6H|7GI$(EUZqD<)EmqGE z5{9GCc>STP37J;w3t2plEqN#;ZX$qVfse+8N}5XAA?!kung=sUpcxnFfSnvE9|X#A zru!@qgVd-snJs3wr&1dnN0c69OC2_K6w$omI*~OLPg_;d%~Ulrf^z5x8e;N&&^yATxs&TCd(CJ-oKnKR{%vS@4$o+Gkt zxBzVWE=cmaskM=^fMpWID(ZCtJSv+o5Q#sz&X1M_un~|ep=t6M+DfjeoEor#mgiZP z=V$XGsdByxKDJ;t7KwCuW6@0p$F@L-ZHznszqW=~0ey{u*BCkBAx8SrP)!$wW27|5 zHXo#g|1AuYm1L`0VPA?1JoNwH z!O&Q!<|o|V)H|xB{FO2q7z+qVHPmGUurNdj#8o=5l`+x)YkblXKxu} zY1pIn!8U9Xe8ph7G54UWcVpXwuyBQ>l{AyLir$j2H2_niPKMa%IEhA@Ip2e~ql%Cq z3>gTiwx+y>&JL`{1@#X+v2#PHt*JY7mQkGTYr7jPw_4z%rH#E%@WWx~3eH4``?H(? z>9TFkid>wHRwdx)Sg$mT(h^a1FwUH?#3Z4{*;2qOio%A82Acs;1;+W-c$n|4BQynB zW>)?-axt3wM7%6Zvz4a2Bogx+S4|7cGXV%KC2S>9mm7|-Hx!`eydmpUtH}s_so&(B zE2T|s)dAU=h3FEJagx|=hb$_H-SCbWfR779LVWVThoM4#LvFN2y^QAgPT1ez5^!~; zl!+lCA#cKE9)FFQ25~^m1z`(hgN+S}EK?!}zRw1Rz{V`uf&e!;C)O>n;hM$S#sWTS z87K1jZpJeJWW2|7;S(sAvnYeNHM9RLe4ZRvd)NEI@U5|8|ugIm>8*) z%Xx#>#dM|vvCDS@yAV4XKnIFN?mQ9t7p-u2uTI5g!rSAg=0sTaM4%LmVC+_ECIlO^vs4JDBLZ&EVS!{J z#9?oX!&jhCh`|D!%Px{EmMoFHOFEUx69E0k3%VG9WIO3(m4I$`E``xZ`m&5&SP_Z@ z@=P1`%gOZNJ@Xi40aI;j2bT{6FDuwJObgVE`FKMaJ1Z~Novbho|C&T!TR86#cN9cOdLp7vK^BoISnGxtn8HG0&H;#R4W6qxVVEbs z{H+x}c$g1 zpG_0Fp2+tVpg*KBj6CTEJK)phF7v2Ea!<3fS#%hwmFNUApVN~*M#px}TbN-#q9@OR)B3i*0Q?^Cwv)$r*hsAeC%Bl|``w0>2 zQXo(LOr7Nbv;hWhpW1=MeR(JR7~~L+BwBn9`y831_Ay0{0Bc7Nv0osPNOsDpoQS($ zMI0MjC=#%zNQkfdjKF;^H!kgQMQL*5J}6i8g`5UcUePW&jiS7w-SU~-p)!!K2WAHc zPZ5MsAxU6TEu3ioCT^e`kM0=LS8Fq{L3M8t!#5uhW7~Sz@>ejP z3IDH*!`tGFCrshO&}pF=7Ce_)iO1YlxRqRPL=j7o3a|kQAvy}l>Ob~)mQ>;SB|Eor z#91Xi@+81QB$E=l<4t7)PM+7M$)E(1J#-&NBsPa;2Q_O{LYN2Ar4C2p4EGvsO~7sB zh(u(uLLm9Vj0jN^TeI7&M#QUGArfX%YBo)Yk0xNbvLjsC3F(@X4+%qdbjm7_d__c1 zoJ}XP=E2FAJ(o~#)e-bfJCErSUp9k#7yx8jeHd!3lYq2=Mv17SJz*Uk%lnkG1 zvRq(>+w8J{RRtM*afr_=%Cu~Yzjk1Ch``(8uZ}>4;b?`(B+Y}SR{7#Rlt8h6EChRp$6lOftRMFA0$ZuGMvhL!{1Vd4Tsq%M#rM4oAw z9iKIpnk}!>m3x~eZYD)?2uzqsw;en&QKMxDB@J{XKdgB=4P;k@hsT$`6F!RKK!+a3 zr8A#t_WTVyH>G9Y(IYTsW&3TEnRl3&TsPkM+-Hp4=01_{%|?*5)NC7AjFsO!Vw5^J z*E3u6wIEAFM1zzbo(rV=o+2aXPR3A2asW%-_rH|){mt;c-v;mdU!8X&Su^_vJgdKI z5c5E2Cf3Z~H?YV2hw+TK`BUC2ZHyUqo8D*`_V{ShTtv??#=jETnJ*X_MI$|1bXVa5AVDKCif@+*5fHKbb^HrG6?P;jBm9rosSX{-zLOxtv=$mH}G z6p@{UQ{4<9cW?!q!XkIYV zbYN4jadEs{(<1A%-dJmvr;8?@E}HRV#O86vFI#1!m4Cx!KYsddA@y`t>U>C3_U_6* zV06h6lqBwa#8tKtFDF{&>^4`>`2PQuSa3CC!S&y;VBrRhg|Etjj~NR-|BMBCp3b&j z`m@bM@L~K+L)v1=By*W3lE_S3=Qv(qZz|vx{cwSkacP3qTp=OxYIXwt#owX#MXWRC z2I4ic$rOZMx>B<}(HAv2;J%CTl_K!FUhE3bZXyiCuooUAyWx{D_V81SDhLd|?4rFG zijE;@0+GuR>dBh~6`@vD2xS3weSJN0ciGl}>_16wwb}LCM(qXmq6`P_q6`VWD5KtP z9y}eqwYSFCDg{O)>u5$QQ<`O({-1kWbW=~p;X14q7^+7)lR35F$=-NUu zvPRh$+wM{~G~fbyuR10#SEy`oDW84jwe{as4Q$Vh8#nX!vp!!s{l4|b6A)paKYtztc{PL;U2Hrgo-;L}^M>h-(x}{F(}Fl2JvbY2XKe)G zzv1*mBbH=O3;Gl)F$s6?v02LTIevi;rUCD$H9)igjw5AA@{mFI?%e~3xeHOC*PCnS z_s~YpI0VFf0LTmQ-@(LNpkqX8|S(sH6w)^49?S?t6rsux-nX{OQ7xcTjO4 zib5%<6m3C=kQYII>$u&1hb&+- zy1(7NxC#mm*bQeMWeGoN2<(Q+LxtZqxE??i7nlpRZmm$f7jv`LUR9NlgTd!i1uVlP zZcber^Vab9D?*uj@om0tK)DIt2If*N;7$Al!;P&<=!hO{2fV~WO!BjaKp2 zS>ORQX&ovbE<9HP_3;{L$MrHM+5l|a&jOa9&C9uzha0&-E50NBF25k$Cv!cE2_BHS z9zo?BfoIweXpr=AeHHKwv~EMM-}GW`<=W4v;(AKRy4j)l9NaZ;1Y`-z6&sn0xj?pJ zIBw<$Zia~GVHOqz{w7_n0g5?HCtQOv*%goIoeF=mCQI`sf00#FQ{Yapg`Km&7TiZr9a#b62OAn z&e=44;$C9CRG>}9k9ZA2olqp|3@~-k8Y9% z&ST3*L|@&W8^77v86`V(0e}Ex=K(IK;!=LD-;2g%*Bwo5?>1#lxiY!q&yq*8qlKfc z%c@hhj@jt(;rH_|uW>|f2cu8WY$Fi-=VtJqOs@cRQHE$%)}mo^$vUZbq033u@3rRq zULfat0}#$zvVeI^XLJxcV$@knZbuj=$%9)syjFe@Ch(GcSt2FE^S+qcp@yt>)=}+ zp7Rd1*f!OzHYLRWk%PPAzKkx)xrM&N)@G;oJ~=0&(pWs=gcaHA; z^6=hWPd2UUC+}7lTOZrh)HBxq*b~>f!^*r~5Q?`AU0+$>`HzW-Yeq)aO_4SH{pisn z?|V-w67uRUPJdADbpD?A=#PEp9l0&oayDb@`FoY0Uw)oEG|*XGQh%MXuT;JE_L-kV zpI@H$qD{}+L$}->ziZ^=aUb3Zzkj0y^;?`PQH2+l5Hxu`cp5Yt5)bWqGaf=jwKh$-(Q&1N?>7CyW-dc2S zYEg^qP49l)|EhNRIfwI$4nB^lcHVk^od2mJ=Zd6(J8%5`s3QG9-k{s@D_w8D5pW{s z_nV`$$It4$w&9J0Q3rdT3i5We8!~xQ&f1-6ZioIpUGw&By~ErCQy+SKmp|~0>lFz; zes2%Dcjxib+-^1do<0BY>7a-ckE2$fP?t#USFe`-@#mzZDObYI-6+}kJl20+-nOCZ zUMvj^jb14~n-mgXJ>VNhcbEU(>e7SH-b-)$x6j<$N1m)ZfA6&oXTqlMSIquB zE99D;zJB=P%UjQmt$(^}Y^C7NUbi{ab+qG#f3LQD*HK%tQR-vwQUzA?jKOD9j8+pr z_vbA4gU>@8yM^S9ThqEB&2EQB@{~C~i^pj{9dueUHCGipYvZ=zug(2tSep?a);)Ya z-`~5>fx5!C2j(t+^Ycqnf`dydW1FgDPZd?3?^sY*?KX3N>aLN?ChlGJ{e$uuc{>i- zPfMA5Sozm%mx{fkcZ~jc$%FF#ADxewuy^#`6eYH-(&wm0m!KPE&X`1ahru5lNNy4-v#Y4z7m>$4r6*{y5{>$+}`&)$ogkp6{L zb+u1tC}TD~%-(QjU(bLAeU)pj71XWKcqRJGU9vA%<}=ss#|a66*-5L1JuUxoUP95Z z;XUj-9y}n~|M$KNlahvYN#8Y6es)Z#SIN1P(@uAI|5lG*oZ@SaJ-h;@GJM&PJ9nNu zi~h5+e$nfZ%Qr4n_$hOLb?Z?@1DMc%n(qEF@fz6fqV(Pw8_r~hFZH}z`KZh1eYTu^@!PMP zpCT7u{}^f}9gJqu-lmx}IRulqCouYb;$GX~NHaq$WPkwmK^MT9!i?55c;J?lL0*6K z4QMryujzI{$jKq5F--kksSxZ$3G` zt;2~!o6hdKT6g}^xL@lQ$e&znH+;%`;xUom#wDfh&{6Lp10kLLEiw4a}; zIDuAP)Vv)ChJEZIV}o1o=@sDa)R-{;C&PD%3r9w7c-q;^@xr)`%QQgIBU$tI$DsPM~TZtCLia_!cmJ!8M!6F&aStJ$fNQ6HaQG3CS6elc5S##RpqA0r{AvF=pozs2fVM3+IQo9{D96nf>VEXn9-D_xI)gr)#o&!{AM4$5x!LikG@>R3)vx<(x9wr`O?v zx;z`iKeD|p0{m(CIbk`T0D)PFb{oHGI@ASBp z?bn88XucBp)SS8ZN9)RucIyr_x^|#O(#dEf9baN3k(`lq;?@whfRS`2>oa(3w>^U( z8G;NAfP}~s=W@QdScEgR_r8=Nr|fA##%od8G)@eO)q(D5L8z0=5%Cf$d}}2OA|W8X zF^F#iFD=7YsMd=y|B;Sddgd~;u@mCK&?{E!#eo>gnS*i~IQ1m2Esd%G!-QZMSDbiq z%<>2sFFR#h^gzAC82hU|g?s{WV}mbgTK#ceruOOfj6{MDrJ) zV!6^5v~;pVdw6z%X6R-7R7di^MB2Q%&x%H9~#H-8QIUz(Ln45_OAge~rzKY(Z zN$kU;1MVY}0BlLWpOS+YO}Wd789{x0eG|TgoBS|sCOf3TYY$LYg8hB>#s`+_y5EFy z)CP?zNLLVKC{hI#Xv*>By!Zl9Y?VO+bb3{Bkh&x?G7?nZ1~7U8t+<1>X7Cr9P*hA@ zOftB+zizKzKBewZKps5XY6i;Ke4&Bn>%d3@Tm6gZ+=B0g9S(D!OZdT|wxoI+8 z=+X?B&#f8#aj$Jdr=_iXbU1Iv$@eCYi}L&8uYq0s*DpNME6Ba7pw8jFmRg36;}QujUXdwq|5!y7UViX(-j1q2 zCO&6&PS`Pg&$~x%?|G3J=mtUyJTxi2e)?M*&Rl%_>yu~Glc(L^R99CwFDLx=ql49_ zeSLkMV=51<-k$vM;5GI4x;NhV!}+hp7n4G6B~HHC?~~U5@tu31aCUEf*~E$8&FUR; z?a9oyI&W`U-FtGb{9H+o=@2;oY<>5#r{j!=ZqHro>i7MXyK}^XNA^D~_mPOMM+t}3 ze|_=3Wb&TU`%SO6(2ZQZqf&|yfMthy(G*fa6>Yl^Hx8=GtqqH9}^n3 z?n|l4A|t<=x|*Yb?<6<<7TA&>f9U>1dpj5?ep3Zerh8l2F(?MB_nTf-LE=C)bwEc0 zd=pU2pqcEdMpN>MhiCy_w@5%qF4s?{o$NOgP4-e7%Us?WKuxEPeDVi{|B8v^R zB>cGn?UUW+E~#=aaYWFkwhoKc;CAT!w6v!!;h98w>O^~*NS!XbLWOrSlF@Laq(1%H zwQI=TMN<`1aa?+*WrOkuCFk2^oD7pW8IFQy3V04~Lb8bZ?L&=BI^DTJ=v^#E8S4m$fXGF-bTg^FJ?Eia`h^T literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/media/img/quicktime.gif b/plugins/TinyMCE/js/plugins/media/img/quicktime.gif new file mode 100644 index 0000000000000000000000000000000000000000..3b0499145b16138249f653a1a3f2c80230fb292c GIT binary patch literal 303 zcmV+~0nq+ONk%w1VGsZi0K^{vH>m7Qv+~s9^fsC5ZpZP=*zu3F=Jxpf8k_5u%JNv6 z=md-84VLU4w)kSE=yI&-yw>b=v+SqE?+kq47pC+YrR?bJ^yu>Zyvpn;hTp*6^mM!O zu+8$^=JX7bb<~J01ZTA{q@86#&8&6~H`Ss{{?p%K!-p%L6P2TpFYz90?pD06UU# BbnE~C literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/media/img/realmedia.gif b/plugins/TinyMCE/js/plugins/media/img/realmedia.gif new file mode 100644 index 0000000000000000000000000000000000000000..fdfe0b9ac05869ae845fdd828eaad97cc0c69dbc GIT binary patch literal 439 zcmV;o0Z9HwNk%w1VI=?(0K^{vQcz8xz}f&njBB06v9GQ`Jv%NdDHCI&z`wqZw$(Lw zuFTBL!Pe#<92tv>h)9OE1Xh}vnVEHSaeb-GByg#tqM_B*)YRkdSdqTuipLaF8n=^^LJP4|1^gGRdo_Rl+a*grZQ1hw@Zo1ikN$oB{QbRq&z?QIckdq1aE3;Fq_(WV>Kc7gjQtQh+9OrtFhn-)LUqD<|MOIl_!(Ed#pPRE;S)g;ew3>pd zn`Wa(lc2DGa)peFw3f88dp-|`@*)AXj;@(8hwDr|7Sxsp;&YxjN*Y{PBB!TIU|!b7Zgv0OaG5)&Kwi literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/media/img/trans.gif b/plugins/TinyMCE/js/plugins/media/img/trans.gif new file mode 100644 index 0000000000000000000000000000000000000000..388486517fa8da13ebd150e8f65d5096c3e10c3a GIT binary patch literal 43 ncmZ?wbhEHbWMp7un7{x9ia%KxMSyG_5FaGNz{KRj$Y2csb)f_x literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/media/img/windowsmedia.gif b/plugins/TinyMCE/js/plugins/media/img/windowsmedia.gif new file mode 100644 index 0000000000000000000000000000000000000000..ab50f2d887a0843b116ef598e5a005e5601d18d0 GIT binary patch literal 415 zcmV;Q0bu?|Nk%w1VGjTg0M$PL`E^qkEu+z?1&N?x_*pRg{rx~kg!#|I<>uyug^O^t z0hZGrt*x!>$1C!zn`W5@`ts6_uMW)2%<0NUEKIo?SIPPE=}U0}7Z(?JcX!y=*;bF< zCWz-=h7+2ao9)(dOHM;+X=xs9)%!~xc&ICMZdRYdUQ2$^@9y(6X3NCIz{cM7f^Z=Q z1_tQ95kgl8b%R%OiYTIo7LSdE^@}A^8LW002J#EC2ui01p5U000KOz@O0K01zUifeIyT9%!RzMDgehG|mwLz+Eh; z7Z~iE zrX?OfJ^>XeDJK)xJuWOB3_l1N0Ra>g4Gk^=ED0V6LI?>4;Q|6OB{LplLMRLg8U5-E J?0y6R06W6!pgRBn literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/media/js/embed.js b/plugins/TinyMCE/js/plugins/media/js/embed.js new file mode 100644 index 0000000000..f8dc810527 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/media/js/embed.js @@ -0,0 +1,73 @@ +/** + * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose. + */ + +function writeFlash(p) { + writeEmbed( + 'D27CDB6E-AE6D-11cf-96B8-444553540000', + 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0', + 'application/x-shockwave-flash', + p + ); +} + +function writeShockWave(p) { + writeEmbed( + '166B1BCA-3F9C-11CF-8075-444553540000', + 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0', + 'application/x-director', + p + ); +} + +function writeQuickTime(p) { + writeEmbed( + '02BF25D5-8C17-4B23-BC80-D3488ABDDC6B', + 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0', + 'video/quicktime', + p + ); +} + +function writeRealMedia(p) { + writeEmbed( + 'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA', + 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0', + 'audio/x-pn-realaudio-plugin', + p + ); +} + +function writeWindowsMedia(p) { + p.url = p.src; + writeEmbed( + '6BF52A52-394A-11D3-B153-00C04F79FAA6', + 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701', + 'application/x-mplayer2', + p + ); +} + +function writeEmbed(cls, cb, mt, p) { + var h = '', n; + + h += ''; + + h += ''); + +function init() { + var pl = "", f, val; + var type = "flash", fe, i; + + ed = tinyMCEPopup.editor; + + tinyMCEPopup.resizeToInnerSize(); + f = document.forms[0] + + fe = ed.selection.getNode(); + if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) { + pl = fe.title; + + switch (ed.dom.getAttrib(fe, 'class')) { + case 'mceItemFlash': + type = 'flash'; + break; + + case 'mceItemFlashVideo': + type = 'flv'; + break; + + case 'mceItemShockWave': + type = 'shockwave'; + break; + + case 'mceItemWindowsMedia': + type = 'wmp'; + break; + + case 'mceItemQuickTime': + type = 'qt'; + break; + + case 'mceItemRealMedia': + type = 'rmp'; + break; + } + + document.forms[0].insert.value = ed.getLang('update', 'Insert', true); + } + + document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media'); + document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media'); + document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor'); + + var html = getMediaListHTML('medialist','src','media','media'); + if (html == "") + document.getElementById("linklistrow").style.display = 'none'; + else + document.getElementById("linklistcontainer").innerHTML = html; + + // Resize some elements + if (isVisible('filebrowser')) + document.getElementById('src').style.width = '230px'; + + // Setup form + if (pl != "") { + pl = tinyMCEPopup.editor.plugins.media._parse(pl); + + switch (type) { + case "flash": + setBool(pl, 'flash', 'play'); + setBool(pl, 'flash', 'loop'); + setBool(pl, 'flash', 'menu'); + setBool(pl, 'flash', 'swliveconnect'); + setStr(pl, 'flash', 'quality'); + setStr(pl, 'flash', 'scale'); + setStr(pl, 'flash', 'salign'); + setStr(pl, 'flash', 'wmode'); + setStr(pl, 'flash', 'base'); + setStr(pl, 'flash', 'flashvars'); + break; + + case "qt": + setBool(pl, 'qt', 'loop'); + setBool(pl, 'qt', 'autoplay'); + setBool(pl, 'qt', 'cache'); + setBool(pl, 'qt', 'controller'); + setBool(pl, 'qt', 'correction'); + setBool(pl, 'qt', 'enablejavascript'); + setBool(pl, 'qt', 'kioskmode'); + setBool(pl, 'qt', 'autohref'); + setBool(pl, 'qt', 'playeveryframe'); + setBool(pl, 'qt', 'tarsetcache'); + setStr(pl, 'qt', 'scale'); + setStr(pl, 'qt', 'starttime'); + setStr(pl, 'qt', 'endtime'); + setStr(pl, 'qt', 'tarset'); + setStr(pl, 'qt', 'qtsrcchokespeed'); + setStr(pl, 'qt', 'volume'); + setStr(pl, 'qt', 'qtsrc'); + break; + + case "shockwave": + setBool(pl, 'shockwave', 'sound'); + setBool(pl, 'shockwave', 'progress'); + setBool(pl, 'shockwave', 'autostart'); + setBool(pl, 'shockwave', 'swliveconnect'); + setStr(pl, 'shockwave', 'swvolume'); + setStr(pl, 'shockwave', 'swstretchstyle'); + setStr(pl, 'shockwave', 'swstretchhalign'); + setStr(pl, 'shockwave', 'swstretchvalign'); + break; + + case "wmp": + setBool(pl, 'wmp', 'autostart'); + setBool(pl, 'wmp', 'enabled'); + setBool(pl, 'wmp', 'enablecontextmenu'); + setBool(pl, 'wmp', 'fullscreen'); + setBool(pl, 'wmp', 'invokeurls'); + setBool(pl, 'wmp', 'mute'); + setBool(pl, 'wmp', 'stretchtofit'); + setBool(pl, 'wmp', 'windowlessvideo'); + setStr(pl, 'wmp', 'balance'); + setStr(pl, 'wmp', 'baseurl'); + setStr(pl, 'wmp', 'captioningid'); + setStr(pl, 'wmp', 'currentmarker'); + setStr(pl, 'wmp', 'currentposition'); + setStr(pl, 'wmp', 'defaultframe'); + setStr(pl, 'wmp', 'playcount'); + setStr(pl, 'wmp', 'rate'); + setStr(pl, 'wmp', 'uimode'); + setStr(pl, 'wmp', 'volume'); + break; + + case "rmp": + setBool(pl, 'rmp', 'autostart'); + setBool(pl, 'rmp', 'loop'); + setBool(pl, 'rmp', 'autogotourl'); + setBool(pl, 'rmp', 'center'); + setBool(pl, 'rmp', 'imagestatus'); + setBool(pl, 'rmp', 'maintainaspect'); + setBool(pl, 'rmp', 'nojava'); + setBool(pl, 'rmp', 'prefetch'); + setBool(pl, 'rmp', 'shuffle'); + setStr(pl, 'rmp', 'console'); + setStr(pl, 'rmp', 'controls'); + setStr(pl, 'rmp', 'numloop'); + setStr(pl, 'rmp', 'scriptcallbacks'); + break; + } + + setStr(pl, null, 'src'); + setStr(pl, null, 'id'); + setStr(pl, null, 'name'); + setStr(pl, null, 'vspace'); + setStr(pl, null, 'hspace'); + setStr(pl, null, 'bgcolor'); + setStr(pl, null, 'align'); + setStr(pl, null, 'width'); + setStr(pl, null, 'height'); + + if ((val = ed.dom.getAttrib(fe, "width")) != "") + pl.width = f.width.value = val; + + if ((val = ed.dom.getAttrib(fe, "height")) != "") + pl.height = f.height.value = val; + + oldWidth = pl.width ? parseInt(pl.width) : 0; + oldHeight = pl.height ? parseInt(pl.height) : 0; + } else + oldWidth = oldHeight = 0; + + selectByValue(f, 'media_type', type); + changedType(type); + updateColor('bgcolor_pick', 'bgcolor'); + + TinyMCE_EditableSelects.init(); + generatePreview(); +} + +function insertMedia() { + var fe, f = document.forms[0], h; + + tinyMCEPopup.restoreSelection(); + + if (!AutoValidator.validate(f)) { + tinyMCEPopup.alert(ed.getLang('invalid_data')); + return false; + } + + f.width.value = f.width.value == "" ? 100 : f.width.value; + f.height.value = f.height.value == "" ? 100 : f.height.value; + + fe = ed.selection.getNode(); + if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) { + switch (f.media_type.options[f.media_type.selectedIndex].value) { + case "flash": + fe.className = "mceItemFlash"; + break; + + case "flv": + fe.className = "mceItemFlashVideo"; + break; + + case "shockwave": + fe.className = "mceItemShockWave"; + break; + + case "qt": + fe.className = "mceItemQuickTime"; + break; + + case "wmp": + fe.className = "mceItemWindowsMedia"; + break; + + case "rmp": + fe.className = "mceItemRealMedia"; + break; + } + + if (fe.width != f.width.value || fe.height != f.height.value) + ed.execCommand('mceRepaint'); + + fe.title = serializeParameters(); + fe.width = f.width.value; + fe.height = f.height.value; + fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : ''); + fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : ''); + fe.align = f.align.options[f.align.selectedIndex].value; + } else { + h = ' 0) { + var html = ""; + + html += ''; + + return html; + } + + return ""; +} + +function getType(v) { + var fo, i, c, el, x, f = document.forms[0]; + + fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';'); + + // YouTube + if (v.match(/watch\?v=(.+)(.*)/)) { + f.width.value = '425'; + f.height.value = '350'; + f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1]; + return 'flash'; + } + + // Google video + if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) { + f.width.value = '425'; + f.height.value = '326'; + f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en'; + return 'flash'; + } + + for (i=0; i 0 ? s.substring(0, s.length - 1) : s; + + return s; +} + +function setBool(pl, p, n) { + if (typeof(pl[n]) == "undefined") + return; + + document.forms[0].elements[p + "_" + n].checked = pl[n] != 'false'; +} + +function setStr(pl, p, n) { + var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n]; + + if (typeof(pl[n]) == "undefined") + return; + + if (e.type == "text") + e.value = pl[n]; + else + selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]); +} + +function getBool(p, n, d, tv, fv) { + var v = document.forms[0].elements[p + "_" + n].checked; + + tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'"; + fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'"; + + return (v == d) ? '' : n + (v ? ':' + tv + ',' : ":\'" + fv + "\',"); +} + +function getStr(p, n, d) { + var e = document.forms[0].elements[(p != null ? p + "_" : "") + n]; + var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value; + + if (n == 'src') + v = tinyMCEPopup.editor.convertURL(v, 'src', null); + + return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',"); +} + +function getInt(p, n, d) { + var e = document.forms[0].elements[(p != null ? p + "_" : "") + n]; + var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value; + + return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ","); +} + +function jsEncode(s) { + s = s.replace(new RegExp('\\\\', 'g'), '\\\\'); + s = s.replace(new RegExp('"', 'g'), '\\"'); + s = s.replace(new RegExp("'", 'g'), "\\'"); + + return s; +} + +function generatePreview(c) { + var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh; + + p.innerHTML = ''; + + nw = parseInt(f.width.value); + nh = parseInt(f.height.value); + + if (f.width.value != "" && f.height.value != "") { + if (f.constrain.checked) { + if (c == 'width' && oldWidth != 0) { + wp = nw / oldWidth; + nh = Math.round(wp * nh); + f.height.value = nh; + } else if (c == 'height' && oldHeight != 0) { + hp = nh / oldHeight; + nw = Math.round(hp * nw); + f.width.value = nw; + } + } + } + + if (f.width.value != "") + oldWidth = nw; + + if (f.height.value != "") + oldHeight = nh; + + // After constrain + pl = serializeParameters(); + + switch (f.media_type.options[f.media_type.selectedIndex].value) { + case "flash": + cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'; + codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0'; + type = 'application/x-shockwave-flash'; + break; + + case "shockwave": + cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000'; + codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0'; + type = 'application/x-director'; + break; + + case "qt": + cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B'; + codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0'; + type = 'video/quicktime'; + break; + + case "wmp": + cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6'; + codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701'; + type = 'application/x-mplayer2'; + break; + + case "rmp": + cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA'; + codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701'; + type = 'audio/x-pn-realaudio-plugin'; + break; + } + + if (pl == '') { + p.innerHTML = ''; + return; + } + + pl = tinyMCEPopup.editor.plugins.media._parse(pl); + + if (!pl.src) { + p.innerHTML = ''; + return; + } + + pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src); + pl.width = !pl.width ? 100 : pl.width; + pl.height = !pl.height ? 100 : pl.height; + pl.id = !pl.id ? 'obj' : pl.id; + pl.name = !pl.name ? 'eobj' : pl.name; + pl.align = !pl.align ? '' : pl.align; + + // Avoid annoying warning about insecure items + if (!tinymce.isIE || document.location.protocol != 'https:') { + h += ''; + + for (n in pl) { + h += ''; + + // Add extra url parameter if it's an absolute URL + if (n == 'src' && pl[n].indexOf('://') != -1) + h += ''; + } + } + + h += ' + + + {#media_dlg.title} + + + + + + + + + +
+
+ +
+ +
+
+
+ {#media_dlg.general} + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
 
+
+ + + + + + +
x   
+
+
+ +
+ {#media_dlg.preview} + +
+
+ +
+
+ {#media_dlg.advanced} + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
 
+
+
+ +
+ {#media_dlg.flash_options} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+ + + + + + + + + + + +
+
+ +
+ {#media_dlg.flv_options} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+
+ +
+ {#media_dlg.qt_options} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+  
+ + + + + +
 
+
+
+ +
+ {#media_dlg.wmp_options} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+
+ +
+ {#media_dlg.rmp_options} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+   +
+
+ +
+ {#media_dlg.shockwave_options} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+ + + + + +
+ 		+ + + + + +
+
+ + + + + +
+ 		+ + + + + +
+
+
+
+
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js new file mode 100644 index 0000000000..f2dbbff2bb --- /dev/null +++ b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'·':" ")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(tinymce.isIE&&f.keyCode==9){d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");tinymce.dom.Event.cancel(f)}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js new file mode 100644 index 0000000000..e3b078bfae --- /dev/null +++ b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js @@ -0,0 +1,53 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.Nonbreaking', { + init : function(ed, url) { + var t = this; + + t.editor = ed; + + // Register commands + ed.addCommand('mceNonBreaking', function() { + ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '·' : ' '); + }); + + // Register buttons + ed.addButton('nonbreaking', {title : 'nonbreaking.nonbreaking_desc', cmd : 'mceNonBreaking'}); + + if (ed.getParam('nonbreaking_force_tab')) { + ed.onKeyDown.add(function(ed, e) { + if (tinymce.isIE && e.keyCode == 9) { + ed.execCommand('mceNonBreaking'); + ed.execCommand('mceNonBreaking'); + ed.execCommand('mceNonBreaking'); + tinymce.dom.Event.cancel(e); + } + }); + } + }, + + getInfo : function() { + return { + longname : 'Nonbreaking space', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + + // Private methods + }); + + // Register plugin + tinymce.PluginManager.add('nonbreaking', tinymce.plugins.Nonbreaking); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js new file mode 100644 index 0000000000..9945cd8580 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js @@ -0,0 +1 @@ +(function(){var a=tinymce.dom.Event;tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(d,e){var f=this,c,b;f.editor=d;c=d.getParam("noneditable_editable_class","mceEditable");b=d.getParam("noneditable_noneditable_class","mceNonEditable");d.onNodeChange.addToTop(function(h,g,k){var j,i;j=h.dom.getParent(h.selection.getStart(),function(l){return h.dom.hasClass(l,b)});i=h.dom.getParent(h.selection.getEnd(),function(l){return h.dom.hasClass(l,b)});if(j||i){f._setDisabled(1);return false}else{f._setDisabled(0)}})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_block:function(c,d){var b=d.keyCode;if((b>32&&b<41)||(b>111&&b<124)){return}return a.cancel(d)},_setDisabled:function(d){var c=this,b=c.editor;tinymce.each(b.controlManager.controls,function(e){e.setDisabled(d)});if(d!==c.disabled){if(d){b.onKeyDown.addToTop(c._block);b.onKeyPress.addToTop(c._block);b.onKeyUp.addToTop(c._block);b.onPaste.addToTop(c._block)}else{b.onKeyDown.remove(c._block);b.onKeyPress.remove(c._block);b.onKeyUp.remove(c._block);b.onPaste.remove(c._block)}c.disabled=d}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js new file mode 100644 index 0000000000..656c971b8c --- /dev/null +++ b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js @@ -0,0 +1,90 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + var Event = tinymce.dom.Event; + + tinymce.create('tinymce.plugins.NonEditablePlugin', { + init : function(ed, url) { + var t = this, editClass, nonEditClass; + + t.editor = ed; + editClass = ed.getParam("noneditable_editable_class", "mceEditable"); + nonEditClass = ed.getParam("noneditable_noneditable_class", "mceNonEditable"); + + ed.onNodeChange.addToTop(function(ed, cm, n) { + var sc, ec; + + // Block if start or end is inside a non editable element + sc = ed.dom.getParent(ed.selection.getStart(), function(n) { + return ed.dom.hasClass(n, nonEditClass); + }); + + ec = ed.dom.getParent(ed.selection.getEnd(), function(n) { + return ed.dom.hasClass(n, nonEditClass); + }); + + // Block or unblock + if (sc || ec) { + t._setDisabled(1); + return false; + } else + t._setDisabled(0); + }); + }, + + getInfo : function() { + return { + longname : 'Non editable elements', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + _block : function(ed, e) { + var k = e.keyCode; + + // Don't block arrow keys, pg up/down, and F1-F12 + if ((k > 32 && k < 41) || (k > 111 && k < 124)) + return; + + return Event.cancel(e); + }, + + _setDisabled : function(s) { + var t = this, ed = t.editor; + + tinymce.each(ed.controlManager.controls, function(c) { + c.setDisabled(s); + }); + + if (s !== t.disabled) { + if (s) { + ed.onKeyDown.addToTop(t._block); + ed.onKeyPress.addToTop(t._block); + ed.onKeyUp.addToTop(t._block); + ed.onPaste.addToTop(t._block); + } else { + ed.onKeyDown.remove(t._block); + ed.onKeyPress.remove(t._block); + ed.onKeyUp.remove(t._block); + ed.onPaste.remove(t._block); + } + + t.disabled = s; + } + } + }); + + // Register plugin + tinymce.PluginManager.add('noneditable', tinymce.plugins.NonEditablePlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/pagebreak/css/content.css b/plugins/TinyMCE/js/plugins/pagebreak/css/content.css new file mode 100644 index 0000000000..c949d58cc4 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/pagebreak/css/content.css @@ -0,0 +1 @@ +.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../img/pagebreak.gif) no-repeat center top;} diff --git a/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js new file mode 100644 index 0000000000..a212f69633 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='',a="mcePageBreak",c=b.getParam("pagebreak_separator",""),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.settings.content_css!==false){b.dom.loadCSS(d+"/css/content.css")}if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js new file mode 100644 index 0000000000..4e1eb0a7aa --- /dev/null +++ b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js @@ -0,0 +1,77 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.PageBreakPlugin', { + init : function(ed, url) { + var pb = '', cls = 'mcePageBreak', sep = ed.getParam('pagebreak_separator', ''), pbRE; + + pbRE = new RegExp(sep.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g, function(a) {return '\\' + a;}), 'g'); + + // Register commands + ed.addCommand('mcePageBreak', function() { + ed.execCommand('mceInsertContent', 0, pb); + }); + + // Register buttons + ed.addButton('pagebreak', {title : 'pagebreak.desc', cmd : cls}); + + ed.onInit.add(function() { + if (ed.settings.content_css !== false) + ed.dom.loadCSS(url + "/css/content.css"); + + if (ed.theme.onResolveName) { + ed.theme.onResolveName.add(function(th, o) { + if (o.node.nodeName == 'IMG' && ed.dom.hasClass(o.node, cls)) + o.name = 'pagebreak'; + }); + } + }); + + ed.onClick.add(function(ed, e) { + e = e.target; + + if (e.nodeName === 'IMG' && ed.dom.hasClass(e, cls)) + ed.selection.select(e); + }); + + ed.onNodeChange.add(function(ed, cm, n) { + cm.setActive('pagebreak', n.nodeName === 'IMG' && ed.dom.hasClass(n, cls)); + }); + + ed.onBeforeSetContent.add(function(ed, o) { + o.content = o.content.replace(pbRE, pb); + }); + + ed.onPostProcess.add(function(ed, o) { + if (o.get) + o.content = o.content.replace(/]+>/g, function(im) { + if (im.indexOf('class="mcePageBreak') !== -1) + im = sep; + + return im; + }); + }); + }, + + getInfo : function() { + return { + longname : 'PageBreak', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('pagebreak', tinymce.plugins.PageBreakPlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/pagebreak/img/pagebreak.gif b/plugins/TinyMCE/js/plugins/pagebreak/img/pagebreak.gif new file mode 100644 index 0000000000000000000000000000000000000000..acdf4085f3068c4c0a1d6855f4b80dae8bac3068 GIT binary patch literal 325 zcmV-L0lNN2Nk%w1VPpUd0J9GO`>v<{=;ru;boX6P{`2zsmyZ3>&HK5t_;hIbi-G;z z+4`cI{KdfcXj}GCLjV8&A^8LW000jFEC2ui0Av6R000E?@X1N5y*TU5yZ>M)j$|1M z4Ouvb$pHu>IW8BZq|n;U0s@T!VM5~w1_+1X!EiVl!&PITYdjT!ffYfpt{jAfv%qvh zA63WUHSlr7LkeyaV4(pM0f50(II?RD4RtMg4-E+tFhdAy5{3c=0}3Bg9Y8`B2To20 zR%SO62L%9}0H+dzoKB$+2TOwzUrwi{XiBM^4V#>63q3!LsU3u93zH8CdwqY%62;1g z0g8ze$k93lWExp`CUe|K4qOWk17ZeJ0|5pDP6+}};{>bI@lOWj=kf}r2sHp7w9-Ie XK%9UG6W(*AX-vY05F<*&5CH%?Gwy&_ literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/pagebreak/img/trans.gif b/plugins/TinyMCE/js/plugins/pagebreak/img/trans.gif new file mode 100644 index 0000000000000000000000000000000000000000..388486517fa8da13ebd150e8f65d5096c3e10c3a GIT binary patch literal 43 ncmZ?wbhEHbWMp7un7{x9ia%KxMSyG_5FaGNz{KRj$Y2csb)f_x literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/paste/editor_plugin.js b/plugins/TinyMCE/js/plugins/paste/editor_plugin.js new file mode 100644 index 0000000000..78fd6d73ee --- /dev/null +++ b/plugins/TinyMCE/js/plugins/paste/editor_plugin.js @@ -0,0 +1 @@ +(function(){var c=tinymce.each,d=null,a={paste_auto_cleanup_on_paste:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_notifyalways:false,paste_text_linebreaktype:"p",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(e,f){return e.getParam(f,a[f])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(e,f){var g=this;g.editor=e;g.url=f;g.onPreProcess=new tinymce.util.Dispatcher(g);g.onPostProcess=new tinymce.util.Dispatcher(g);g.onPreProcess.add(g._preProcess);g.onPostProcess.add(g._postProcess);g.onPreProcess.add(function(j,k){e.execCallback("paste_preprocess",j,k)});g.onPostProcess.add(function(j,k){e.execCallback("paste_postprocess",j,k)});e.pasteAsPlainText=false;function i(l,j){var k=e.dom;g.onPreProcess.dispatch(g,l);l.node=k.create("div",0,l.content);g.onPostProcess.dispatch(g,l);l.content=e.serializer.serialize(l.node,{getInner:1});if((!j)&&(e.pasteAsPlainText)){g._insertPlainText(e,k,l.content);if(!b(e,"paste_text_sticky")){e.pasteAsPlainText=false;e.controlManager.setActive("pastetext",false)}}else{if(/<(p|h[1-6]|ul|ol)/.test(l.content)){g._insertBlockContent(e,k,l.content)}else{g._insert(l.content)}}}e.addCommand("mceInsertClipboardContent",function(j,k){i(k,true)});if(!b(e,"paste_text_use_dialog")){e.addCommand("mcePasteText",function(k,j){var l=tinymce.util.Cookie;e.pasteAsPlainText=!e.pasteAsPlainText;e.controlManager.setActive("pastetext",e.pasteAsPlainText);if((e.pasteAsPlainText)&&(!l.get("tinymcePasteText"))){if(b(e,"paste_text_sticky")){e.windowManager.alert("Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.")}else{e.windowManager.alert("Paste is now in plain text mode. Click again to toggle back to regular paste mode.")}if(!b(e,"paste_text_notifyalways")){l.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}e.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});e.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function h(s){var m,q,k,l=e.selection,p=e.dom,r=e.getBody(),j;if(p.get("_mcePaste")){return}m=p.add(r,"div",{id:"_mcePaste","class":"mcePaste"},"\uFEFF");if(r!=e.getDoc().body){j=p.getPos(e.selection.getStart(),r).y}else{j=r.scrollTop}p.setStyles(m,{position:"absolute",left:-10000,top:j,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){k=p.doc.body.createTextRange();k.moveToElementText(m);k.execCommand("Paste");p.remove(m);if(m.innerHTML==="\uFEFF"){e.execCommand("mcePasteWord");s.preventDefault();return}i({content:m.innerHTML});return tinymce.dom.Event.cancel(s)}else{function o(n){n.preventDefault()}p.bind(e.getDoc(),"mousedown",o);p.bind(e.getDoc(),"keydown",o);q=e.selection.getRng();m=m.firstChild;k=e.getDoc().createRange();k.setStart(m,0);k.setEnd(m,1);l.setRng(k);window.setTimeout(function(){var t="",n=p.select("div.mcePaste");c(n,function(u){c(p.select("div.mcePaste",u),function(v){p.remove(v,1)});t+=(p.select("> span.Apple-style-span div",u)[0]||p.select("> span.Apple-style-span",u)[0]||u).innerHTML});c(n,function(u){p.remove(u)});if(q){l.setRng(q)}i({content:t});p.unbind(e.getDoc(),"mousedown",o);p.unbind(e.getDoc(),"keydown",o)},0)}}if(b(e,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){e.onKeyDown.add(function(j,k){if(((tinymce.isMac?k.metaKey:k.ctrlKey)&&k.keyCode==86)||(k.shiftKey&&k.keyCode==45)){h(k)}})}else{e.onPaste.addToTop(function(j,k){return h(k)})}}if(b(e,"paste_block_drop")){e.onInit.add(function(){e.dom.bind(e.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(j){j.preventDefault();j.stopPropagation();return false})})}g._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(i,f){var l=this.editor,k=f.content,q=tinymce.grep,p=tinymce.explode,g=tinymce.trim,m,j;function e(h){c(h,function(o){if(o.constructor==RegExp){k=k.replace(o,"")}else{k=k.replace(o[0],o[1])}})}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(k)||f.wordContent){f.wordContent=true;e([/^\s*( )+/gi,/( |]*>)+\s*$/gi]);if(b(l,"paste_convert_headers_to_strong")){k=k.replace(/

]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"

$1

")}if(b(l,"paste_convert_middot_lists")){e([[//gi,"$&__MCE_ITEM__"],[/(]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"]])}e([//gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/ /gi,"\u00a0"]]);do{m=k.length;k=k.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(m!=k.length);if(b(l,"paste_retain_style_properties").replace(/^none$/i,"").length==0){k=k.replace(/<\/?span[^>]*>/gi,"")}else{e([[/([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(u,h,t){var v=[],o=0,r=p(g(t).replace(/"/gi,"'"),";");c(r,function(s){var w,y,z=p(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":v[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":v[o++]="text-align:"+y;return;case"vert-align":v[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":v[o++]="color:"+y;return;case"mso-background":case"mso-highlight":v[o++]="background:"+y;return;case"mso-default-height":v[o++]="min-height:"+x(y);return;case"mso-default-width":v[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":v[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){v[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){v[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}v[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+v.join(";")+'"'}else{return h}}]])}}if(b(l,"paste_convert_headers_to_strong")){e([[/]*>/gi,"

"],[/<\/h[1-6][^>]*>/gi,"

"]])}j=b(l,"paste_strip_class_attributes");if(j!=="none"){function n(r,o){if(j==="all"){return""}var h=q(p(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(s){return(/^(?!mso)/i.test(s))});return h.length?' class="'+h.join(" ")+'"':""}k=k.replace(/ class="([^"]+)"/gi,n);k=k.replace(/ class=(\w+)/gi,n)}if(b(l,"paste_remove_spans")){k=k.replace(/<\/?span[^>]*>/gi,"")}f.content=k},_postProcess:function(h,j){var g=this,f=g.editor,i=f.dom,e;if(j.wordContent){c(i.select("a",j.node),function(k){if(!k.href||k.href.indexOf("#_Toc")!=-1){i.remove(k,1)}});if(b(f,"paste_convert_middot_lists")){g._convertLists(h,j)}e=b(f,"paste_retain_style_properties");if((tinymce.is(e,"string"))&&(e!=="all")&&(e!=="*")){e=tinymce.explode(e.replace(/^none$/i,""));c(i.select("*",j.node),function(n){var o={},l=0,m,p,k;if(e){for(m=0;m0){i.setStyles(n,o)}else{if(n.nodeName=="SPAN"&&!n.className){i.remove(n,true)}}})}}if(b(f,"paste_remove_styles")||(b(f,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(i.select("*[style]",j.node),function(k){k.removeAttribute("style");k.removeAttribute("_mce_style")})}else{if(tinymce.isWebKit){c(i.select("*",j.node),function(k){k.removeAttribute("_mce_style")})}}},_convertLists:function(h,f){var j=h.editor.dom,i,m,e=-1,g,n=[],l,k;c(j.select("p",f.node),function(u){var r,v="",t,s,o,q;for(r=u.firstChild;r&&r.nodeType==3;r=r.nextSibling){v+=r.nodeValue}v=u.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/ /g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(v)){t="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(v)){t="ol"}if(t){g=parseFloat(u.style.marginLeft||0);if(g>e){n.push(g)}if(!i||t!=l){i=j.create(t);j.insertAfter(i,u)}else{if(g>e){i=m.appendChild(j.create(t))}else{if(g]*>/gi,"");if(t=="ul"&&/^[\u2022\u00b7\u00a7\u00d8o]/.test(p)){j.remove(w)}else{if(/^[\s\S]*\w+\.( |\u00a0)*\s*/.test(p)){j.remove(w)}}});s=u.innerHTML;if(t=="ul"){s=u.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*( |\u00a0)+\s*/,"")}else{s=u.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.( |\u00a0)+\s*/,"")}m=i.appendChild(j.create("li",0,s));j.remove(u);e=g;l=t}else{i=e=0}});k=f.node.innerHTML;if(k.indexOf("__MCE_ITEM__")!=-1){f.node.innerHTML=k.replace(/__MCE_ITEM__/g,"")}},_insertBlockContent:function(l,h,m){var f,j,g=l.selection,q,n,e,o,i,k="mce_marker";function p(t){var s;if(tinymce.isIE){s=l.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(false);s.select()}else{g.select(t,1);g.collapse(false)}}this._insert(' ',1);j=h.get(k);f=h.getParent(j,"p,h1,h2,h3,h4,h5,h6,ul,ol,th,td");if(f&&!/TD|TH/.test(f.nodeName)){j=h.split(f,j);c(h.create("div",0,m).childNodes,function(r){q=j.parentNode.insertBefore(r.cloneNode(true),j)});p(q)}else{h.setOuterHTML(j,m);g.select(l.getBody(),1);g.collapse(0)}while(n=h.get(k)){h.remove(n)}n=g.getStart();e=h.getViewPort(l.getWin());o=l.dom.getPos(n).y;i=n.clientHeight;if(oe.y+e.h){l.getDoc().body.scrollTop=o0)){if(!d){d=("34,quot,38,amp,39,apos,60,lt,62,gt,"+j.serializer.settings.entities).split(",")}if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(v)){q([/[\n\r]+/g])}else{q([/\r+/g])}q([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/ /gi," "],[/&(#\d+|[a-z0-9]{1,10});/gi,function(i,h){if(h.charAt(0)==="#"){return String.fromCharCode(h.slice(1))}else{return((i=y(d,h))>0)?String.fromCharCode(d[i-1]):" "}}],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"],/^\s+|\s+$/g]);v=x.encode(v);if(!s.isCollapsed()){z.execCommand("Delete",false,null)}if(m(o,"array")||(m(o,"array"))){q(o)}else{if(m(o,"string")){q(new RegExp(o,"gi"))}}if(g=="none"){q([[/\n+/g," "]])}else{if(g=="br"){q([[/\n/g,"
"]])}else{q([/^\s+|\s+$/g,[/\n\n/g,"

"],[/\n/g,"
"]])}}if((l=v.indexOf("

"))!=-1){k=v.lastIndexOf("

");r=s.getNode();e=[];do{if(r.nodeType==1){if(r.nodeName=="TD"||r.nodeName=="BODY"){break}e[e.length]=r}}while(r=r.parentNode);if(e.length>0){p=v.substring(0,l);f="";for(t=0,u=e.length;t";f+="<"+e[e.length-t-1].nodeName.toLowerCase()+">"}if(l==k){v=p+f+v.substring(l+7)}else{v=p+v.substring(l+4,k+4)+f+v.substring(k+7)}}}j.execCommand("mceInsertRawHTML",false,v+' ');window.setTimeout(function(){var h=x.get("_plain_text_marker"),B,i,A,w;s.select(h,false);z.execCommand("Delete",false,null);h=null;B=s.getStart();i=x.getViewPort(n);A=x.getPos(B).y;w=B.clientHeight;if((Ai.y+i.h)){z.body.scrollTop=A

]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi, "

$1

"); + } + + if (getParam(ed, "paste_convert_middot_lists")) { + process([ + [//gi, '$&__MCE_ITEM__'], // Convert supportLists to a list item marker + [/(]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__'] // Convert mso-list and symbol spans to item markers + ]); + } + + process([ + // Word comments like conditional comments etc + //gi, + + // Remove comments, scripts (e.g., msoShowComment), XML tag, VML content, MS Office namespaced tags, and a few other tags + /<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi, + + // Convert into for line-though + [/<(\/?)s>/gi, "<$1strike>"], + + // Replace nsbp entites to char since it's easier to handle + [/ /gi, "\u00a0"] + ]); + + // Remove bad attributes, with or without quotes, ensuring that attribute text is really inside a tag. + // If JavaScript had a RegExp look-behind, we could have integrated this with the last process() array and got rid of the loop. But alas, it does not, so we cannot. + do { + len = h.length; + h = h.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi, "$1"); + } while (len != h.length); + + // Remove all spans if no styles is to be retained + if (getParam(ed, "paste_retain_style_properties").replace(/^none$/i, "").length == 0) { + h = h.replace(/<\/?span[^>]*>/gi, ""); + } else { + // We're keeping styles, so at least clean them up. + // CSS Reference: http://msdn.microsoft.com/en-us/library/aa155477.aspx + + process([ + // Convert ___ to string of alternating breaking/non-breaking spaces of same length + [/([\s\u00a0]*)<\/span>/gi, + function(str, spaces) { + return (spaces.length > 0)? spaces.replace(/./, " ").slice(Math.floor(spaces.length/2)).split("").join("\u00a0") : ""; + } + ], + + // Examine all styles: delete junk, transform some, and keep the rest + [/(<[a-z][^>]*)\sstyle="([^"]*)"/gi, + function(str, tag, style) { + var n = [], + i = 0, + s = explode(trim(style).replace(/"/gi, "'"), ";"); + + // Examine each style definition within the tag's style attribute + each(s, function(v) { + var name, value, + parts = explode(v, ":"); + + function ensureUnits(v) { + return v + ((v !== "0") && (/\d$/.test(v)))? "px" : ""; + } + + if (parts.length == 2) { + name = parts[0].toLowerCase(); + value = parts[1].toLowerCase(); + + // Translate certain MS Office styles into their CSS equivalents + switch (name) { + case "mso-padding-alt": + case "mso-padding-top-alt": + case "mso-padding-right-alt": + case "mso-padding-bottom-alt": + case "mso-padding-left-alt": + case "mso-margin-alt": + case "mso-margin-top-alt": + case "mso-margin-right-alt": + case "mso-margin-bottom-alt": + case "mso-margin-left-alt": + case "mso-table-layout-alt": + case "mso-height": + case "mso-width": + case "mso-vertical-align-alt": + n[i++] = name.replace(/^mso-|-alt$/g, "") + ":" + ensureUnits(value); + return; + + case "horiz-align": + n[i++] = "text-align:" + value; + return; + + case "vert-align": + n[i++] = "vertical-align:" + value; + return; + + case "font-color": + case "mso-foreground": + n[i++] = "color:" + value; + return; + + case "mso-background": + case "mso-highlight": + n[i++] = "background:" + value; + return; + + case "mso-default-height": + n[i++] = "min-height:" + ensureUnits(value); + return; + + case "mso-default-width": + n[i++] = "min-width:" + ensureUnits(value); + return; + + case "mso-padding-between-alt": + n[i++] = "border-collapse:separate;border-spacing:" + ensureUnits(value); + return; + + case "text-line-through": + if ((value == "single") || (value == "double")) { + n[i++] = "text-decoration:line-through"; + } + return; + + case "mso-zero-height": + if (value == "yes") { + n[i++] = "display:none"; + } + return; + } + + // Eliminate all MS Office style definitions that have no CSS equivalent by examining the first characters in the name + if (/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(name)) { + return; + } + + // If it reached this point, it must be a valid CSS style + n[i++] = name + ":" + parts[1]; // Lower-case name, but keep value case + } + }); + + // If style attribute contained any valid styles the re-write it; otherwise delete style attribute. + if (i > 0) { + return tag + ' style="' + n.join(';') + '"'; + } else { + return tag; + } + } + ] + ]); + } + } + + // Replace headers with + if (getParam(ed, "paste_convert_headers_to_strong")) { + process([ + [/]*>/gi, "

"], + [/<\/h[1-6][^>]*>/gi, "

"] + ]); + } + + // Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso"). + // Note:- paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation. + stripClass = getParam(ed, "paste_strip_class_attributes"); + + if (stripClass !== "none") { + function removeClasses(match, g1) { + if (stripClass === "all") + return ''; + + var cls = grep(explode(g1.replace(/^(["'])(.*)\1$/, "$2"), " "), + function(v) { + return (/^(?!mso)/i.test(v)); + } + ); + + return cls.length ? ' class="' + cls.join(" ") + '"' : ''; + }; + + h = h.replace(/ class="([^"]+)"/gi, removeClasses); + h = h.replace(/ class=(\w+)/gi, removeClasses); + } + + // Remove spans option + if (getParam(ed, "paste_remove_spans")) { + h = h.replace(/<\/?span[^>]*>/gi, ""); + } + + //console.log('After preprocess:' + h); + + o.content = h; + }, + + /** + * Various post process items. + */ + _postProcess : function(pl, o) { + var t = this, ed = t.editor, dom = ed.dom, styleProps; + + if (o.wordContent) { + // Remove named anchors or TOC links + each(dom.select('a', o.node), function(a) { + if (!a.href || a.href.indexOf('#_Toc') != -1) + dom.remove(a, 1); + }); + + if (getParam(ed, "paste_convert_middot_lists")) { + t._convertLists(pl, o); + } + + // Process styles + styleProps = getParam(ed, "paste_retain_style_properties"); // retained properties + + // Process only if a string was specified and not equal to "all" or "*" + if ((tinymce.is(styleProps, "string")) && (styleProps !== "all") && (styleProps !== "*")) { + styleProps = tinymce.explode(styleProps.replace(/^none$/i, "")); + + // Retains some style properties + each(dom.select('*', o.node), function(el) { + var newStyle = {}, npc = 0, i, sp, sv; + + // Store a subset of the existing styles + if (styleProps) { + for (i = 0; i < styleProps.length; i++) { + sp = styleProps[i]; + sv = dom.getStyle(el, sp); + + if (sv) { + newStyle[sp] = sv; + npc++; + } + } + } + + // Remove all of the existing styles + dom.setAttrib(el, 'style', ''); + + if (styleProps && npc > 0) + dom.setStyles(el, newStyle); // Add back the stored subset of styles + else // Remove empty span tags that do not have class attributes + if (el.nodeName == 'SPAN' && !el.className) + dom.remove(el, true); + }); + } + } + + // Remove all style information or only specifically on WebKit to avoid the style bug on that browser + if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) { + each(dom.select('*[style]', o.node), function(el) { + el.removeAttribute('style'); + el.removeAttribute('_mce_style'); + }); + } else { + if (tinymce.isWebKit) { + // We need to compress the styles on WebKit since if you paste it will become + // Removing the mce_style that contains the real value will force the Serializer engine to compress the styles + each(dom.select('*', o.node), function(el) { + el.removeAttribute('_mce_style'); + }); + } + } + }, + + /** + * Converts the most common bullet and number formats in Office into a real semantic UL/LI list. + */ + _convertLists : function(pl, o) { + var dom = pl.editor.dom, listElm, li, lastMargin = -1, margin, levels = [], lastType, html; + + // Convert middot lists into real semantic lists + each(dom.select('p', o.node), function(p) { + var sib, val = '', type, html, idx, parents; + + // Get text node value at beginning of paragraph + for (sib = p.firstChild; sib && sib.nodeType == 3; sib = sib.nextSibling) + val += sib.nodeValue; + + val = p.innerHTML.replace(/<\/?\w+[^>]*>/gi, '').replace(/ /g, '\u00a0'); + + // Detect unordered lists look for bullets + if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(val)) + type = 'ul'; + + // Detect ordered lists 1., a. or ixv. + if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(val)) + type = 'ol'; + + // Check if node value matches the list pattern: o   + if (type) { + margin = parseFloat(p.style.marginLeft || 0); + + if (margin > lastMargin) + levels.push(margin); + + if (!listElm || type != lastType) { + listElm = dom.create(type); + dom.insertAfter(listElm, p); + } else { + // Nested list element + if (margin > lastMargin) { + listElm = li.appendChild(dom.create(type)); + } else if (margin < lastMargin) { + // Find parent level based on margin value + idx = tinymce.inArray(levels, margin); + parents = dom.getParents(listElm.parentNode, type); + listElm = parents[parents.length - 1 - idx] || listElm; + } + } + + // Remove middot or number spans if they exists + each(dom.select('span', p), function(span) { + var html = span.innerHTML.replace(/<\/?\w+[^>]*>/gi, ''); + + // Remove span with the middot or the number + if (type == 'ul' && /^[\u2022\u00b7\u00a7\u00d8o]/.test(html)) + dom.remove(span); + else if (/^[\s\S]*\w+\.( |\u00a0)*\s*/.test(html)) + dom.remove(span); + }); + + html = p.innerHTML; + + // Remove middot/list items + if (type == 'ul') + html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*( |\u00a0)+\s*/, ''); + else + html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*\w+\.( |\u00a0)+\s*/, ''); + + // Create li and add paragraph data into the new li + li = listElm.appendChild(dom.create('li', 0, html)); + dom.remove(p); + + lastMargin = margin; + lastType = type; + } else + listElm = lastMargin = 0; // End list element + }); + + // Remove any left over makers + html = o.node.innerHTML; + if (html.indexOf('__MCE_ITEM__') != -1) + o.node.innerHTML = html.replace(/__MCE_ITEM__/g, ''); + }, + + /** + * This method will split the current block parent and insert the contents inside the split position. + * This logic can be improved so text nodes at the start/end remain in the start/end block elements + */ + _insertBlockContent : function(ed, dom, content) { + var parentBlock, marker, sel = ed.selection, last, elm, vp, y, elmHeight, markerId = 'mce_marker'; + + function select(n) { + var r; + + if (tinymce.isIE) { + r = ed.getDoc().body.createTextRange(); + r.moveToElementText(n); + r.collapse(false); + r.select(); + } else { + sel.select(n, 1); + sel.collapse(false); + } + } + + // Insert a marker for the caret position + this._insert(' ', 1); + marker = dom.get(markerId); + parentBlock = dom.getParent(marker, 'p,h1,h2,h3,h4,h5,h6,ul,ol,th,td'); + + // If it's a parent block but not a table cell + if (parentBlock && !/TD|TH/.test(parentBlock.nodeName)) { + // Split parent block + marker = dom.split(parentBlock, marker); + + // Insert nodes before the marker + each(dom.create('div', 0, content).childNodes, function(n) { + last = marker.parentNode.insertBefore(n.cloneNode(true), marker); + }); + + // Move caret after marker + select(last); + } else { + dom.setOuterHTML(marker, content); + sel.select(ed.getBody(), 1); + sel.collapse(0); + } + + // Remove marker if it's left + while (elm = dom.get(markerId)) + dom.remove(elm); + + // Get element, position and height + elm = sel.getStart(); + vp = dom.getViewPort(ed.getWin()); + y = ed.dom.getPos(elm).y; + elmHeight = elm.clientHeight; + + // Is element within viewport if not then scroll it into view + if (y < vp.y || y + elmHeight > vp.y + vp.h) + ed.getDoc().body.scrollTop = y < vp.y ? y : y - vp.h + 25; + }, + + /** + * Inserts the specified contents at the caret position. + */ + _insert : function(h, skip_undo) { + var ed = this.editor; + + // First delete the contents seems to work better on WebKit + if (!ed.selection.isCollapsed()) + ed.getDoc().execCommand('Delete', false, null); + + // It's better to use the insertHTML method on Gecko since it will combine paragraphs correctly before inserting the contents + ed.execCommand(tinymce.isGecko ? 'insertHTML' : 'mceInsertContent', false, h, {skip_undo : skip_undo}); + }, + + /** + * Instead of the old plain text method which tried to re-create a paste operation, the + * new approach adds a plain text mode toggle switch that changes the behavior of paste. + * This function is passed the same input that the regular paste plugin produces. + * It performs additional scrubbing and produces (and inserts) the plain text. + * This approach leverages all of the great existing functionality in the paste + * plugin, and requires minimal changes to add the new functionality. + * Speednet - June 2009 + */ + _insertPlainText : function(ed, dom, h) { + var i, len, pos, rpos, node, breakElms, before, after, + w = ed.getWin(), + d = ed.getDoc(), + sel = ed.selection, + is = tinymce.is, + inArray = tinymce.inArray, + linebr = getParam(ed, "paste_text_linebreaktype"), + rl = getParam(ed, "paste_text_replacements"); + + function process(items) { + each(items, function(v) { + if (v.constructor == RegExp) + h = h.replace(v, ""); + else + h = h.replace(v[0], v[1]); + }); + }; + + if ((typeof(h) === "string") && (h.length > 0)) { + if (!entities) + entities = ("34,quot,38,amp,39,apos,60,lt,62,gt," + ed.serializer.settings.entities).split(","); + + // If HTML content with line-breaking tags, then remove all cr/lf chars because only tags will break a line + if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(h)) { + process([ + /[\n\r]+/g + ]); + } else { + // Otherwise just get rid of carriage returns (only need linefeeds) + process([ + /\r+/g + ]); + } + + process([ + [/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi, "\n\n"], // Block tags get a blank line after them + [/]*>|<\/tr>/gi, "\n"], // Single linebreak for
tags and table rows + [/<\/t[dh]>\s*]*>/gi, "\t"], // Table cells get tabs betweem them + /<[a-z!\/?][^>]*>/gi, // Delete all remaining tags + [/ /gi, " "], // Convert non-break spaces to regular spaces (remember, *plain text*) + [ + // HTML entity + /&(#\d+|[a-z0-9]{1,10});/gi, + + // Replace with actual character + function(e, s) { + if (s.charAt(0) === "#") { + return String.fromCharCode(s.slice(1)); + } + else { + return ((e = inArray(entities, s)) > 0)? String.fromCharCode(entities[e-1]) : " "; + } + } + ], + [/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"], // Cool little RegExp deletes whitespace around linebreak chars. + [/\n{3,}/g, "\n\n"], // Max. 2 consecutive linebreaks + /^\s+|\s+$/g // Trim the front & back + ]); + + h = dom.encode(h); + + // Delete any highlighted text before pasting + if (!sel.isCollapsed()) { + d.execCommand("Delete", false, null); + } + + // Perform default or custom replacements + if (is(rl, "array") || (is(rl, "array"))) { + process(rl); + } + else if (is(rl, "string")) { + process(new RegExp(rl, "gi")); + } + + // Treat paragraphs as specified in the config + if (linebr == "none") { + process([ + [/\n+/g, " "] + ]); + } + else if (linebr == "br") { + process([ + [/\n/g, "
"] + ]); + } + else { + process([ + /^\s+|\s+$/g, + [/\n\n/g, "

"], + [/\n/g, "
"] + ]); + } + + // This next piece of code handles the situation where we're pasting more than one paragraph of plain + // text, and we are pasting the content into the middle of a block node in the editor. The block + // node gets split at the selection point into "Para A" and "Para B" (for the purposes of explaining). + // The first paragraph of the pasted text is appended to "Para A", and the last paragraph of the + // pasted text is prepended to "Para B". Any other paragraphs of pasted text are placed between + // "Para A" and "Para B". This code solves a host of problems with the original plain text plugin and + // now handles styles correctly. (Pasting plain text into a styled paragraph is supposed to make the + // plain text take the same style as the existing paragraph.) + if ((pos = h.indexOf("

")) != -1) { + rpos = h.lastIndexOf("

"); + node = sel.getNode(); + breakElms = []; // Get list of elements to break + + do { + if (node.nodeType == 1) { + // Don't break tables and break at body + if (node.nodeName == "TD" || node.nodeName == "BODY") { + break; + } + + breakElms[breakElms.length] = node; + } + } while (node = node.parentNode); + + // Are we in the middle of a block node? + if (breakElms.length > 0) { + before = h.substring(0, pos); + after = ""; + + for (i=0, len=breakElms.length; i"; + after += "<" + breakElms[breakElms.length-i-1].nodeName.toLowerCase() + ">"; + } + + if (pos == rpos) { + h = before + after + h.substring(pos+7); + } + else { + h = before + h.substring(pos+4, rpos+4) + after + h.substring(rpos+7); + } + } + } + + // Insert content at the caret, plus add a marker for repositioning the caret + ed.execCommand("mceInsertRawHTML", false, h + ' '); + + // Reposition the caret to the marker, which was placed immediately after the inserted content. + // Needs to be done asynchronously (in window.setTimeout) or else it doesn't work in all browsers. + // The second part of the code scrolls the content up if the caret is positioned off-screen. + // This is only necessary for WebKit browsers, but it doesn't hurt to use for all. + window.setTimeout(function() { + var marker = dom.get('_plain_text_marker'), + elm, vp, y, elmHeight; + + sel.select(marker, false); + d.execCommand("Delete", false, null); + marker = null; + + // Get element, position and height + elm = sel.getStart(); + vp = dom.getViewPort(w); + y = dom.getPos(elm).y; + elmHeight = elm.clientHeight; + + // Is element within viewport if not then scroll it into view + if ((y < vp.y) || (y + elmHeight > vp.y + vp.h)) { + d.body.scrollTop = y < vp.y ? y : y - vp.h + 25; + } + }, 0); + } + }, + + /** + * This method will open the old style paste dialogs. Some users might want the old behavior but still use the new cleanup engine. + */ + _legacySupport : function() { + var t = this, ed = t.editor; + + // Register command(s) for backwards compatibility + ed.addCommand("mcePasteWord", function() { + ed.windowManager.open({ + file: t.url + "/pasteword.htm", + width: parseInt(getParam(ed, "paste_dialog_width")), + height: parseInt(getParam(ed, "paste_dialog_height")), + inline: 1 + }); + }); + + if (getParam(ed, "paste_text_use_dialog")) { + ed.addCommand("mcePasteText", function() { + ed.windowManager.open({ + file : t.url + "/pastetext.htm", + width: parseInt(getParam(ed, "paste_dialog_width")), + height: parseInt(getParam(ed, "paste_dialog_height")), + inline : 1 + }); + }); + } + + // Register button for backwards compatibility + ed.addButton("pasteword", {title : "paste.paste_word_desc", cmd : "mcePasteWord"}); + } + }); + + // Register plugin + tinymce.PluginManager.add("paste", tinymce.plugins.PastePlugin); +})(); diff --git a/plugins/TinyMCE/js/plugins/paste/js/pastetext.js b/plugins/TinyMCE/js/plugins/paste/js/pastetext.js new file mode 100644 index 0000000000..c524f9eb03 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/paste/js/pastetext.js @@ -0,0 +1,36 @@ +tinyMCEPopup.requireLangPack(); + +var PasteTextDialog = { + init : function() { + this.resize(); + }, + + insert : function() { + var h = tinyMCEPopup.dom.encode(document.getElementById('content').value), lines; + + // Convert linebreaks into paragraphs + if (document.getElementById('linebreaks').checked) { + lines = h.split(/\r?\n/); + if (lines.length > 1) { + h = ''; + tinymce.each(lines, function(row) { + h += '

' + row + '

'; + }); + } + } + + tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h}); + tinyMCEPopup.close(); + }, + + resize : function() { + var vp = tinyMCEPopup.dom.getViewPort(window), el; + + el = document.getElementById('content'); + + el.style.width = (vp.w - 20) + 'px'; + el.style.height = (vp.h - 90) + 'px'; + } +}; + +tinyMCEPopup.onInit.add(PasteTextDialog.init, PasteTextDialog); diff --git a/plugins/TinyMCE/js/plugins/paste/js/pasteword.js b/plugins/TinyMCE/js/plugins/paste/js/pasteword.js new file mode 100644 index 0000000000..a52731c368 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/paste/js/pasteword.js @@ -0,0 +1,51 @@ +tinyMCEPopup.requireLangPack(); + +var PasteWordDialog = { + init : function() { + var ed = tinyMCEPopup.editor, el = document.getElementById('iframecontainer'), ifr, doc, css, cssHTML = ''; + + // Create iframe + el.innerHTML = ''; + ifr = document.getElementById('iframe'); + doc = ifr.contentWindow.document; + + // Force absolute CSS urls + css = [ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css")]; + css = css.concat(tinymce.explode(ed.settings.content_css) || []); + tinymce.each(css, function(u) { + cssHTML += ''; + }); + + // Write content into iframe + doc.open(); + doc.write('' + cssHTML + ''); + doc.close(); + + doc.designMode = 'on'; + this.resize(); + + window.setTimeout(function() { + ifr.contentWindow.focus(); + }, 10); + }, + + insert : function() { + var h = document.getElementById('iframe').contentWindow.document.body.innerHTML; + + tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h, wordContent : true}); + tinyMCEPopup.close(); + }, + + resize : function() { + var vp = tinyMCEPopup.dom.getViewPort(window), el; + + el = document.getElementById('iframe'); + + if (el) { + el.style.width = (vp.w - 20) + 'px'; + el.style.height = (vp.h - 90) + 'px'; + } + } +}; + +tinyMCEPopup.onInit.add(PasteWordDialog.init, PasteWordDialog); diff --git a/plugins/TinyMCE/js/plugins/paste/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/paste/langs/en_dlg.js new file mode 100644 index 0000000000..eeac778960 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/paste/langs/en_dlg.js @@ -0,0 +1,5 @@ +tinyMCE.addI18n('en.paste_dlg',{ +text_title:"Use CTRL+V on your keyboard to paste the text into the window.", +text_linebreaks:"Keep linebreaks", +word_title:"Use CTRL+V on your keyboard to paste the text into the window." +}); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/paste/pastetext.htm b/plugins/TinyMCE/js/plugins/paste/pastetext.htm new file mode 100644 index 0000000000..b655945476 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/paste/pastetext.htm @@ -0,0 +1,27 @@ + + + {#paste.paste_text_desc} + + + + +
+
{#paste.paste_text_desc}
+ +
+ +
+ +
+ +
{#paste_dlg.text_title}
+ + + +
+ + +
+
+ + \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/paste/pasteword.htm b/plugins/TinyMCE/js/plugins/paste/pasteword.htm new file mode 100644 index 0000000000..0f6bb41210 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/paste/pasteword.htm @@ -0,0 +1,21 @@ + + + {#paste.paste_word_desc} + + + + +
+
{#paste.paste_word_desc}
+ +
{#paste_dlg.word_title}
+ +
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/preview/editor_plugin.js b/plugins/TinyMCE/js/plugins/preview/editor_plugin.js new file mode 100644 index 0000000000..507909c5f0 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/preview/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.Preview",{init:function(a,b){var d=this,c=tinymce.explode(a.settings.content_css);d.editor=a;tinymce.each(c,function(f,e){c[e]=a.documentBaseURI.toAbsolute(f)});a.addCommand("mcePreview",function(){a.windowManager.open({file:a.getParam("plugin_preview_pageurl",b+"/preview.html"),width:parseInt(a.getParam("plugin_preview_width","550")),height:parseInt(a.getParam("plugin_preview_height","600")),resizable:"yes",scrollbars:"yes",popup_css:c?c.join(","):a.baseURI.toAbsolute("themes/"+a.settings.theme+"/skins/"+a.settings.skin+"/content.css"),inline:a.getParam("plugin_preview_inline",1)},{base:a.documentBaseURI.getURI()})});a.addButton("preview",{title:"preview.preview_desc",cmd:"mcePreview"})},getInfo:function(){return{longname:"Preview",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("preview",tinymce.plugins.Preview)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/preview/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/preview/editor_plugin_src.js new file mode 100644 index 0000000000..80f00f0d9f --- /dev/null +++ b/plugins/TinyMCE/js/plugins/preview/editor_plugin_src.js @@ -0,0 +1,53 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.Preview', { + init : function(ed, url) { + var t = this, css = tinymce.explode(ed.settings.content_css); + + t.editor = ed; + + // Force absolute CSS urls + tinymce.each(css, function(u, k) { + css[k] = ed.documentBaseURI.toAbsolute(u); + }); + + ed.addCommand('mcePreview', function() { + ed.windowManager.open({ + file : ed.getParam("plugin_preview_pageurl", url + "/preview.html"), + width : parseInt(ed.getParam("plugin_preview_width", "550")), + height : parseInt(ed.getParam("plugin_preview_height", "600")), + resizable : "yes", + scrollbars : "yes", + popup_css : css ? css.join(',') : ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css"), + inline : ed.getParam("plugin_preview_inline", 1) + }, { + base : ed.documentBaseURI.getURI() + }); + }); + + ed.addButton('preview', {title : 'preview.preview_desc', cmd : 'mcePreview'}); + }, + + getInfo : function() { + return { + longname : 'Preview', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('preview', tinymce.plugins.Preview); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/preview/example.html b/plugins/TinyMCE/js/plugins/preview/example.html new file mode 100644 index 0000000000..b2c3d90ce0 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/preview/example.html @@ -0,0 +1,28 @@ + + + + + +Example of a custom preview page + + + +Editor contents:
+
+ +
+ + + diff --git a/plugins/TinyMCE/js/plugins/preview/jscripts/embed.js b/plugins/TinyMCE/js/plugins/preview/jscripts/embed.js new file mode 100644 index 0000000000..f8dc810527 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/preview/jscripts/embed.js @@ -0,0 +1,73 @@ +/** + * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose. + */ + +function writeFlash(p) { + writeEmbed( + 'D27CDB6E-AE6D-11cf-96B8-444553540000', + 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0', + 'application/x-shockwave-flash', + p + ); +} + +function writeShockWave(p) { + writeEmbed( + '166B1BCA-3F9C-11CF-8075-444553540000', + 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0', + 'application/x-director', + p + ); +} + +function writeQuickTime(p) { + writeEmbed( + '02BF25D5-8C17-4B23-BC80-D3488ABDDC6B', + 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0', + 'video/quicktime', + p + ); +} + +function writeRealMedia(p) { + writeEmbed( + 'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA', + 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0', + 'audio/x-pn-realaudio-plugin', + p + ); +} + +function writeWindowsMedia(p) { + p.url = p.src; + writeEmbed( + '6BF52A52-394A-11D3-B153-00C04F79FAA6', + 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701', + 'application/x-mplayer2', + p + ); +} + +function writeEmbed(cls, cb, mt, p) { + var h = '', n; + + h += ''; + + h += ' + + + + + +{#preview.preview_desc} + + + + + diff --git a/plugins/TinyMCE/js/plugins/print/editor_plugin.js b/plugins/TinyMCE/js/plugins/print/editor_plugin.js new file mode 100644 index 0000000000..b5b3a55edf --- /dev/null +++ b/plugins/TinyMCE/js/plugins/print/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.Print",{init:function(a,b){a.addCommand("mcePrint",function(){a.getWin().print()});a.addButton("print",{title:"print.print_desc",cmd:"mcePrint"})},getInfo:function(){return{longname:"Print",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("print",tinymce.plugins.Print)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/print/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/print/editor_plugin_src.js new file mode 100644 index 0000000000..3933fe656c --- /dev/null +++ b/plugins/TinyMCE/js/plugins/print/editor_plugin_src.js @@ -0,0 +1,34 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.Print', { + init : function(ed, url) { + ed.addCommand('mcePrint', function() { + ed.getWin().print(); + }); + + ed.addButton('print', {title : 'print.print_desc', cmd : 'mcePrint'}); + }, + + getInfo : function() { + return { + longname : 'Print', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('print', tinymce.plugins.Print); +})(); diff --git a/plugins/TinyMCE/js/plugins/save/editor_plugin.js b/plugins/TinyMCE/js/plugins/save/editor_plugin.js new file mode 100644 index 0000000000..8e93996671 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/save/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.Save",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceSave",c._save,c);a.addCommand("mceCancel",c._cancel,c);a.addButton("save",{title:"save.save_desc",cmd:"mceSave"});a.addButton("cancel",{title:"save.cancel_desc",cmd:"mceCancel"});a.onNodeChange.add(c._nodeChange,c);a.addShortcut("ctrl+s",a.getLang("save.save_desc"),"mceSave")},getInfo:function(){return{longname:"Save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,c){var b=this.editor;if(b.getParam("save_enablewhendirty")){a.setDisabled("save",!b.isDirty());a.setDisabled("cancel",!b.isDirty())}},_save:function(){var c=this.editor,a,e,d,b;a=tinymce.DOM.get(c.id).form||tinymce.DOM.getParent(c.id,"form");if(c.getParam("save_enablewhendirty")&&!c.isDirty()){return}tinyMCE.triggerSave();if(e=c.getParam("save_onsavecallback")){if(c.execCallback("save_onsavecallback",c)){c.startContent=tinymce.trim(c.getContent({format:"raw"}));c.nodeChanged()}return}if(a){c.isNotDirty=true;if(a.onsubmit==null||a.onsubmit()!=false){a.submit()}c.nodeChanged()}else{c.windowManager.alert("Error: No form element found.")}},_cancel:function(){var a=this.editor,c,b=tinymce.trim(a.startContent);if(c=a.getParam("save_oncancelcallback")){a.execCallback("save_oncancelcallback",a);return}a.setContent(b);a.undoManager.clear();a.nodeChanged()}});tinymce.PluginManager.add("save",tinymce.plugins.Save)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/save/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/save/editor_plugin_src.js new file mode 100644 index 0000000000..f5a3de8f5f --- /dev/null +++ b/plugins/TinyMCE/js/plugins/save/editor_plugin_src.js @@ -0,0 +1,101 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.Save', { + init : function(ed, url) { + var t = this; + + t.editor = ed; + + // Register commands + ed.addCommand('mceSave', t._save, t); + ed.addCommand('mceCancel', t._cancel, t); + + // Register buttons + ed.addButton('save', {title : 'save.save_desc', cmd : 'mceSave'}); + ed.addButton('cancel', {title : 'save.cancel_desc', cmd : 'mceCancel'}); + + ed.onNodeChange.add(t._nodeChange, t); + ed.addShortcut('ctrl+s', ed.getLang('save.save_desc'), 'mceSave'); + }, + + getInfo : function() { + return { + longname : 'Save', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + // Private methods + + _nodeChange : function(ed, cm, n) { + var ed = this.editor; + + if (ed.getParam('save_enablewhendirty')) { + cm.setDisabled('save', !ed.isDirty()); + cm.setDisabled('cancel', !ed.isDirty()); + } + }, + + // Private methods + + _save : function() { + var ed = this.editor, formObj, os, i, elementId; + + formObj = tinymce.DOM.get(ed.id).form || tinymce.DOM.getParent(ed.id, 'form'); + + if (ed.getParam("save_enablewhendirty") && !ed.isDirty()) + return; + + tinyMCE.triggerSave(); + + // Use callback instead + if (os = ed.getParam("save_onsavecallback")) { + if (ed.execCallback('save_onsavecallback', ed)) { + ed.startContent = tinymce.trim(ed.getContent({format : 'raw'})); + ed.nodeChanged(); + } + + return; + } + + if (formObj) { + ed.isNotDirty = true; + + if (formObj.onsubmit == null || formObj.onsubmit() != false) + formObj.submit(); + + ed.nodeChanged(); + } else + ed.windowManager.alert("Error: No form element found."); + }, + + _cancel : function() { + var ed = this.editor, os, h = tinymce.trim(ed.startContent); + + // Use callback instead + if (os = ed.getParam("save_oncancelcallback")) { + ed.execCallback('save_oncancelcallback', ed); + return; + } + + ed.setContent(h); + ed.undoManager.clear(); + ed.nodeChanged(); + } + }); + + // Register plugin + tinymce.PluginManager.add('save', tinymce.plugins.Save); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/searchreplace/css/searchreplace.css b/plugins/TinyMCE/js/plugins/searchreplace/css/searchreplace.css new file mode 100644 index 0000000000..ecdf58c7b5 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/searchreplace/css/searchreplace.css @@ -0,0 +1,6 @@ +.panel_wrapper {height:85px;} +.panel_wrapper div.current {height:85px;} + +/* IE */ +* html .panel_wrapper {height:100px;} +* html .panel_wrapper div.current {height:100px;} diff --git a/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js new file mode 100644 index 0000000000..c3f8358c61 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:160+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js new file mode 100644 index 0000000000..ea2ee83808 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js @@ -0,0 +1,57 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.SearchReplacePlugin', { + init : function(ed, url) { + function open(m) { + ed.windowManager.open({ + file : url + '/searchreplace.htm', + width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)), + height : 160 + parseInt(ed.getLang('searchreplace.delta_height', 0)), + inline : 1, + auto_focus : 0 + }, { + mode : m, + search_string : ed.selection.getContent({format : 'text'}), + plugin_url : url + }); + }; + + // Register commands + ed.addCommand('mceSearch', function() { + open('search'); + }); + + ed.addCommand('mceReplace', function() { + open('replace'); + }); + + // Register buttons + ed.addButton('search', {title : 'searchreplace.search_desc', cmd : 'mceSearch'}); + ed.addButton('replace', {title : 'searchreplace.replace_desc', cmd : 'mceReplace'}); + + ed.addShortcut('ctrl+f', 'searchreplace.search_desc', 'mceSearch'); + }, + + getInfo : function() { + return { + longname : 'Search/Replace', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('searchreplace', tinymce.plugins.SearchReplacePlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js b/plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js new file mode 100644 index 0000000000..c0a6243297 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js @@ -0,0 +1,130 @@ +tinyMCEPopup.requireLangPack(); + +var SearchReplaceDialog = { + init : function(ed) { + var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode"); + + this.switchMode(m); + + f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string"); + + // Focus input field + f[m + '_panel_searchstring'].focus(); + }, + + switchMode : function(m) { + var f, lm = this.lastMode; + + if (lm != m) { + f = document.forms[0]; + + if (lm) { + f[m + '_panel_searchstring'].value = f[lm + '_panel_searchstring'].value; + f[m + '_panel_backwardsu'].checked = f[lm + '_panel_backwardsu'].checked; + f[m + '_panel_backwardsd'].checked = f[lm + '_panel_backwardsd'].checked; + f[m + '_panel_casesensitivebox'].checked = f[lm + '_panel_casesensitivebox'].checked; + } + + mcTabs.displayTab(m + '_tab', m + '_panel'); + document.getElementById("replaceBtn").style.display = (m == "replace") ? "inline" : "none"; + document.getElementById("replaceAllBtn").style.display = (m == "replace") ? "inline" : "none"; + this.lastMode = m; + } + }, + + searchNext : function(a) { + var ed = tinyMCEPopup.editor, se = ed.selection, r = se.getRng(), f, m = this.lastMode, s, b, fl = 0, w = ed.getWin(), wm = ed.windowManager, fo = 0; + + // Get input + f = document.forms[0]; + s = f[m + '_panel_searchstring'].value; + b = f[m + '_panel_backwardsu'].checked; + ca = f[m + '_panel_casesensitivebox'].checked; + rs = f['replace_panel_replacestring'].value; + + if (s == '') + return; + + function fix() { + // Correct Firefox graphics glitches + r = se.getRng().cloneRange(); + ed.getDoc().execCommand('SelectAll', false, null); + se.setRng(r); + }; + + function replace() { + if (tinymce.isIE) + ed.selection.getRng().duplicate().pasteHTML(rs); // Needs to be duplicated due to selection bug in IE + else + ed.getDoc().execCommand('InsertHTML', false, rs); + }; + + // IE flags + if (ca) + fl = fl | 4; + + switch (a) { + case 'all': + // Move caret to beginning of text + ed.execCommand('SelectAll'); + ed.selection.collapse(true); + + if (tinymce.isIE) { + while (r.findText(s, b ? -1 : 1, fl)) { + r.scrollIntoView(); + r.select(); + replace(); + fo = 1; + + if (b) { + r.moveEnd("character", -(rs.length)); // Otherwise will loop forever + } + } + + tinyMCEPopup.storeSelection(); + } else { + while (w.find(s, ca, b, false, false, false, false)) { + replace(); + fo = 1; + } + } + + if (fo) + tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.allreplaced')); + else + tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound')); + + return; + + case 'current': + if (!ed.selection.isCollapsed()) + replace(); + + break; + } + + se.collapse(b); + r = se.getRng(); + + // Whats the point + if (!s) + return; + + if (tinymce.isIE) { + if (r.findText(s, b ? -1 : 1, fl)) { + r.scrollIntoView(); + r.select(); + } else + tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound')); + + tinyMCEPopup.storeSelection(); + } else { + if (!w.find(s, ca, b, false, false, false, false)) + tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound')); + else + fix(); + } + } +}; + +tinyMCEPopup.onInit.add(SearchReplaceDialog.init, SearchReplaceDialog); diff --git a/plugins/TinyMCE/js/plugins/searchreplace/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/searchreplace/langs/en_dlg.js new file mode 100644 index 0000000000..370959afa3 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/searchreplace/langs/en_dlg.js @@ -0,0 +1,16 @@ +tinyMCE.addI18n('en.searchreplace_dlg',{ +searchnext_desc:"Find again", +notfound:"The search has been completed. The search string could not be found.", +search_title:"Find", +replace_title:"Find/Replace", +allreplaced:"All occurrences of the search string were replaced.", +findwhat:"Find what", +replacewith:"Replace with", +direction:"Direction", +up:"Up", +down:"Down", +mcase:"Match case", +findnext:"Find next", +replace:"Replace", +replaceall:"Replace all" +}); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm b/plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm new file mode 100644 index 0000000000..d0424cfc9b --- /dev/null +++ b/plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm @@ -0,0 +1,99 @@ + + + + {#searchreplace_dlg.replace_title} + + + + + + + +
+
+ +
+ +
+
+ + + + + + + + + + + +
+ + + + + + + + +
+
+ + + + + +
+
+
+ +
+ + + + + + + + + + + + + + + +
+ + + + + + + + +
+
+ + + + + +
+
+
+ +
+ +
+ + + + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/spellchecker/css/content.css b/plugins/TinyMCE/js/plugins/spellchecker/css/content.css new file mode 100644 index 0000000000..24efa02170 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/spellchecker/css/content.css @@ -0,0 +1 @@ +.mceItemHiddenSpellWord {background:url(../img/wline.gif) repeat-x bottom left; cursor:default;} diff --git a/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js new file mode 100644 index 0000000000..377e4e8a0e --- /dev/null +++ b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js @@ -0,0 +1 @@ +(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;e.addCommand("mceSpellCheck",function(){if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);e.windowManager.alert("spellchecker.no_mpell")}})}else{g._done()}});e.onInit.add(function(){if(e.settings.content_css!==false){e.dom.loadCSS(f+"/css/content.css")}});e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){l.setSelected(1);f.selectedItem.setSelected(0);f.selectedItem=l;f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);if(n==f.selectedLang){f.selectedItem=l}})});return g}},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}\u201d\u201c');for(d=0;d$1$2');q=q.replace(g,'$1$2');j.replace(j.create("span",{"class":"mceItemHidden"},q),r)}}});l.moveToBookmark(m)},_showMenu:function(g,i){var h=this,g=h.editor,d=h._menu,k,j=g.dom,f=j.getViewPort(g.getWin());if(!d){k=b.getPos(g.getContentAreaContainer());d=g.controlManager.createDropMenu("spellcheckermenu",{offset_x:k.x,offset_y:k.y,"class":"mceNoIcons"});h._menu=d}if(j.hasClass(i.target,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);h._sendRPC("getSuggestions",[h.selectedLang,j.decode(i.target.innerHTML)],function(e){d.removeAll();if(e.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(e,function(l){d.add({title:l,onclick:function(){j.replace(g.getDoc().createTextNode(l),i.target);h._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}d.add({title:"spellchecker.ignore_word",onclick:function(){j.remove(i.target,1);h._checkDone()}});d.add({title:"spellchecker.ignore_words",onclick:function(){h._removeWords(j.decode(i.target.innerHTML));h._checkDone()}});d.update()});g.selection.select(i.target);k=j.getPos(i.target);d.showMenu(k.x,k.y+i.target.offsetHeight-f.y);return tinymce.dom.Event.cancel(i)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,h,d){var g=this,f=g.editor.getParam("spellchecker_rpc_url","{backend}");if(f=="{backend}"){g.editor.setProgressState(0);alert("Please specify: spellchecker_rpc_url");return}a.sendRPC({url:f,method:e,params:h,success:d,error:function(j,i){g.editor.setProgressState(0);g.editor.windowManager.alert(j.errstr||("Error response: "+i.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js new file mode 100644 index 0000000000..0b3d3b6007 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js @@ -0,0 +1,341 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + var JSONRequest = tinymce.util.JSONRequest, each = tinymce.each, DOM = tinymce.DOM; + + tinymce.create('tinymce.plugins.SpellcheckerPlugin', { + getInfo : function() { + return { + longname : 'Spellchecker', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + init : function(ed, url) { + var t = this, cm; + + t.url = url; + t.editor = ed; + + // Register commands + ed.addCommand('mceSpellCheck', function() { + if (!t.active) { + ed.setProgressState(1); + t._sendRPC('checkWords', [t.selectedLang, t._getWords()], function(r) { + if (r.length > 0) { + t.active = 1; + t._markWords(r); + ed.setProgressState(0); + ed.nodeChanged(); + } else { + ed.setProgressState(0); + ed.windowManager.alert('spellchecker.no_mpell'); + } + }); + } else + t._done(); + }); + + ed.onInit.add(function() { + if (ed.settings.content_css !== false) + ed.dom.loadCSS(url + '/css/content.css'); + }); + + ed.onClick.add(t._showMenu, t); + ed.onContextMenu.add(t._showMenu, t); + ed.onBeforeGetContent.add(function() { + if (t.active) + t._removeWords(); + }); + + ed.onNodeChange.add(function(ed, cm) { + cm.setActive('spellchecker', t.active); + }); + + ed.onSetContent.add(function() { + t._done(); + }); + + ed.onBeforeGetContent.add(function() { + t._done(); + }); + + ed.onBeforeExecCommand.add(function(ed, cmd) { + if (cmd == 'mceFullScreen') + t._done(); + }); + + // Find selected language + t.languages = {}; + each(ed.getParam('spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv', 'hash'), function(v, k) { + if (k.indexOf('+') === 0) { + k = k.substring(1); + t.selectedLang = v; + } + + t.languages[k] = v; + }); + }, + + createControl : function(n, cm) { + var t = this, c, ed = t.editor; + + if (n == 'spellchecker') { + c = cm.createSplitButton(n, {title : 'spellchecker.desc', cmd : 'mceSpellCheck', scope : t}); + + c.onRenderMenu.add(function(c, m) { + m.add({title : 'spellchecker.langs', 'class' : 'mceMenuItemTitle'}).setDisabled(1); + each(t.languages, function(v, k) { + var o = {icon : 1}, mi; + + o.onclick = function() { + mi.setSelected(1); + t.selectedItem.setSelected(0); + t.selectedItem = mi; + t.selectedLang = v; + }; + + o.title = k; + mi = m.add(o); + mi.setSelected(v == t.selectedLang); + + if (v == t.selectedLang) + t.selectedItem = mi; + }) + }); + + return c; + } + }, + + // Internal functions + + _walk : function(n, f) { + var d = this.editor.getDoc(), w; + + if (d.createTreeWalker) { + w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false); + + while ((n = w.nextNode()) != null) + f.call(this, n); + } else + tinymce.walk(n, f, 'childNodes'); + }, + + _getSeparators : function() { + var re = '', i, str = this.editor.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}\u201d\u201c'); + + // Build word separator regexp + for (i=0; i$1$2'); + v = v.replace(r3, '$1$2'); + + dom.replace(dom.create('span', {'class' : 'mceItemHidden'}, v), n); + } + } + }); + + se.moveToBookmark(b); + }, + + _showMenu : function(ed, e) { + var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin()); + + if (!m) { + p1 = DOM.getPos(ed.getContentAreaContainer()); + //p2 = DOM.getPos(ed.getContainer()); + + m = ed.controlManager.createDropMenu('spellcheckermenu', { + offset_x : p1.x, + offset_y : p1.y, + 'class' : 'mceNoIcons' + }); + + t._menu = m; + } + + if (dom.hasClass(e.target, 'mceItemHiddenSpellWord')) { + m.removeAll(); + m.add({title : 'spellchecker.wait', 'class' : 'mceMenuItemTitle'}).setDisabled(1); + + t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(e.target.innerHTML)], function(r) { + m.removeAll(); + + if (r.length > 0) { + m.add({title : 'spellchecker.sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1); + each(r, function(v) { + m.add({title : v, onclick : function() { + dom.replace(ed.getDoc().createTextNode(v), e.target); + t._checkDone(); + }}); + }); + + m.addSeparator(); + } else + m.add({title : 'spellchecker.no_sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1); + + m.add({ + title : 'spellchecker.ignore_word', + onclick : function() { + dom.remove(e.target, 1); + t._checkDone(); + } + }); + + m.add({ + title : 'spellchecker.ignore_words', + onclick : function() { + t._removeWords(dom.decode(e.target.innerHTML)); + t._checkDone(); + } + }); + + m.update(); + }); + + ed.selection.select(e.target); + p1 = dom.getPos(e.target); + m.showMenu(p1.x, p1.y + e.target.offsetHeight - vp.y); + + return tinymce.dom.Event.cancel(e); + } else + m.hideMenu(); + }, + + _checkDone : function() { + var t = this, ed = t.editor, dom = ed.dom, o; + + each(dom.select('span'), function(n) { + if (n && dom.hasClass(n, 'mceItemHiddenSpellWord')) { + o = true; + return false; + } + }); + + if (!o) + t._done(); + }, + + _done : function() { + var t = this, la = t.active; + + if (t.active) { + t.active = 0; + t._removeWords(); + + if (t._menu) + t._menu.hideMenu(); + + if (la) + t.editor.nodeChanged(); + } + }, + + _sendRPC : function(m, p, cb) { + var t = this, url = t.editor.getParam("spellchecker_rpc_url", "{backend}"); + + if (url == '{backend}') { + t.editor.setProgressState(0); + alert('Please specify: spellchecker_rpc_url'); + return; + } + + JSONRequest.sendRPC({ + url : url, + method : m, + params : p, + success : cb, + error : function(e, x) { + t.editor.setProgressState(0); + t.editor.windowManager.alert(e.errstr || ('Error response: ' + x.responseText)); + } + }); + } + }); + + // Register plugin + tinymce.PluginManager.add('spellchecker', tinymce.plugins.SpellcheckerPlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/spellchecker/img/wline.gif b/plugins/TinyMCE/js/plugins/spellchecker/img/wline.gif new file mode 100644 index 0000000000000000000000000000000000000000..7d0a4dbca03cc13177a359a5f175dda819fdf464 GIT binary patch literal 46 ycmZ?wbhEHbWMN=tXkcXcqowu#|9{1wEQ|~cj0`#qKmd|qU}ANVOOs?}um%7FLkRf* literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/plugins/style/css/props.css b/plugins/TinyMCE/js/plugins/style/css/props.css new file mode 100644 index 0000000000..eb1f264960 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/style/css/props.css @@ -0,0 +1,13 @@ +#text_font {width:250px;} +#text_size {width:70px;} +.mceAddSelectValue {background:#DDD;} +select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padding_right, #box_padding_bottom, #box_padding_left {width:70px;} +#box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {width:70px;} +#positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {width:70px;} +#positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {width:70px;} +.panel_wrapper div.current {padding-top:10px;height:230px;} +.delim {border-left:1px solid gray;} +.tdelim {border-bottom:1px solid gray;} +#block_display {width:145px;} +#list_type {width:115px;} +.disabled {background:#EEE;} diff --git a/plugins/TinyMCE/js/plugins/style/editor_plugin.js b/plugins/TinyMCE/js/plugins/style/editor_plugin.js new file mode 100644 index 0000000000..cab2153c40 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/style/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.StylePlugin",{init:function(a,b){a.addCommand("mceStyleProps",function(){a.windowManager.open({file:b+"/props.htm",width:480+parseInt(a.getLang("style.delta_width",0)),height:320+parseInt(a.getLang("style.delta_height",0)),inline:1},{plugin_url:b,style_text:a.selection.getNode().style.cssText})});a.addCommand("mceSetElementStyle",function(d,c){if(e=a.selection.getNode()){a.dom.setAttrib(e,"style",c);a.execCommand("mceRepaint")}});a.onNodeChange.add(function(d,c,f){c.setDisabled("styleprops",f.nodeName==="BODY")});a.addButton("styleprops",{title:"style.desc",cmd:"mceStyleProps"})},getInfo:function(){return{longname:"Style",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("style",tinymce.plugins.StylePlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/style/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/style/editor_plugin_src.js new file mode 100644 index 0000000000..5f7755f184 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/style/editor_plugin_src.js @@ -0,0 +1,55 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.StylePlugin', { + init : function(ed, url) { + // Register commands + ed.addCommand('mceStyleProps', function() { + ed.windowManager.open({ + file : url + '/props.htm', + width : 480 + parseInt(ed.getLang('style.delta_width', 0)), + height : 320 + parseInt(ed.getLang('style.delta_height', 0)), + inline : 1 + }, { + plugin_url : url, + style_text : ed.selection.getNode().style.cssText + }); + }); + + ed.addCommand('mceSetElementStyle', function(ui, v) { + if (e = ed.selection.getNode()) { + ed.dom.setAttrib(e, 'style', v); + ed.execCommand('mceRepaint'); + } + }); + + ed.onNodeChange.add(function(ed, cm, n) { + cm.setDisabled('styleprops', n.nodeName === 'BODY'); + }); + + // Register buttons + ed.addButton('styleprops', {title : 'style.desc', cmd : 'mceStyleProps'}); + }, + + getInfo : function() { + return { + longname : 'Style', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/style/js/props.js b/plugins/TinyMCE/js/plugins/style/js/props.js new file mode 100644 index 0000000000..a8dd93dec5 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/style/js/props.js @@ -0,0 +1,641 @@ +tinyMCEPopup.requireLangPack(); + +var defaultFonts = "" + + "Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" + + "Times New Roman, Times, serif=Times New Roman, Times, serif;" + + "Courier New, Courier, mono=Courier New, Courier, mono;" + + "Times New Roman, Times, serif=Times New Roman, Times, serif;" + + "Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" + + "Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" + + "Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif"; + +var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger"; +var defaultMeasurement = "+pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%"; +var defaultSpacingMeasurement = "pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;+ems=em;exs=ex;%"; +var defaultIndentMeasurement = "pixels=px;+points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%"; +var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900"; +var defaultTextStyle = "normal;italic;oblique"; +var defaultVariant = "normal;small-caps"; +var defaultLineHeight = "normal"; +var defaultAttachment = "fixed;scroll"; +var defaultRepeat = "no-repeat;repeat;repeat-x;repeat-y"; +var defaultPosH = "left;center;right"; +var defaultPosV = "top;center;bottom"; +var defaultVAlign = "baseline;sub;super;top;text-top;middle;bottom;text-bottom"; +var defaultDisplay = "inline;block;list-item;run-in;compact;marker;table;inline-table;table-row-group;table-header-group;table-footer-group;table-row;table-column-group;table-column;table-cell;table-caption;none"; +var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;outset"; +var defaultBorderWidth = "thin;medium;thick"; +var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none"; + +function init() { + var ce = document.getElementById('container'), h; + + ce.style.cssText = tinyMCEPopup.getWindowArg('style_text'); + + h = getBrowserHTML('background_image_browser','background_image','image','advimage'); + document.getElementById("background_image_browser").innerHTML = h; + + document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color'); + document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color'); + document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top'); + document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right'); + document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom'); + document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left'); + + fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true); + fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true); + fillSelect(0, 'text_size_measurement', 'style_font_size_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'text_case', 'style_text_case', "capitalize;uppercase;lowercase", ';', true); + fillSelect(0, 'text_weight', 'style_font_weight', defaultWeight, ';', true); + fillSelect(0, 'text_style', 'style_font_style', defaultTextStyle, ';', true); + fillSelect(0, 'text_variant', 'style_font_variant', defaultVariant, ';', true); + fillSelect(0, 'text_lineheight', 'style_font_line_height', defaultLineHeight, ';', true); + fillSelect(0, 'text_lineheight_measurement', 'style_font_line_height_measurement', defaultMeasurement, ';', true); + + fillSelect(0, 'background_attachment', 'style_background_attachment', defaultAttachment, ';', true); + fillSelect(0, 'background_repeat', 'style_background_repeat', defaultRepeat, ';', true); + + fillSelect(0, 'background_hpos_measurement', 'style_background_hpos_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'background_vpos_measurement', 'style_background_vpos_measurement', defaultMeasurement, ';', true); + + fillSelect(0, 'background_hpos', 'style_background_hpos', defaultPosH, ';', true); + fillSelect(0, 'background_vpos', 'style_background_vpos', defaultPosV, ';', true); + + fillSelect(0, 'block_wordspacing', 'style_wordspacing', 'normal', ';', true); + fillSelect(0, 'block_wordspacing_measurement', 'style_wordspacing_measurement', defaultSpacingMeasurement, ';', true); + fillSelect(0, 'block_letterspacing', 'style_letterspacing', 'normal', ';', true); + fillSelect(0, 'block_letterspacing_measurement', 'style_letterspacing_measurement', defaultSpacingMeasurement, ';', true); + fillSelect(0, 'block_vertical_alignment', 'style_vertical_alignment', defaultVAlign, ';', true); + fillSelect(0, 'block_text_align', 'style_text_align', "left;right;center;justify", ';', true); + fillSelect(0, 'block_whitespace', 'style_whitespace', "normal;pre;nowrap", ';', true); + fillSelect(0, 'block_display', 'style_display', defaultDisplay, ';', true); + fillSelect(0, 'block_text_indent_measurement', 'style_text_indent_measurement', defaultIndentMeasurement, ';', true); + + fillSelect(0, 'box_width_measurement', 'style_box_width_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'box_height_measurement', 'style_box_height_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'box_float', 'style_float', 'left;right;none', ';', true); + fillSelect(0, 'box_clear', 'style_clear', 'left;right;both;none', ';', true); + fillSelect(0, 'box_padding_left_measurement', 'style_padding_left_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'box_padding_top_measurement', 'style_padding_top_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'box_padding_bottom_measurement', 'style_padding_bottom_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'box_padding_right_measurement', 'style_padding_right_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'box_margin_left_measurement', 'style_margin_left_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'box_margin_top_measurement', 'style_margin_top_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'box_margin_bottom_measurement', 'style_margin_bottom_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'box_margin_right_measurement', 'style_margin_right_measurement', defaultMeasurement, ';', true); + + fillSelect(0, 'border_style_top', 'style_border_style_top', defaultBorderStyle, ';', true); + fillSelect(0, 'border_style_right', 'style_border_style_right', defaultBorderStyle, ';', true); + fillSelect(0, 'border_style_bottom', 'style_border_style_bottom', defaultBorderStyle, ';', true); + fillSelect(0, 'border_style_left', 'style_border_style_left', defaultBorderStyle, ';', true); + + fillSelect(0, 'border_width_top', 'style_border_width_top', defaultBorderWidth, ';', true); + fillSelect(0, 'border_width_right', 'style_border_width_right', defaultBorderWidth, ';', true); + fillSelect(0, 'border_width_bottom', 'style_border_width_bottom', defaultBorderWidth, ';', true); + fillSelect(0, 'border_width_left', 'style_border_width_left', defaultBorderWidth, ';', true); + + fillSelect(0, 'border_width_top_measurement', 'style_border_width_top_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'border_width_right_measurement', 'style_border_width_right_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'border_width_bottom_measurement', 'style_border_width_bottom_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'border_width_left_measurement', 'style_border_width_left_measurement', defaultMeasurement, ';', true); + + fillSelect(0, 'list_type', 'style_list_type', defaultListType, ';', true); + fillSelect(0, 'list_position', 'style_list_position', "inside;outside", ';', true); + + fillSelect(0, 'positioning_type', 'style_positioning_type', "absolute;relative;static", ';', true); + fillSelect(0, 'positioning_visibility', 'style_positioning_visibility', "inherit;visible;hidden", ';', true); + + fillSelect(0, 'positioning_width_measurement', 'style_positioning_width_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'positioning_height_measurement', 'style_positioning_height_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'positioning_overflow', 'style_positioning_overflow', "visible;hidden;scroll;auto", ';', true); + + fillSelect(0, 'positioning_placement_top_measurement', 'style_positioning_placement_top_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'positioning_placement_right_measurement', 'style_positioning_placement_right_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'positioning_placement_bottom_measurement', 'style_positioning_placement_bottom_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'positioning_placement_left_measurement', 'style_positioning_placement_left_measurement', defaultMeasurement, ';', true); + + fillSelect(0, 'positioning_clip_top_measurement', 'style_positioning_clip_top_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'positioning_clip_right_measurement', 'style_positioning_clip_right_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'positioning_clip_bottom_measurement', 'style_positioning_clip_bottom_measurement', defaultMeasurement, ';', true); + fillSelect(0, 'positioning_clip_left_measurement', 'style_positioning_clip_left_measurement', defaultMeasurement, ';', true); + + TinyMCE_EditableSelects.init(); + setupFormData(); + showDisabledControls(); +} + +function setupFormData() { + var ce = document.getElementById('container'), f = document.forms[0], s, b, i; + + // Setup text fields + + selectByValue(f, 'text_font', ce.style.fontFamily, true, true); + selectByValue(f, 'text_size', getNum(ce.style.fontSize), true, true); + selectByValue(f, 'text_size_measurement', getMeasurement(ce.style.fontSize)); + selectByValue(f, 'text_weight', ce.style.fontWeight, true, true); + selectByValue(f, 'text_style', ce.style.fontStyle, true, true); + selectByValue(f, 'text_lineheight', getNum(ce.style.lineHeight), true, true); + selectByValue(f, 'text_lineheight_measurement', getMeasurement(ce.style.lineHeight)); + selectByValue(f, 'text_case', ce.style.textTransform, true, true); + selectByValue(f, 'text_variant', ce.style.fontVariant, true, true); + f.text_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.color); + updateColor('text_color_pick', 'text_color'); + f.text_underline.checked = inStr(ce.style.textDecoration, 'underline'); + f.text_overline.checked = inStr(ce.style.textDecoration, 'overline'); + f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through'); + f.text_blink.checked = inStr(ce.style.textDecoration, 'blink'); + + // Setup background fields + + f.background_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.backgroundColor); + updateColor('background_color_pick', 'background_color'); + f.background_image.value = ce.style.backgroundImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1"); + selectByValue(f, 'background_repeat', ce.style.backgroundRepeat, true, true); + selectByValue(f, 'background_attachment', ce.style.backgroundAttachment, true, true); + selectByValue(f, 'background_hpos', getNum(getVal(ce.style.backgroundPosition, 0)), true, true); + selectByValue(f, 'background_hpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 0))); + selectByValue(f, 'background_vpos', getNum(getVal(ce.style.backgroundPosition, 1)), true, true); + selectByValue(f, 'background_vpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 1))); + + // Setup block fields + + selectByValue(f, 'block_wordspacing', getNum(ce.style.wordSpacing), true, true); + selectByValue(f, 'block_wordspacing_measurement', getMeasurement(ce.style.wordSpacing)); + selectByValue(f, 'block_letterspacing', getNum(ce.style.letterSpacing), true, true); + selectByValue(f, 'block_letterspacing_measurement', getMeasurement(ce.style.letterSpacing)); + selectByValue(f, 'block_vertical_alignment', ce.style.verticalAlign, true, true); + selectByValue(f, 'block_text_align', ce.style.textAlign, true, true); + f.block_text_indent.value = getNum(ce.style.textIndent); + selectByValue(f, 'block_text_indent_measurement', getMeasurement(ce.style.textIndent)); + selectByValue(f, 'block_whitespace', ce.style.whiteSpace, true, true); + selectByValue(f, 'block_display', ce.style.display, true, true); + + // Setup box fields + + f.box_width.value = getNum(ce.style.width); + selectByValue(f, 'box_width_measurement', getMeasurement(ce.style.width)); + + f.box_height.value = getNum(ce.style.height); + selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height)); + + if (tinymce.isGecko) + selectByValue(f, 'box_float', ce.style.cssFloat, true, true); + else + selectByValue(f, 'box_float', ce.style.styleFloat, true, true); + + selectByValue(f, 'box_clear', ce.style.clear, true, true); + + setupBox(f, ce, 'box_padding', 'padding', ''); + setupBox(f, ce, 'box_margin', 'margin', ''); + + // Setup border fields + + setupBox(f, ce, 'border_style', 'border', 'Style'); + setupBox(f, ce, 'border_width', 'border', 'Width'); + setupBox(f, ce, 'border_color', 'border', 'Color'); + + updateColor('border_color_top_pick', 'border_color_top'); + updateColor('border_color_right_pick', 'border_color_right'); + updateColor('border_color_bottom_pick', 'border_color_bottom'); + updateColor('border_color_left_pick', 'border_color_left'); + + f.elements.border_color_top.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_top.value); + f.elements.border_color_right.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_right.value); + f.elements.border_color_bottom.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_bottom.value); + f.elements.border_color_left.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_left.value); + + // Setup list fields + + selectByValue(f, 'list_type', ce.style.listStyleType, true, true); + selectByValue(f, 'list_position', ce.style.listStylePosition, true, true); + f.list_bullet_image.value = ce.style.listStyleImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1"); + + // Setup box fields + + selectByValue(f, 'positioning_type', ce.style.position, true, true); + selectByValue(f, 'positioning_visibility', ce.style.visibility, true, true); + selectByValue(f, 'positioning_overflow', ce.style.overflow, true, true); + f.positioning_zindex.value = ce.style.zIndex ? ce.style.zIndex : ""; + + f.positioning_width.value = getNum(ce.style.width); + selectByValue(f, 'positioning_width_measurement', getMeasurement(ce.style.width)); + + f.positioning_height.value = getNum(ce.style.height); + selectByValue(f, 'positioning_height_measurement', getMeasurement(ce.style.height)); + + setupBox(f, ce, 'positioning_placement', '', '', ['top', 'right', 'bottom', 'left']); + + s = ce.style.clip.replace(new RegExp("rect\\('?([^']*)'?\\)", 'gi'), "$1"); + s = s.replace(/,/g, ' '); + + if (!hasEqualValues([getVal(s, 0), getVal(s, 1), getVal(s, 2), getVal(s, 3)])) { + f.positioning_clip_top.value = getNum(getVal(s, 0)); + selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0))); + f.positioning_clip_right.value = getNum(getVal(s, 1)); + selectByValue(f, 'positioning_clip_right_measurement', getMeasurement(getVal(s, 1))); + f.positioning_clip_bottom.value = getNum(getVal(s, 2)); + selectByValue(f, 'positioning_clip_bottom_measurement', getMeasurement(getVal(s, 2))); + f.positioning_clip_left.value = getNum(getVal(s, 3)); + selectByValue(f, 'positioning_clip_left_measurement', getMeasurement(getVal(s, 3))); + } else { + f.positioning_clip_top.value = getNum(getVal(s, 0)); + selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0))); + f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value; + } + +// setupBox(f, ce, '', 'border', 'Color'); +} + +function getMeasurement(s) { + return s.replace(/^([0-9.]+)(.*)$/, "$2"); +} + +function getNum(s) { + if (new RegExp('^(?:[0-9.]+)(?:[a-z%]+)$', 'gi').test(s)) + return s.replace(/[^0-9.]/g, ''); + + return s; +} + +function inStr(s, n) { + return new RegExp(n, 'gi').test(s); +} + +function getVal(s, i) { + var a = s.split(' '); + + if (a.length > 1) + return a[i]; + + return ""; +} + +function setValue(f, n, v) { + if (f.elements[n].type == "text") + f.elements[n].value = v; + else + selectByValue(f, n, v, true, true); +} + +function setupBox(f, ce, fp, pr, sf, b) { + if (typeof(b) == "undefined") + b = ['Top', 'Right', 'Bottom', 'Left']; + + if (isSame(ce, pr, sf, b)) { + f.elements[fp + "_same"].checked = true; + + setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf])); + f.elements[fp + "_top"].disabled = false; + + f.elements[fp + "_right"].value = ""; + f.elements[fp + "_right"].disabled = true; + f.elements[fp + "_bottom"].value = ""; + f.elements[fp + "_bottom"].disabled = true; + f.elements[fp + "_left"].value = ""; + f.elements[fp + "_left"].disabled = true; + + if (f.elements[fp + "_top_measurement"]) { + selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf])); + f.elements[fp + "_left_measurement"].disabled = true; + f.elements[fp + "_bottom_measurement"].disabled = true; + f.elements[fp + "_right_measurement"].disabled = true; + } + } else { + f.elements[fp + "_same"].checked = false; + + setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf])); + f.elements[fp + "_top"].disabled = false; + + setValue(f, fp + "_right", getNum(ce.style[pr + b[1] + sf])); + f.elements[fp + "_right"].disabled = false; + + setValue(f, fp + "_bottom", getNum(ce.style[pr + b[2] + sf])); + f.elements[fp + "_bottom"].disabled = false; + + setValue(f, fp + "_left", getNum(ce.style[pr + b[3] + sf])); + f.elements[fp + "_left"].disabled = false; + + if (f.elements[fp + "_top_measurement"]) { + selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf])); + selectByValue(f, fp + '_right_measurement', getMeasurement(ce.style[pr + b[1] + sf])); + selectByValue(f, fp + '_bottom_measurement', getMeasurement(ce.style[pr + b[2] + sf])); + selectByValue(f, fp + '_left_measurement', getMeasurement(ce.style[pr + b[3] + sf])); + f.elements[fp + "_left_measurement"].disabled = false; + f.elements[fp + "_bottom_measurement"].disabled = false; + f.elements[fp + "_right_measurement"].disabled = false; + } + } +} + +function isSame(e, pr, sf, b) { + var a = [], i, x; + + if (typeof(b) == "undefined") + b = ['Top', 'Right', 'Bottom', 'Left']; + + if (typeof(sf) == "undefined" || sf == null) + sf = ""; + + a[0] = e.style[pr + b[0] + sf]; + a[1] = e.style[pr + b[1] + sf]; + a[2] = e.style[pr + b[2] + sf]; + a[3] = e.style[pr + b[3] + sf]; + + for (i=0; i 0 ? s.substring(1) : s; + + if (f.text_none.checked) + s = "none"; + + ce.style.textDecoration = s; + + // Build background styles + + ce.style.backgroundColor = f.background_color.value; + ce.style.backgroundImage = f.background_image.value != "" ? "url(" + f.background_image.value + ")" : ""; + ce.style.backgroundRepeat = f.background_repeat.value; + ce.style.backgroundAttachment = f.background_attachment.value; + + if (f.background_hpos.value != "") { + s = ""; + s += f.background_hpos.value + (isNum(f.background_hpos.value) ? f.background_hpos_measurement.value : "") + " "; + s += f.background_vpos.value + (isNum(f.background_vpos.value) ? f.background_vpos_measurement.value : ""); + ce.style.backgroundPosition = s; + } + + // Build block styles + + ce.style.wordSpacing = f.block_wordspacing.value + (isNum(f.block_wordspacing.value) ? f.block_wordspacing_measurement.value : ""); + ce.style.letterSpacing = f.block_letterspacing.value + (isNum(f.block_letterspacing.value) ? f.block_letterspacing_measurement.value : ""); + ce.style.verticalAlign = f.block_vertical_alignment.value; + ce.style.textAlign = f.block_text_align.value; + ce.style.textIndent = f.block_text_indent.value + (isNum(f.block_text_indent.value) ? f.block_text_indent_measurement.value : ""); + ce.style.whiteSpace = f.block_whitespace.value; + ce.style.display = f.block_display.value; + + // Build box styles + + ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : ""); + ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : ""); + ce.style.styleFloat = f.box_float.value; + + if (tinymce.isGecko) + ce.style.cssFloat = f.box_float.value; + + ce.style.clear = f.box_clear.value; + + if (!f.box_padding_same.checked) { + ce.style.paddingTop = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : ""); + ce.style.paddingRight = f.box_padding_right.value + (isNum(f.box_padding_right.value) ? f.box_padding_right_measurement.value : ""); + ce.style.paddingBottom = f.box_padding_bottom.value + (isNum(f.box_padding_bottom.value) ? f.box_padding_bottom_measurement.value : ""); + ce.style.paddingLeft = f.box_padding_left.value + (isNum(f.box_padding_left.value) ? f.box_padding_left_measurement.value : ""); + } else + ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : ""); + + if (!f.box_margin_same.checked) { + ce.style.marginTop = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : ""); + ce.style.marginRight = f.box_margin_right.value + (isNum(f.box_margin_right.value) ? f.box_margin_right_measurement.value : ""); + ce.style.marginBottom = f.box_margin_bottom.value + (isNum(f.box_margin_bottom.value) ? f.box_margin_bottom_measurement.value : ""); + ce.style.marginLeft = f.box_margin_left.value + (isNum(f.box_margin_left.value) ? f.box_margin_left_measurement.value : ""); + } else + ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : ""); + + // Build border styles + + if (!f.border_style_same.checked) { + ce.style.borderTopStyle = f.border_style_top.value; + ce.style.borderRightStyle = f.border_style_right.value; + ce.style.borderBottomStyle = f.border_style_bottom.value; + ce.style.borderLeftStyle = f.border_style_left.value; + } else + ce.style.borderStyle = f.border_style_top.value; + + if (!f.border_width_same.checked) { + ce.style.borderTopWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : ""); + ce.style.borderRightWidth = f.border_width_right.value + (isNum(f.border_width_right.value) ? f.border_width_right_measurement.value : ""); + ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : ""); + ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : ""); + } else + ce.style.borderWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : ""); + + if (!f.border_color_same.checked) { + ce.style.borderTopColor = f.border_color_top.value; + ce.style.borderRightColor = f.border_color_right.value; + ce.style.borderBottomColor = f.border_color_bottom.value; + ce.style.borderLeftColor = f.border_color_left.value; + } else + ce.style.borderColor = f.border_color_top.value; + + // Build list styles + + ce.style.listStyleType = f.list_type.value; + ce.style.listStylePosition = f.list_position.value; + ce.style.listStyleImage = f.list_bullet_image.value != "" ? "url(" + f.list_bullet_image.value + ")" : ""; + + // Build positioning styles + + ce.style.position = f.positioning_type.value; + ce.style.visibility = f.positioning_visibility.value; + + if (ce.style.width == "") + ce.style.width = f.positioning_width.value + (isNum(f.positioning_width.value) ? f.positioning_width_measurement.value : ""); + + if (ce.style.height == "") + ce.style.height = f.positioning_height.value + (isNum(f.positioning_height.value) ? f.positioning_height_measurement.value : ""); + + ce.style.zIndex = f.positioning_zindex.value; + ce.style.overflow = f.positioning_overflow.value; + + if (!f.positioning_placement_same.checked) { + ce.style.top = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : ""); + ce.style.right = f.positioning_placement_right.value + (isNum(f.positioning_placement_right.value) ? f.positioning_placement_right_measurement.value : ""); + ce.style.bottom = f.positioning_placement_bottom.value + (isNum(f.positioning_placement_bottom.value) ? f.positioning_placement_bottom_measurement.value : ""); + ce.style.left = f.positioning_placement_left.value + (isNum(f.positioning_placement_left.value) ? f.positioning_placement_left_measurement.value : ""); + } else { + s = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : ""); + ce.style.top = s; + ce.style.right = s; + ce.style.bottom = s; + ce.style.left = s; + } + + if (!f.positioning_clip_same.checked) { + s = "rect("; + s += (isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto") + " "; + s += (isNum(f.positioning_clip_right.value) ? f.positioning_clip_right.value + f.positioning_clip_right_measurement.value : "auto") + " "; + s += (isNum(f.positioning_clip_bottom.value) ? f.positioning_clip_bottom.value + f.positioning_clip_bottom_measurement.value : "auto") + " "; + s += (isNum(f.positioning_clip_left.value) ? f.positioning_clip_left.value + f.positioning_clip_left_measurement.value : "auto"); + s += ")"; + + if (s != "rect(auto auto auto auto)") + ce.style.clip = s; + } else { + s = "rect("; + t = isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto"; + s += t + " "; + s += t + " "; + s += t + " "; + s += t + ")"; + + if (s != "rect(auto auto auto auto)") + ce.style.clip = s; + } + + ce.style.cssText = ce.style.cssText; +} + +function isNum(s) { + return new RegExp('[0-9]+', 'g').test(s); +} + +function showDisabledControls() { + var f = document.forms, i, a; + + for (i=0; i 1) { + addSelectValue(f, s, p[0], p[1]); + + if (se) + selectByValue(f, s, p[1]); + } else { + addSelectValue(f, s, p[0], p[0]); + + if (se) + selectByValue(f, s, p[0]); + } + } +} + +function toggleSame(ce, pre) { + var el = document.forms[0].elements, i; + + if (ce.checked) { + el[pre + "_top"].disabled = false; + el[pre + "_right"].disabled = true; + el[pre + "_bottom"].disabled = true; + el[pre + "_left"].disabled = true; + + if (el[pre + "_top_measurement"]) { + el[pre + "_top_measurement"].disabled = false; + el[pre + "_right_measurement"].disabled = true; + el[pre + "_bottom_measurement"].disabled = true; + el[pre + "_left_measurement"].disabled = true; + } + } else { + el[pre + "_top"].disabled = false; + el[pre + "_right"].disabled = false; + el[pre + "_bottom"].disabled = false; + el[pre + "_left"].disabled = false; + + if (el[pre + "_top_measurement"]) { + el[pre + "_top_measurement"].disabled = false; + el[pre + "_right_measurement"].disabled = false; + el[pre + "_bottom_measurement"].disabled = false; + el[pre + "_left_measurement"].disabled = false; + } + } + + showDisabledControls(); +} + +function synch(fr, to) { + var f = document.forms[0]; + + f.elements[to].value = f.elements[fr].value; + + if (f.elements[fr + "_measurement"]) + selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value); +} + +tinyMCEPopup.onInit.add(init); diff --git a/plugins/TinyMCE/js/plugins/style/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/style/langs/en_dlg.js new file mode 100644 index 0000000000..5026313e2e --- /dev/null +++ b/plugins/TinyMCE/js/plugins/style/langs/en_dlg.js @@ -0,0 +1,63 @@ +tinyMCE.addI18n('en.style_dlg',{ +title:"Edit CSS Style", +apply:"Apply", +text_tab:"Text", +background_tab:"Background", +block_tab:"Block", +box_tab:"Box", +border_tab:"Border", +list_tab:"List", +positioning_tab:"Positioning", +text_props:"Text", +text_font:"Font", +text_size:"Size", +text_weight:"Weight", +text_style:"Style", +text_variant:"Variant", +text_lineheight:"Line height", +text_case:"Case", +text_color:"Color", +text_decoration:"Decoration", +text_overline:"overline", +text_underline:"underline", +text_striketrough:"strikethrough", +text_blink:"blink", +text_none:"none", +background_color:"Background color", +background_image:"Background image", +background_repeat:"Repeat", +background_attachment:"Attachment", +background_hpos:"Horizontal position", +background_vpos:"Vertical position", +block_wordspacing:"Word spacing", +block_letterspacing:"Letter spacing", +block_vertical_alignment:"Vertical alignment", +block_text_align:"Text align", +block_text_indent:"Text indent", +block_whitespace:"Whitespace", +block_display:"Display", +box_width:"Width", +box_height:"Height", +box_float:"Float", +box_clear:"Clear", +padding:"Padding", +same:"Same for all", +top:"Top", +right:"Right", +bottom:"Bottom", +left:"Left", +margin:"Margin", +style:"Style", +width:"Width", +height:"Height", +color:"Color", +list_type:"Type", +bullet_image:"Bullet image", +position:"Position", +positioning_type:"Type", +visibility:"Visibility", +zindex:"Z-index", +overflow:"Overflow", +placement:"Placement", +clip:"Clip" +}); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/style/props.htm b/plugins/TinyMCE/js/plugins/style/props.htm new file mode 100644 index 0000000000..7cfd2682b7 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/style/props.htm @@ -0,0 +1,728 @@ + + + + {#style_dlg.title} + + + + + + + + + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + +
 
+ 		+ +
+ + + +
+ + + + + + +
+ +  
+ 		+ +
+ + + + + +
 
+
{#style_dlg.text_decoration} + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
 
+
+ + + + +
 
+
+ + + + + + +
 
+
+ + + + + + +
 
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
 
+
+ + + + + + +
 
+
+ + + + + + +
 
+
+
+ +
+ + + + + + + + + + + + + + +
+ + + + + + +
 
+ 		   
+ + + + + + +
 
+ 		   
+
+
+ {#style_dlg.padding} + + + + + + + + + + + + + + + + + + + + + + +
 
+ + + + + + +
 
+
+ + + + + + +
 
+
+ + + + + + +
 
+
+ + + + + + +
 
+
+
+
+ +
+
+ {#style_dlg.margin} + + + + + + + + + + + + + + + + + + + + + + +
 
+ + + + + + +
 
+
+ + + + + + +
 
+
+ + + + + + +
 
+
+ + + + + + +
 
+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  {#style_dlg.style} {#style_dlg.width} {#style_dlg.color}
      
{#style_dlg.top}   + + + + + + +
 
+ 		  + + + + + +
 
+
{#style_dlg.right}   + + + + + + +
 
+ 		  + + + + + +
 
+
{#style_dlg.bottom}   + + + + + + +
 
+ 		  + + + + + +
 
+
{#style_dlg.left}   + + + + + + +
 
+ 		  + + + + + +
 
+
+
+ +
+ + + + + + + + + + + + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
   
+ + + + + + +
 
+ 		   
+ + + + + + +
 
+ 		   
+ +
+
+ {#style_dlg.placement} + + + + + + + + + + + + + + + + + + + + + + +
 
{#style_dlg.top} + + + + + + +
 
+
{#style_dlg.right} + + + + + + +
 
+
{#style_dlg.bottom} + + + + + + +
 
+
{#style_dlg.left} + + + + + + +
 
+
+
+
+ +
+
+ {#style_dlg.clip} + + + + + + + + + + + + + + + + + + + + + + +
 
{#style_dlg.top} + + + + + + +
 
+
{#style_dlg.right} + + + + + + +
 
+
{#style_dlg.bottom} + + + + + + +
 
+
{#style_dlg.left} + + + + + + +
 
+
+
+
+
+
+
+ +
+
+
+ +
 
+
+
+ + +
+
+ +
+
+
+ + + diff --git a/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js new file mode 100644 index 0000000000..27d2440222 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js @@ -0,0 +1 @@ +(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",f.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js new file mode 100644 index 0000000000..c2be2f40a6 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js @@ -0,0 +1,112 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, explode = tinymce.explode; + + tinymce.create('tinymce.plugins.TabFocusPlugin', { + init : function(ed, url) { + function tabCancel(ed, e) { + if (e.keyCode === 9) + return Event.cancel(e); + }; + + function tabHandler(ed, e) { + var x, i, f, el, v; + + function find(d) { + f = DOM.getParent(ed.id, 'form'); + el = f.elements; + + if (f) { + each(el, function(e, i) { + if (e.id == ed.id) { + x = i; + return false; + } + }); + + if (d > 0) { + for (i = x + 1; i < el.length; i++) { + if (el[i].type != 'hidden') + return el[i]; + } + } else { + for (i = x - 1; i >= 0; i--) { + if (el[i].type != 'hidden') + return el[i]; + } + } + } + + return null; + }; + + if (e.keyCode === 9) { + v = explode(ed.getParam('tab_focus', ed.getParam('tabfocus_elements', ':prev,:next'))); + + if (v.length == 1) { + v[1] = v[0]; + v[0] = ':prev'; + } + + // Find element to focus + if (e.shiftKey) { + if (v[0] == ':prev') + el = find(-1); + else + el = DOM.get(v[0]); + } else { + if (v[1] == ':next') + el = find(1); + else + el = DOM.get(v[1]); + } + + if (el) { + if (ed = tinymce.get(el.id || el.name)) + ed.focus(); + else + window.setTimeout(function() {window.focus();el.focus();}, 10); + + return Event.cancel(e); + } + } + }; + + ed.onKeyUp.add(tabCancel); + + if (tinymce.isGecko) { + ed.onKeyPress.add(tabHandler); + ed.onKeyDown.add(tabCancel); + } else + ed.onKeyDown.add(tabHandler); + + ed.onInit.add(function() { + each(DOM.select('a:first,a:last', ed.getContainer()), function(n) { + Event.add(n, 'focus', function() {ed.focus();}); + }); + }); + }, + + getInfo : function() { + return { + longname : 'Tabfocus', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('tabfocus', tinymce.plugins.TabFocusPlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/table/cell.htm b/plugins/TinyMCE/js/plugins/table/cell.htm new file mode 100644 index 0000000000..d243e1d833 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/cell.htm @@ -0,0 +1,178 @@ + + + + {#table_dlg.cell_title} + + + + + + + + +
+
+ +
+ +
+
+
+ {#table_dlg.general_props} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ +
+
+
+ +
+
+ {#table_dlg.advanced_props} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + + +
 
+
+ + + + + +
 
+
+ + + + + +
 
+
+
+
+
+ +
+
+ +
+ + + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/table/css/cell.css b/plugins/TinyMCE/js/plugins/table/css/cell.css new file mode 100644 index 0000000000..a067ecdfed --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/css/cell.css @@ -0,0 +1,17 @@ +/* CSS file for cell dialog in the table plugin */ + +.panel_wrapper div.current { + height: 200px; +} + +.advfield { + width: 200px; +} + +#action { + margin-bottom: 3px; +} + +#class { + width: 150px; +} \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/table/css/row.css b/plugins/TinyMCE/js/plugins/table/css/row.css new file mode 100644 index 0000000000..1f7755dafa --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/css/row.css @@ -0,0 +1,25 @@ +/* CSS file for row dialog in the table plugin */ + +.panel_wrapper div.current { + height: 200px; +} + +.advfield { + width: 200px; +} + +#action { + margin-bottom: 3px; +} + +#rowtype,#align,#valign,#class,#height { + width: 150px; +} + +#height { + width: 50px; +} + +.col2 { + padding-left: 20px; +} diff --git a/plugins/TinyMCE/js/plugins/table/css/table.css b/plugins/TinyMCE/js/plugins/table/css/table.css new file mode 100644 index 0000000000..d11c3f69cb --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/css/table.css @@ -0,0 +1,13 @@ +/* CSS file for table dialog in the table plugin */ + +.panel_wrapper div.current { + height: 245px; +} + +.advfield { + width: 200px; +} + +#class { + width: 150px; +} diff --git a/plugins/TinyMCE/js/plugins/table/editor_plugin.js b/plugins/TinyMCE/js/plugins/table/editor_plugin.js new file mode 100644 index 0000000000..39f2c694be --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/editor_plugin.js @@ -0,0 +1 @@ +(function(b){var c=b.each;function a(E,D,H){var e,I,A,n;r();n=D.getParent(H.getStart(),"th,td");if(n){I=C(n);A=F();n=v(I.x,I.y)}function r(){var J=0;e=[];c(["thead","tbody","tfoot"],function(K){var L=D.select(K+" tr",E);c(L,function(M,N){N+=J;c(D.select("td,th",M),function(T,O){var P,Q,R,S;if(e[N]){while(e[N][O]){O++}}R=g(T,"rowspan");S=g(T,"colspan");for(Q=N;Q'}return false}},"childNodes");J=J.cloneNode(false);J.rowSpan=J.colSpan=1;if(K){J.appendChild(K)}else{if(!b.isIE){J.innerHTML='
'}}return J}function p(){var J=D.createRng();c(D.select("tr",E),function(K){if(K.cells.length==0){D.remove(K)}});if(D.select("tr",E).length==0){J.setStartAfter(E);J.setEndAfter(E);H.setRng(J);D.remove(E);return}c(D.select("thead,tbody,tfoot",E),function(K){if(K.rows.length==0){D.remove(K)}});r();row=e[Math.min(e.length-1,I.y)];if(row){H.select(row[Math.min(row.length-1,I.x)].elm,true);H.collapse(true)}}function s(P,N,R,O){var M,K,J,L,Q;M=e[N][P].elm.parentNode;for(J=1;J<=R;J++){M=D.getNext(M,"tr");if(M){for(K=P;K>=0;K--){Q=e[N+J][K].elm;if(Q.parentNode==M){for(L=1;L<=O;L++){D.insertAfter(d(Q),Q)}break}}if(K==-1){for(L=1;L<=O;L++){M.insertBefore(d(M.cells[0]),M.cells[0])}}}}}function z(){c(e,function(J,K){c(J,function(M,L){var P,O,Q,N;if(h(M)){M=M.elm;P=g(M,"colspan");O=g(M,"rowspan");if(P>1||O>1){M.colSpan=M.rowSpan=1;for(N=0;N1){O.rowSpan=rowSpan+1;continue}}else{if(J>0&&e[J-1][N]){R=e[J-1][N].elm;rowSpan=g(R,"rowspan");if(rowSpan>1){R.rowSpan=rowSpan+1;continue}}}K=d(O);K.colSpan=O.colSpan;Q.appendChild(K);L=O}}if(Q.hasChildNodes()){if(!M){D.insertAfter(Q,P)}else{P.parentNode.insertBefore(Q,P)}}}function f(K){var L,J;c(e,function(M,N){c(M,function(P,O){if(h(P)){L=O;if(K){return false}}});if(K){return !L}});c(e,function(P,Q){var M=P[L].elm,N,O;if(M!=J){O=g(M,"colspan");N=g(M,"rowspan");if(O==1){if(!K){D.insertAfter(d(M),M);s(L,Q,N-1,O)}else{M.parentNode.insertBefore(d(M),M);s(L,Q,N-1,O)}}else{M.colSpan++}J=M}})}function m(){var J=[];c(e,function(K,L){c(K,function(N,M){if(h(N)&&b.inArray(J,M)===-1){c(e,function(Q){var O=Q[M].elm,P;P=g(O,"colspan");if(P>1){O.colSpan=P-1}else{D.remove(O)}});J.push(M)}})});p()}function l(){var K;function J(N){var M,O,L;M=D.getNext(N,"tr");c(N.cells,function(P){var Q=g(P,"rowspan");if(Q>1){P.rowSpan=Q-1;O=C(P);s(O.x,O.y,1,1)}});O=C(N.cells[0]);c(e[O.y],function(P){var Q;P=P.elm;if(P!=L){Q=g(P,"rowspan");if(Q<=1){D.remove(P)}else{P.rowSpan=Q-1}L=P}})}K=j();c(K.reverse(),function(L){J(L)});p()}function B(){var J=j();D.remove(J);p();return J}function G(){var J=j();c(J,function(L,K){J[K]=L.cloneNode(true)});return J}function w(L,K){var M=j(),J=M[K?0:M.length-1],N=J.cells.length;c(e,function(P){var O;N=0;c(P,function(R,Q){if(R.real){N+=R.colspan}if(R.elm.parentNode==J){O=1}});if(O){return false}});if(!K){L.reverse()}c(L,function(Q){var P=Q.cells.length,O;for(i=0;iK){K=O}if(N>J){J=N}if(P.real){R=P.colspan-1;Q=P.rowspan-1;if(R){if(O+R>K){K=O+R}}if(Q){if(N+Q>J){J=N+Q}}}}})});return{x:K,y:J}}function t(P){var M,L,R,Q,K,J,N,O;A=C(P);if(I&&A){M=Math.min(I.x,A.x);L=Math.min(I.y,A.y);R=Math.max(I.x,A.x);Q=Math.max(I.y,A.y);K=R;J=Q;for(y=L;y<=J;y++){P=e[y][M];if(!P.real){if(M-(P.colspan-1)K){K=x+N}}if(O){if(y+O>J){J=y+O}}}}}D.removeClass(D.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=L;y<=J;y++){for(x=M;x<=K;x++){D.addClass(e[y][x].elm,"mceSelected")}}}}b.extend(this,{deleteTable:q,split:z,merge:o,insertRow:k,insertCol:f,deleteCols:m,deleteRows:l,cutRows:B,copyRows:G,pasteRows:w,getPos:C,setStartCell:u,setEndCell:t})}b.create("tinymce.plugins.TablePlugin",{init:function(e,f){var d,j;function h(m){var l=e.selection,k=e.dom.getParent(m||l.getNode(),"table");if(k){return new a(k,e.dom,l)}}function g(){e.getBody().style.webkitUserSelect="";e.dom.removeClass(e.dom.select("td.mceSelected,th.mceSelected"),"mceSelected")}c([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(k){e.addButton(k[0],{title:k[1],cmd:k[2],ui:k[3]})});if(!b.isIE){e.onClick.add(function(k,l){l=l.target;if(l.nodeName==="TABLE"){k.selection.select(l)}})}e.onNodeChange.add(function(l,k,o){var m;o=l.selection.getStart();m=l.dom.getParent(o,"td,th,caption");k.setActive("table",o.nodeName==="TABLE"||!!m);if(m&&m.nodeName==="CAPTION"){m=0}k.setDisabled("delete_table",!m);k.setDisabled("delete_col",!m);k.setDisabled("delete_table",!m);k.setDisabled("delete_row",!m);k.setDisabled("col_after",!m);k.setDisabled("col_before",!m);k.setDisabled("row_after",!m);k.setDisabled("row_before",!m);k.setDisabled("row_props",!m);k.setDisabled("cell_props",!m);k.setDisabled("split_cells",!m);k.setDisabled("merge_cells",!m)});e.onInit.add(function(l){var k,o,p=l.dom,m;d=l.windowManager;l.onMouseDown.add(function(q,r){if(r.button!=2){g();o=p.getParent(r.target,"td,th");k=p.getParent(o,"table")}});p.bind(l.getDoc(),"mouseover",function(t){var r,q,s=t.target;if(o&&(m||s!=o)&&(s.nodeName=="TD"||s.nodeName=="TH")){q=p.getParent(s,"table");if(q==k){if(!m){m=h(q);m.setStartCell(o);l.getBody().style.webkitUserSelect="none"}m.setEndCell(s)}r=l.selection.getSel();if(r.removeAllRanges){r.removeAllRanges()}else{r.empty()}t.preventDefault()}});l.onMouseUp.add(function(z,A){var r,t=z.selection,B,C=t.getSel(),q,u,s,w;if(o){if(m){z.getBody().style.webkitUserSelect=""}function v(D,F){var E=new b.dom.TreeWalker(D,D);do{if(D.nodeType==3&&b.trim(D.nodeValue).length!=0){if(F){r.setStart(D,0)}else{r.setEnd(D,D.nodeValue.length)}return}if(D.nodeName=="BR"){if(F){r.setStartBefore(D)}else{r.setEndBefore(D)}return}}while(D=(F?E.next():E.prev()))}B=p.select("td.mceSelected,th.mceSelected");if(B.length>0){r=p.createRng();u=B[0];w=B[B.length-1];v(u,1);q=new b.dom.TreeWalker(u,p.getParent(B[0],"table"));do{if(u.nodeName=="TD"||u.nodeName=="TH"){if(!p.hasClass(u,"mceSelected")){break}s=u}}while(u=q.next());v(s);t.setRng(r)}z.nodeChanged();o=m=k=null}});l.onKeyUp.add(function(q,r){g()});if(l&&l.plugins.contextmenu){l.plugins.contextmenu.onContextMenu.add(function(s,q,u){var v,t=l.selection,r=t.getNode()||l.getBody();if(l.dom.getParent(u,"td")||l.dom.getParent(u,"th")){q.removeAll();if(r.nodeName=="A"&&!l.dom.getAttrib(r,"name")){q.add({title:"advanced.link_desc",icon:"link",cmd:l.plugins.advlink?"mceAdvLink":"mceLink",ui:true});q.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});q.addSeparator()}if(r.nodeName=="IMG"&&r.className.indexOf("mceItem")==-1){q.add({title:"advanced.image_desc",icon:"image",cmd:l.plugins.advimage?"mceAdvImage":"mceImage",ui:true});q.addSeparator()}q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});q.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});q.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});q.addSeparator();v=q.addMenu({title:"table.cell"});v.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});v.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});v.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});v=q.addMenu({title:"table.row"});v.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});v.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});v.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});v.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});v.addSeparator();v.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});v.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});v.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!j);v.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!j);v=q.addMenu({title:"table.col"});v.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});v.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});v.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(!b.isIE){function n(){var q;for(q=l.getBody().lastChild;q&&q.nodeType==3&&!q.nodeValue.length;q=q.previousSibling){}if(q&&q.nodeName=="TABLE"){l.dom.add(l.getBody(),"p",null,'
')}}if(b.isGecko){l.onKeyDown.add(function(r,t){var q,s,u=r.dom;if(t.keyCode==37||t.keyCode==38){q=r.selection.getRng();s=u.getParent(q.startContainer,"table");if(s&&r.getBody().firstChild==s){if(isAtStart(q,s)){q=u.createRng();q.setStartBefore(s);q.setEndBefore(s);r.selection.setRng(q);t.preventDefault()}}}})}l.onKeyUp.add(n);l.onSetContent.add(n);l.onVisualAid.add(n);l.onPreProcess.add(function(q,s){var r=s.node.lastChild;if(r&&r.childNodes.length==1&&r.firstChild.nodeName=="BR"){q.dom.remove(r)}});n()}});c({mceTableSplitCells:function(k){k.split()},mceTableMergeCells:function(l){var m,n,k;k=e.dom.getParent(e.selection.getNode(),"th,td");if(k){m=k.rowSpan;n=k.colSpan}if(!e.dom.select("td.mceSelected,th.mceSelected").length){d.open({url:f+"/merge_cells.htm",width:240+parseInt(e.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(e.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:m,cols:n,onaction:function(o){l.merge(k,o.cols,o.rows)},plugin_url:f})}else{l.merge()}},mceTableInsertRowBefore:function(k){k.insertRow(true)},mceTableInsertRowAfter:function(k){k.insertRow()},mceTableInsertColBefore:function(k){k.insertCol(true)},mceTableInsertColAfter:function(k){k.insertCol()},mceTableDeleteCol:function(k){k.deleteCols()},mceTableDeleteRow:function(k){k.deleteRows()},mceTableCutRow:function(k){j=k.cutRows()},mceTableCopyRow:function(k){j=k.copyRows()},mceTablePasteRowBefore:function(k){k.pasteRows(j,true)},mceTablePasteRowAfter:function(k){k.pasteRows(j)},mceTableDelete:function(k){k.deleteTable()}},function(l,k){e.addCommand(k,function(){var m=h();if(m){l(m);e.execCommand("mceRepaint");g()}})});c({mceInsertTable:function(k){d.open({url:f+"/table.htm",width:400+parseInt(e.getLang("table.table_delta_width",0)),height:320+parseInt(e.getLang("table.table_delta_height",0)),inline:1},{plugin_url:f,action:k?k.action:0})},mceTableRowProps:function(){d.open({url:f+"/row.htm",width:400+parseInt(e.getLang("table.rowprops_delta_width",0)),height:295+parseInt(e.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:f})},mceTableCellProps:function(){d.open({url:f+"/cell.htm",width:400+parseInt(e.getLang("table.cellprops_delta_width",0)),height:295+parseInt(e.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:f})}},function(l,k){e.addCommand(k,function(m,n){l(n)})})}});b.PluginManager.add("table",b.plugins.TablePlugin)})(tinymce); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/table/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/table/editor_plugin_src.js new file mode 100644 index 0000000000..2260f34a31 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/editor_plugin_src.js @@ -0,0 +1,1118 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function(tinymce) { + var each = tinymce.each; + + /** + * Table Grid class. + */ + function TableGrid(table, dom, selection) { + var grid, startPos, endPos, selectedCell; + + buildGrid(); + selectedCell = dom.getParent(selection.getStart(), 'th,td'); + if (selectedCell) { + startPos = getPos(selectedCell); + endPos = findEndPos(); + selectedCell = getCell(startPos.x, startPos.y); + } + + function buildGrid() { + var startY = 0; + + grid = []; + + each(['thead', 'tbody', 'tfoot'], function(part) { + var rows = dom.select(part + ' tr', table); + + each(rows, function(tr, y) { + y += startY; + + each(dom.select('td,th', tr), function(td, x) { + var x2, y2, rowspan, colspan; + + // Skip over existing cells produced by rowspan + if (grid[y]) { + while (grid[y][x]) + x++; + } + + // Get col/rowspan from cell + rowspan = getSpanVal(td, 'rowspan'); + colspan = getSpanVal(td, 'colspan'); + + // Fill out rowspan/colspan right and down + for (y2 = y; y2 < y + rowspan; y2++) { + if (!grid[y2]) + grid[y2] = []; + + for (x2 = x; x2 < x + colspan; x2++) { + grid[y2][x2] = { + part : part, + real : y2 == y && x2 == x, + elm : td, + rowspan : rowspan, + colspan : colspan + }; + } + } + }); + }); + + startY += rows.length; + }); + }; + + function getCell(x, y) { + var row; + + row = grid[y]; + if (row) + return row[x]; + }; + + function getSpanVal(td, name) { + return parseInt(td.getAttribute(name) || 1); + }; + + function isCellSelected(cell) { + return dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell; + }; + + function getSelectedRows() { + var rows = []; + + each(table.rows, function(row) { + each(row.cells, function(cell) { + if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) { + rows.push(row); + return false; + } + }); + }); + + return rows; + }; + + function deleteTable() { + var rng = dom.createRng(); + + rng.setStartAfter(table); + rng.setEndAfter(table); + + selection.setRng(rng); + + dom.remove(table); + }; + + function cloneCell(cell) { + var formatNode; + + // Clone formats + tinymce.walk(cell, function(node) { + var curNode; + + if (node.nodeType == 3) { + each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) { + node = node.cloneNode(false); + + if (!formatNode) + formatNode = curNode = node; + else if (curNode) + curNode.appendChild(node); + + curNode = node; + }); + + // Add something to the inner node + if (curNode) + curNode.innerHTML = tinymce.isIE ? ' ' : '
'; + + return false; + } + }, 'childNodes'); + + cell = cell.cloneNode(false); + cell.rowSpan = cell.colSpan = 1; + + if (formatNode) { + cell.appendChild(formatNode); + } else { + if (!tinymce.isIE) + cell.innerHTML = '
'; + } + + return cell; + }; + + function cleanup() { + var rng = dom.createRng(); + + // Empty rows + each(dom.select('tr', table), function(tr) { + if (tr.cells.length == 0) + dom.remove(tr); + }); + + // Empty table + if (dom.select('tr', table).length == 0) { + rng.setStartAfter(table); + rng.setEndAfter(table); + selection.setRng(rng); + dom.remove(table); + return; + } + + // Empty header/body/footer + each(dom.select('thead,tbody,tfoot', table), function(part) { + if (part.rows.length == 0) + dom.remove(part); + }); + + // Restore selection to start position if it still exists + buildGrid(); + + // Restore the selection to the closest table position + row = grid[Math.min(grid.length - 1, startPos.y)]; + if (row) { + selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true); + selection.collapse(true); + } + }; + + function fillLeftDown(x, y, rows, cols) { + var tr, x2, r, c, cell; + + tr = grid[y][x].elm.parentNode; + for (r = 1; r <= rows; r++) { + tr = dom.getNext(tr, 'tr'); + + if (tr) { + // Loop left to find real cell + for (x2 = x; x2 >= 0; x2--) { + cell = grid[y + r][x2].elm; + + if (cell.parentNode == tr) { + // Append clones after + for (c = 1; c <= cols; c++) + dom.insertAfter(cloneCell(cell), cell); + + break; + } + } + + if (x2 == -1) { + // Insert nodes before first cell + for (c = 1; c <= cols; c++) + tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]); + } + } + } + }; + + function split() { + each(grid, function(row, y) { + each(row, function(cell, x) { + var colSpan, rowSpan, newCell, i; + + if (isCellSelected(cell)) { + cell = cell.elm; + colSpan = getSpanVal(cell, 'colspan'); + rowSpan = getSpanVal(cell, 'rowspan'); + + if (colSpan > 1 || rowSpan > 1) { + cell.colSpan = cell.rowSpan = 1; + + // Insert cells right + for (i = 0; i < colSpan - 1; i++) + dom.insertAfter(cloneCell(cell), cell); + + fillLeftDown(x, y, rowSpan - 1, colSpan); + } + } + }); + }); + }; + + function merge(cell, cols, rows) { + var startX, startY, endX, endY, x, y, startCell, endCell, cell, children; + + // Use specified cell and cols/rows + if (cell) { + pos = getPos(cell); + startX = pos.x; + startY = pos.y; + endX = startX + (cols - 1); + endY = startY + (rows - 1); + } else { + // Use selection + startX = startPos.x; + startY = startPos.y; + endX = endPos.x; + endY = endPos.y; + } + + // Find start/end cells + startCell = getCell(startX, startY); + endCell = getCell(endX, endY); + + // Check if the cells exists and if they are of the same part for example tbody = tbody + if (startCell && endCell && startCell.part == endCell.part) { + // Split and rebuild grid + split(); + buildGrid(); + + // Set row/col span to start cell + startCell = getCell(startX, startY).elm; + startCell.colSpan = (endX - startX) + 1; + startCell.rowSpan = (endY - startY) + 1; + + // Remove other cells and add it's contents to the start cell + for (y = startY; y <= endY; y++) { + for (x = startX; x <= endX; x++) { + cell = grid[y][x].elm; + + if (cell != startCell) { + // Move children to startCell + children = tinymce.grep(cell.childNodes); + each(children, function(node, i) { + // Jump over last BR element + if (node.nodeName != 'BR' || i != children.length - 1) + startCell.appendChild(node); + }); + + // Remove cell + dom.remove(cell); + } + } + } + + // Remove empty rows etc and restore caret location + cleanup(); + } + }; + + function insertRow(before) { + var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell; + + // Find first/last row + each(grid, function(row, y) { + each(row, function(cell, x) { + if (isCellSelected(cell)) { + cell = cell.elm; + rowElm = cell.parentNode; + newRow = rowElm.cloneNode(false); + posY = y; + + if (before) + return false; + } + }); + + if (before) + return !posY; + }); + + for (x = 0; x < grid[0].length; x++) { + cell = grid[posY][x].elm; + + if (cell != lastCell) { + if (!before) { + rowSpan = getSpanVal(cell, 'rowspan'); + if (rowSpan > 1) { + cell.rowSpan = rowSpan + 1; + continue; + } + } else { + // Check if cell above can be expanded + if (posY > 0 && grid[posY - 1][x]) { + otherCell = grid[posY - 1][x].elm; + rowSpan = getSpanVal(otherCell, 'rowspan'); + if (rowSpan > 1) { + otherCell.rowSpan = rowSpan + 1; + continue; + } + } + } + + // Insert new cell into new row + newCell = cloneCell(cell) + newCell.colSpan = cell.colSpan; + newRow.appendChild(newCell); + + lastCell = cell; + } + } + + if (newRow.hasChildNodes()) { + if (!before) + dom.insertAfter(newRow, rowElm); + else + rowElm.parentNode.insertBefore(newRow, rowElm); + } + }; + + function insertCol(before) { + var posX, lastCell; + + // Find first/last column + each(grid, function(row, y) { + each(row, function(cell, x) { + if (isCellSelected(cell)) { + posX = x; + + if (before) + return false; + } + }); + + if (before) + return !posX; + }); + + each(grid, function(row, y) { + var cell = row[posX].elm, rowSpan, colSpan; + + if (cell != lastCell) { + colSpan = getSpanVal(cell, 'colspan'); + rowSpan = getSpanVal(cell, 'rowspan'); + + if (colSpan == 1) { + if (!before) { + dom.insertAfter(cloneCell(cell), cell); + fillLeftDown(posX, y, rowSpan - 1, colSpan); + } else { + cell.parentNode.insertBefore(cloneCell(cell), cell); + fillLeftDown(posX, y, rowSpan - 1, colSpan); + } + } else + cell.colSpan++; + + lastCell = cell; + } + }); + }; + + function deleteCols() { + var cols = []; + + // Get selected column indexes + each(grid, function(row, y) { + each(row, function(cell, x) { + if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) { + each(grid, function(row) { + var cell = row[x].elm, colSpan; + + colSpan = getSpanVal(cell, 'colspan'); + + if (colSpan > 1) + cell.colSpan = colSpan - 1; + else + dom.remove(cell); + }); + + cols.push(x); + } + }); + }); + + cleanup(); + }; + + function deleteRows() { + var rows; + + function deleteRow(tr) { + var nextTr, pos, lastCell; + + nextTr = dom.getNext(tr, 'tr'); + + // Move down row spanned cells + each(tr.cells, function(cell) { + var rowSpan = getSpanVal(cell, 'rowspan'); + + if (rowSpan > 1) { + cell.rowSpan = rowSpan - 1; + pos = getPos(cell); + fillLeftDown(pos.x, pos.y, 1, 1); + } + }); + + // Delete cells + pos = getPos(tr.cells[0]); + each(grid[pos.y], function(cell) { + var rowSpan; + + cell = cell.elm; + + if (cell != lastCell) { + rowSpan = getSpanVal(cell, 'rowspan'); + + if (rowSpan <= 1) + dom.remove(cell); + else + cell.rowSpan = rowSpan - 1; + + lastCell = cell; + } + }); + }; + + // Get selected rows and move selection out of scope + rows = getSelectedRows(); + + // Delete all selected rows + each(rows.reverse(), function(tr) { + deleteRow(tr); + }); + + cleanup(); + }; + + function cutRows() { + var rows = getSelectedRows(); + + dom.remove(rows); + cleanup(); + + return rows; + }; + + function copyRows() { + var rows = getSelectedRows(); + + each(rows, function(row, i) { + rows[i] = row.cloneNode(true); + }); + + return rows; + }; + + function pasteRows(rows, before) { + var selectedRows = getSelectedRows(), + targetRow = selectedRows[before ? 0 : selectedRows.length - 1], + targetCellCount = targetRow.cells.length; + + // Calc target cell count + each(grid, function(row) { + var match; + + targetCellCount = 0; + each(row, function(cell, x) { + if (cell.real) + targetCellCount += cell.colspan; + + if (cell.elm.parentNode == targetRow) + match = 1; + }); + + if (match) + return false; + }); + + if (!before) + rows.reverse(); + + each(rows, function(row) { + var cellCount = row.cells.length, cell; + + // Remove col/rowspans + for (i = 0; i < cellCount; i++) { + cell = row.cells[i]; + cell.colSpan = cell.rowSpan = 1; + } + + // Needs more cells + for (i = cellCount; i < targetCellCount; i++) + row.appendChild(cloneCell(row.cells[cellCount - 1])); + + // Needs less cells + for (i = targetCellCount; i < cellCount; i++) + dom.remove(row.cells[i]); + + // Add before/after + if (before) + targetRow.parentNode.insertBefore(row, targetRow); + else + dom.insertAfter(row, targetRow); + }); + }; + + function getPos(target) { + var pos; + + each(grid, function(row, y) { + each(row, function(cell, x) { + if (cell.elm == target) { + pos = {x : x, y : y}; + return false; + } + }); + + return !pos; + }); + + return pos; + }; + + function setStartCell(cell) { + startPos = getPos(cell); + }; + + function findEndPos() { + var pos, maxX, maxY; + + maxX = maxY = 0; + + each(grid, function(row, y) { + each(row, function(cell, x) { + var colSpan, rowSpan; + + if (isCellSelected(cell)) { + cell = grid[y][x]; + + if (x > maxX) + maxX = x; + + if (y > maxY) + maxY = y; + + if (cell.real) { + colSpan = cell.colspan - 1; + rowSpan = cell.rowspan - 1; + + if (colSpan) { + if (x + colSpan > maxX) + maxX = x + colSpan; + } + + if (rowSpan) { + if (y + rowSpan > maxY) + maxY = y + rowSpan; + } + } + } + }); + }); + + return {x : maxX, y : maxY}; + }; + + function setEndCell(cell) { + var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan; + + endPos = getPos(cell); + + if (startPos && endPos) { + // Get start/end positions + startX = Math.min(startPos.x, endPos.x); + startY = Math.min(startPos.y, endPos.y); + endX = Math.max(startPos.x, endPos.x); + endY = Math.max(startPos.y, endPos.y); + + // Expand end positon to include spans + maxX = endX; + maxY = endY; + + // Expand startX + for (y = startY; y <= maxY; y++) { + cell = grid[y][startX]; + + if (!cell.real) { + if (startX - (cell.colspan - 1) < startX) + startX -= cell.colspan - 1; + } + } + + // Expand startY + for (x = startX; x <= maxX; x++) { + cell = grid[startY][x]; + + if (!cell.real) { + if (startY - (cell.rowspan - 1) < startY) + startY -= cell.rowspan - 1; + } + } + + // Find max X, Y + for (y = startY; y <= endY; y++) { + for (x = startX; x <= endX; x++) { + cell = grid[y][x]; + + if (cell.real) { + colSpan = cell.colspan - 1; + rowSpan = cell.rowspan - 1; + + if (colSpan) { + if (x + colSpan > maxX) + maxX = x + colSpan; + } + + if (rowSpan) { + if (y + rowSpan > maxY) + maxY = y + rowSpan; + } + } + } + } + + // Remove current selection + dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected'); + + // Add new selection + for (y = startY; y <= maxY; y++) { + for (x = startX; x <= maxX; x++) + dom.addClass(grid[y][x].elm, 'mceSelected'); + } + } + }; + + // Expose to public + tinymce.extend(this, { + deleteTable : deleteTable, + split : split, + merge : merge, + insertRow : insertRow, + insertCol : insertCol, + deleteCols : deleteCols, + deleteRows : deleteRows, + cutRows : cutRows, + copyRows : copyRows, + pasteRows : pasteRows, + getPos : getPos, + setStartCell : setStartCell, + setEndCell : setEndCell + }); + }; + + tinymce.create('tinymce.plugins.TablePlugin', { + init : function(ed, url) { + var winMan, clipboardRows; + + function createTableGrid(node) { + var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table'); + + if (tblElm) + return new TableGrid(tblElm, ed.dom, selection); + }; + + function cleanup() { + // Restore selection possibilities + ed.getBody().style.webkitUserSelect = ''; + ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected'); + }; + + // Register buttons + each([ + ['table', 'table.desc', 'mceInsertTable', true], + ['delete_table', 'table.del', 'mceTableDelete'], + ['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'], + ['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'], + ['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'], + ['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'], + ['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'], + ['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'], + ['row_props', 'table.row_desc', 'mceTableRowProps', true], + ['cell_props', 'table.cell_desc', 'mceTableCellProps', true], + ['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true], + ['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true] + ], function(c) { + ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]}); + }); + + // Select whole table is a table border is clicked + if (!tinymce.isIE) { + ed.onClick.add(function(ed, e) { + e = e.target; + + if (e.nodeName === 'TABLE') + ed.selection.select(e); + }); + } + + // Handle node change updates + ed.onNodeChange.add(function(ed, cm, n) { + var p; + + n = ed.selection.getStart(); + p = ed.dom.getParent(n, 'td,th,caption'); + cm.setActive('table', n.nodeName === 'TABLE' || !!p); + + // Disable table tools if we are in caption + if (p && p.nodeName === 'CAPTION') + p = 0; + + cm.setDisabled('delete_table', !p); + cm.setDisabled('delete_col', !p); + cm.setDisabled('delete_table', !p); + cm.setDisabled('delete_row', !p); + cm.setDisabled('col_after', !p); + cm.setDisabled('col_before', !p); + cm.setDisabled('row_after', !p); + cm.setDisabled('row_before', !p); + cm.setDisabled('row_props', !p); + cm.setDisabled('cell_props', !p); + cm.setDisabled('split_cells', !p); + cm.setDisabled('merge_cells', !p); + }); + + ed.onInit.add(function(ed) { + var startTable, startCell, dom = ed.dom, tableGrid; + + winMan = ed.windowManager; + + // Add cell selection logic + ed.onMouseDown.add(function(ed, e) { + if (e.button != 2) { + cleanup(); + + startCell = dom.getParent(e.target, 'td,th'); + startTable = dom.getParent(startCell, 'table'); + } + }); + + dom.bind(ed.getDoc(), 'mouseover', function(e) { + var sel, table, target = e.target; + + if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) { + table = dom.getParent(target, 'table'); + if (table == startTable) { + if (!tableGrid) { + tableGrid = createTableGrid(table); + tableGrid.setStartCell(startCell); + + ed.getBody().style.webkitUserSelect = 'none'; + } + + tableGrid.setEndCell(target); + } + + // Remove current selection + sel = ed.selection.getSel(); + + if (sel.removeAllRanges) + sel.removeAllRanges(); + else + sel.empty(); + + e.preventDefault(); + } + }); + + ed.onMouseUp.add(function(ed, e) { + var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode; + + // Move selection to startCell + if (startCell) { + if (tableGrid) + ed.getBody().style.webkitUserSelect = ''; + + function setPoint(node, start) { + var walker = new tinymce.dom.TreeWalker(node, node); + + do { + // Text node + if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) { + if (start) + rng.setStart(node, 0); + else + rng.setEnd(node, node.nodeValue.length); + + return; + } + + // BR element + if (node.nodeName == 'BR') { + if (start) + rng.setStartBefore(node); + else + rng.setEndBefore(node); + + return; + } + } while (node = (start ? walker.next() : walker.prev())); + }; + + // Try to expand text selection as much as we can only Gecko supports cell selection + selectedCells = dom.select('td.mceSelected,th.mceSelected'); + if (selectedCells.length > 0) { + rng = dom.createRng(); + node = selectedCells[0]; + endNode = selectedCells[selectedCells.length - 1]; + + setPoint(node, 1); + walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table')); + + do { + if (node.nodeName == 'TD' || node.nodeName == 'TH') { + if (!dom.hasClass(node, 'mceSelected')) + break; + + lastNode = node; + } + } while (node = walker.next()); + + setPoint(lastNode); + + sel.setRng(rng); + } + + ed.nodeChanged(); + startCell = tableGrid = startTable = null; + } + }); + + ed.onKeyUp.add(function(ed, e) { + cleanup(); + }); + + // Add context menu + if (ed && ed.plugins.contextmenu) { + ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) { + var sm, se = ed.selection, el = se.getNode() || ed.getBody(); + + if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th')) { + m.removeAll(); + + if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) { + m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true}); + m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'}); + m.addSeparator(); + } + + if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) { + m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true}); + m.addSeparator(); + } + + m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}}); + m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'}); + m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'}); + m.addSeparator(); + + // Cell menu + sm = m.addMenu({title : 'table.cell'}); + sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'}); + sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'}); + sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'}); + + // Row menu + sm = m.addMenu({title : 'table.row'}); + sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'}); + sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'}); + sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'}); + sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'}); + sm.addSeparator(); + sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'}); + sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'}); + sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows); + sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows); + + // Column menu + sm = m.addMenu({title : 'table.col'}); + sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'}); + sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'}); + sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'}); + } else + m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'}); + }); + } + + // Fixes an issue on Gecko where it's impossible to place the caret behind a table + // This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled + if (!tinymce.isIE) { + function fixTableCaretPos() { + var last; + + // Skip empty text nodes form the end + for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ; + + if (last && last.nodeName == 'TABLE') + ed.dom.add(ed.getBody(), 'p', null, '
'); + }; + + // Fixes an bug where it's impossible to place the caret before a table in Gecko + // this fix solves it by detecting when the caret is at the beginning of such a table + // and then manually moves the caret infront of the table + if (tinymce.isGecko) { + ed.onKeyDown.add(function(ed, e) { + var rng, table, dom = ed.dom; + + // On gecko it's not possible to place the caret before a table + if (e.keyCode == 37 || e.keyCode == 38) { + rng = ed.selection.getRng(); + table = dom.getParent(rng.startContainer, 'table'); + + if (table && ed.getBody().firstChild == table) { + if (isAtStart(rng, table)) { + rng = dom.createRng(); + + rng.setStartBefore(table); + rng.setEndBefore(table); + + ed.selection.setRng(rng); + + e.preventDefault(); + } + } + } + }); + } + + ed.onKeyUp.add(fixTableCaretPos); + ed.onSetContent.add(fixTableCaretPos); + ed.onVisualAid.add(fixTableCaretPos); + + ed.onPreProcess.add(function(ed, o) { + var last = o.node.lastChild; + + if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR') + ed.dom.remove(last); + }); + + fixTableCaretPos(); + } + }); + + // Register action commands + each({ + mceTableSplitCells : function(grid) { + grid.split(); + }, + + mceTableMergeCells : function(grid) { + var rowSpan, colSpan, cell; + + cell = ed.dom.getParent(ed.selection.getNode(), 'th,td'); + if (cell) { + rowSpan = cell.rowSpan; + colSpan = cell.colSpan; + } + + if (!ed.dom.select('td.mceSelected,th.mceSelected').length) { + winMan.open({ + url : url + '/merge_cells.htm', + width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)), + height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)), + inline : 1 + }, { + rows : rowSpan, + cols : colSpan, + onaction : function(data) { + grid.merge(cell, data.cols, data.rows); + }, + plugin_url : url + }); + } else + grid.merge(); + }, + + mceTableInsertRowBefore : function(grid) { + grid.insertRow(true); + }, + + mceTableInsertRowAfter : function(grid) { + grid.insertRow(); + }, + + mceTableInsertColBefore : function(grid) { + grid.insertCol(true); + }, + + mceTableInsertColAfter : function(grid) { + grid.insertCol(); + }, + + mceTableDeleteCol : function(grid) { + grid.deleteCols(); + }, + + mceTableDeleteRow : function(grid) { + grid.deleteRows(); + }, + + mceTableCutRow : function(grid) { + clipboardRows = grid.cutRows(); + }, + + mceTableCopyRow : function(grid) { + clipboardRows = grid.copyRows(); + }, + + mceTablePasteRowBefore : function(grid) { + grid.pasteRows(clipboardRows, true); + }, + + mceTablePasteRowAfter : function(grid) { + grid.pasteRows(clipboardRows); + }, + + mceTableDelete : function(grid) { + grid.deleteTable(); + } + }, function(func, name) { + ed.addCommand(name, function() { + var grid = createTableGrid(); + + if (grid) { + func(grid); + ed.execCommand('mceRepaint'); + cleanup(); + } + }); + }); + + // Register dialog commands + each({ + mceInsertTable : function(val) { + winMan.open({ + url : url + '/table.htm', + width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)), + height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)), + inline : 1 + }, { + plugin_url : url, + action : val ? val.action : 0 + }); + }, + + mceTableRowProps : function() { + winMan.open({ + url : url + '/row.htm', + width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)), + height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)), + inline : 1 + }, { + plugin_url : url + }); + }, + + mceTableCellProps : function() { + winMan.open({ + url : url + '/cell.htm', + width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)), + height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)), + inline : 1 + }, { + plugin_url : url + }); + } + }, function(func, name) { + ed.addCommand(name, function(ui, val) { + func(val); + }); + }); + } + }); + + // Register plugin + tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin); +})(tinymce); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/table/js/cell.js b/plugins/TinyMCE/js/plugins/table/js/cell.js new file mode 100644 index 0000000000..f24619172d --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/js/cell.js @@ -0,0 +1,286 @@ +tinyMCEPopup.requireLangPack(); + +var ed; + +function init() { + ed = tinyMCEPopup.editor; + tinyMCEPopup.resizeToInnerSize(); + + document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table'); + document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor'); + document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor') + + var inst = ed; + var tdElm = ed.dom.getParent(ed.selection.getStart(), "td,th"); + var formObj = document.forms[0]; + var st = ed.dom.parseStyle(ed.dom.getAttrib(tdElm, "style")); + + // Get table cell data + var celltype = tdElm.nodeName.toLowerCase(); + var align = ed.dom.getAttrib(tdElm, 'align'); + var valign = ed.dom.getAttrib(tdElm, 'valign'); + var width = trimSize(getStyle(tdElm, 'width', 'width')); + var height = trimSize(getStyle(tdElm, 'height', 'height')); + var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor')); + var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor')); + var className = ed.dom.getAttrib(tdElm, 'class'); + var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");; + var id = ed.dom.getAttrib(tdElm, 'id'); + var lang = ed.dom.getAttrib(tdElm, 'lang'); + var dir = ed.dom.getAttrib(tdElm, 'dir'); + var scope = ed.dom.getAttrib(tdElm, 'scope'); + + // Setup form + addClassesToList('class', 'table_cell_styles'); + TinyMCE_EditableSelects.init(); + + if (!ed.dom.hasClass(tdElm, 'mceSelected')) { + formObj.bordercolor.value = bordercolor; + formObj.bgcolor.value = bgcolor; + formObj.backgroundimage.value = backgroundimage; + formObj.width.value = width; + formObj.height.value = height; + formObj.id.value = id; + formObj.lang.value = lang; + formObj.style.value = ed.dom.serializeStyle(st); + selectByValue(formObj, 'align', align); + selectByValue(formObj, 'valign', valign); + selectByValue(formObj, 'class', className, true, true); + selectByValue(formObj, 'celltype', celltype); + selectByValue(formObj, 'dir', dir); + selectByValue(formObj, 'scope', scope); + + // Resize some elements + if (isVisible('backgroundimagebrowser')) + document.getElementById('backgroundimage').style.width = '180px'; + + updateColor('bordercolor_pick', 'bordercolor'); + updateColor('bgcolor_pick', 'bgcolor'); + } else + tinyMCEPopup.dom.hide('action'); +} + +function updateAction() { + var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0]; + + tinyMCEPopup.restoreSelection(); + el = ed.selection.getStart(); + tdElm = ed.dom.getParent(el, "td,th"); + trElm = ed.dom.getParent(el, "tr"); + tableElm = ed.dom.getParent(el, "table"); + + // Cell is selected + if (ed.dom.hasClass(tdElm, 'mceSelected')) { + // Update all selected sells + tinymce.each(ed.dom.select('td.mceSelected,th.mceSelected'), function(td) { + updateCell(td); + }); + + ed.addVisual(); + ed.nodeChanged(); + inst.execCommand('mceEndUndoLevel'); + tinyMCEPopup.close(); + return; + } + + ed.execCommand('mceBeginUndoLevel'); + + switch (getSelectValue(formObj, 'action')) { + case "cell": + var celltype = getSelectValue(formObj, 'celltype'); + var scope = getSelectValue(formObj, 'scope'); + + function doUpdate(s) { + if (s) { + updateCell(tdElm); + + ed.addVisual(); + ed.nodeChanged(); + inst.execCommand('mceEndUndoLevel'); + tinyMCEPopup.close(); + } + }; + + if (ed.getParam("accessibility_warnings", 1)) { + if (celltype == "th" && scope == "") + tinyMCEPopup.confirm(ed.getLang('table_dlg.missing_scope', '', true), doUpdate); + else + doUpdate(1); + + return; + } + + updateCell(tdElm); + break; + + case "row": + var cell = trElm.firstChild; + + if (cell.nodeName != "TD" && cell.nodeName != "TH") + cell = nextCell(cell); + + do { + cell = updateCell(cell, true); + } while ((cell = nextCell(cell)) != null); + + break; + + case "all": + var rows = tableElm.getElementsByTagName("tr"); + + for (var i=0; i 0) { + tinymce.each(tableElm.rows, function(tr) { + var i; + + for (i = 0; i < tr.cells.length; i++) { + if (dom.hasClass(tr.cells[i], 'mceSelected')) { + updateRow(tr, true); + return; + } + } + }); + + inst.addVisual(); + inst.nodeChanged(); + inst.execCommand('mceEndUndoLevel'); + tinyMCEPopup.close(); + return; + } + + inst.execCommand('mceBeginUndoLevel'); + + switch (action) { + case "row": + updateRow(trElm); + break; + + case "all": + var rows = tableElm.getElementsByTagName("tr"); + + for (var i=0; i colLimit) { + tinyMCEPopup.alert(inst.getLang('table_dlg.col_limit').replace(/\{\$cols\}/g, colLimit)); + return false; + } else if (rowLimit && rows > rowLimit) { + tinyMCEPopup.alert(inst.getLang('table_dlg.row_limit').replace(/\{\$rows\}/g, rowLimit)); + return false; + } else if (cellLimit && cols * rows > cellLimit) { + tinyMCEPopup.alert(inst.getLang('table_dlg.cell_limit').replace(/\{\$cells\}/g, cellLimit)); + return false; + } + + // Update table + if (action == "update") { + inst.execCommand('mceBeginUndoLevel'); + + dom.setAttrib(elm, 'cellPadding', cellpadding, true); + dom.setAttrib(elm, 'cellSpacing', cellspacing, true); + dom.setAttrib(elm, 'border', border); + dom.setAttrib(elm, 'align', align); + dom.setAttrib(elm, 'frame', frame); + dom.setAttrib(elm, 'rules', rules); + dom.setAttrib(elm, 'class', className); + dom.setAttrib(elm, 'style', style); + dom.setAttrib(elm, 'id', id); + dom.setAttrib(elm, 'summary', summary); + dom.setAttrib(elm, 'dir', dir); + dom.setAttrib(elm, 'lang', lang); + + capEl = inst.dom.select('caption', elm)[0]; + + if (capEl && !caption) + capEl.parentNode.removeChild(capEl); + + if (!capEl && caption) { + capEl = elm.ownerDocument.createElement('caption'); + + if (!tinymce.isIE) + capEl.innerHTML = '
'; + + elm.insertBefore(capEl, elm.firstChild); + } + + if (width && inst.settings.inline_styles) { + dom.setStyle(elm, 'width', width); + dom.setAttrib(elm, 'width', ''); + } else { + dom.setAttrib(elm, 'width', width, true); + dom.setStyle(elm, 'width', ''); + } + + // Remove these since they are not valid XHTML + dom.setAttrib(elm, 'borderColor', ''); + dom.setAttrib(elm, 'bgColor', ''); + dom.setAttrib(elm, 'background', ''); + + if (height && inst.settings.inline_styles) { + dom.setStyle(elm, 'height', height); + dom.setAttrib(elm, 'height', ''); + } else { + dom.setAttrib(elm, 'height', height, true); + dom.setStyle(elm, 'height', ''); + } + + if (background != '') + elm.style.backgroundImage = "url('" + background + "')"; + else + elm.style.backgroundImage = ''; + +/* if (tinyMCEPopup.getParam("inline_styles")) { + if (width != '') + elm.style.width = getCSSSize(width); + }*/ + + if (bordercolor != "") { + elm.style.borderColor = bordercolor; + elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle; + elm.style.borderWidth = border == "" ? "1px" : border; + } else + elm.style.borderColor = ''; + + elm.style.backgroundColor = bgcolor; + elm.style.height = getCSSSize(height); + + inst.addVisual(); + + // Fix for stange MSIE align bug + //elm.outerHTML = elm.outerHTML; + + inst.nodeChanged(); + inst.execCommand('mceEndUndoLevel'); + + // Repaint if dimensions changed + if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight) + inst.execCommand('mceRepaint'); + + tinyMCEPopup.close(); + return true; + } + + // Create new table + html += ''); + + tinymce.each('h1,h2,h3,h4,h5,h6,p'.split(','), function(n) { + if (patt) + patt += ','; + + patt += n + ' ._mce_marker'; + }); + + tinymce.each(inst.dom.select(patt), function(n) { + inst.dom.split(inst.dom.getParent(n, 'h1,h2,h3,h4,h5,h6,p'), n); + }); + + dom.setOuterHTML(dom.select('br._mce_marker')[0], html); + } else + inst.execCommand('mceInsertContent', false, html); + + tinymce.each(dom.select('table[_mce_new]'), function(node) { + var td = dom.select('td', node); + + inst.selection.select(td[0], true); + inst.selection.collapse(); + + dom.setAttrib(node, '_mce_new', ''); + }); + + inst.addVisual(); + inst.execCommand('mceEndUndoLevel'); + + tinyMCEPopup.close(); +} + +function makeAttrib(attrib, value) { + var formObj = document.forms[0]; + var valueElm = formObj.elements[attrib]; + + if (typeof(value) == "undefined" || value == null) { + value = ""; + + if (valueElm) + value = valueElm.value; + } + + if (value == "") + return ""; + + // XML encode it + value = value.replace(/&/g, '&'); + value = value.replace(/\"/g, '"'); + value = value.replace(//g, '>'); + + return ' ' + attrib + '="' + value + '"'; +} + +function init() { + tinyMCEPopup.resizeToInnerSize(); + + document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table'); + document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table'); + document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor'); + document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor'); + + var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', ''); + var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = ""; + var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules, frame; + var inst = tinyMCEPopup.editor, dom = inst.dom; + var formObj = document.forms[0]; + var elm = dom.getParent(inst.selection.getNode(), "table"); + + action = tinyMCEPopup.getWindowArg('action'); + + if (!action) + action = elm ? "update" : "insert"; + + if (elm && action != "insert") { + var rowsAr = elm.rows; + var cols = 0; + for (var i=0; i cols) + cols = rowsAr[i].cells.length; + + cols = cols; + rows = rowsAr.length; + + st = dom.parseStyle(dom.getAttrib(elm, "style")); + border = trimSize(getStyle(elm, 'border', 'borderWidth')); + cellpadding = dom.getAttrib(elm, 'cellpadding', ""); + cellspacing = dom.getAttrib(elm, 'cellspacing', ""); + width = trimSize(getStyle(elm, 'width', 'width')); + height = trimSize(getStyle(elm, 'height', 'height')); + bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor')); + bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor')); + align = dom.getAttrib(elm, 'align', align); + frame = dom.getAttrib(elm, 'frame'); + rules = dom.getAttrib(elm, 'rules'); + className = tinymce.trim(dom.getAttrib(elm, 'class').replace(/mceItem.+/g, '')); + id = dom.getAttrib(elm, 'id'); + summary = dom.getAttrib(elm, 'summary'); + style = dom.serializeStyle(st); + dir = dom.getAttrib(elm, 'dir'); + lang = dom.getAttrib(elm, 'lang'); + background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1"); + formObj.caption.checked = elm.getElementsByTagName('caption').length > 0; + + orgTableWidth = width; + orgTableHeight = height; + + action = "update"; + formObj.insert.value = inst.getLang('update'); + } + + addClassesToList('class', "table_styles"); + TinyMCE_EditableSelects.init(); + + // Update form + selectByValue(formObj, 'align', align); + selectByValue(formObj, 'tframe', frame); + selectByValue(formObj, 'rules', rules); + selectByValue(formObj, 'class', className, true, true); + formObj.cols.value = cols; + formObj.rows.value = rows; + formObj.border.value = border; + formObj.cellpadding.value = cellpadding; + formObj.cellspacing.value = cellspacing; + formObj.width.value = width; + formObj.height.value = height; + formObj.bordercolor.value = bordercolor; + formObj.bgcolor.value = bgcolor; + formObj.id.value = id; + formObj.summary.value = summary; + formObj.style.value = style; + formObj.dir.value = dir; + formObj.lang.value = lang; + formObj.backgroundimage.value = background; + + updateColor('bordercolor_pick', 'bordercolor'); + updateColor('bgcolor_pick', 'bgcolor'); + + // Resize some elements + if (isVisible('backgroundimagebrowser')) + document.getElementById('backgroundimage').style.width = '180px'; + + // Disable some fields in update mode + if (action == "update") { + formObj.cols.disabled = true; + formObj.rows.disabled = true; + } +} + +function changedSize() { + var formObj = document.forms[0]; + var st = dom.parseStyle(formObj.style.value); + +/* var width = formObj.width.value; + if (width != "") + st['width'] = tinyMCEPopup.getParam("inline_styles") ? getCSSSize(width) : ""; + else + st['width'] = "";*/ + + var height = formObj.height.value; + if (height != "") + st['height'] = getCSSSize(height); + else + st['height'] = ""; + + formObj.style.value = dom.serializeStyle(st); +} + +function changedBackgroundImage() { + var formObj = document.forms[0]; + var st = dom.parseStyle(formObj.style.value); + + st['background-image'] = "url('" + formObj.backgroundimage.value + "')"; + + formObj.style.value = dom.serializeStyle(st); +} + +function changedBorder() { + var formObj = document.forms[0]; + var st = dom.parseStyle(formObj.style.value); + + // Update border width if the element has a color + if (formObj.border.value != "" && formObj.bordercolor.value != "") + st['border-width'] = formObj.border.value + "px"; + + formObj.style.value = dom.serializeStyle(st); +} + +function changedColor() { + var formObj = document.forms[0]; + var st = dom.parseStyle(formObj.style.value); + + st['background-color'] = formObj.bgcolor.value; + + if (formObj.bordercolor.value != "") { + st['border-color'] = formObj.bordercolor.value; + + // Add border-width if it's missing + if (!st['border-width']) + st['border-width'] = formObj.border.value == "" ? "1px" : formObj.border.value + "px"; + } + + formObj.style.value = dom.serializeStyle(st); +} + +function changedStyle() { + var formObj = document.forms[0]; + var st = dom.parseStyle(formObj.style.value); + + if (st['background-image']) + formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1"); + else + formObj.backgroundimage.value = ''; + + if (st['width']) + formObj.width.value = trimSize(st['width']); + + if (st['height']) + formObj.height.value = trimSize(st['height']); + + if (st['background-color']) { + formObj.bgcolor.value = st['background-color']; + updateColor('bgcolor_pick','bgcolor'); + } + + if (st['border-color']) { + formObj.bordercolor.value = st['border-color']; + updateColor('bordercolor_pick','bordercolor'); + } +} + +tinyMCEPopup.onInit.add(init); diff --git a/plugins/TinyMCE/js/plugins/table/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/table/langs/en_dlg.js new file mode 100644 index 0000000000..000332a35d --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/langs/en_dlg.js @@ -0,0 +1,74 @@ +tinyMCE.addI18n('en.table_dlg',{ +general_tab:"General", +advanced_tab:"Advanced", +general_props:"General properties", +advanced_props:"Advanced properties", +rowtype:"Row in table part", +title:"Insert/Modify table", +width:"Width", +height:"Height", +cols:"Cols", +rows:"Rows", +cellspacing:"Cellspacing", +cellpadding:"Cellpadding", +border:"Border", +align:"Alignment", +align_default:"Default", +align_left:"Left", +align_right:"Right", +align_middle:"Center", +row_title:"Table row properties", +cell_title:"Table cell properties", +cell_type:"Cell type", +valign:"Vertical alignment", +align_top:"Top", +align_bottom:"Bottom", +bordercolor:"Border color", +bgcolor:"Background color", +merge_cells_title:"Merge table cells", +id:"Id", +style:"Style", +langdir:"Language direction", +langcode:"Language code", +mime:"Target MIME type", +ltr:"Left to right", +rtl:"Right to left", +bgimage:"Background image", +summary:"Summary", +td:"Data", +th:"Header", +cell_cell:"Update current cell", +cell_row:"Update all cells in row", +cell_all:"Update all cells in table", +row_row:"Update current row", +row_odd:"Update odd rows in table", +row_even:"Update even rows in table", +row_all:"Update all rows in table", +thead:"Table Head", +tbody:"Table Body", +tfoot:"Table Foot", +scope:"Scope", +rowgroup:"Row Group", +colgroup:"Col Group", +col_limit:"You've exceeded the maximum number of columns of {$cols}.", +row_limit:"You've exceeded the maximum number of rows of {$rows}.", +cell_limit:"You've exceeded the maximum number of cells of {$cells}.", +missing_scope:"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.", +caption:"Table caption", +frame:"Frame", +frame_none:"none", +frame_groups:"groups", +frame_rows:"rows", +frame_cols:"cols", +frame_all:"all", +rules:"Rules", +rules_void:"void", +rules_above:"above", +rules_below:"below", +rules_hsides:"hsides", +rules_lhs:"lhs", +rules_rhs:"rhs", +rules_vsides:"vsides", +rules_box:"box", +rules_border:"border" +}); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/table/merge_cells.htm b/plugins/TinyMCE/js/plugins/table/merge_cells.htm new file mode 100644 index 0000000000..9736ed8c03 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/merge_cells.htm @@ -0,0 +1,32 @@ + + + + {#table_dlg.merge_cells_title} + + + + + + +
+
+ {#table_dlg.merge_cells_title} + + + + + + + + + +
{#table_dlg.cols}:
{#table_dlg.rows}:
+
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/table/row.htm b/plugins/TinyMCE/js/plugins/table/row.htm new file mode 100644 index 0000000000..092e6c8270 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/row.htm @@ -0,0 +1,155 @@ + + + + {#table_dlg.row_title} + + + + + + + + +
+
+ +
+ +
+
+
+ {#table_dlg.general_props} + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+
+
+ +
+
+ {#table_dlg.advanced_props} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + + +
 
+
+ + + + + +
 
+
+
+
+
+ +
+
+ +
+ + + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/table/table.htm b/plugins/TinyMCE/js/plugins/table/table.htm new file mode 100644 index 0000000000..f269039228 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/table/table.htm @@ -0,0 +1,187 @@ + + + + {#table_dlg.title} + + + + + + + + + +
+
+ +
+ +
+
+
+ {#table_dlg.general_props} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ +
+
+ {#table_dlg.advanced_props} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
 
+
+ +
+ +
+ +
+ + + + + +
 
+
+ + + + + +
 
+
+
+
+
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/template/blank.htm b/plugins/TinyMCE/js/plugins/template/blank.htm new file mode 100644 index 0000000000..ecde53fae7 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/template/blank.htm @@ -0,0 +1,12 @@ + + + blank_page + + + + + + + diff --git a/plugins/TinyMCE/js/plugins/template/css/template.css b/plugins/TinyMCE/js/plugins/template/css/template.css new file mode 100644 index 0000000000..2d23a4938c --- /dev/null +++ b/plugins/TinyMCE/js/plugins/template/css/template.css @@ -0,0 +1,23 @@ +#frmbody { + padding: 10px; + background-color: #FFF; + border: 1px solid #CCC; +} + +.frmRow { + margin-bottom: 10px; +} + +#templatesrc { + border: none; + width: 320px; + height: 240px; +} + +.title { + padding-bottom: 5px; +} + +.mceActionPanel { + padding-top: 5px; +} diff --git a/plugins/TinyMCE/js/plugins/template/editor_plugin.js b/plugins/TinyMCE/js/plugins/template/editor_plugin.js new file mode 100644 index 0000000000..ebe3c27d78 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/template/editor_plugin.js @@ -0,0 +1 @@ +(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.TemplatePlugin",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceTemplate",function(e){b.windowManager.open({file:c+"/template.htm",width:b.getParam("template_popup_width",750),height:b.getParam("template_popup_height",600),inline:1},{plugin_url:c})});b.addCommand("mceInsertTemplate",d._insertTemplate,d);b.addButton("template",{title:"template.desc",cmd:"mceTemplate"});b.onPreProcess.add(function(e,g){var f=e.dom;a(f.select("div",g.node),function(h){if(f.hasClass(h,"mceTmpl")){a(f.select("*",h),function(i){if(f.hasClass(i,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){i.innerHTML=d._getDateTime(new Date(),e.getParam("template_mdate_format",e.getLang("template.mdate_format")))}});d._replaceVals(h)}})})},getInfo:function(){return{longname:"Template plugin",author:"Moxiecode Systems AB",authorurl:"http://www.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_insertTemplate:function(i,j){var k=this,g=k.editor,f,c,d=g.dom,b=g.selection.getContent();f=j.content;a(k.editor.getParam("template_replace_values"),function(l,h){if(typeof(l)!="function"){f=f.replace(new RegExp("\\{\\$"+h+"\\}","g"),l)}});c=d.create("div",null,f);n=d.select(".mceTmpl",c);if(n&&n.length>0){c=d.create("div",null);c.appendChild(n[0].cloneNode(true))}function e(l,h){return new RegExp("\\b"+h+"\\b","g").test(l.className)}a(d.select("*",c),function(h){if(e(h,g.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_cdate_format",g.getLang("template.cdate_format")))}if(e(h,g.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_mdate_format",g.getLang("template.mdate_format")))}if(e(h,g.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))){h.innerHTML=b}});k._replaceVals(c);g.execCommand("mceInsertContent",false,c.innerHTML);g.addVisual()},_replaceVals:function(c){var d=this.editor.dom,b=this.editor.getParam("template_replace_values");a(d.select("*",c),function(f){a(b,function(g,e){if(d.hasClass(f,e)){if(typeof(b[e])=="function"){b[e](f)}}})})},_getDateTime:function(e,b){if(!b){return""}function c(g,d){var f;g=""+g;if(g.length 0) { + el = dom.create('div', null); + el.appendChild(n[0].cloneNode(true)); + } + + function hasClass(n, c) { + return new RegExp('\\b' + c + '\\b', 'g').test(n.className); + }; + + each(dom.select('*', el), function(n) { + // Replace cdate + if (hasClass(n, ed.getParam('template_cdate_classes', 'cdate').replace(/\s+/g, '|'))) + n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_cdate_format", ed.getLang("template.cdate_format"))); + + // Replace mdate + if (hasClass(n, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|'))) + n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format"))); + + // Replace selection + if (hasClass(n, ed.getParam('template_selected_content_classes', 'selcontent').replace(/\s+/g, '|'))) + n.innerHTML = sel; + }); + + t._replaceVals(el); + + ed.execCommand('mceInsertContent', false, el.innerHTML); + ed.addVisual(); + }, + + _replaceVals : function(e) { + var dom = this.editor.dom, vl = this.editor.getParam('template_replace_values'); + + each(dom.select('*', e), function(e) { + each(vl, function(v, k) { + if (dom.hasClass(e, k)) { + if (typeof(vl[k]) == 'function') + vl[k](e); + } + }); + }); + }, + + _getDateTime : function(d, fmt) { + if (!fmt) + return ""; + + function addZeros(value, len) { + var i; + + value = "" + value; + + if (value.length < len) { + for (i=0; i<(len-value.length); i++) + value = "0" + value; + } + + return value; + } + + fmt = fmt.replace("%D", "%m/%d/%y"); + fmt = fmt.replace("%r", "%I:%M:%S %p"); + fmt = fmt.replace("%Y", "" + d.getFullYear()); + fmt = fmt.replace("%y", "" + d.getYear()); + fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2)); + fmt = fmt.replace("%d", addZeros(d.getDate(), 2)); + fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2)); + fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2)); + fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2)); + fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1)); + fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM")); + fmt = fmt.replace("%B", "" + this.editor.getLang("template_months_long").split(',')[d.getMonth()]); + fmt = fmt.replace("%b", "" + this.editor.getLang("template_months_short").split(',')[d.getMonth()]); + fmt = fmt.replace("%A", "" + this.editor.getLang("template_day_long").split(',')[d.getDay()]); + fmt = fmt.replace("%a", "" + this.editor.getLang("template_day_short").split(',')[d.getDay()]); + fmt = fmt.replace("%%", "%"); + + return fmt; + } + }); + + // Register plugin + tinymce.PluginManager.add('template', tinymce.plugins.TemplatePlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/template/js/template.js b/plugins/TinyMCE/js/plugins/template/js/template.js new file mode 100644 index 0000000000..24045d7311 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/template/js/template.js @@ -0,0 +1,106 @@ +tinyMCEPopup.requireLangPack(); + +var TemplateDialog = { + preInit : function() { + var url = tinyMCEPopup.getParam("template_external_list_url"); + + if (url != null) + document.write(''); + }, + + init : function() { + var ed = tinyMCEPopup.editor, tsrc, sel, x, u; + + tsrc = ed.getParam("template_templates", false); + sel = document.getElementById('tpath'); + + // Setup external template list + if (!tsrc && typeof(tinyMCETemplateList) != 'undefined') { + for (x=0, tsrc = []; x'); + }); + }, + + selectTemplate : function(u, ti) { + var d = window.frames['templatesrc'].document, x, tsrc = this.tsrc; + + if (!u) + return; + + d.body.innerHTML = this.templateHTML = this.getFileContents(u); + + for (x=0; x + + {#template_dlg.title} + + + + + +
+
+
{#template_dlg.desc}
+
+ +
+
+
+
+ {#template_dlg.preview} + +
+
+ +
+ + +
+
+
+ + diff --git a/plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js b/plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js new file mode 100644 index 0000000000..53d31c44fa --- /dev/null +++ b/plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state){c.state=true;c._toggleVisualChars()}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(){var m=this,g=m.editor,a,e,f,k=g.getDoc(),l=g.getBody(),j,n=g.selection,c;m.state=!m.state;g.controlManager.setActive("visualchars",m.state);if(m.state){a=[];tinymce.walk(l,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(e=0;e$1');j=j.replace(/\u00a0/g,"\u00b7");g.dom.setOuterHTML(a[e],j,k)}}else{a=tinymce.grep(g.dom.select("span",l),function(b){return g.dom.hasClass(b,"mceVisualNbsp")});for(e=0;e$1'); + nv = nv.replace(/\u00a0/g, '\u00b7'); + ed.dom.setOuterHTML(nl[i], nv, d); + } + } else { + nl = tinymce.grep(ed.dom.select('span', b), function(n) { + return ed.dom.hasClass(n, 'mceVisualNbsp'); + }); + + for (i=0; i0')}}else{tinymce.DOM.add(h,"span",{},'0')}});a.onInit.add(function(e){e.selection.onSetContent.add(function(){c._count(e)});c._count(e)});a.onSetContent.add(function(e){c._count(e)});a.onKeyUp.add(function(f,g){if(g.keyCode==d){return}if(13==g.keyCode||8==d||46==d){c._count(f)}d=g.keyCode})},_count:function(b){var c=this,a=0;if(c.block){return}c.block=1;setTimeout(function(){var d=b.getContent({format:"raw"});if(d){d=d.replace(/<.[^<>]*?>/g," ").replace(/ | /gi," ");d=d.replace(c.cleanre,"");d.replace(c.countre,function(){a++})}tinymce.DOM.setHTML(c.id,a.toString());setTimeout(function(){c.block=0},2000)},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js new file mode 100644 index 0000000000..bdfebf1b3d --- /dev/null +++ b/plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js @@ -0,0 +1,98 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.WordCount', { + block : 0, + id : null, + countre : null, + cleanre : null, + + init : function(ed, url) { + var t = this, last = 0; + + t.countre = ed.getParam('wordcount_countregex', /\S\s+/g); + t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$'"_+=\\/-]*/g); + t.id = ed.id + '-word-count'; + + ed.onPostRender.add(function(ed, cm) { + var row, id; + + // Add it to the specified id or the theme advanced path + id = ed.getParam('wordcount_target_id'); + if (!id) { + row = tinymce.DOM.get(ed.id + '_path_row'); + + if (row) + tinymce.DOM.add(row.parentNode, 'div', {'style': 'float: right'}, ed.getLang('wordcount.words', 'Words: ') + '0'); + } else + tinymce.DOM.add(id, 'span', {}, '0'); + }); + + ed.onInit.add(function(ed) { + ed.selection.onSetContent.add(function() { + t._count(ed); + }); + + t._count(ed); + }); + + ed.onSetContent.add(function(ed) { + t._count(ed); + }); + + ed.onKeyUp.add(function(ed, e) { + if (e.keyCode == last) + return; + + if (13 == e.keyCode || 8 == last || 46 == last) + t._count(ed); + + last = e.keyCode; + }); + }, + + _count : function(ed) { + var t = this, tc = 0; + + // Keep multiple calls from happening at the same time + if (t.block) + return; + + t.block = 1; + + setTimeout(function() { + var tx = ed.getContent({format : 'raw'}); + + if (tx) { + tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/ | /gi, ' '); // remove html tags and space chars + tx = tx.replace(t.cleanre, ''); // remove numbers and punctuation + tx.replace(t.countre, function() {tc++;}); // count the words + } + + tinymce.DOM.setHTML(t.id, tc.toString()); + + setTimeout(function() {t.block = 0;}, 2000); + }, 1); + }, + + getInfo: function() { + return { + longname : 'Word Count plugin', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount); +})(); diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm new file mode 100644 index 0000000000..3aeac0deba --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm @@ -0,0 +1,141 @@ + + + + {#xhtmlxtras_dlg.title_abbr_element} + + + + + + + + + +
+
+ +
+ +
+
+
+ {#xhtmlxtras_dlg.fieldset_attrib_tab} + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
: + +
:
: + +
: + +
+
+
+
+
+ {#xhtmlxtras_dlg.fieldset_events_tab} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
:
:
:
:
:
:
:
+
+
+
+
+ + + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm new file mode 100644 index 0000000000..31ee7b70f3 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm @@ -0,0 +1,141 @@ + + + + {#xhtmlxtras_dlg.title_acronym_element} + + + + + + + + + +
+
+ +
+ +
+
+
+ {#xhtmlxtras_dlg.fieldset_attrib_tab} + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
: + +
:
: + +
: + +
+
+
+
+
+ {#xhtmlxtras_dlg.fieldset_events_tab} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
:
:
:
:
:
:
:
+
+
+
+
+ + + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm new file mode 100644 index 0000000000..17054da3ed --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm @@ -0,0 +1,148 @@ + + + + {#xhtmlxtras_dlg.attribs_title} + + + + + + + + +
+
+ +
+ +
+
+
+ {#xhtmlxtras_dlg.attribute_attrib_tab} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
+ +
:
: + +
: + +
+
+
+
+
+ {#xhtmlxtras_dlg.attribute_events_tab} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
:
:
:
:
:
:
:
+
+
+
+
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm new file mode 100644 index 0000000000..d0a3e3a8e5 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm @@ -0,0 +1,141 @@ + + + + {#xhtmlxtras_dlg.title_cite_element} + + + + + + + + + +
+
+ +
+ +
+
+
+ {#xhtmlxtras_dlg.fieldset_attrib_tab} + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
: + +
:
: + +
: + +
+
+
+
+
+ {#xhtmlxtras_dlg.fieldset_events_tab} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
:
:
:
:
:
:
:
+
+
+
+
+ + + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/css/attributes.css b/plugins/TinyMCE/js/plugins/xhtmlxtras/css/attributes.css new file mode 100644 index 0000000000..9a6a235c35 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/css/attributes.css @@ -0,0 +1,11 @@ +.panel_wrapper div.current { + height: 290px; +} + +#id, #style, #title, #dir, #hreflang, #lang, #classlist, #tabindex, #accesskey { + width: 200px; +} + +#events_panel input { + width: 200px; +} diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/css/popup.css b/plugins/TinyMCE/js/plugins/xhtmlxtras/css/popup.css new file mode 100644 index 0000000000..e67114dbaa --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/css/popup.css @@ -0,0 +1,9 @@ +input.field, select.field {width:200px;} +input.picker {width:179px; margin-left: 5px;} +input.disabled {border-color:#F2F2F2;} +img.picker {vertical-align:text-bottom; cursor:pointer;} +h1 {padding: 0 0 5px 0;} +.panel_wrapper div.current {height:160px;} +#xhtmlxtrasdel .panel_wrapper div.current, #xhtmlxtrasins .panel_wrapper div.current {height: 230px;} +a.browse span {display:block; width:20px; height:20px; background:url('../../../themes/advanced/img/icons.gif') -140px -20px;} +#datetime {width:180px;} diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm new file mode 100644 index 0000000000..8b07fa8429 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm @@ -0,0 +1,161 @@ + + + + {#xhtmlxtras_dlg.title_del_element} + + + + + + + + + +
+
+ +
+ +
+
+
+ {#xhtmlxtras_dlg.fieldset_general_tab} + + + + + + + + + +
: + + + + + +
+
:
+
+
+ {#xhtmlxtras_dlg.fieldset_attrib_tab} + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
: + +
:
: + +
: + +
+
+
+
+
+ {#xhtmlxtras_dlg.fieldset_events_tab} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
:
:
:
:
:
:
:
+
+
+
+
+ + + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js new file mode 100644 index 0000000000..e5195265e0 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js @@ -0,0 +1 @@ +(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(b,c){b.addCommand("mceCite",function(){b.windowManager.open({file:c+"/cite.htm",width:350+parseInt(b.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:c})});b.addCommand("mceAcronym",function(){b.windowManager.open({file:c+"/acronym.htm",width:350+parseInt(b.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.acronym_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceAbbr",function(){b.windowManager.open({file:c+"/abbr.htm",width:350+parseInt(b.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.abbr_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceDel",function(){b.windowManager.open({file:c+"/del.htm",width:340+parseInt(b.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(b.getLang("xhtmlxtras.del_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceIns",function(){b.windowManager.open({file:c+"/ins.htm",width:340+parseInt(b.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(b.getLang("xhtmlxtras.ins_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceAttributes",function(){b.windowManager.open({file:c+"/attributes.htm",width:380,height:370,inline:1},{plugin_url:c})});b.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});b.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});b.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});b.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});b.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});b.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});if(tinymce.isIE){function a(d,e){if(e.set){e.content=e.content.replace(/]+)>/gi,"");e.content=e.content.replace(/<\/abbr>/gi,"")}}b.onBeforeSetContent.add(a);b.onPostProcess.add(a)}b.onNodeChange.add(function(e,d,g,f){g=e.dom.getParent(g,"CITE,ACRONYM,ABBR,DEL,INS");d.setDisabled("cite",f);d.setDisabled("acronym",f);d.setDisabled("abbr",f);d.setDisabled("del",f);d.setDisabled("ins",f);d.setDisabled("attribs",g&&g.nodeName=="BODY");d.setActive("cite",0);d.setActive("acronym",0);d.setActive("abbr",0);d.setActive("del",0);d.setActive("ins",0);if(g){do{d.setDisabled(g.nodeName.toLowerCase(),0);d.setActive(g.nodeName.toLowerCase(),1)}while(g=g.parentNode)}});b.onPreInit.add(function(){b.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js new file mode 100644 index 0000000000..9b51b8368d --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js @@ -0,0 +1,144 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + tinymce.create('tinymce.plugins.XHTMLXtrasPlugin', { + init : function(ed, url) { + // Register commands + ed.addCommand('mceCite', function() { + ed.windowManager.open({ + file : url + '/cite.htm', + width : 350 + parseInt(ed.getLang('xhtmlxtras.cite_delta_width', 0)), + height : 250 + parseInt(ed.getLang('xhtmlxtras.cite_delta_height', 0)), + inline : 1 + }, { + plugin_url : url + }); + }); + + ed.addCommand('mceAcronym', function() { + ed.windowManager.open({ + file : url + '/acronym.htm', + width : 350 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)), + height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)), + inline : 1 + }, { + plugin_url : url + }); + }); + + ed.addCommand('mceAbbr', function() { + ed.windowManager.open({ + file : url + '/abbr.htm', + width : 350 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)), + height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)), + inline : 1 + }, { + plugin_url : url + }); + }); + + ed.addCommand('mceDel', function() { + ed.windowManager.open({ + file : url + '/del.htm', + width : 340 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)), + height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)), + inline : 1 + }, { + plugin_url : url + }); + }); + + ed.addCommand('mceIns', function() { + ed.windowManager.open({ + file : url + '/ins.htm', + width : 340 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)), + height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)), + inline : 1 + }, { + plugin_url : url + }); + }); + + ed.addCommand('mceAttributes', function() { + ed.windowManager.open({ + file : url + '/attributes.htm', + width : 380, + height : 370, + inline : 1 + }, { + plugin_url : url + }); + }); + + // Register buttons + ed.addButton('cite', {title : 'xhtmlxtras.cite_desc', cmd : 'mceCite'}); + ed.addButton('acronym', {title : 'xhtmlxtras.acronym_desc', cmd : 'mceAcronym'}); + ed.addButton('abbr', {title : 'xhtmlxtras.abbr_desc', cmd : 'mceAbbr'}); + ed.addButton('del', {title : 'xhtmlxtras.del_desc', cmd : 'mceDel'}); + ed.addButton('ins', {title : 'xhtmlxtras.ins_desc', cmd : 'mceIns'}); + ed.addButton('attribs', {title : 'xhtmlxtras.attribs_desc', cmd : 'mceAttributes'}); + + if (tinymce.isIE) { + function fix(ed, o) { + if (o.set) { + o.content = o.content.replace(/]+)>/gi, ''); + o.content = o.content.replace(/<\/abbr>/gi, ''); + } + }; + + ed.onBeforeSetContent.add(fix); + ed.onPostProcess.add(fix); + } + + ed.onNodeChange.add(function(ed, cm, n, co) { + n = ed.dom.getParent(n, 'CITE,ACRONYM,ABBR,DEL,INS'); + + cm.setDisabled('cite', co); + cm.setDisabled('acronym', co); + cm.setDisabled('abbr', co); + cm.setDisabled('del', co); + cm.setDisabled('ins', co); + cm.setDisabled('attribs', n && n.nodeName == 'BODY'); + cm.setActive('cite', 0); + cm.setActive('acronym', 0); + cm.setActive('abbr', 0); + cm.setActive('del', 0); + cm.setActive('ins', 0); + + // Activate all + if (n) { + do { + cm.setDisabled(n.nodeName.toLowerCase(), 0); + cm.setActive(n.nodeName.toLowerCase(), 1); + } while (n = n.parentNode); + } + }); + + ed.onPreInit.add(function() { + // Fixed IE issue where it can't handle these elements correctly + ed.dom.create('abbr'); + }); + }, + + getInfo : function() { + return { + longname : 'XHTML Xtras Plugin', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + } + }); + + // Register plugin + tinymce.PluginManager.add('xhtmlxtras', tinymce.plugins.XHTMLXtrasPlugin); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm new file mode 100644 index 0000000000..6c5470cfcc --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm @@ -0,0 +1,161 @@ + + + + {#xhtmlxtras_dlg.title_ins_element} + + + + + + + + + +
+
+ +
+ +
+
+
+ {#xhtmlxtras_dlg.fieldset_general_tab} + + + + + + + + + +
: + + + + + +
+
:
+
+
+ {#xhtmlxtras_dlg.fieldset_attrib_tab} + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
: + +
:
: + +
: + +
+
+
+
+
+ {#xhtmlxtras_dlg.fieldset_events_tab} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
:
:
:
:
:
:
:
+
+
+
+
+ + + +
+
+ + diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/abbr.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/abbr.js new file mode 100644 index 0000000000..4b51a25721 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/abbr.js @@ -0,0 +1,28 @@ +/** + * abbr.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +function init() { + SXE.initElementDialog('abbr'); + if (SXE.currentAction == "update") { + SXE.showRemoveButton(); + } +} + +function insertAbbr() { + SXE.insertElement('abbr'); + tinyMCEPopup.close(); +} + +function removeAbbr() { + SXE.removeElement('abbr'); + tinyMCEPopup.close(); +} + +tinyMCEPopup.onInit.add(init); diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/acronym.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/acronym.js new file mode 100644 index 0000000000..6ec2f88716 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/acronym.js @@ -0,0 +1,28 @@ +/** + * acronym.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +function init() { + SXE.initElementDialog('acronym'); + if (SXE.currentAction == "update") { + SXE.showRemoveButton(); + } +} + +function insertAcronym() { + SXE.insertElement('acronym'); + tinyMCEPopup.close(); +} + +function removeAcronym() { + SXE.removeElement('acronym'); + tinyMCEPopup.close(); +} + +tinyMCEPopup.onInit.add(init); diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js new file mode 100644 index 0000000000..d62a219e6b --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js @@ -0,0 +1,126 @@ +/** + * attributes.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +function init() { + tinyMCEPopup.resizeToInnerSize(); + var inst = tinyMCEPopup.editor; + var dom = inst.dom; + var elm = inst.selection.getNode(); + var f = document.forms[0]; + var onclick = dom.getAttrib(elm, 'onclick'); + + setFormValue('title', dom.getAttrib(elm, 'title')); + setFormValue('id', dom.getAttrib(elm, 'id')); + setFormValue('style', dom.getAttrib(elm, "style")); + setFormValue('dir', dom.getAttrib(elm, 'dir')); + setFormValue('lang', dom.getAttrib(elm, 'lang')); + setFormValue('tabindex', dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : "")); + setFormValue('accesskey', dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : "")); + setFormValue('onfocus', dom.getAttrib(elm, 'onfocus')); + setFormValue('onblur', dom.getAttrib(elm, 'onblur')); + setFormValue('onclick', onclick); + setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick')); + setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown')); + setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup')); + setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover')); + setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove')); + setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout')); + setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress')); + setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown')); + setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup')); + className = dom.getAttrib(elm, 'class'); + + addClassesToList('classlist', 'advlink_styles'); + selectByValue(f, 'classlist', className, true); + + TinyMCE_EditableSelects.init(); +} + +function setFormValue(name, value) { + if(value && document.forms[0].elements[name]){ + document.forms[0].elements[name].value = value; + } +} + +function insertAction() { + var inst = tinyMCEPopup.editor; + var elm = inst.selection.getNode(); + + tinyMCEPopup.execCommand("mceBeginUndoLevel"); + setAllAttribs(elm); + tinyMCEPopup.execCommand("mceEndUndoLevel"); + tinyMCEPopup.close(); +} + +function setAttrib(elm, attrib, value) { + var formObj = document.forms[0]; + var valueElm = formObj.elements[attrib.toLowerCase()]; + var inst = tinyMCEPopup.editor; + var dom = inst.dom; + + if (typeof(value) == "undefined" || value == null) { + value = ""; + + if (valueElm) + value = valueElm.value; + } + + if (value != "") { + dom.setAttrib(elm, attrib.toLowerCase(), value); + + if (attrib == "style") + attrib = "style.cssText"; + + if (attrib.substring(0, 2) == 'on') + value = 'return true;' + value; + + if (attrib == "class") + attrib = "className"; + + elm[attrib]=value; + } else + elm.removeAttribute(attrib); +} + +function setAllAttribs(elm) { + var f = document.forms[0]; + + setAttrib(elm, 'title'); + setAttrib(elm, 'id'); + setAttrib(elm, 'style'); + setAttrib(elm, 'class', getSelectValue(f, 'classlist')); + setAttrib(elm, 'dir'); + setAttrib(elm, 'lang'); + setAttrib(elm, 'tabindex'); + setAttrib(elm, 'accesskey'); + setAttrib(elm, 'onfocus'); + setAttrib(elm, 'onblur'); + setAttrib(elm, 'onclick'); + setAttrib(elm, 'ondblclick'); + setAttrib(elm, 'onmousedown'); + setAttrib(elm, 'onmouseup'); + setAttrib(elm, 'onmouseover'); + setAttrib(elm, 'onmousemove'); + setAttrib(elm, 'onmouseout'); + setAttrib(elm, 'onkeypress'); + setAttrib(elm, 'onkeydown'); + setAttrib(elm, 'onkeyup'); + + // Refresh in old MSIE +// if (tinyMCE.isMSIE5) +// elm.outerHTML = elm.outerHTML; +} + +function insertAttribute() { + tinyMCEPopup.close(); +} + +tinyMCEPopup.onInit.add(init); +tinyMCEPopup.requireLangPack(); diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/cite.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/cite.js new file mode 100644 index 0000000000..009b71546a --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/cite.js @@ -0,0 +1,28 @@ +/** + * cite.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +function init() { + SXE.initElementDialog('cite'); + if (SXE.currentAction == "update") { + SXE.showRemoveButton(); + } +} + +function insertCite() { + SXE.insertElement('cite'); + tinyMCEPopup.close(); +} + +function removeCite() { + SXE.removeElement('cite'); + tinyMCEPopup.close(); +} + +tinyMCEPopup.onInit.add(init); diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js new file mode 100644 index 0000000000..9e5d8c5717 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js @@ -0,0 +1,63 @@ +/** + * del.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +function init() { + SXE.initElementDialog('del'); + if (SXE.currentAction == "update") { + setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime')); + setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite')); + SXE.showRemoveButton(); + } +} + +function setElementAttribs(elm) { + setAllCommonAttribs(elm); + setAttrib(elm, 'datetime'); + setAttrib(elm, 'cite'); +} + +function insertDel() { + var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'DEL'); + + tinyMCEPopup.execCommand('mceBeginUndoLevel'); + if (elm == null) { + var s = SXE.inst.selection.getContent(); + if(s.length > 0) { + insertInlineElement('del'); + var elementArray = tinymce.grep(SXE.inst.dom.select('del'), function(n) {return n.id == '#sxe_temp_del#';}); + for (var i=0; i 0) { + tagName = element_name; + + insertInlineElement(element_name); + var elementArray = tinymce.grep(SXE.inst.dom.select(element_name)); + for (var i=0; i -1) ? true : false; +} + +SXE.removeClass = function(elm,cl) { + if(elm.className == null || elm.className == "" || !SXE.containsClass(elm,cl)) { + return true; + } + var classNames = elm.className.split(" "); + var newClassNames = ""; + for (var x = 0, cnl = classNames.length; x < cnl; x++) { + if (classNames[x] != cl) { + newClassNames += (classNames[x] + " "); + } + } + elm.className = newClassNames.substring(0,newClassNames.length-1); //removes extra space at the end +} + +SXE.addClass = function(elm,cl) { + if(!SXE.containsClass(elm,cl)) elm.className ? elm.className += " " + cl : elm.className = cl; + return true; +} + +function insertInlineElement(en) { + var ed = tinyMCEPopup.editor, dom = ed.dom; + + ed.getDoc().execCommand('FontName', false, 'mceinline'); + tinymce.each(dom.select('span,font'), function(n) { + if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline') + dom.replace(dom.create(en, {_mce_new : 1}), n, 1); + }); +} diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js new file mode 100644 index 0000000000..3774f0a184 --- /dev/null +++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js @@ -0,0 +1,62 @@ +/** + * ins.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +function init() { + SXE.initElementDialog('ins'); + if (SXE.currentAction == "update") { + setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime')); + setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite')); + SXE.showRemoveButton(); + } +} + +function setElementAttribs(elm) { + setAllCommonAttribs(elm); + setAttrib(elm, 'datetime'); + setAttrib(elm, 'cite'); +} + +function insertIns() { + var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'INS'); + tinyMCEPopup.execCommand('mceBeginUndoLevel'); + if (elm == null) { + var s = SXE.inst.selection.getContent(); + if(s.length > 0) { + insertInlineElement('INS'); + var elementArray = tinymce.grep(SXE.inst.dom.select('ins'), function(n) {return n.id == '#sxe_temp_ins#';}); + for (var i=0; i + + + {#advanced_dlg.about_title} + + + + + +
+ +
+ +
+
+

{#advanced_dlg.about_title}

+

Version: ()

+

TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under LGPL + by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.

+

Copyright © 2003-2008, Moxiecode Systems AB, All rights reserved.

+

For more information about this software visit the TinyMCE website.

+ +
+ Got Moxie? + Hosted By Sourceforge + Also on freshmeat +
+
+ +
+
+

{#advanced_dlg.about_loaded}

+ +
+
+ +

 

+
+
+ +
+
+
+
+ +
+ +
+ + diff --git a/plugins/TinyMCE/js/themes/advanced/anchor.htm b/plugins/TinyMCE/js/themes/advanced/anchor.htm new file mode 100644 index 0000000000..2bc63fcfdc --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/anchor.htm @@ -0,0 +1,26 @@ + + + + {#advanced_dlg.anchor_title} + + + + +
+ + + + + + + + +
{#advanced_dlg.anchor_title}
{#advanced_dlg.anchor_name}:
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/themes/advanced/charmap.htm b/plugins/TinyMCE/js/themes/advanced/charmap.htm new file mode 100644 index 0000000000..f11a38ad8a --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/charmap.htm @@ -0,0 +1,53 @@ + + + + {#advanced_dlg.charmap_title} + + + + + + + + + + + + + + + + +
{#advanced_dlg.charmap_title}
+ + + + + + + + + +
 
 
+
+ + + + + + + + + + + + + + + + +
HTML-Code
 
 
NUM-Code
 
+
+ + + diff --git a/plugins/TinyMCE/js/themes/advanced/color_picker.htm b/plugins/TinyMCE/js/themes/advanced/color_picker.htm new file mode 100644 index 0000000000..096e7550c3 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/color_picker.htm @@ -0,0 +1,73 @@ + + + + {#advanced_dlg.colorpicker_title} + + + + + +
+
+ +
+ +
+
+
+ {#advanced_dlg.colorpicker_picker_title} +
+ + +
+ +
+ +
+
+
+
+ +
+
+ {#advanced_dlg.colorpicker_palette_title} +
+ +
+ +
+
+
+ +
+
+ {#advanced_dlg.colorpicker_named_title} +
+ +
+ +
+ +
+ {#advanced_dlg.colorpicker_name} +
+
+
+
+ +
+ + +
+ +
+ +
+
+
+ + diff --git a/plugins/TinyMCE/js/themes/advanced/editor_template.js b/plugins/TinyMCE/js/themes/advanced/editor_template.js new file mode 100644 index 0000000000..914b9f49ba --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/editor_template.js @@ -0,0 +1 @@ +(function(e){var d=e.DOM,b=e.dom.Event,h=e.extend,f=e.each,a=e.util.Cookie,g,c=e.explode;e.ThemeManager.requireLangPack("advanced");e.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(j,k){var l=this,m,i,n;l.editor=j;l.url=k;l.onResolveName=new e.util.Dispatcher(this);l.settings=m=h({theme_advanced_path:true,theme_advanced_toolbar_location:"bottom",theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",readonly:j.settings.readonly},j.settings);if(!m.font_size_style_values){m.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(e.is(m.theme_advanced_font_sizes,"string")){m.font_size_style_values=e.explode(m.font_size_style_values);m.font_size_classes=e.explode(m.font_size_classes||"");n={};j.settings.theme_advanced_font_sizes=m.theme_advanced_font_sizes;f(j.getParam("theme_advanced_font_sizes","","hash"),function(q,p){var o;if(p==q&&q>=1&&q<=7){p=q+" ("+l.sizes[q-1]+"pt)";o=m.font_size_classes[q-1];q=m.font_size_style_values[q-1]||(l.sizes[q-1]+"pt")}if(/^\s*\./.test(q)){o=q.replace(/\./g,"")}n[p]=o?{"class":o}:{fontSize:q}});m.theme_advanced_font_sizes=n}if((i=m.theme_advanced_path_location)&&i!="none"){m.theme_advanced_statusbar_location=m.theme_advanced_path_location}if(m.theme_advanced_statusbar_location=="none"){m.theme_advanced_statusbar_location=0}j.onInit.add(function(){if(!j.settings.readonly){j.onNodeChange.add(l._nodeChanged,l)}if(j.settings.content_css!==false){j.dom.loadCSS(j.baseURI.toAbsolute("themes/advanced/skins/"+j.settings.skin+"/content.css"))}});j.onSetProgressState.add(function(q,o,r){var s,t=q.id,p;if(o){l.progressTimer=setTimeout(function(){s=q.getContainer();s=s.insertBefore(d.create("DIV",{style:"position:relative"}),s.firstChild);p=d.get(q.id+"_tbl");d.add(s,"div",{id:t+"_blocker","class":"mceBlocker",style:{width:p.clientWidth+2,height:p.clientHeight+2}});d.add(s,"div",{id:t+"_progress","class":"mceProgress",style:{left:p.clientWidth/2,top:p.clientHeight/2}})},r||0)}else{d.remove(t+"_blocker");d.remove(t+"_progress");clearTimeout(l.progressTimer)}});d.loadCSS(m.editor_css?j.documentBaseURI.toAbsolute(m.editor_css):k+"/skins/"+j.settings.skin+"/ui.css");if(m.skin_variant){d.loadCSS(k+"/skins/"+j.settings.skin+"/ui_"+m.skin_variant+".css")}},createControl:function(l,i){var j,k;if(k=i.createControl(l)){return k}switch(l){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((j=this.controls[l])){return i.createButton(l,{title:"advanced."+j[0],cmd:j[1],ui:j[2],value:j[3]})}},execCommand:function(k,j,l){var i=this["_"+k];if(i){i.call(this,j,l);return true}return false},_importClasses:function(k){var i=this.editor,j=i.controlManager.get("styleselect");if(j.getLength()==0){f(i.dom.getClasses(),function(n,l){var m="style_"+l;i.formatter.register(m,{inline:"span",classes:n["class"]});j.add(n["class"],m)})}},_createStyleSelect:function(m){var k=this,i=k.editor,j=i.controlManager,l;l=j.createListBox("styleselect",{title:"advanced.style_select",onselect:function(n){i.focus();i.formatter.toggle(n);return false}});i.onInit.add(function(){var o=0,n=i.getParam("style_formats");if(n){f(n,function(p){var q,r=0;f(p,function(){r++});if(r>1){q=p.name=p.name||"style_"+(o++);i.formatter.register(q,p);l.add(p.title,q)}else{l.add(p.title)}})}else{f(i.getParam("theme_advanced_styles","","hash"),function(r,q){var p;if(r){p="style_"+(o++);i.formatter.register(p,{inline:"span",classes:r});l.add(k.editor.translate(q),p)}})}});if(l.getLength()==0){l.onPostRender.add(function(o,p){if(!l.NativeListBox){b.add(p.id+"_text","focus",k._importClasses,k);b.add(p.id+"_text","mousedown",k._importClasses,k);b.add(p.id+"_open","focus",k._importClasses,k);b.add(p.id+"_open","mousedown",k._importClasses,k)}else{b.add(p.id,"focus",k._importClasses,k)}})}return l},_createFontSelect:function(){var k,j=this,i=j.editor;k=i.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(l){i.execCommand("FontName",false,l);return false}});if(k){f(i.getParam("theme_advanced_fonts",j.settings.theme_advanced_fonts,"hash"),function(m,l){k.add(i.translate(l),m,{style:m.indexOf("dings")==-1?"font-family:"+m:""})})}return k},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(i){if(i.fontSize){k.execCommand("FontSize",false,i.fontSize)}else{f(m.settings.theme_advanced_font_sizes,function(p,o){if(p["class"]){j.push(p["class"])}});k.editorCommands._applyInlineStyle("span",{"class":i["class"]},{check_classes:j})}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(o,i){var p=o.fontSize;if(p>=1&&p<=7){p=m.sizes[parseInt(p)-1]+"pt"}n.add(i,o,{style:"font-size:"+p,"class":"mceFontSize"+(l++)+(" "+(o["class"]||""))})})}return n},_createBlockFormats:function(){var k,i={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},j=this;k=j.editor.controlManager.createListBox("formatselect",{title:"advanced.block",cmd:"FormatBlock"});if(k){f(j.editor.getParam("theme_advanced_blockformats",j.settings.theme_advanced_blockformats,"hash"),function(m,l){k.add(j.editor.translate(l!=m?l:i[m]),m,{"class":"mce_formatPreview mce_"+m})})}return k},_createForeColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_text_colors){l.colors=i}if(k.theme_advanced_default_foreground_color){l.default_color=k.theme_advanced_default_foreground_color}l.title="advanced.forecolor_desc";l.cmd="ForeColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("forecolor",l);return m},_createBackColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_background_colors){l.colors=i}if(k.theme_advanced_default_background_color){l.default_color=k.theme_advanced_default_background_color}l.title="advanced.backcolor_desc";l.cmd="HiliteColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("backcolor",l);return m},renderUI:function(k){var m,l,q,v=this,r=v.editor,w=v.settings,u,j,i;m=j=d.create("span",{id:r.id+"_parent","class":"mceEditor "+r.settings.skin+"Skin"+(w.skin_variant?" "+r.settings.skin+"Skin"+v._ufirst(w.skin_variant):"")});if(!d.boxModel){m=d.add(m,"div",{"class":"mceOldBoxModel"})}m=u=d.add(m,"table",{id:r.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});m=q=d.add(m,"tbody");switch((w.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":l=v._rowLayout(w,q,k);break;case"customlayout":l=r.execCallback("theme_advanced_custom_layout",w,q,k,j);break;default:l=v._simpleLayout(w,q,k,j)}m=k.targetNode;i=d.stdMode?u.getElementsByTagName("tr"):u.rows;d.addClass(i[0],"mceFirst");d.addClass(i[i.length-1],"mceLast");f(d.select("tr",q),function(o){d.addClass(o.firstChild,"mceFirst");d.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(d.get(w.theme_advanced_toolbar_container)){d.get(w.theme_advanced_toolbar_container).appendChild(j)}else{d.insertAfter(j,m)}b.add(r.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){v._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return b.cancel(n)}});if(!r.getParam("accessibility_focus")){b.add(d.add(j,"a",{href:"#"},""),"focus",function(){tinyMCE.get(r.id).focus()})}if(w.theme_advanced_toolbar_location=="external"){k.deltaHeight=0}v.deltaHeight=k.deltaHeight;k.targetNode=null;return{iframeContainer:l,editorContainer:r.id+"_parent",sizeContainer:u,deltaHeight:k.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:e.majorVersion+"."+e.minorVersion}},resizeBy:function(i,j){var k=d.get(this.editor.id+"_tbl");this.resizeTo(k.clientWidth+i,k.clientHeight+j)},resizeTo:function(i,l){var j=this.editor,k=j.settings,n=d.get(j.id+"_tbl"),o=d.get(j.id+"_ifr"),m;i=Math.max(k.theme_advanced_resizing_min_width||100,i);l=Math.max(k.theme_advanced_resizing_min_height||100,l);i=Math.min(k.theme_advanced_resizing_max_width||65535,i);l=Math.min(k.theme_advanced_resizing_max_height||65535,l);m=n.clientHeight-o.clientHeight;d.setStyle(o,"height",l-m);d.setStyles(n,{width:i,height:l})},destroy:function(){var i=this.editor.id;b.clear(i+"_resize");b.clear(i+"_path_row");b.clear(i+"_external_close")},_simpleLayout:function(y,r,k,i){var x=this,u=x.editor,v=y.theme_advanced_toolbar_location,m=y.theme_advanced_statusbar_location,l,j,q,w;if(y.readonly){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});return j}if(v=="top"){x._addToolbars(r,k)}if(v=="external"){l=w=d.create("div",{style:"position:relative"});l=d.add(l,"div",{id:u.id+"_external","class":"mceExternalToolbar"});d.add(l,"a",{id:u.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});l=d.add(l,"table",{id:u.id+"_tblext",cellSpacing:0,cellPadding:0});q=d.add(l,"tbody");if(i.firstChild.className=="mceOldBoxModel"){i.firstChild.appendChild(w)}else{i.insertBefore(w,i.firstChild)}x._addToolbars(q,k);u.onMouseUp.add(function(){var o=d.get(u.id+"_external");d.show(o);d.hide(g);var n=b.add(u.id+"_external_close","click",function(){d.hide(u.id+"_external");b.remove(u.id+"_external_close","click",n)});d.show(o);d.setStyle(o,"top",0-d.getRect(u.id+"_tblext").h-1);d.hide(o);d.show(o);o.style.filter="";g=u.id+"_external";o=null})}if(m=="top"){x._addStatusBar(r,k)}if(!y.theme_advanced_toolbar_container){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"})}if(v=="bottom"){x._addToolbars(r,k)}if(m=="bottom"){x._addStatusBar(r,k)}return j},_rowLayout:function(w,m,k){var v=this,p=v.editor,u,x,i=p.controlManager,l,j,r,q;u=w.theme_advanced_containers_default_class||"";x=w.theme_advanced_containers_default_align||"center";f(c(w.theme_advanced_containers||""),function(s,o){var n=w["theme_advanced_container_"+s]||"";switch(n.toLowerCase()){case"mceeditor":l=d.add(m,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":v._addStatusBar(m,k);break;default:q=(w["theme_advanced_container_"+s+"_align"]||x).toLowerCase();q="mce"+v._ufirst(q);l=d.add(d.add(m,"tr"),"td",{"class":"mceToolbar "+(w["theme_advanced_container_"+s+"_class"]||u)+" "+q||x});r=i.createToolbar("toolbar"+o);v._addControls(n,r);d.setHTML(l,r.renderHTML());k.deltaHeight-=w.theme_advanced_row_height}});return j},_addControls:function(j,i){var k=this,l=k.settings,m,n=k.editor.controlManager;if(l.theme_advanced_disable&&!k._disabled){m={};f(c(l.theme_advanced_disable),function(o){m[o]=1});k._disabled=m}else{m=k._disabled}f(c(j),function(p){var o;if(m&&m[p]){return}if(p=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(q){q=k.createControl(q,n);if(q){i.add(q)}});return}o=k.createControl(p,n);if(o){i.add(o)}})},_addToolbars:function(w,k){var z=this,p,m,r=z.editor,A=z.settings,y,j=r.controlManager,u,l,q=[],x;x=A.theme_advanced_toolbar_align.toLowerCase();x="mce"+z._ufirst(x);l=d.add(d.add(w,"tr"),"td",{"class":"mceToolbar "+x});if(!r.getParam("accessibility_focus")){q.push(d.createHTML("a",{href:"#",onfocus:"tinyMCE.get('"+r.id+"').focus();"},""))}q.push(d.createHTML("a",{href:"#",accesskey:"q",title:r.getLang("advanced.toolbar_focus")},""));for(p=1;(y=A["theme_advanced_buttons"+p]);p++){m=j.createToolbar("toolbar"+p,{"class":"mceToolbarRow"+p});if(A["theme_advanced_buttons"+p+"_add"]){y+=","+A["theme_advanced_buttons"+p+"_add"]}if(A["theme_advanced_buttons"+p+"_add_before"]){y=A["theme_advanced_buttons"+p+"_add_before"]+","+y}z._addControls(y,m);q.push(m.renderHTML());k.deltaHeight-=A.theme_advanced_row_height}q.push(d.createHTML("a",{href:"#",accesskey:"z",title:r.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+r.id+"').focus();"},""));d.setHTML(l,q.join(""))},_addStatusBar:function(m,j){var k,v=this,p=v.editor,w=v.settings,i,q,u,l;k=d.add(m,"tr");k=l=d.add(k,"td",{"class":"mceStatusbar"});k=d.add(k,"div",{id:p.id+"_path_row"},w.theme_advanced_path?p.translate("advanced.path")+": ":" ");d.add(k,"a",{href:"#",accesskey:"x"});if(w.theme_advanced_resizing){d.add(l,"a",{id:p.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize"});if(w.theme_advanced_resizing_use_cookie){p.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+p.id+"_size"),r=d.get(p.id+"_tbl");if(!n){return}if(w.theme_advanced_resize_horizontal){r.style.width=Math.max(10,n.cw)+"px"}r.style.height=Math.max(10,n.ch)+"px";d.get(p.id+"_ifr").style.height=Math.max(10,parseInt(n.ch)+v.deltaHeight)+"px"})}p.onPostRender.add(function(){b.add(p.id+"_resize","mousedown",function(x){var z,t,o,s,y,r;z=d.get(p.id+"_tbl");o=z.clientWidth;s=z.clientHeight;miw=w.theme_advanced_resizing_min_width||100;mih=w.theme_advanced_resizing_min_height||100;maw=w.theme_advanced_resizing_max_width||65535;mah=w.theme_advanced_resizing_max_height||65535;t=d.add(d.get(p.id+"_parent"),"div",{"class":"mcePlaceHolder"});d.setStyles(t,{width:o,height:s});d.hide(z);d.show(t);i={x:x.screenX,y:x.screenY,w:o,h:s,dx:null,dy:null};q=b.add(d.doc,"mousemove",function(B){var n,A;i.dx=B.screenX-i.x;i.dy=B.screenY-i.y;n=Math.max(miw,i.w+i.dx);A=Math.max(mih,i.h+i.dy);n=Math.min(maw,n);A=Math.min(mah,A);if(w.theme_advanced_resize_horizontal){t.style.width=n+"px"}t.style.height=A+"px";return b.cancel(B)});u=b.add(d.doc,"mouseup",function(n){var A;b.remove(d.doc,"mousemove",q);b.remove(d.doc,"mouseup",u);z.style.display="";d.remove(t);if(i.dx===null){return}A=d.get(p.id+"_ifr");if(w.theme_advanced_resize_horizontal){z.style.width=Math.max(10,i.w+i.dx)+"px"}z.style.height=Math.max(10,i.h+i.dy)+"px";A.style.height=Math.max(10,A.clientHeight+i.dy)+"px";if(w.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+p.id+"_size",{cw:i.w+i.dx,ch:i.h+i.dy})}});return b.cancel(x)})})}j.deltaHeight-=21;k=m=null},_nodeChanged:function(o,x,l,u,j){var A=this,i,w=0,z,q,B=A.settings,y,k,r;e.each(A.stateControls,function(n){x.setActive(n,o.queryCommandState(A.controls[n][1]))});function m(p){var s,n=j.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s= 1 && v <= 7) { + k = v + ' (' + t.sizes[v - 1] + 'pt)'; + cl = s.font_size_classes[v - 1]; + v = s.font_size_style_values[v - 1] || (t.sizes[v - 1] + 'pt'); + } + + if (/^\s*\./.test(v)) + cl = v.replace(/\./g, ''); + + o[k] = cl ? {'class' : cl} : {fontSize : v}; + }); + + s.theme_advanced_font_sizes = o; + } + + if ((v = s.theme_advanced_path_location) && v != 'none') + s.theme_advanced_statusbar_location = s.theme_advanced_path_location; + + if (s.theme_advanced_statusbar_location == 'none') + s.theme_advanced_statusbar_location = 0; + + // Init editor + ed.onInit.add(function() { + if (!ed.settings.readonly) + ed.onNodeChange.add(t._nodeChanged, t); + + if (ed.settings.content_css !== false) + ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/" + ed.settings.skin + "/content.css")); + }); + + ed.onSetProgressState.add(function(ed, b, ti) { + var co, id = ed.id, tb; + + if (b) { + t.progressTimer = setTimeout(function() { + co = ed.getContainer(); + co = co.insertBefore(DOM.create('DIV', {style : 'position:relative'}), co.firstChild); + tb = DOM.get(ed.id + '_tbl'); + + DOM.add(co, 'div', {id : id + '_blocker', 'class' : 'mceBlocker', style : {width : tb.clientWidth + 2, height : tb.clientHeight + 2}}); + DOM.add(co, 'div', {id : id + '_progress', 'class' : 'mceProgress', style : {left : tb.clientWidth / 2, top : tb.clientHeight / 2}}); + }, ti || 0); + } else { + DOM.remove(id + '_blocker'); + DOM.remove(id + '_progress'); + clearTimeout(t.progressTimer); + } + }); + + DOM.loadCSS(s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : url + "/skins/" + ed.settings.skin + "/ui.css"); + + if (s.skin_variant) + DOM.loadCSS(url + "/skins/" + ed.settings.skin + "/ui_" + s.skin_variant + ".css"); + }, + + createControl : function(n, cf) { + var cd, c; + + if (c = cf.createControl(n)) + return c; + + switch (n) { + case "styleselect": + return this._createStyleSelect(); + + case "formatselect": + return this._createBlockFormats(); + + case "fontselect": + return this._createFontSelect(); + + case "fontsizeselect": + return this._createFontSizeSelect(); + + case "forecolor": + return this._createForeColorMenu(); + + case "backcolor": + return this._createBackColorMenu(); + } + + if ((cd = this.controls[n])) + return cf.createButton(n, {title : "advanced." + cd[0], cmd : cd[1], ui : cd[2], value : cd[3]}); + }, + + execCommand : function(cmd, ui, val) { + var f = this['_' + cmd]; + + if (f) { + f.call(this, ui, val); + return true; + } + + return false; + }, + + _importClasses : function(e) { + var ed = this.editor, ctrl = ed.controlManager.get('styleselect'); + + if (ctrl.getLength() == 0) { + each(ed.dom.getClasses(), function(o, idx) { + var name = 'style_' + idx; + + ed.formatter.register(name, { + inline : 'span', + classes : o['class'] + }); + + ctrl.add(o['class'], name); + }); + } + }, + + _createStyleSelect : function(n) { + var t = this, ed = t.editor, ctrlMan = ed.controlManager, ctrl; + + // Setup style select box + ctrl = ctrlMan.createListBox('styleselect', { + title : 'advanced.style_select', + onselect : function(name) { + ed.focus(); + ed.formatter.toggle(name); + + return false; // No auto select + } + }); + + // Handle specified format + ed.onInit.add(function() { + var counter = 0, formats = ed.getParam('style_formats'); + + if (formats) { + each(formats, function(fmt) { + var name, keys = 0; + + each(fmt, function() {keys++;}); + + if (keys > 1) { + name = fmt.name = fmt.name || 'style_' + (counter++); + ed.formatter.register(name, fmt); + ctrl.add(fmt.title, name); + } else + ctrl.add(fmt.title); + }); + } else { + each(ed.getParam('theme_advanced_styles', '', 'hash'), function(val, key) { + var name; + + if (val) { + name = 'style_' + (counter++); + + ed.formatter.register(name, { + inline : 'span', + classes : val + }); + + ctrl.add(t.editor.translate(key), name); + } + }); + } + }); + + // Auto import classes if the ctrl box is empty + if (ctrl.getLength() == 0) { + ctrl.onPostRender.add(function(ed, n) { + if (!ctrl.NativeListBox) { + Event.add(n.id + '_text', 'focus', t._importClasses, t); + Event.add(n.id + '_text', 'mousedown', t._importClasses, t); + Event.add(n.id + '_open', 'focus', t._importClasses, t); + Event.add(n.id + '_open', 'mousedown', t._importClasses, t); + } else + Event.add(n.id, 'focus', t._importClasses, t); + }); + } + + return ctrl; + }, + + _createFontSelect : function() { + var c, t = this, ed = t.editor; + + c = ed.controlManager.createListBox('fontselect', { + title : 'advanced.fontdefault', + onselect : function(v) { + ed.execCommand('FontName', false, v); + return false; // No auto select + } + }); + + if (c) { + each(ed.getParam('theme_advanced_fonts', t.settings.theme_advanced_fonts, 'hash'), function(v, k) { + c.add(ed.translate(k), v, {style : v.indexOf('dings') == -1 ? 'font-family:' + v : ''}); + }); + } + + return c; + }, + + _createFontSizeSelect : function() { + var t = this, ed = t.editor, c, i = 0, cl = []; + + c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', onselect : function(v) { + if (v.fontSize) + ed.execCommand('FontSize', false, v.fontSize); + else { + each(t.settings.theme_advanced_font_sizes, function(v, k) { + if (v['class']) + cl.push(v['class']); + }); + + ed.editorCommands._applyInlineStyle('span', {'class' : v['class']}, {check_classes : cl}); + } + + return false; // No auto select + }}); + + if (c) { + each(t.settings.theme_advanced_font_sizes, function(v, k) { + var fz = v.fontSize; + + if (fz >= 1 && fz <= 7) + fz = t.sizes[parseInt(fz) - 1] + 'pt'; + + c.add(k, v, {'style' : 'font-size:' + fz, 'class' : 'mceFontSize' + (i++) + (' ' + (v['class'] || ''))}); + }); + } + + return c; + }, + + _createBlockFormats : function() { + var c, fmts = { + p : 'advanced.paragraph', + address : 'advanced.address', + pre : 'advanced.pre', + h1 : 'advanced.h1', + h2 : 'advanced.h2', + h3 : 'advanced.h3', + h4 : 'advanced.h4', + h5 : 'advanced.h5', + h6 : 'advanced.h6', + div : 'advanced.div', + blockquote : 'advanced.blockquote', + code : 'advanced.code', + dt : 'advanced.dt', + dd : 'advanced.dd', + samp : 'advanced.samp' + }, t = this; + + c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', cmd : 'FormatBlock'}); + if (c) { + each(t.editor.getParam('theme_advanced_blockformats', t.settings.theme_advanced_blockformats, 'hash'), function(v, k) { + c.add(t.editor.translate(k != v ? k : fmts[v]), v, {'class' : 'mce_formatPreview mce_' + v}); + }); + } + + return c; + }, + + _createForeColorMenu : function() { + var c, t = this, s = t.settings, o = {}, v; + + if (s.theme_advanced_more_colors) { + o.more_colors_func = function() { + t._mceColorPicker(0, { + color : c.value, + func : function(co) { + c.setColor(co); + } + }); + }; + } + + if (v = s.theme_advanced_text_colors) + o.colors = v; + + if (s.theme_advanced_default_foreground_color) + o.default_color = s.theme_advanced_default_foreground_color; + + o.title = 'advanced.forecolor_desc'; + o.cmd = 'ForeColor'; + o.scope = this; + + c = t.editor.controlManager.createColorSplitButton('forecolor', o); + + return c; + }, + + _createBackColorMenu : function() { + var c, t = this, s = t.settings, o = {}, v; + + if (s.theme_advanced_more_colors) { + o.more_colors_func = function() { + t._mceColorPicker(0, { + color : c.value, + func : function(co) { + c.setColor(co); + } + }); + }; + } + + if (v = s.theme_advanced_background_colors) + o.colors = v; + + if (s.theme_advanced_default_background_color) + o.default_color = s.theme_advanced_default_background_color; + + o.title = 'advanced.backcolor_desc'; + o.cmd = 'HiliteColor'; + o.scope = this; + + c = t.editor.controlManager.createColorSplitButton('backcolor', o); + + return c; + }, + + renderUI : function(o) { + var n, ic, tb, t = this, ed = t.editor, s = t.settings, sc, p, nl; + + n = p = DOM.create('span', {id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')}); + + if (!DOM.boxModel) + n = DOM.add(n, 'div', {'class' : 'mceOldBoxModel'}); + + n = sc = DOM.add(n, 'table', {id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0}); + n = tb = DOM.add(n, 'tbody'); + + switch ((s.theme_advanced_layout_manager || '').toLowerCase()) { + case "rowlayout": + ic = t._rowLayout(s, tb, o); + break; + + case "customlayout": + ic = ed.execCallback("theme_advanced_custom_layout", s, tb, o, p); + break; + + default: + ic = t._simpleLayout(s, tb, o, p); + } + + n = o.targetNode; + + // Add classes to first and last TRs + nl = DOM.stdMode ? sc.getElementsByTagName('tr') : sc.rows; // Quick fix for IE 8 + DOM.addClass(nl[0], 'mceFirst'); + DOM.addClass(nl[nl.length - 1], 'mceLast'); + + // Add classes to first and last TDs + each(DOM.select('tr', tb), function(n) { + DOM.addClass(n.firstChild, 'mceFirst'); + DOM.addClass(n.childNodes[n.childNodes.length - 1], 'mceLast'); + }); + + if (DOM.get(s.theme_advanced_toolbar_container)) + DOM.get(s.theme_advanced_toolbar_container).appendChild(p); + else + DOM.insertAfter(p, n); + + Event.add(ed.id + '_path_row', 'click', function(e) { + e = e.target; + + if (e.nodeName == 'A') { + t._sel(e.className.replace(/^.*mcePath_([0-9]+).*$/, '$1')); + + return Event.cancel(e); + } + }); +/* + if (DOM.get(ed.id + '_path_row')) { + Event.add(ed.id + '_tbl', 'mouseover', function(e) { + var re; + + e = e.target; + + if (e.nodeName == 'SPAN' && DOM.hasClass(e.parentNode, 'mceButton')) { + re = DOM.get(ed.id + '_path_row'); + t.lastPath = re.innerHTML; + DOM.setHTML(re, e.parentNode.title); + } + }); + + Event.add(ed.id + '_tbl', 'mouseout', function(e) { + if (t.lastPath) { + DOM.setHTML(ed.id + '_path_row', t.lastPath); + t.lastPath = 0; + } + }); + } +*/ + + if (!ed.getParam('accessibility_focus')) + Event.add(DOM.add(p, 'a', {href : '#'}, ''), 'focus', function() {tinyMCE.get(ed.id).focus();}); + + if (s.theme_advanced_toolbar_location == 'external') + o.deltaHeight = 0; + + t.deltaHeight = o.deltaHeight; + o.targetNode = null; + + return { + iframeContainer : ic, + editorContainer : ed.id + '_parent', + sizeContainer : sc, + deltaHeight : o.deltaHeight + }; + }, + + getInfo : function() { + return { + longname : 'Advanced theme', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + version : tinymce.majorVersion + "." + tinymce.minorVersion + } + }, + + resizeBy : function(dw, dh) { + var e = DOM.get(this.editor.id + '_tbl'); + + this.resizeTo(e.clientWidth + dw, e.clientHeight + dh); + }, + + resizeTo : function(w, h) { + var ed = this.editor, s = ed.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr'), dh; + + // Boundery fix box + w = Math.max(s.theme_advanced_resizing_min_width || 100, w); + h = Math.max(s.theme_advanced_resizing_min_height || 100, h); + w = Math.min(s.theme_advanced_resizing_max_width || 0xFFFF, w); + h = Math.min(s.theme_advanced_resizing_max_height || 0xFFFF, h); + + // Calc difference between iframe and container + dh = e.clientHeight - ifr.clientHeight; + + // Resize iframe and container + DOM.setStyle(ifr, 'height', h - dh); + DOM.setStyles(e, {width : w, height : h}); + }, + + destroy : function() { + var id = this.editor.id; + + Event.clear(id + '_resize'); + Event.clear(id + '_path_row'); + Event.clear(id + '_external_close'); + }, + + // Internal functions + + _simpleLayout : function(s, tb, o, p) { + var t = this, ed = t.editor, lo = s.theme_advanced_toolbar_location, sl = s.theme_advanced_statusbar_location, n, ic, etb, c; + + if (s.readonly) { + n = DOM.add(tb, 'tr'); + n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'}); + return ic; + } + + // Create toolbar container at top + if (lo == 'top') + t._addToolbars(tb, o); + + // Create external toolbar + if (lo == 'external') { + n = c = DOM.create('div', {style : 'position:relative'}); + n = DOM.add(n, 'div', {id : ed.id + '_external', 'class' : 'mceExternalToolbar'}); + DOM.add(n, 'a', {id : ed.id + '_external_close', href : 'javascript:;', 'class' : 'mceExternalClose'}); + n = DOM.add(n, 'table', {id : ed.id + '_tblext', cellSpacing : 0, cellPadding : 0}); + etb = DOM.add(n, 'tbody'); + + if (p.firstChild.className == 'mceOldBoxModel') + p.firstChild.appendChild(c); + else + p.insertBefore(c, p.firstChild); + + t._addToolbars(etb, o); + + ed.onMouseUp.add(function() { + var e = DOM.get(ed.id + '_external'); + DOM.show(e); + + DOM.hide(lastExtID); + + var f = Event.add(ed.id + '_external_close', 'click', function() { + DOM.hide(ed.id + '_external'); + Event.remove(ed.id + '_external_close', 'click', f); + }); + + DOM.show(e); + DOM.setStyle(e, 'top', 0 - DOM.getRect(ed.id + '_tblext').h - 1); + + // Fixes IE rendering bug + DOM.hide(e); + DOM.show(e); + e.style.filter = ''; + + lastExtID = ed.id + '_external'; + + e = null; + }); + } + + if (sl == 'top') + t._addStatusBar(tb, o); + + // Create iframe container + if (!s.theme_advanced_toolbar_container) { + n = DOM.add(tb, 'tr'); + n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'}); + } + + // Create toolbar container at bottom + if (lo == 'bottom') + t._addToolbars(tb, o); + + if (sl == 'bottom') + t._addStatusBar(tb, o); + + return ic; + }, + + _rowLayout : function(s, tb, o) { + var t = this, ed = t.editor, dc, da, cf = ed.controlManager, n, ic, to, a; + + dc = s.theme_advanced_containers_default_class || ''; + da = s.theme_advanced_containers_default_align || 'center'; + + each(explode(s.theme_advanced_containers || ''), function(c, i) { + var v = s['theme_advanced_container_' + c] || ''; + + switch (v.toLowerCase()) { + case 'mceeditor': + n = DOM.add(tb, 'tr'); + n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'}); + break; + + case 'mceelementpath': + t._addStatusBar(tb, o); + break; + + default: + a = (s['theme_advanced_container_' + c + '_align'] || da).toLowerCase(); + a = 'mce' + t._ufirst(a); + + n = DOM.add(DOM.add(tb, 'tr'), 'td', { + 'class' : 'mceToolbar ' + (s['theme_advanced_container_' + c + '_class'] || dc) + ' ' + a || da + }); + + to = cf.createToolbar("toolbar" + i); + t._addControls(v, to); + DOM.setHTML(n, to.renderHTML()); + o.deltaHeight -= s.theme_advanced_row_height; + } + }); + + return ic; + }, + + _addControls : function(v, tb) { + var t = this, s = t.settings, di, cf = t.editor.controlManager; + + if (s.theme_advanced_disable && !t._disabled) { + di = {}; + + each(explode(s.theme_advanced_disable), function(v) { + di[v] = 1; + }); + + t._disabled = di; + } else + di = t._disabled; + + each(explode(v), function(n) { + var c; + + if (di && di[n]) + return; + + // Compatiblity with 2.x + if (n == 'tablecontrols') { + each(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"], function(n) { + n = t.createControl(n, cf); + + if (n) + tb.add(n); + }); + + return; + } + + c = t.createControl(n, cf); + + if (c) + tb.add(c); + }); + }, + + _addToolbars : function(c, o) { + var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a; + + a = s.theme_advanced_toolbar_align.toLowerCase(); + a = 'mce' + t._ufirst(a); + + n = DOM.add(DOM.add(c, 'tr'), 'td', {'class' : 'mceToolbar ' + a}); + + if (!ed.getParam('accessibility_focus')) + h.push(DOM.createHTML('a', {href : '#', onfocus : 'tinyMCE.get(\'' + ed.id + '\').focus();'}, '')); + + h.push(DOM.createHTML('a', {href : '#', accesskey : 'q', title : ed.getLang("advanced.toolbar_focus")}, '')); + + // Create toolbar and add the controls + for (i=1; (v = s['theme_advanced_buttons' + i]); i++) { + tb = cf.createToolbar("toolbar" + i, {'class' : 'mceToolbarRow' + i}); + + if (s['theme_advanced_buttons' + i + '_add']) + v += ',' + s['theme_advanced_buttons' + i + '_add']; + + if (s['theme_advanced_buttons' + i + '_add_before']) + v = s['theme_advanced_buttons' + i + '_add_before'] + ',' + v; + + t._addControls(v, tb); + + //n.appendChild(n = tb.render()); + h.push(tb.renderHTML()); + + o.deltaHeight -= s.theme_advanced_row_height; + } + + h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '')); + DOM.setHTML(n, h.join('')); + }, + + _addStatusBar : function(tb, o) { + var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td; + + n = DOM.add(tb, 'tr'); + n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'}); + n = DOM.add(n, 'div', {id : ed.id + '_path_row'}, s.theme_advanced_path ? ed.translate('advanced.path') + ': ' : ' '); + DOM.add(n, 'a', {href : '#', accesskey : 'x'}); + + if (s.theme_advanced_resizing) { + DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize'}); + + if (s.theme_advanced_resizing_use_cookie) { + ed.onPostRender.add(function() { + var o = Cookie.getHash("TinyMCE_" + ed.id + "_size"), c = DOM.get(ed.id + '_tbl'); + + if (!o) + return; + + if (s.theme_advanced_resize_horizontal) + c.style.width = Math.max(10, o.cw) + 'px'; + + c.style.height = Math.max(10, o.ch) + 'px'; + DOM.get(ed.id + '_ifr').style.height = Math.max(10, parseInt(o.ch) + t.deltaHeight) + 'px'; + }); + } + + ed.onPostRender.add(function() { + Event.add(ed.id + '_resize', 'mousedown', function(e) { + var c, p, w, h, n, pa; + + // Measure container + c = DOM.get(ed.id + '_tbl'); + w = c.clientWidth; + h = c.clientHeight; + + miw = s.theme_advanced_resizing_min_width || 100; + mih = s.theme_advanced_resizing_min_height || 100; + maw = s.theme_advanced_resizing_max_width || 0xFFFF; + mah = s.theme_advanced_resizing_max_height || 0xFFFF; + + // Setup placeholder + p = DOM.add(DOM.get(ed.id + '_parent'), 'div', {'class' : 'mcePlaceHolder'}); + DOM.setStyles(p, {width : w, height : h}); + + // Replace with placeholder + DOM.hide(c); + DOM.show(p); + + // Create internal resize obj + r = { + x : e.screenX, + y : e.screenY, + w : w, + h : h, + dx : null, + dy : null + }; + + // Start listening + mf = Event.add(DOM.doc, 'mousemove', function(e) { + var w, h; + + // Calc delta values + r.dx = e.screenX - r.x; + r.dy = e.screenY - r.y; + + // Boundery fix box + w = Math.max(miw, r.w + r.dx); + h = Math.max(mih, r.h + r.dy); + w = Math.min(maw, w); + h = Math.min(mah, h); + + // Resize placeholder + if (s.theme_advanced_resize_horizontal) + p.style.width = w + 'px'; + + p.style.height = h + 'px'; + + return Event.cancel(e); + }); + + me = Event.add(DOM.doc, 'mouseup', function(e) { + var ifr; + + // Stop listening + Event.remove(DOM.doc, 'mousemove', mf); + Event.remove(DOM.doc, 'mouseup', me); + + c.style.display = ''; + DOM.remove(p); + + if (r.dx === null) + return; + + ifr = DOM.get(ed.id + '_ifr'); + + if (s.theme_advanced_resize_horizontal) + c.style.width = Math.max(10, r.w + r.dx) + 'px'; + + c.style.height = Math.max(10, r.h + r.dy) + 'px'; + ifr.style.height = Math.max(10, ifr.clientHeight + r.dy) + 'px'; + + if (s.theme_advanced_resizing_use_cookie) { + Cookie.setHash("TinyMCE_" + ed.id + "_size", { + cw : r.w + r.dx, + ch : r.h + r.dy + }); + } + }); + + return Event.cancel(e); + }); + }); + } + + o.deltaHeight -= 21; + n = tb = null; + }, + + _nodeChanged : function(ed, cm, n, co, ob) { + var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn; + + tinymce.each(t.stateControls, function(c) { + cm.setActive(c, ed.queryCommandState(t.controls[c][1])); + }); + + function getParent(name) { + var i, parents = ob.parents, func = name; + + if (typeof(name) == 'string') { + func = function(node) { + return node.nodeName == name; + }; + } + + for (i = 0; i < parents.length; i++) { + if (func(parents[i])) + return parents[i]; + } + }; + + cm.setActive('visualaid', ed.hasVisual); + cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing); + cm.setDisabled('redo', !ed.undoManager.hasRedo()); + cm.setDisabled('outdent', !ed.queryCommandState('Outdent')); + + p = getParent('A'); + if (c = cm.get('link')) { + if (!p || !p.name) { + c.setDisabled(!p && co); + c.setActive(!!p); + } + } + + if (c = cm.get('unlink')) { + c.setDisabled(!p && co); + c.setActive(!!p && !p.name); + } + + if (c = cm.get('anchor')) { + c.setActive(!!p && p.name); + } + + p = getParent('IMG'); + if (c = cm.get('image')) + c.setActive(!!p && n.className.indexOf('mceItem') == -1); + + if (c = cm.get('styleselect')) { + t._importClasses(); + + // Check each format and update + c.select(function(fmt) { + return !!ed.formatter.match(fmt); + }); + } + + if (c = cm.get('formatselect')) { + p = getParent(DOM.isBlock); + + if (p) + c.select(p.nodeName.toLowerCase()); + } + + // Find out current fontSize, fontFamily and fontClass + getParent(function(n) { + if (n.nodeName === 'SPAN') { + if (!cl && n.className) + cl = n.className; + + if (!fz && n.style.fontSize) + fz = n.style.fontSize; + + if (!fn && n.style.fontFamily) + fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase(); + } + + return false; + }); + + if (c = cm.get('fontselect')) { + c.select(function(v) { + return v.replace(/^([^,]+).*/, '$1').toLowerCase() == fn; + }); + } + + // Select font size + if (c = cm.get('fontsizeselect')) { + // Use computed style + if (s.theme_advanced_runtime_fontsize && !fz && !cl) + fz = ed.dom.getStyle(n, 'fontSize', true); + + c.select(function(v) { + if (v.fontSize && v.fontSize === fz) + return true; + + if (v['class'] && v['class'] === cl) + return true; + }); + } + + if (s.theme_advanced_path && s.theme_advanced_statusbar_location) { + p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'}); + DOM.setHTML(p, ''); + + getParent(function(n) { + var na = n.nodeName.toLowerCase(), u, pi, ti = ''; + + /*if (n.getAttribute('_mce_bogus')) + return; +*/ + // Ignore non element and hidden elements + if (n.nodeType != 1 || n.nodeName === 'BR' || (DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved'))) + return; + + // Fake name + if (v = DOM.getAttrib(n, 'mce_name')) + na = v; + + // Handle prefix + if (tinymce.isIE && n.scopeName !== 'HTML') + na = n.scopeName + ':' + na; + + // Remove internal prefix + na = na.replace(/mce\:/g, ''); + + // Handle node name + switch (na) { + case 'b': + na = 'strong'; + break; + + case 'i': + na = 'em'; + break; + + case 'img': + if (v = DOM.getAttrib(n, 'src')) + ti += 'src: ' + v + ' '; + + break; + + case 'a': + if (v = DOM.getAttrib(n, 'name')) { + ti += 'name: ' + v + ' '; + na += '#' + v; + } + + if (v = DOM.getAttrib(n, 'href')) + ti += 'href: ' + v + ' '; + + break; + + case 'font': + if (v = DOM.getAttrib(n, 'face')) + ti += 'font: ' + v + ' '; + + if (v = DOM.getAttrib(n, 'size')) + ti += 'size: ' + v + ' '; + + if (v = DOM.getAttrib(n, 'color')) + ti += 'color: ' + v + ' '; + + break; + + case 'span': + if (v = DOM.getAttrib(n, 'style')) + ti += 'style: ' + v + ' '; + + break; + } + + if (v = DOM.getAttrib(n, 'id')) + ti += 'id: ' + v + ' '; + + if (v = n.className) { + v = v.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g, '') + + if (v) { + ti += 'class: ' + v + ' '; + + if (DOM.isBlock(n) || na == 'img' || na == 'span') + na += '.' + v; + } + } + + na = na.replace(/(html:)/g, ''); + na = {name : na, node : n, title : ti}; + t.onResolveName.dispatch(t, na); + ti = na.title; + na = na.name; + + //u = "javascript:tinymce.EditorManager.get('" + ed.id + "').theme._sel('" + (de++) + "');"; + pi = DOM.create('a', {'href' : "javascript:;", onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na); + + if (p.hasChildNodes()) { + p.insertBefore(DOM.doc.createTextNode(' \u00bb '), p.firstChild); + p.insertBefore(pi, p.firstChild); + } else + p.appendChild(pi); + }, ed.getBody()); + } + }, + + // Commands gets called by execCommand + + _sel : function(v) { + this.editor.execCommand('mceSelectNodeDepth', false, v); + }, + + _mceInsertAnchor : function(ui, v) { + var ed = this.editor; + + ed.windowManager.open({ + url : tinymce.baseURL + '/themes/advanced/anchor.htm', + width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)), + height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)), + inline : true + }, { + theme_url : this.url + }); + }, + + _mceCharMap : function() { + var ed = this.editor; + + ed.windowManager.open({ + url : tinymce.baseURL + '/themes/advanced/charmap.htm', + width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)), + height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)), + inline : true + }, { + theme_url : this.url + }); + }, + + _mceHelp : function() { + var ed = this.editor; + + ed.windowManager.open({ + url : tinymce.baseURL + '/themes/advanced/about.htm', + width : 480, + height : 380, + inline : true + }, { + theme_url : this.url + }); + }, + + _mceColorPicker : function(u, v) { + var ed = this.editor; + + v = v || {}; + + ed.windowManager.open({ + url : tinymce.baseURL + '/themes/advanced/color_picker.htm', + width : 375 + parseInt(ed.getLang('advanced.colorpicker_delta_width', 0)), + height : 250 + parseInt(ed.getLang('advanced.colorpicker_delta_height', 0)), + close_previous : false, + inline : true + }, { + input_color : v.color, + func : v.func, + theme_url : this.url + }); + }, + + _mceCodeEditor : function(ui, val) { + var ed = this.editor; + + ed.windowManager.open({ + url : tinymce.baseURL + '/themes/advanced/source_editor.htm', + width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)), + height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)), + inline : true, + resizable : true, + maximizable : true + }, { + theme_url : this.url + }); + }, + + _mceImage : function(ui, val) { + var ed = this.editor; + + // Internal image object like a flash placeholder + if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1) + return; + + ed.windowManager.open({ + url : tinymce.baseURL + '/themes/advanced/image.htm', + width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)), + height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)), + inline : true + }, { + theme_url : this.url + }); + }, + + _mceLink : function(ui, val) { + var ed = this.editor; + + ed.windowManager.open({ + url : tinymce.baseURL + '/themes/advanced/link.htm', + width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)), + height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)), + inline : true + }, { + theme_url : this.url + }); + }, + + _mceNewDocument : function() { + var ed = this.editor; + + ed.windowManager.confirm('advanced.newdocument', function(s) { + if (s) + ed.execCommand('mceSetContent', false, ''); + }); + }, + + _mceForeColor : function() { + var t = this; + + this._mceColorPicker(0, { + color: t.fgColor, + func : function(co) { + t.fgColor = co; + t.editor.execCommand('ForeColor', false, co); + } + }); + }, + + _mceBackColor : function() { + var t = this; + + this._mceColorPicker(0, { + color: t.bgColor, + func : function(co) { + t.bgColor = co; + t.editor.execCommand('HiliteColor', false, co); + } + }); + }, + + _ufirst : function(s) { + return s.substring(0, 1).toUpperCase() + s.substring(1); + } + }); + + tinymce.ThemeManager.add('advanced', tinymce.themes.AdvancedTheme); +}(tinymce)); \ No newline at end of file diff --git a/plugins/TinyMCE/js/themes/advanced/image.htm b/plugins/TinyMCE/js/themes/advanced/image.htm new file mode 100644 index 0000000000..f30d670641 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/image.htm @@ -0,0 +1,80 @@ + + + + {#advanced_dlg.image_title} + + + + + + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
 
+ x +
+
+
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/themes/advanced/img/colorpicker.jpg b/plugins/TinyMCE/js/themes/advanced/img/colorpicker.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b4c542d107b25f68a9d4f9d7a109d0565d1f1437 GIT binary patch literal 3189 zcmbW0dsLEX8o)utyLkf>vO+8cOg9wF%x1j+p@RkpsHC1z^8%LRB~9&2XDqEGG)XNW za}>Dv$PIyhNYo}DFE8{K%%;saJRZN^Z|nBZpzy$8e9+2Iz;a<8Kk+#d^3T1~%eX+Yocd57U@)iBS;Lz~Rksn75)5aOo z?47y!`{oCW4<9{#^7PrO*Kd~J{`T(uhu>GYz#z*%v4Hp|*ne=j0$dhWR+d&aD_mfU z{lIJKY6bDeS-VBjZPE+fQ9+fq&?sTsg&TH0!Hk!%jG`%fj}7?y8(*!UeJ1mKAkW+N+qrtJ``cfL69@8V&h4pSlYZct zdbj(JoO9O?Qsypg_fMOg z#rMbU1sg3&fUGhub|uS1yIT&?FK_29gtOKhHhq6|)$&^OfnnC|ikp{TaNez5@_lf< zVtK=Xq%zSvAMNgxI$d``m?>^#DeXGE<=1t-8%N)&Uj?N0rRmZL=i-Ck?cDEJW9D3T zQNPlr2-xo8nJClmdhOM!G zSxEgwFp>mhr9k%KF1;r^Lf?*3q*Hw)AAX54&QN>v!`Sj4coX05(}r$KJj?NGNXrKD z8NeX+XC1e{BJniG?|2&dIw0`UbHjy&?fwkwr)jCV>jFx1PkkVvaTKR0CyLX7_nCecUzMp7ZL}O4zG~}I+CyvTeU-TI-o>tMCfOfLfd}6{ zn-VTf)-(a;Sp7?!H+8zxp-X96c*~5f=$(V9wU)QI1jM{4!5`D}1JYcRmW=fTf+e4QuYi-${T5Wl!DOA;{Oo23HgADWZ0p6&DQlQq?3y&OLbGnI?ce`qz*7HE3Q&J0yE1{KY(ay2sM|HXSio`Q) zzXlFjW+UfD{LLS0Y3NDMZ+bLSxya70{JN19=17g3?)?e9FZ5ZnrErV zvc9TlZ?yq&c7k1;y1CMvfr`2*p>dU3G~uVHuoh;U3XOlsL-Hc><_FsSENHw4o(p$j zw)bdIf$wKuY_M5uY7jo7*N8)xlDq44D&RA{O83Md zUZRt!OQyD3-d!M)y58T8o^7r1;Q)?=Jbggc))teO1jnW^(b!S@M~%0?c1D#A#m!42 z6EgV^RRPY~f@L299EO4F{YM6aRn%jA0bj&VhnX{+pd%E8D?>;{UE_=;kb=g2yfqfAsCc65n7)rm9R;0fugG!a?6I`}*+F&TF6jg!YbNSM&6n z!>=Ksh-cuFCLM#PT%OLR31*# zS!FN80v&b?Q9xLl3|=v$!KrSTHPk$lOz&cBC(uMCnl~&v&7{(2O78wex~cmSOpaE& z@n0x|jdJ&(EI@;CjEQDIz&KHWb$avInqg_#umE)7H0pr@iwQbrk>en z79En`gx%hnTVYhT!J&F=6h@YKI{B>qZeoJ13eb^8$|MD$Fd|@Xz9!KyjAO3$S7A&6 zYeXZFhR=5gk`glrvDnM5U17rT-%tL9$Xkv}o|0U3PlQp{eM3$Ocx?e|u{ujx6p2chSy@+SHkN##WBa9ifCVH+`fLyi`WHu2S0Ro<$2jyxdslxi%sXK_EHhD>M5VFx3b4`Flh zIc+g;!#Pf^N9TwRp)FB8seslma>NhVnFKcGYRfSYt`m)MKVN zJFFM37S4z!if;L>jai*Z;Dx9uyz#v$-IYW1Q)7knZia`sJ-gGm3ULV6Au?R(5Si3A z5F(+LINUNU&E#}=!BCsu%B>|82L8R~_$}at>B^3wP{a$xih^b*veU}^%SvA!+$lzK zBsz66-IK>Ysg7aaQ~#J+Ae@Vb#6Xz!tXUW*GLZDfkf66tq!{&32#Rm+|vJii{`y-7cV5enl_GL(c= z{?V^}q$&*ST0{H+~kYM|3uYAs#ozCy(?T>GWX{31NhEwAXaj z$-4<~)zvKkig3>%>7H#88haoT&KLQ(p^}5wZDdLx6KuYt)#=5@obg1ET z!{g_qB0WaNtYWyPG+?L#;E<_|jLW|K#~bMh0c5F+bE?jc+QiEu*c*>0hl)mt&v;q9 zPKAu!+3dJ`Y)zlylp^0O;m9NO(KQNpN*rDyx3ok0O5&`hV>Gm_4_)o#6CnbVu%_YL zkA_EL0QME}wev(ESKLmxMjDBc)Yb-aJM+rU(|mZh4tM?0}d<^7HhJa22mwL*EptRLFpXUAn5J_@V literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/themes/advanced/img/icons.gif b/plugins/TinyMCE/js/themes/advanced/img/icons.gif new file mode 100644 index 0000000000000000000000000000000000000000..e46de5333082869b9bdab2576a554a2f9d01a966 GIT binary patch literal 11794 zcmWk!i9gei8~^OH(+nR+?qiNn!bm7$?mKheng~fXL_(QujvSd%A?0R7CgiL}a+f(O zN;OjH`ZiMOvR}XFKX_ix^M0Q9`~5r)PWGmI!&c$uzz+b}8$Q_3J`4cB+Lzu9odL-SKwq4;O-1r8)E~_ottI`aGXoKC%Au zn^#xDp}vVP`bSneE^UKdg?XnvE=UgehDKkkY9AdP{jI0_{bSMZpThwmk!wGX_1zudul>Eom7>$LI-A@t$)|4>D~MG&C1_zCR1#W^XEVDR=-wEvF0W^qAtIs z)-CkjpLXBFAX75e+9f86jDNd1jBg175*w=9#^cLYOG~p~zTtm;=-E(mwEEr#kH?=` z-Wu+Rd-7l>t*GMu*vscGE`ur7p5fH>_4Ul$YaH&E-1_Ck_kU=tbynl;glkiYS2iwJ z-)y_;S#nxV+^x;tu`DgtJ<_87V@KPMpId}(oB5Gw>!@21XPSy`tQFNgx|oyWnc8>M zkLZ#x(AGCiB$sv!%xqejT1GWCcTPOk(|a`k%iP?O1A_Nz47LvW@HcrMzkKIDUObf1 z)zCO~sEF^Cv(6I;!t!~vmMv!MTq|dpGdMJN5pl6)`RRWnqpR%I)gK8i_viq?$m)lw{^5u3pND@{D+11X1P+Xj4tqBz2fmV`K<2l!6#eJx03j`!`bbftj>{VZ?~#@ zU#JBxOKgFCqr7M5*o1vF7MI9$@=SWN!_Gq&7LIl$wy|dC{;UObM|R^SnJ;&^Wp==L+_>& z9HFf(-Mr8qJuAIf=hE^#Z)d6TH`q7&i@xNqXXld=2f)y?FoB5cX3Nt39Pt#l#og4K zA&A6+zw_sUcj~5eFu!VdwMX>`BMEvvH%=aDgW)ZuM2ZSN4)r=>Vt*GRKA&I8XFgV1 zKi5zQr=hdAr%|WSI}_T{_!nC5iz(e)PhsO_mIml8g%%3dH5b_zkz!3&vk4t4W>xyMM?Rgim)VJ3NYxbJ4@Sjn7klMA@JUN%=;H zWlkO&nbi|9mgRux$Q5}7q9fi)r~s&1w$YFcvjv4XXzy4-$6*EQ`ZwLeG3I9-e9yq0 zvbZ9Tq~w6TD^4pydn{tS7l9$6A5+rmocRc+IDpsZHqgiz<<v1V88S53UnpB&;jp(#rxs?7)FN!A}!Hx4c61 z#F}q>>Wg`cXtsv&)jrs2Fx2C(ow6p`M32bZf`Ff4#{?`DtW>E2*T$yX<1}p<#B7lF z6?x7+@}phbnN6nhHmKGPc~!0>@2sjOFJVG5Zl2fhOHV^O<6_F(Iq9BSaa(yDjqM9m!(@@Nm@ z+DX@KB#wUkPf>HP_E%>-AN4#EnlWCAogFY%&LGXN&cIcbmaJZ{ixIC&FOgCMSFVG~M0=r(q6P`J zaUS!vbQfk&IX;d~TExp(;V;0A)_0OQpXuBjpBLC_6*;RL{t9L}ZJzdbr2@Y&5UN%{ zFk`RW3^V5R?DLnV!wRxnuTL%u1)7oPrvjej4)xJ*5heUff@g_n}PjrtHiE2w)A{bkYhPFp2LdbjUQh%`f5MNZFsh1ef(*WrjeE0(&mG&X_a~M7*Ew+(shSk zElBN;D`~mUr{ZO?j&Bn`tvdKsW!kVp>F0d>Iy^v9Dc-WqU|Dfrc&PxuIGJ1;b9?r6 z!Say}Q}KYFmx$qEIPw-z_KdAq58fK`tOK{X5~Q{PR=Z6dRmEsbWarMD(|TmY!Y0Ya zPyE3{9XB1pO>V zTeY%3Aa&+RSF&M_{q53*Q%?pf`?sIJ{&^o&w(&j8{U`n;DozuwC+h~ddZh>`#P`PC zMcR$W0n2Cx!qfweM#Sqd7_wi^4tUoavKsFP9nr9(nLA%NTnh~h>XhMO@?4^v^8B!z z48^Q?Z!zOjF=q1k{magEw=!=^75oY3(s7+7;(kvGFu5-hC5W@CZkr`9$5?aVC+o#k!`Ff-pjNh;Xzx=)4EidJCw_a}637gMQ9RoVSP zS4a0ao+AVvv6mrC=f(?F6W$+}&v2=c&-9QP-hM>yf*nYCAz5caYP8mS2QQ&a-U{S` zkqK?t3bE3v3&}L1a~FZ}r%@I58`#Cdv&Di33e`<_9{BW~S-bCwrg#uh<%~m{h)m`E zXQdz9Xqk|))l4RQfM(b~en_al`fe|WqGxYcy&Z9-i;d9Rr(FH{|V z_)+x?Kg>}^3f$iR+20nf{-vuw_8m~NoOR@pkY!u4qc39Ve=o7nO z1raO6;``q%>aRVpIo?<7!aN{55XC=dWOdyPh_L<9i_3|#ZV58Zio6m7u5oM|KL+2+ zF;Ttv)*DR-SqOIgk!Nte&HJd7XrSPJFP;ntd9DH9OS9$n-!#yu-+v6lx8|Vg-m4hb~vvbIqwo#nlcg8dqF>StYcwZ4^j&u$*LLn7UUmOw|944evOFdj95PEc_13$ zo+*$>h!~lS-(6^Mm9{S07qR+wlwUof^wD5IJs!5zRH^s|Z>@LPYJ(CkfbYp*R6kH36@v4yDb9>>z zr^)jn#KB&kWah`4VlH)&*4_Wsbs=p}A@}2xXch1DQ$@xpJ z_UmmS`#tVCN%7s)G>U7Yn#WYZ&d1Fc_Qcx-gs9J$UJ=%~BGGmwU-)Glh6rE<@^As- zgX}rP)(@4w%~w|5p}Q|%39yWMWS8oqe$wj2p0E7%61`2SsJ-r9YNBlWH>8t+#FOb% zjUV>n@i3ei3CQ*Z;%DW0N7N$bLN}Jw($RXWiBM!0DY`+NNQyyS0+dIkZyTR>p2N2e z8@zY}OX+e2@TZZgN8@gtIuMRX*E)48Ou_qP#vSRsbw$AL&SVX|_Mtgk+IO@)lks{e zW8J~7kCdK5@mnD!fL0F0L@0+U0-A`|Ynes^!o#N|n*GFEP3TIMxVQ^hh1FsAIAN}9 zSxCH$s&R(KK{y3RLHr(%Sv_M0^LjUgoVpYmfyXChA}xRe6HKQ92RycH6x;ekd7a5aoCYh(bmTdj51#3tC*c66d43 zt@&r!5!2MTd2cDWkJM~t{Ar0^u4ek>YylUcN4!YQxhxw8ySR2B`dhlin$hrS=z^@c zrlV#*a2cA86!zQg^HUsPhngQk1isJhYD*6g(8aIufEYM<*v5URk?O2v0%0;f@6F$P zv1Hso|C>Vevy92U{kZD`1Sekbqcya;CzA7%R@a}>=PK~j) zO`(y9kj9px#YMYU3;%6ar|u%ubb`ZrL7?0TR%w}7n9O3G43sFNJ021q&wM&yLM^&# z6?S6V+6g`KMSNA#YE`++Km~Q?K<>03Ov*k^S}#lWQdm;8iIw{T;n)HvPigI+b_ohB zs|&^k#ht79>r~SqE78lVPRfurI;1}LP4&>udUTucLgiU-8aD~-6IrTFr?~c%R+FDK zXbjZgr~Tu9mY>De4<@s!JXn3%HD3j$$qW{2??A&rY-4d?V^MDH<+8@I-p2CY1`DDL zYoW1vUsG*hQ+-MkYhOmiFR`?;rklT-*zz}S?Yq$tc;j};jqb7=y}dX3pWSHt1=oR^ zb@=eRfz2@z!lPx)ZG6NDa=oI5xouof&^i1 zu!YPZVHZg3BU|K#qy-h&nF}aV4ABN+iqG2=h0zp}&?PqXY9}Zj=41m&w6XQv*}%hR zkSrT%Xx46c1L_d)LDQ@49ZYDL+dfPXndOT55ITIQ2>Vn>kpk5`5HI2aK^(N)a{xww zDN=;4REpt>u$x}u++5LBDmYh$YM`|oQoxG-!niYUOA=tRZMTo}P$66-xd^PUL}Dpj z$*Em|By1f|`X%<}vh&TiP116Ne=`YCprE|j7(dF*;36R@3V6W`>4opnBEm|k&^Zzj zMFxh5*jgegf{m`kTZB`3Syy{md63g@F~v#*e61Iwio5o_2h{0B2}{5Oq3t^0T^;Z+ z2{nHay7Rklz^osg!Imb&!kM=*S8rDd!Nq@zjZgGHasjv>ff=(l(4+ruYCl%6bcdtU zFPs6GQri@ncRzfD$p=A-zeTghrAo-qt9^*=@oE_WB9Gd?@w??;&?F#37DBe&8Xs)dn}B4gu<=94Vmw-w3U%P&BNSX2G+0IyHcN%}2O;k;2X~ea zKCMKsgCJ85%(Sv&XC;)&1e&&sn&v}=95jZ5CjAzx7>DiSi|wHT!eOug3MOR~Rmkr| zlAw*i)@0HH-`EGDRWNeO`0XquUj*s2Wfng}eK^R&dn9j}>`+D@ztQts_#GGZrLLm&WU$_1p$dSV+KuG%t z2va_TZJxpLIUjGq)9ypX9K4~xMW~nxi<=lw#-R+kvxayf_25Bd+@MbL;50=9!5>5z zJVbij-&0Ox@WO?l$L48a1%2mJ|$sbyJ&S~lSFAU~R?#`g9MNv>5T$B_K>^~!31MM>-!F^JNeo%za z1ER7=JADOa& z;REs{Av#{hlL~lJ#XL#V@aZMP05FP+F5sbAyy=ajYD7+UV?HY2JXR|N(rMvbW)4n6 zBDiMGlOKp4w#Z`&@;w{g!$-Lj7O-tdU&?@7Y!PyL0N)HV*M*abt7HLj5M>}TOdYgS z5@`mIj%1zyy8puHK2&voig!jpxqtP)bEs*6O%V%hd4VB!UJQZ9lVJDSEGl`Jrai(f z6zJ+l-@KUk!e_OvVqHjti8`!+EqNhac4x5s&fxX^t+~ykgQ5SuyE!<;e1@n3Btfgq z^IvXtb|T}(e7;Fe99)Du9quJoH{F zFnvs1m+%6de({3}XH(y=d37Gr&I02^Yj_y6$AlKKCrP0Cbv2~tZY<;uz>imo{o(^F zL{VuHHkS`Eh6nUR-_ zA>k0hqt@CA%=FUk%GYY4P|VbKY|&Ijn24c;S^O8dlT*v>U%zX<{Eis-Vf^0@L|B{R zK@27Yp<~5EcnG-~U{u*FVjNKrf_qY7H#vQwq6h+B`Kl#&k_(6cV#p_VG-*Y8WHjpp z`qXn!mxnk&f`li5J4{%GyvQBiTTxeta$VGqgm}dlN#ntebAjhfNR}|`OPUR$&c*|9 z0vXb$;Ibe6lU*oWH7sij%sY;A6!2G@@rVlt-Xpf=K&vew1CT)xRp)80ri|*65d#x2*#s0C1~n3o>_sfSy65iLtr(F^n6@z&7dg4Q`#wp<-(B7?ZEhmG zA@oa%-Mp`%^{oOiNxO)1QC#5?ePiW~N*5WJn0&61I{E8c*MnAPGF6+7zV)aTXu48n zD<_8Q+$uC*baOuVGzG{d^~7{8m58fLsT%vW1pSPCB)9_>4uck>jDkiQ> zkJPfI;wPFRKD9$*{A9y*d5FhjIe(ZyU$jytJ5X^1^2nuvm|`MLgv>N7i*7bWUeC&! z-|c|?lq@(p9lA9iE#@LSUn8RkC7-8<%64-kRE<-X3r=9i)bdUyk*P3?MPiJw^X<_$ zkAs`pG>N^7m5KE-Mny23f7m64G$G;{ODUY`ZzS)_;G(b^8nLTZD7W8H2>0tA!V>Nh z?8`Do1k=^XAVt%0kmT#~5w8M4iS|Kae}Ts<06SXMJlSfj|%(CK`E+G!nHx(#P# zpR0yVliaoB>T!6MLef0_xSU~f{W-1Fl_IU{t=?(ZTe<4Szw{QO+Y8zklRkbn$ubZ4q|&IK zC0Hryz&C#S(0noXvy#m1Hq|V9!=FGlGGUb6~vt+v}dh2qxwEPZViQ+OTDZ7Pgq^P)v<=w0BD9>>v0Um zDkmtJCIdNg6kd~H)E%(V zQu~RKFkBH5{PNQ!w_y}H;320Y_6AATKoi0aej~VUN1nlWx>SLkQ_|Vp;qMdcP>9-&>YYZCFX|*= zYx9XX0fibkRJSeDaIVVn^q}FD1&qX;>M^u9+GY{oWyGsGehQ9Mo}tjgHZQ1VYdfO1 zrZbcn5^;`U4yLjVN?N91{O*8^m3s2tN#rG=vZId5PckN^8f#GBmWDOG4b1;Giy|5V zZG4_WeR~LBv^(3CzWgJASUalN9v19`;dc#_#apP;{`5sghI5l?p~4~=siPbwTw5H5 z+GibRQcKM^FocK8QIFbej6da{`*$1K{^{q8L&di>qQG|s4-;}Nx<{WByY;Q6`LIDM z^S&szm3lZf%%%G&%-*W4ZhvK+DL-)jEETRoo`q{_14-V@14)Ayx11?iQZq0Tn3DxG zxUe`Ns6#tGAN_8 ze_UOD9iyAS42fMkCoMZLl5V;TwMRb??U|Y89dbmg@pBwfKIj%NqNtTA%-q1a zYQiJu9feiwTDGUw%|C5=ME}we#qDF41U+xgJvr(UY{(mPg4N5qzTF2N_PS`xi@$Qm zm7ySjm*ikv!0*dfIuKb=VibmSInV9DP^n}j^v+bo!KjIn7lfLYC$9CDq$t}?;WEmJ z0)sv7OP%vo)YwuH^BOlOC1cpM9#z7!x^{>gl$FEldbI60 zkgrDtIK=lIx=Y+UL>O|z8g_tyH2wq#sghrN6oFD`2rBq55bVE<57oQQ6fr6P;e+E2 zOLoseChS}Zcg8ZMUe+#J**32~z7-creMOMJFFVV!UMiv_YXsW}!LLu!h_GDSSX=RD zp2GSRD~F?2oORUR+8r}ww6G-&6G5SgGr>FA=QG5!wbv{U#I}0=0AYKm4~!37`;aah zHmnPSFoS~rvH2^{zO(NBuuQ{6)Z$KSSw`OVm^@MzIP4kdVX-a#mh~Bwf5pz;FPWE| zvJS(UgD({f2CqC+iTqE!IwA*x4DdwUp?vbg1C-t6?t9*$d5M>2+_Cz91cfJmWhcgH z*-CcoJ%l+O(;yVkA!z_V!lFx&m0jR0Aw`zUSBA^g){=Rm=pyl8$vFV1HM);}ZZkH2sidfpK@a@hHraOxqDn zSBb_bl>pVeY%@06;K)uN)?loc(s3K{8;6uAk|yBu98jl=JP(eLy2$(t7cx@9agRj~ zQgGwKRRsuTUvjGykMrf3sPau}0h&l9X!!@USOta$VTy#k78^D@H$l7Lj4XBAi(e&! znEOA3tyM{{nL$<*~_EHZ@SsAa2vaj^fVEldc?R%fA zHF&WecySnkqbbx%=cV zNI94GM0YckaPnnK{Zpx z(-I-OP4!3N2uFOaWa^z#Q>#M90nZ?-#oaWQ>e~F%pgJIa=@as@qR^FHcO%*7rpkmi zgq*AXjAfCr4gS;)v+;3)^G!$Rn=I_>O5AI0i!1`z&Nk$$BR%o-wWFAld;}XeQCjN+ z8Gv__QHN4cn+cY&){LLCbd%li1KpPUX76>USk%fISx9oyH`~)O9qF3nB1zmsm7T@wvrO*6*FGCp>n7bvpIB`c|#(K%j3AYdMy$Q(TT zZ(Fklef*KKT;nZS=)?p~dj1h5RRWzMjUK~VtU|toF5P+10s<^b#)(=-@Bhae@SpbN@Fo@9z(Gp;I98lx~Hh-poGc7NuNVpv-r$$0^soNwO9>pHQ z_*@Wr$im*?9`Gi?wsQwkxCkT(cC96q!iDeYNq4*`??|&w?olIiYcLt;&CFv&05|V} zVJ*2AIqS>*yJf^Gt-sOoL6P^s0p;YhNrOGiEX8(}&Ds{RpLAgh~!d z1>2g%qlYe_Orq~=MFXNlxWLGNgie9uDEd0xu!L2ZG?N}t=@1A=6S%;i6qpmkvPeX@lfji0|_j_%Y1r=4YYOmyWSlsBJfZTc#+eOf!7?EanC=?{R(6WztT z|FpXV4o=i?T^=cLY<^GtWA?xwv^KXao!nq^wTPGs+JysX*9<9q_J}R^Uv0DMCL0?k z3n~$qN`@edhyXdrrb_?3!x#e&vLLhj_+MY|KKL;%%KwtvrGgTb4Yvr4h-D?P>^)dY zMk7XN%(VMELueIUD^mK(h@t5q4bgXI_v* z$@AVj&--6IZ;lS?$b3Gq|9RKpX?YIpmG(sq(~Dw!YD5IawFJHcvn$9v69<5P6qqU! z)F&dRk5QxX!y_y^+2|QAv-iE`=NhiNFe|(od??vGEm8?1hYJ1yk@879ij$++FQ9&Y==2&n! zs>*xRg^?DGalKT-TJX+`#W<4@+W#m50BEnyk8Lu1OET%34C{Sh(KpPAJNqx%Ei5eE z4NYdeOr-@P#bsp!;1&zT1y7qdA6H`N)}Vn7{*Xxg>}|OG~KnbQOOjk5{#ASh6P%RhMo^HqqmXq|M_j@@wST@MAfz5oZmKTys+Iey?nSxsnuqHWf6z{95x#?!oQ3 z1j=2tH6(Nvtkqi@BYmh1{jjW1R_Ga~hRKw+kI|xs6;i2k*Oz2Gs0tPsb&4ii(WU&+ z`^D!UI@2sS)v0PI@xjef^#Io2Jd1tTacFji8HI@Pp7(Y{?yAQ*V}fQ~UQ&EtuOtFz zv_GX+A|9^5HG6%cn%?IN1y$ZTI{745rIKnUS|}L}$NF2hXw&V*{7z=gwIKt#_ zwr)xFj&ZNwkGx`DU;O=~zs3>3 z5VW5kaC@5OHZSE?sd;bi{P^YTu_9fcL>sn`jOH%>C)7fUsSTw%bk{+VaSD_;S+Nhx zp-WA-W3o6F@9lES{!pM+XZ#4ZRdN01JSLtCHZEy;9sl<~O22UX*p8_?suk)kMPguUV$i+B;HkurSBart5)TRz z$zn-iDoKa*lfo^NBHWV>A54lokrb7l6kV8fq#`M%HR4H;KvE&Su z&A`@-(3~H?w0~qd((JoI9UkleK11NnKS*m$&bybKKb2h2nvCEh84Y47Q5YF*h7Kp& z@3gvgGQDsy`SOX=SJF?H6#fhqJH^oYQR+z3;ZdVG*(S~s&W==*ocL0elxqEy8q1X0 zFVZsC_SYZ$Rd?^F4uDd?Gc=Ym{HfW!)tj}iQf_`pX%(bYyVHo;jFUVdx*MUuW4LpE znXzg9L0~&a2;d-=*HQ%+c@%W$!S2crXbn`aw2Ym5Ls2 zPaQ2x8>>hgANghtWQqA_Hl`rXR3PnJ;6Izvrd7_&=%1O5%Bgoh(@=4zrkfE0AyI7F zok(vNHp89pVRq`wi&tm9yfjIn`$h5mHt9^4g(z?P{Q<|IUoQ`yeS6~UyC0_zob1AM zD%1U?Kga!RCh?zE*VIRuY7Q56 z9a+~HFW%{QtHZzMDZRunYP`9Pa#>F=_@rC(`>$HuO6zP1-IxvSnOf&7hQ~fgse=cN z8isB88#|vg2X@7O{_ss_o_%QKg6`4pyPkE#JiT@7<9FS~?)Y~zEk}Roz3flXMS F{{gR&nqvR} literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/themes/advanced/js/about.js b/plugins/TinyMCE/js/themes/advanced/js/about.js new file mode 100644 index 0000000000..5cee9ed863 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/js/about.js @@ -0,0 +1,72 @@ +tinyMCEPopup.requireLangPack(); + +function init() { + var ed, tcont; + + tinyMCEPopup.resizeToInnerSize(); + ed = tinyMCEPopup.editor; + + // Give FF some time + window.setTimeout(insertHelpIFrame, 10); + + tcont = document.getElementById('plugintablecontainer'); + document.getElementById('plugins_tab').style.display = 'none'; + + var html = ""; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + + tinymce.each(ed.plugins, function(p, n) { + var info; + + if (!p.getInfo) + return; + + html += ''; + + info = p.getInfo(); + + if (info.infourl != null && info.infourl != '') + html += ''; + else + html += ''; + + if (info.authorurl != null && info.authorurl != '') + html += ''; + else + html += ''; + + html += ''; + html += ''; + + document.getElementById('plugins_tab').style.display = ''; + + }); + + html += ''; + html += '
' + ed.getLang('advanced_dlg.about_plugin') + '' + ed.getLang('advanced_dlg.about_author') + '' + ed.getLang('advanced_dlg.about_version') + '
' + info.longname + '' + info.longname + '' + info.author + '' + info.author + '' + info.version + '
'; + + tcont.innerHTML = html; + + tinyMCEPopup.dom.get('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion; + tinyMCEPopup.dom.get('date').innerHTML = tinymce.releaseDate; +} + +function insertHelpIFrame() { + var html; + + if (tinyMCEPopup.getParam('docs_url')) { + html = ''; + document.getElementById('iframecontainer').innerHTML = html; + document.getElementById('help_tab').style.display = 'block'; + } +} + +tinyMCEPopup.onInit.add(init); diff --git a/plugins/TinyMCE/js/themes/advanced/js/anchor.js b/plugins/TinyMCE/js/themes/advanced/js/anchor.js new file mode 100644 index 0000000000..7fe7810558 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/js/anchor.js @@ -0,0 +1,37 @@ +tinyMCEPopup.requireLangPack(); + +var AnchorDialog = { + init : function(ed) { + var action, elm, f = document.forms[0]; + + this.editor = ed; + elm = ed.dom.getParent(ed.selection.getNode(), 'A'); + v = ed.dom.getAttrib(elm, 'name'); + + if (v) { + this.action = 'update'; + f.anchorName.value = v; + } + + f.insert.value = ed.getLang(elm ? 'update' : 'insert'); + }, + + update : function() { + var ed = this.editor, elm, name = document.forms[0].anchorName.value; + + tinyMCEPopup.restoreSelection(); + + if (this.action != 'update') + ed.selection.collapse(1); + + elm = ed.dom.getParent(ed.selection.getNode(), 'A'); + if (elm) + elm.name = name; + else + ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : name, 'class' : 'mceItemAnchor'}, '')); + + tinyMCEPopup.close(); + } +}; + +tinyMCEPopup.onInit.add(AnchorDialog.init, AnchorDialog); diff --git a/plugins/TinyMCE/js/themes/advanced/js/charmap.js b/plugins/TinyMCE/js/themes/advanced/js/charmap.js new file mode 100644 index 0000000000..8c5aea1721 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/js/charmap.js @@ -0,0 +1,335 @@ +/** + * charmap.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +tinyMCEPopup.requireLangPack(); + +var charmap = [ + [' ', ' ', true, 'no-break space'], + ['&', '&', true, 'ampersand'], + ['"', '"', true, 'quotation mark'], +// finance + ['¢', '¢', true, 'cent sign'], + ['€', '€', true, 'euro sign'], + ['£', '£', true, 'pound sign'], + ['¥', '¥', true, 'yen sign'], +// signs + ['©', '©', true, 'copyright sign'], + ['®', '®', true, 'registered sign'], + ['™', '™', true, 'trade mark sign'], + ['‰', '‰', true, 'per mille sign'], + ['µ', 'µ', true, 'micro sign'], + ['·', '·', true, 'middle dot'], + ['•', '•', true, 'bullet'], + ['…', '…', true, 'three dot leader'], + ['′', '′', true, 'minutes / feet'], + ['″', '″', true, 'seconds / inches'], + ['§', '§', true, 'section sign'], + ['¶', '¶', true, 'paragraph sign'], + ['ß', 'ß', true, 'sharp s / ess-zed'], +// quotations + ['‹', '‹', true, 'single left-pointing angle quotation mark'], + ['›', '›', true, 'single right-pointing angle quotation mark'], + ['«', '«', true, 'left pointing guillemet'], + ['»', '»', true, 'right pointing guillemet'], + ['‘', '‘', true, 'left single quotation mark'], + ['’', '’', true, 'right single quotation mark'], + ['“', '“', true, 'left double quotation mark'], + ['”', '”', true, 'right double quotation mark'], + ['‚', '‚', true, 'single low-9 quotation mark'], + ['„', '„', true, 'double low-9 quotation mark'], + ['<', '<', true, 'less-than sign'], + ['>', '>', true, 'greater-than sign'], + ['≤', '≤', true, 'less-than or equal to'], + ['≥', '≥', true, 'greater-than or equal to'], + ['–', '–', true, 'en dash'], + ['—', '—', true, 'em dash'], + ['¯', '¯', true, 'macron'], + ['‾', '‾', true, 'overline'], + ['¤', '¤', true, 'currency sign'], + ['¦', '¦', true, 'broken bar'], + ['¨', '¨', true, 'diaeresis'], + ['¡', '¡', true, 'inverted exclamation mark'], + ['¿', '¿', true, 'turned question mark'], + ['ˆ', 'ˆ', true, 'circumflex accent'], + ['˜', '˜', true, 'small tilde'], + ['°', '°', true, 'degree sign'], + ['−', '−', true, 'minus sign'], + ['±', '±', true, 'plus-minus sign'], + ['÷', '÷', true, 'division sign'], + ['⁄', '⁄', true, 'fraction slash'], + ['×', '×', true, 'multiplication sign'], + ['¹', '¹', true, 'superscript one'], + ['²', '²', true, 'superscript two'], + ['³', '³', true, 'superscript three'], + ['¼', '¼', true, 'fraction one quarter'], + ['½', '½', true, 'fraction one half'], + ['¾', '¾', true, 'fraction three quarters'], +// math / logical + ['ƒ', 'ƒ', true, 'function / florin'], + ['∫', '∫', true, 'integral'], + ['∑', '∑', true, 'n-ary sumation'], + ['∞', '∞', true, 'infinity'], + ['√', '√', true, 'square root'], + ['∼', '∼', false,'similar to'], + ['≅', '≅', false,'approximately equal to'], + ['≈', '≈', true, 'almost equal to'], + ['≠', '≠', true, 'not equal to'], + ['≡', '≡', true, 'identical to'], + ['∈', '∈', false,'element of'], + ['∉', '∉', false,'not an element of'], + ['∋', '∋', false,'contains as member'], + ['∏', '∏', true, 'n-ary product'], + ['∧', '∧', false,'logical and'], + ['∨', '∨', false,'logical or'], + ['¬', '¬', true, 'not sign'], + ['∩', '∩', true, 'intersection'], + ['∪', '∪', false,'union'], + ['∂', '∂', true, 'partial differential'], + ['∀', '∀', false,'for all'], + ['∃', '∃', false,'there exists'], + ['∅', '∅', false,'diameter'], + ['∇', '∇', false,'backward difference'], + ['∗', '∗', false,'asterisk operator'], + ['∝', '∝', false,'proportional to'], + ['∠', '∠', false,'angle'], +// undefined + ['´', '´', true, 'acute accent'], + ['¸', '¸', true, 'cedilla'], + ['ª', 'ª', true, 'feminine ordinal indicator'], + ['º', 'º', true, 'masculine ordinal indicator'], + ['†', '†', true, 'dagger'], + ['‡', '‡', true, 'double dagger'], +// alphabetical special chars + ['À', 'À', true, 'A - grave'], + ['Á', 'Á', true, 'A - acute'], + ['Â', 'Â', true, 'A - circumflex'], + ['Ã', 'Ã', true, 'A - tilde'], + ['Ä', 'Ä', true, 'A - diaeresis'], + ['Å', 'Å', true, 'A - ring above'], + ['Æ', 'Æ', true, 'ligature AE'], + ['Ç', 'Ç', true, 'C - cedilla'], + ['È', 'È', true, 'E - grave'], + ['É', 'É', true, 'E - acute'], + ['Ê', 'Ê', true, 'E - circumflex'], + ['Ë', 'Ë', true, 'E - diaeresis'], + ['Ì', 'Ì', true, 'I - grave'], + ['Í', 'Í', true, 'I - acute'], + ['Î', 'Î', true, 'I - circumflex'], + ['Ï', 'Ï', true, 'I - diaeresis'], + ['Ð', 'Ð', true, 'ETH'], + ['Ñ', 'Ñ', true, 'N - tilde'], + ['Ò', 'Ò', true, 'O - grave'], + ['Ó', 'Ó', true, 'O - acute'], + ['Ô', 'Ô', true, 'O - circumflex'], + ['Õ', 'Õ', true, 'O - tilde'], + ['Ö', 'Ö', true, 'O - diaeresis'], + ['Ø', 'Ø', true, 'O - slash'], + ['Œ', 'Œ', true, 'ligature OE'], + ['Š', 'Š', true, 'S - caron'], + ['Ù', 'Ù', true, 'U - grave'], + ['Ú', 'Ú', true, 'U - acute'], + ['Û', 'Û', true, 'U - circumflex'], + ['Ü', 'Ü', true, 'U - diaeresis'], + ['Ý', 'Ý', true, 'Y - acute'], + ['Ÿ', 'Ÿ', true, 'Y - diaeresis'], + ['Þ', 'Þ', true, 'THORN'], + ['à', 'à', true, 'a - grave'], + ['á', 'á', true, 'a - acute'], + ['â', 'â', true, 'a - circumflex'], + ['ã', 'ã', true, 'a - tilde'], + ['ä', 'ä', true, 'a - diaeresis'], + ['å', 'å', true, 'a - ring above'], + ['æ', 'æ', true, 'ligature ae'], + ['ç', 'ç', true, 'c - cedilla'], + ['è', 'è', true, 'e - grave'], + ['é', 'é', true, 'e - acute'], + ['ê', 'ê', true, 'e - circumflex'], + ['ë', 'ë', true, 'e - diaeresis'], + ['ì', 'ì', true, 'i - grave'], + ['í', 'í', true, 'i - acute'], + ['î', 'î', true, 'i - circumflex'], + ['ï', 'ï', true, 'i - diaeresis'], + ['ð', 'ð', true, 'eth'], + ['ñ', 'ñ', true, 'n - tilde'], + ['ò', 'ò', true, 'o - grave'], + ['ó', 'ó', true, 'o - acute'], + ['ô', 'ô', true, 'o - circumflex'], + ['õ', 'õ', true, 'o - tilde'], + ['ö', 'ö', true, 'o - diaeresis'], + ['ø', 'ø', true, 'o slash'], + ['œ', 'œ', true, 'ligature oe'], + ['š', 'š', true, 's - caron'], + ['ù', 'ù', true, 'u - grave'], + ['ú', 'ú', true, 'u - acute'], + ['û', 'û', true, 'u - circumflex'], + ['ü', 'ü', true, 'u - diaeresis'], + ['ý', 'ý', true, 'y - acute'], + ['þ', 'þ', true, 'thorn'], + ['ÿ', 'ÿ', true, 'y - diaeresis'], + ['Α', 'Α', true, 'Alpha'], + ['Β', 'Β', true, 'Beta'], + ['Γ', 'Γ', true, 'Gamma'], + ['Δ', 'Δ', true, 'Delta'], + ['Ε', 'Ε', true, 'Epsilon'], + ['Ζ', 'Ζ', true, 'Zeta'], + ['Η', 'Η', true, 'Eta'], + ['Θ', 'Θ', true, 'Theta'], + ['Ι', 'Ι', true, 'Iota'], + ['Κ', 'Κ', true, 'Kappa'], + ['Λ', 'Λ', true, 'Lambda'], + ['Μ', 'Μ', true, 'Mu'], + ['Ν', 'Ν', true, 'Nu'], + ['Ξ', 'Ξ', true, 'Xi'], + ['Ο', 'Ο', true, 'Omicron'], + ['Π', 'Π', true, 'Pi'], + ['Ρ', 'Ρ', true, 'Rho'], + ['Σ', 'Σ', true, 'Sigma'], + ['Τ', 'Τ', true, 'Tau'], + ['Υ', 'Υ', true, 'Upsilon'], + ['Φ', 'Φ', true, 'Phi'], + ['Χ', 'Χ', true, 'Chi'], + ['Ψ', 'Ψ', true, 'Psi'], + ['Ω', 'Ω', true, 'Omega'], + ['α', 'α', true, 'alpha'], + ['β', 'β', true, 'beta'], + ['γ', 'γ', true, 'gamma'], + ['δ', 'δ', true, 'delta'], + ['ε', 'ε', true, 'epsilon'], + ['ζ', 'ζ', true, 'zeta'], + ['η', 'η', true, 'eta'], + ['θ', 'θ', true, 'theta'], + ['ι', 'ι', true, 'iota'], + ['κ', 'κ', true, 'kappa'], + ['λ', 'λ', true, 'lambda'], + ['μ', 'μ', true, 'mu'], + ['ν', 'ν', true, 'nu'], + ['ξ', 'ξ', true, 'xi'], + ['ο', 'ο', true, 'omicron'], + ['π', 'π', true, 'pi'], + ['ρ', 'ρ', true, 'rho'], + ['ς', 'ς', true, 'final sigma'], + ['σ', 'σ', true, 'sigma'], + ['τ', 'τ', true, 'tau'], + ['υ', 'υ', true, 'upsilon'], + ['φ', 'φ', true, 'phi'], + ['χ', 'χ', true, 'chi'], + ['ψ', 'ψ', true, 'psi'], + ['ω', 'ω', true, 'omega'], +// symbols + ['ℵ', 'ℵ', false,'alef symbol'], + ['ϖ', 'ϖ', false,'pi symbol'], + ['ℜ', 'ℜ', false,'real part symbol'], + ['ϑ','ϑ', false,'theta symbol'], + ['ϒ', 'ϒ', false,'upsilon - hook symbol'], + ['℘', '℘', false,'Weierstrass p'], + ['ℑ', 'ℑ', false,'imaginary part'], +// arrows + ['←', '←', true, 'leftwards arrow'], + ['↑', '↑', true, 'upwards arrow'], + ['→', '→', true, 'rightwards arrow'], + ['↓', '↓', true, 'downwards arrow'], + ['↔', '↔', true, 'left right arrow'], + ['↵', '↵', false,'carriage return'], + ['⇐', '⇐', false,'leftwards double arrow'], + ['⇑', '⇑', false,'upwards double arrow'], + ['⇒', '⇒', false,'rightwards double arrow'], + ['⇓', '⇓', false,'downwards double arrow'], + ['⇔', '⇔', false,'left right double arrow'], + ['∴', '∴', false,'therefore'], + ['⊂', '⊂', false,'subset of'], + ['⊃', '⊃', false,'superset of'], + ['⊄', '⊄', false,'not a subset of'], + ['⊆', '⊆', false,'subset of or equal to'], + ['⊇', '⊇', false,'superset of or equal to'], + ['⊕', '⊕', false,'circled plus'], + ['⊗', '⊗', false,'circled times'], + ['⊥', '⊥', false,'perpendicular'], + ['⋅', '⋅', false,'dot operator'], + ['⌈', '⌈', false,'left ceiling'], + ['⌉', '⌉', false,'right ceiling'], + ['⌊', '⌊', false,'left floor'], + ['⌋', '⌋', false,'right floor'], + ['⟨', '〈', false,'left-pointing angle bracket'], + ['⟩', '〉', false,'right-pointing angle bracket'], + ['◊', '◊', true,'lozenge'], + ['♠', '♠', false,'black spade suit'], + ['♣', '♣', true, 'black club suit'], + ['♥', '♥', true, 'black heart suit'], + ['♦', '♦', true, 'black diamond suit'], + [' ', ' ', false,'en space'], + [' ', ' ', false,'em space'], + [' ', ' ', false,'thin space'], + ['‌', '‌', false,'zero width non-joiner'], + ['‍', '‍', false,'zero width joiner'], + ['‎', '‎', false,'left-to-right mark'], + ['‏', '‏', false,'right-to-left mark'], + ['­', '­', false,'soft hyphen'] +]; + +tinyMCEPopup.onInit.add(function() { + tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML()); +}); + +function renderCharMapHTML() { + var charsPerRow = 20, tdWidth=20, tdHeight=20, i; + var html = ''; + var cols=-1; + + for (i=0; i' + + '' + + charmap[i][1] + + ''; + if ((cols+1) % charsPerRow == 0) + html += ''; + } + } + + if (cols % charsPerRow > 0) { + var padd = charsPerRow - (cols % charsPerRow); + for (var i=0; i '; + } + + html += '
'; + + return html; +} + +function insertChar(chr) { + tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';'); + + // Refocus in window + if (tinyMCEPopup.isWindow) + window.focus(); + + tinyMCEPopup.editor.focus(); + tinyMCEPopup.close(); +} + +function previewChar(codeA, codeB, codeN) { + var elmA = document.getElementById('codeA'); + var elmB = document.getElementById('codeB'); + var elmV = document.getElementById('codeV'); + var elmN = document.getElementById('codeN'); + + if (codeA=='#160;') { + elmV.innerHTML = '__'; + } else { + elmV.innerHTML = '&' + codeA; + } + + elmB.innerHTML = '&' + codeA; + elmA.innerHTML = '&' + codeB; + elmN.innerHTML = codeN; +} diff --git a/plugins/TinyMCE/js/themes/advanced/js/color_picker.js b/plugins/TinyMCE/js/themes/advanced/js/color_picker.js new file mode 100644 index 0000000000..fd9700f222 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/js/color_picker.js @@ -0,0 +1,253 @@ +tinyMCEPopup.requireLangPack(); + +var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false; + +var colors = [ + "#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033", + "#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099", + "#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff", + "#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033", + "#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399", + "#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff", + "#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333", + "#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399", + "#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff", + "#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633", + "#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699", + "#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff", + "#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633", + "#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999", + "#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff", + "#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933", + "#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999", + "#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff", + "#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33", + "#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99", + "#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff", + "#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33", + "#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99", + "#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff", + "#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33", + "#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99", + "#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff" +]; + +var named = { + '#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige', + '#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown', + '#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue', + '#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod', + '#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen', + '#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue', + '#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue', + '#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen', + '#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey', + '#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory', + '#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue', + '#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen', + '#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey', + '#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon', + '#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue', + '#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin', + '#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid', + '#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff', + '#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue', + '#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver', + '#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen', + '#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet', + '#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen' +}; + +function init() { + var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color')); + + tinyMCEPopup.resizeToInnerSize(); + + generatePicker(); + + if (inputColor) { + changeFinalColor(inputColor); + + col = convertHexToRGB(inputColor); + + if (col) + updateLight(col.r, col.g, col.b); + } +} + +function insertAction() { + var color = document.getElementById("color").value, f = tinyMCEPopup.getWindowArg('func'); + + tinyMCEPopup.restoreSelection(); + + if (f) + f(color); + + tinyMCEPopup.close(); +} + +function showColor(color, name) { + if (name) + document.getElementById("colorname").innerHTML = name; + + document.getElementById("preview").style.backgroundColor = color; + document.getElementById("color").value = color.toLowerCase(); +} + +function convertRGBToHex(col) { + var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi"); + + if (!col) + return col; + + var rgb = col.replace(re, "$1,$2,$3").split(','); + if (rgb.length == 3) { + r = parseInt(rgb[0]).toString(16); + g = parseInt(rgb[1]).toString(16); + b = parseInt(rgb[2]).toString(16); + + r = r.length == 1 ? '0' + r : r; + g = g.length == 1 ? '0' + g : g; + b = b.length == 1 ? '0' + b : b; + + return "#" + r + g + b; + } + + return col; +} + +function convertHexToRGB(col) { + if (col.indexOf('#') != -1) { + col = col.replace(new RegExp('[^0-9A-F]', 'gi'), ''); + + r = parseInt(col.substring(0, 2), 16); + g = parseInt(col.substring(2, 4), 16); + b = parseInt(col.substring(4, 6), 16); + + return {r : r, g : g, b : b}; + } + + return null; +} + +function generatePicker() { + var el = document.getElementById('light'), h = '', i; + + for (i = 0; i < detail; i++){ + h += '
'; + } + + el.innerHTML = h; +} + +function generateWebColors() { + var el = document.getElementById('webcolors'), h = '', i; + + if (el.className == 'generated') + return; + + h += '' + + ''; + + for (i=0; i' + + '' + + ''; + if ((i+1) % 18 == 0) + h += ''; + } + + h += '
'; + + el.innerHTML = h; + el.className = 'generated'; +} + +function generateNamedColors() { + var el = document.getElementById('namedcolors'), h = '', n, v, i = 0; + + if (el.className == 'generated') + return; + + for (n in named) { + v = named[n]; + h += '' + } + + el.innerHTML = h; + el.className = 'generated'; +} + +function dechex(n) { + return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16); +} + +function computeColor(e) { + var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB; + + x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0); + y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0); + + partWidth = document.getElementById('colors').width / 6; + partDetail = detail / 2; + imHeight = document.getElementById('colors').height; + + r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255; + g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255 + (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth); + b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth); + + coef = (imHeight - y) / imHeight; + r = 128 + (r - 128) * coef; + g = 128 + (g - 128) * coef; + b = 128 + (b - 128) * coef; + + changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b)); + updateLight(r, g, b); +} + +function updateLight(r, g, b) { + var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color; + + for (i=0; i=0) && (i'); + }, + + init : function() { + var f = document.forms[0], ed = tinyMCEPopup.editor; + + // Setup browse button + document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image'); + if (isVisible('srcbrowser')) + document.getElementById('src').style.width = '180px'; + + e = ed.selection.getNode(); + + this.fillFileList('image_list', 'tinyMCEImageList'); + + if (e.nodeName == 'IMG') { + f.src.value = ed.dom.getAttrib(e, 'src'); + f.alt.value = ed.dom.getAttrib(e, 'alt'); + f.border.value = this.getAttrib(e, 'border'); + f.vspace.value = this.getAttrib(e, 'vspace'); + f.hspace.value = this.getAttrib(e, 'hspace'); + f.width.value = ed.dom.getAttrib(e, 'width'); + f.height.value = ed.dom.getAttrib(e, 'height'); + f.insert.value = ed.getLang('update'); + this.styleVal = ed.dom.getAttrib(e, 'style'); + selectByValue(f, 'image_list', f.src.value); + selectByValue(f, 'align', this.getAttrib(e, 'align')); + this.updateStyle(); + } + }, + + fillFileList : function(id, l) { + var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl; + + l = window[l]; + + if (l && l.length > 0) { + lst.options[lst.options.length] = new Option('', ''); + + tinymce.each(l, function(o) { + lst.options[lst.options.length] = new Option(o[0], o[1]); + }); + } else + dom.remove(dom.getParent(id, 'tr')); + }, + + update : function() { + var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, args = {}, el; + + tinyMCEPopup.restoreSelection(); + + if (f.src.value === '') { + if (ed.selection.getNode().nodeName == 'IMG') { + ed.dom.remove(ed.selection.getNode()); + ed.execCommand('mceRepaint'); + } + + tinyMCEPopup.close(); + return; + } + + if (!ed.settings.inline_styles) { + args = tinymce.extend(args, { + vspace : nl.vspace.value, + hspace : nl.hspace.value, + border : nl.border.value, + align : getSelectValue(f, 'align') + }); + } else + args.style = this.styleVal; + + tinymce.extend(args, { + src : f.src.value, + alt : f.alt.value, + width : f.width.value, + height : f.height.value + }); + + el = ed.selection.getNode(); + + if (el && el.nodeName == 'IMG') { + ed.dom.setAttribs(el, args); + } else { + ed.execCommand('mceInsertContent', false, '', {skip_undo : 1}); + ed.dom.setAttribs('__mce_tmp', args); + ed.dom.setAttrib('__mce_tmp', 'id', ''); + ed.undoManager.add(); + } + + tinyMCEPopup.close(); + }, + + updateStyle : function() { + var dom = tinyMCEPopup.dom, st, v, f = document.forms[0]; + + if (tinyMCEPopup.editor.settings.inline_styles) { + st = tinyMCEPopup.dom.parseStyle(this.styleVal); + + // Handle align + v = getSelectValue(f, 'align'); + if (v) { + if (v == 'left' || v == 'right') { + st['float'] = v; + delete st['vertical-align']; + } else { + st['vertical-align'] = v; + delete st['float']; + } + } else { + delete st['float']; + delete st['vertical-align']; + } + + // Handle border + v = f.border.value; + if (v || v == '0') { + if (v == '0') + st['border'] = '0'; + else + st['border'] = v + 'px solid black'; + } else + delete st['border']; + + // Handle hspace + v = f.hspace.value; + if (v) { + delete st['margin']; + st['margin-left'] = v + 'px'; + st['margin-right'] = v + 'px'; + } else { + delete st['margin-left']; + delete st['margin-right']; + } + + // Handle vspace + v = f.vspace.value; + if (v) { + delete st['margin']; + st['margin-top'] = v + 'px'; + st['margin-bottom'] = v + 'px'; + } else { + delete st['margin-top']; + delete st['margin-bottom']; + } + + // Merge + st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st), 'img'); + this.styleVal = dom.serializeStyle(st, 'img'); + } + }, + + getAttrib : function(e, at) { + var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2; + + if (ed.settings.inline_styles) { + switch (at) { + case 'align': + if (v = dom.getStyle(e, 'float')) + return v; + + if (v = dom.getStyle(e, 'vertical-align')) + return v; + + break; + + case 'hspace': + v = dom.getStyle(e, 'margin-left') + v2 = dom.getStyle(e, 'margin-right'); + if (v && v == v2) + return parseInt(v.replace(/[^0-9]/g, '')); + + break; + + case 'vspace': + v = dom.getStyle(e, 'margin-top') + v2 = dom.getStyle(e, 'margin-bottom'); + if (v && v == v2) + return parseInt(v.replace(/[^0-9]/g, '')); + + break; + + case 'border': + v = 0; + + tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) { + sv = dom.getStyle(e, 'border-' + sv + '-width'); + + // False or not the same as prev + if (!sv || (sv != v && v !== 0)) { + v = 0; + return false; + } + + if (sv) + v = sv; + }); + + if (v) + return parseInt(v.replace(/[^0-9]/g, '')); + + break; + } + } + + if (v = dom.getAttrib(e, at)) + return v; + + return ''; + }, + + resetImageData : function() { + var f = document.forms[0]; + + f.width.value = f.height.value = ""; + }, + + updateImageData : function() { + var f = document.forms[0], t = ImageDialog; + + if (f.width.value == "") + f.width.value = t.preloadImg.width; + + if (f.height.value == "") + f.height.value = t.preloadImg.height; + }, + + getImageData : function() { + var f = document.forms[0]; + + this.preloadImg = new Image(); + this.preloadImg.onload = this.updateImageData; + this.preloadImg.onerror = this.resetImageData; + this.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.src.value); + } +}; + +ImageDialog.preInit(); +tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog); diff --git a/plugins/TinyMCE/js/themes/advanced/js/link.js b/plugins/TinyMCE/js/themes/advanced/js/link.js new file mode 100644 index 0000000000..f67a5bc828 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/js/link.js @@ -0,0 +1,156 @@ +tinyMCEPopup.requireLangPack(); + +var LinkDialog = { + preInit : function() { + var url; + + if (url = tinyMCEPopup.getParam("external_link_list_url")) + document.write(''); + }, + + init : function() { + var f = document.forms[0], ed = tinyMCEPopup.editor; + + // Setup browse button + document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser', 'href', 'file', 'theme_advanced_link'); + if (isVisible('hrefbrowser')) + document.getElementById('href').style.width = '180px'; + + this.fillClassList('class_list'); + this.fillFileList('link_list', 'tinyMCELinkList'); + this.fillTargetList('target_list'); + + if (e = ed.dom.getParent(ed.selection.getNode(), 'A')) { + f.href.value = ed.dom.getAttrib(e, 'href'); + f.linktitle.value = ed.dom.getAttrib(e, 'title'); + f.insert.value = ed.getLang('update'); + selectByValue(f, 'link_list', f.href.value); + selectByValue(f, 'target_list', ed.dom.getAttrib(e, 'target')); + selectByValue(f, 'class_list', ed.dom.getAttrib(e, 'class')); + } + }, + + update : function() { + var f = document.forms[0], ed = tinyMCEPopup.editor, e, b; + + tinyMCEPopup.restoreSelection(); + e = ed.dom.getParent(ed.selection.getNode(), 'A'); + + // Remove element if there is no href + if (!f.href.value) { + if (e) { + tinyMCEPopup.execCommand("mceBeginUndoLevel"); + b = ed.selection.getBookmark(); + ed.dom.remove(e, 1); + ed.selection.moveToBookmark(b); + tinyMCEPopup.execCommand("mceEndUndoLevel"); + tinyMCEPopup.close(); + return; + } + } + + tinyMCEPopup.execCommand("mceBeginUndoLevel"); + + // Create new anchor elements + if (e == null) { + ed.getDoc().execCommand("unlink", false, null); + tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1}); + + tinymce.each(ed.dom.select("a"), function(n) { + if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') { + e = n; + + ed.dom.setAttribs(e, { + href : f.href.value, + title : f.linktitle.value, + target : f.target_list ? getSelectValue(f, "target_list") : null, + 'class' : f.class_list ? getSelectValue(f, "class_list") : null + }); + } + }); + } else { + ed.dom.setAttribs(e, { + href : f.href.value, + title : f.linktitle.value, + target : f.target_list ? getSelectValue(f, "target_list") : null, + 'class' : f.class_list ? getSelectValue(f, "class_list") : null + }); + } + + // Don't move caret if selection was image + if (e.childNodes.length != 1 || e.firstChild.nodeName != 'IMG') { + ed.focus(); + ed.selection.select(e); + ed.selection.collapse(0); + tinyMCEPopup.storeSelection(); + } + + tinyMCEPopup.execCommand("mceEndUndoLevel"); + tinyMCEPopup.close(); + }, + + checkPrefix : function(n) { + if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email'))) + n.value = 'mailto:' + n.value; + + if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external'))) + n.value = 'http://' + n.value; + }, + + fillFileList : function(id, l) { + var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl; + + l = window[l]; + + if (l && l.length > 0) { + lst.options[lst.options.length] = new Option('', ''); + + tinymce.each(l, function(o) { + lst.options[lst.options.length] = new Option(o[0], o[1]); + }); + } else + dom.remove(dom.getParent(id, 'tr')); + }, + + fillClassList : function(id) { + var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl; + + if (v = tinyMCEPopup.getParam('theme_advanced_styles')) { + cl = []; + + tinymce.each(v.split(';'), function(v) { + var p = v.split('='); + + cl.push({'title' : p[0], 'class' : p[1]}); + }); + } else + cl = tinyMCEPopup.editor.dom.getClasses(); + + if (cl.length > 0) { + lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), ''); + + tinymce.each(cl, function(o) { + lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']); + }); + } else + dom.remove(dom.getParent(id, 'tr')); + }, + + fillTargetList : function(id) { + var dom = tinyMCEPopup.dom, lst = dom.get(id), v; + + lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), ''); + lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_same'), '_self'); + lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_blank'), '_blank'); + + if (v = tinyMCEPopup.getParam('theme_advanced_link_targets')) { + tinymce.each(v.split(','), function(v) { + v = v.split('='); + lst.options[lst.options.length] = new Option(v[0], v[1]); + }); + } + } +}; + +LinkDialog.preInit(); +tinyMCEPopup.onInit.add(LinkDialog.init, LinkDialog); diff --git a/plugins/TinyMCE/js/themes/advanced/js/source_editor.js b/plugins/TinyMCE/js/themes/advanced/js/source_editor.js new file mode 100644 index 0000000000..279328614c --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/js/source_editor.js @@ -0,0 +1,62 @@ +tinyMCEPopup.requireLangPack(); +tinyMCEPopup.onInit.add(onLoadInit); + +function saveContent() { + tinyMCEPopup.editor.setContent(document.getElementById('htmlSource').value, {source_view : true}); + tinyMCEPopup.close(); +} + +function onLoadInit() { + tinyMCEPopup.resizeToInnerSize(); + + // Remove Gecko spellchecking + if (tinymce.isGecko) + document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck"); + + document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent({source_view : true}); + + if (tinyMCEPopup.editor.getParam("theme_advanced_source_editor_wrap", true)) { + setWrap('soft'); + document.getElementById('wraped').checked = true; + } + + resizeInputs(); +} + +function setWrap(val) { + var v, n, s = document.getElementById('htmlSource'); + + s.wrap = val; + + if (!tinymce.isIE) { + v = s.value; + n = s.cloneNode(false); + n.setAttribute("wrap", val); + s.parentNode.replaceChild(n, s); + n.value = v; + } +} + +function toggleWordWrap(elm) { + if (elm.checked) + setWrap('soft'); + else + setWrap('off'); +} + +var wHeight=0, wWidth=0, owHeight=0, owWidth=0; + +function resizeInputs() { + var el = document.getElementById('htmlSource'); + + if (!tinymce.isIE) { + wHeight = self.innerHeight - 65; + wWidth = self.innerWidth - 16; + } else { + wHeight = document.body.clientHeight - 70; + wWidth = document.body.clientWidth - 16; + } + + el.style.height = Math.abs(wHeight) + 'px'; + el.style.width = Math.abs(wWidth) + 'px'; +} diff --git a/plugins/TinyMCE/js/themes/advanced/langs/en.js b/plugins/TinyMCE/js/themes/advanced/langs/en.js new file mode 100644 index 0000000000..69694b1f9f --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/langs/en.js @@ -0,0 +1,62 @@ +tinyMCE.addI18n('en.advanced',{ +style_select:"Styles", +font_size:"Font size", +fontdefault:"Font family", +block:"Format", +paragraph:"Paragraph", +div:"Div", +address:"Address", +pre:"Preformatted", +h1:"Heading 1", +h2:"Heading 2", +h3:"Heading 3", +h4:"Heading 4", +h5:"Heading 5", +h6:"Heading 6", +blockquote:"Blockquote", +code:"Code", +samp:"Code sample", +dt:"Definition term ", +dd:"Definition description", +bold_desc:"Bold (Ctrl+B)", +italic_desc:"Italic (Ctrl+I)", +underline_desc:"Underline (Ctrl+U)", +striketrough_desc:"Strikethrough", +justifyleft_desc:"Align left", +justifycenter_desc:"Align center", +justifyright_desc:"Align right", +justifyfull_desc:"Align full", +bullist_desc:"Unordered list", +numlist_desc:"Ordered list", +outdent_desc:"Outdent", +indent_desc:"Indent", +undo_desc:"Undo (Ctrl+Z)", +redo_desc:"Redo (Ctrl+Y)", +link_desc:"Insert/edit link", +unlink_desc:"Unlink", +image_desc:"Insert/edit image", +cleanup_desc:"Cleanup messy code", +code_desc:"Edit HTML Source", +sub_desc:"Subscript", +sup_desc:"Superscript", +hr_desc:"Insert horizontal ruler", +removeformat_desc:"Remove formatting", +custom1_desc:"Your custom description here", +forecolor_desc:"Select text color", +backcolor_desc:"Select background color", +charmap_desc:"Insert custom character", +visualaid_desc:"Toggle guidelines/invisible elements", +anchor_desc:"Insert/edit anchor", +cut_desc:"Cut", +copy_desc:"Copy", +paste_desc:"Paste", +image_props_desc:"Image properties", +newdocument_desc:"New document", +help_desc:"Help", +blockquote_desc:"Blockquote", +clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?", +path:"Path", +newdocument:"Are you sure you want clear all contents?", +toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X", +more_colors:"More colors" +}); \ No newline at end of file diff --git a/plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js b/plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js new file mode 100644 index 0000000000..9d124d7db6 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js @@ -0,0 +1,51 @@ +tinyMCE.addI18n('en.advanced_dlg',{ +about_title:"About TinyMCE", +about_general:"About", +about_help:"Help", +about_license:"License", +about_plugins:"Plugins", +about_plugin:"Plugin", +about_author:"Author", +about_version:"Version", +about_loaded:"Loaded plugins", +anchor_title:"Insert/edit anchor", +anchor_name:"Anchor name", +code_title:"HTML Source Editor", +code_wordwrap:"Word wrap", +colorpicker_title:"Select a color", +colorpicker_picker_tab:"Picker", +colorpicker_picker_title:"Color picker", +colorpicker_palette_tab:"Palette", +colorpicker_palette_title:"Palette colors", +colorpicker_named_tab:"Named", +colorpicker_named_title:"Named colors", +colorpicker_color:"Color:", +colorpicker_name:"Name:", +charmap_title:"Select custom character", +image_title:"Insert/edit image", +image_src:"Image URL", +image_alt:"Image description", +image_list:"Image list", +image_border:"Border", +image_dimensions:"Dimensions", +image_vspace:"Vertical space", +image_hspace:"Horizontal space", +image_align:"Alignment", +image_align_baseline:"Baseline", +image_align_top:"Top", +image_align_middle:"Middle", +image_align_bottom:"Bottom", +image_align_texttop:"Text top", +image_align_textbottom:"Text bottom", +image_align_left:"Left", +image_align_right:"Right", +link_title:"Insert/edit link", +link_url:"Link URL", +link_target:"Target", +link_target_same:"Open link in the same window", +link_target_blank:"Open link in a new window", +link_titlefield:"Title", +link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?", +link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?", +link_list:"Link list" +}); \ No newline at end of file diff --git a/plugins/TinyMCE/js/themes/advanced/link.htm b/plugins/TinyMCE/js/themes/advanced/link.htm new file mode 100644 index 0000000000..7565b9ae8b --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/link.htm @@ -0,0 +1,58 @@ + + + + {#advanced_dlg.link_title} + + + + + + + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
 
+
+
+ +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/content.css b/plugins/TinyMCE/js/themes/advanced/skins/default/content.css new file mode 100644 index 0000000000..36f38aba29 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/skins/default/content.css @@ -0,0 +1,35 @@ +body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;} +body {background:#FFF;} +body.mceForceColors {background:#FFF; color:#000;} +h1 {font-size: 2em} +h2 {font-size: 1.5em} +h3 {font-size: 1.17em} +h4 {font-size: 1em} +h5 {font-size: .83em} +h6 {font-size: .75em} +.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;} +a.mceItemAnchor {display:inline-block; width:11px !important; height:11px !important; background:url(img/items.gif) no-repeat 0 0;} +td.mceSelected, th.mceSelected {background-color:#3399ff !important} +img {border:0;} +table {cursor:default} +table td, table th {cursor:text} +ins {border-bottom:1px solid green; text-decoration: none; color:green} +del {color:red; text-decoration:line-through} +cite {border-bottom:1px dashed blue} +acronym {border-bottom:1px dotted #CCC; cursor:help} +abbr {border-bottom:1px dashed #CCC; cursor:help} + +/* IE */ +* html body { +scrollbar-3dlight-color:#F0F0EE; +scrollbar-arrow-color:#676662; +scrollbar-base-color:#F0F0EE; +scrollbar-darkshadow-color:#DDD; +scrollbar-face-color:#E0E0DD; +scrollbar-highlight-color:#F0F0EE; +scrollbar-shadow-color:#F0F0EE; +scrollbar-track-color:#F5F5F5; +} + +img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px} +font[face=mceinline] {font-family:inherit !important} diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/dialog.css b/plugins/TinyMCE/js/themes/advanced/skins/default/dialog.css new file mode 100644 index 0000000000..f01222650e --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/skins/default/dialog.css @@ -0,0 +1,117 @@ +/* Generic */ +body { +font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; +scrollbar-3dlight-color:#F0F0EE; +scrollbar-arrow-color:#676662; +scrollbar-base-color:#F0F0EE; +scrollbar-darkshadow-color:#DDDDDD; +scrollbar-face-color:#E0E0DD; +scrollbar-highlight-color:#F0F0EE; +scrollbar-shadow-color:#F0F0EE; +scrollbar-track-color:#F5F5F5; +background:#F0F0EE; +padding:0; +margin:8px 8px 0 8px; +} + +html {background:#F0F0EE;} +td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} +textarea {resize:none;outline:none;} +a:link, a:visited {color:black;} +a:hover {color:#2B6FB6;} +.nowrap {white-space: nowrap} + +/* Forms */ +fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;} +legend {color:#2B6FB6; font-weight:bold;} +label.msg {display:none;} +label.invalid {color:#EE0000; display:inline;} +input.invalid {border:1px solid #EE0000;} +input {background:#FFF; border:1px solid #CCC;} +input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} +input, select, textarea {border:1px solid #808080;} +input.radio {border:1px none #000000; background:transparent; vertical-align:middle;} +input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;} +.input_noborder {border:0;} + +/* Buttons */ +#insert, #cancel, input.button, .updateButton { +border:0; margin:0; padding:0; +font-weight:bold; +width:94px; height:26px; +background:url(img/buttons.png) 0 -26px; +cursor:pointer; +padding-bottom:2px; +float:left; +} + +#insert {background:url(img/buttons.png) 0 -52px} +#cancel {background:url(img/buttons.png) 0 0; float:right} + +/* Browse */ +a.pickcolor, a.browse {text-decoration:none} +a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;} +.mceOldBoxModel a.browse span {width:22px; height:20px;} +a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;} +a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} +a.browse:hover span.disabled {border:1px solid white; background-color:transparent;} +a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;} +.mceOldBoxModel a.pickcolor span {width:21px; height:17px;} +a.pickcolor:hover span {background-color:#B2BBD0;} +a.pickcolor:hover span.disabled {} + +/* Charmap */ +table.charmap {border:1px solid #AAA; text-align:center} +td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;} +#charmap a {display:block; color:#000; text-decoration:none; border:0} +#charmap a:hover {background:#CCC;color:#2B6FB6} +#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center} +#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center} + +/* Source */ +.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;} +.mceActionPanel {margin-top:5px;} + +/* Tabs classes */ +.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.gif) repeat-x 0 -72px;} +.tabs ul {margin:0; padding:0; list-style:none;} +.tabs li {float:left; background:url(img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;} +.tabs li.current {background:url(img/tabs.gif) no-repeat 0 -18px; margin-right:2px;} +.tabs span {float:left; display:block; background:url(img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;} +.tabs .current span {background:url(img/tabs.gif) no-repeat right -54px;} +.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;} +.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;} + +/* Panels */ +.panel_wrapper div.panel {display:none;} +.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;} +.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;} + +/* Columns */ +.column {float:left;} +.properties {width:100%;} +.properties .column1 {} +.properties .column2 {text-align:left;} + +/* Titles */ +h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;} +h3 {font-size:14px;} +.title {font-size:12px; font-weight:bold; color:#2B6FB6;} + +/* Dialog specific */ +#link .panel_wrapper, #link div.current {height:125px;} +#image .panel_wrapper, #image div.current {height:200px;} +#plugintable thead {font-weight:bold; background:#DDD;} +#plugintable, #about #plugintable td {border:1px solid #919B9C;} +#plugintable {width:96%; margin-top:10px;} +#pluginscontainer {height:290px; overflow:auto;} +#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;} +#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;} +#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;} +#colorpicker #light div {overflow:hidden;} +#colorpicker #previewblock {float:right; padding-left:10px; height:20px;} +#colorpicker .panel_wrapper div.current {height:175px;} +#colorpicker #namedcolors {width:150px;} +#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;} +#colorpicker #colornamecontainer {margin-top:5px;} +#colorpicker #picker_panel fieldset {margin:auto;width:325px;} diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/buttons.png b/plugins/TinyMCE/js/themes/advanced/skins/default/img/buttons.png new file mode 100644 index 0000000000000000000000000000000000000000..7dd58418ba7cfe58ae7efdf174e0b223fe3aa6a0 GIT binary patch literal 3274 zcmV;*3^ntKP)vhvWz=ElHVTU+(h$oTm7rnFw= z#lG_L@z>Yab%+@B(Z}@j@}#p|h#d-Ha21r3lI-j0?ajsc`T6PS=IZI^?Ca|2$-?Z+ z#H%L@czAgD`1gZ@gX+q{=f}bK_x5aTZ1(o``1trpNJ!-4;q&tH-P_pe%f#ZsyXeTl z;^5vYDk=vD2k`Ll^6~KO%foAHYuvlE`uh6h#J%Up!SnO-^YZcM$G_phy57FF>B_@2 zG&J}3_vhy1;NIKl=jBRDN&x`@?dHyV<$1d3kwydU{JsOZD~j?##m9zqnmp zU4)q(-rU*i>gdkR%iP-6>Bzt4<>Tby;C6O)g+u7Fi^Yd9*S@7=d<>TRzqB->R^6~NS=;q{L zU|{$5_HJ%&j-5pI_VnZ97cymWMQsi>#$@a~zJm+b24>*?s`Kw_>-YEd@9ysC=jQ6jz~|-U_V)Jf?d;9X z&BMdN$uR=*^77r?-S6-3%uUYo000UBNklbM`ydMEin*+}whKg169D1bTAel#7r%w?GyUy@b*pMzXSyzY?h@ z3-N}8g51;~G~P<{m+Z|*(~X5P1-aeb(_^{eT^B}ch?tY zrBh#z)8LR*SPxv0!r@BdYYB7ULp;eMaut}B_J#FVuVkeMSfGbo7?foJiWR%d&AM{+ zs^x08)P*FXmS8r^_C58*7PqCixUdj?MS6NHS?Eksi!D8XyhZr=Ul1r3RCu*V{soi3 zzJ^?Tvstfq>vehyT!DW8#RRvmM-f(7XmRUwdY!u(w$X#+dUw5Iw6NIiz9Kb&!jyfs zz7wIdNc;t;*LCX96)%>lcXukOE>3f|baq;ZjG(Zu)>R>@_lO)o=&L%#B#GkczAA~% zJ;h4u>#M7(4qz2p-+=>`?3BIRtq%iL?xv=uYQ!E$>I_#&Nz$GyO&+B4c*3Gp3X9(3 zL1Jlz)e3vPUgz-w9vz_+(dP}js|kB#^j=K3^ni>w0`h8!(x#?9g}qC!cX=BCuM6&( zm{HZxpeuFbq|$0R$Ae@IeR~u%VLT0CqICm0PlIHiXU^_(xm;m9ufe020DG5mHvqWk zv8uF52_Ex?yhN-=D+`4b_He8EJfV;`4BcMHBKDz>m?ehj(7M1T6bhHhxbb3vhLBf} z9#$(b1<%2aSe0yhH{@9U)I&%AWYc zIPAg;vm2`V`mnv%C6P*i?he;)tN|CS4xL=c0F1H~_U7zAY%|$rv%=n-z1^6le`)u{ z*YKg5npCT%<`6pW+f3fp-AGO5i6%8Q_rbns?(Gjhd^-bx>l`XX=5}O=IaG*bwv76? zaniYw5uB5aA5)Fa?>_}jyz}mUk-uY3yhAwr!JRvQ6WP1>uUjLl_ha3iJ0Bo^bT(3x z7shViUd;fvZ=bv{NjcZYe!3W2THIdm#iiKApH8kjsg28H7e9%Wmv?oQ%M>AeU0sQy zqVhx+;KMzQTOkP=!J(@tMeLJ{CogYM8|!1Sn9o;6(`6+}%AqHLvdS15u$HTVqTf<( zC4o%FO%i@{>j<}Qaa>DK_yY38EQ4X%z$FDGltFX@PM5-W%5-&YXdpW@-~q5_&i|GNqZ~+av^y0n>~v!INtH&lx1Wh1SQibqf3B52jwA zjZ&#LRET@3d*jjGHV8YzLKN8($JME3AND@PQnp20B^V;tx-WWXLCoUijgQ|`DeQwm z?d(xt7Vcj1(W6HcLO41@sR%D$YD7#&F*8)1j5xA<^r5I$or2lC!v2BD6us^MW};dk ziCK1hrNueasZ-KKjplzy<`6Ur$k43g%Tq-DD4EoL?NHc%6pco|9108#4LzPk&qNS~ z@IymU5|pGwz$FNxA&0ar0v@vs%@FZFwc6#ch60lPrPZA8zFQV%Ba!Q$2jCz?AD{>m zABo%u27~f$#FXoiNTioa2Ms=s%z!aWFqu9F$&75jxYE{k<3?K~{tMssI3ADuf;JP4 z^6_{t&ItyUDPPCq@sE<}z@RA-p9y05jX*pem=#tQMf;`syXaAiOwI5-e>6Td^_UkR zVfopVjqHO&pbPeEGRaR(Ju{`8e?{Fe8htkP5OfcsHZZu(FW;SCB7e1)VzJe`-~MS^ z`S$K=EQakbUxL@k{7TNYvN8{^lNazhajyS(k}%djNZ!ZSjt{oC501Tn!wJH>z+uAs z*P#3G`Ja68Ud1PYo)nG&HZjU$oynf$VXWmLfl4;LhW7;=BP>X*f$Q?+>3y zm6jmg29B0i2HM2L?pADHyD$O!GO&h3IxI^|O#`aZI25KttkOis1efk`Zb7u4IESjV z4GwmPfid_p&J9l1GOSaja&pS)3G6@e;EDw5## zNmZJ(A5x{!DLc>`uo9qQq30%Q$+e$2XEbV!Mk8BEAO(yeX`~ckG*oGzF(xS|s?tzX z%ciO{SeVhsiAp?Owtw%KkyL4{1iE9DT0xu2LTswiQqfSQv4X&28CfHD>^<3DrR5Qn zM&rb#1uB*H2Qg`m?Z6qRrzi3 zK~m{Taw4qO??+<1JSSX0g+08D{Wid_tT+UljgqS;38RfbrBcNa-eyay(q#K%1L#KK z>dR(KRcXA#u|<{Ue^Zs_ci2wJRgc#17&s=|3t(>xARK=DOyDXl5HN18(zIB$Rh1U7 z$wd$E2n1yNBLnDG`R#UxEdU3Uh2ZUW9_OT2X%4&H?%$$HbJ%S}4J)jEB<5wG8q|kKzxu41Cw-5|H{*E`4`XOxxoD9Y}F^Z SLTQbO*E^TJI;F+RU=09Vu@yA{ literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/menu_check.gif b/plugins/TinyMCE/js/themes/advanced/skins/default/img/menu_check.gif new file mode 100644 index 0000000000000000000000000000000000000000..adfdddccd7cac62a17d68873fa53c248bff8351a GIT binary patch literal 70 zcmZ?wbhEHb6k!lyXkcUjg8%>jEB<5wG8q|kKzxu41Cwk||H{*E`4`XG(j;}D)%x|1 U%)82UlRJ8EoZ9xTT7&iJhvXcHF*h)T1OnEW1i^?zgDfop1p?usL*#PMGT;HQkSO{q6FlJyb$PWkPf|h*eTST}7h8z$}MF(XD(aQ)ZLZ zM?v0rT<1C4XHn<6PbNA{XL@>1^)apdD_@tcYDrW#m`k#MmslI7p^P;Az74wGs`!SI zLs$GEZHsafXsu1i-WleMzAL(yw$-LK{0hv;6hrx8kx!!4$``dAyBnY9Jz&DqJo2$A z!(L$H=KqBeY~CF_viHPz^tTglc?D97CqEBjzUwH}7GI zapg8YZM~>2Wk%E$d&r@9ly9b4Q zJpM7T@}r63I(OExUlG%Xcjz3MU+9U^r!SkpjNThDtaP)7>j6L5z%o5|^hlVOyI*uY zt^UU6NTuY?(Lb4ZIU2Zb5Vz}Pb7KF%ivf&j^CL>$cDz?rMNTQQ|NqDVD7mhghUp%h zhIA{gi{S8y9YhIIbSv$`B!JiPi!0#4#Jge0)p&YVPHchWcyAn zQhvb8ggXGXs9;k`u9Uq*YB>O+Q3Rq=2hlLFcG{Q3ORH_}JnY8C+r%@}6|%ySP%bWG zV~mA;?P`Q2L_Ss})nrJ{$TmeA9Tt*4=}X5x%RioM@_?ZsKSEST-f+GBv~Ya)xX3O{ z8!d=YthI-13OI;RN~`>|6u5L{z20oBp%9MIj)n$!Aw{Wpq&Rtr4~*_74Gjo@3el>B zz(Rk;;>2lp73<2;d=r*8z%WkdsG=vRuG_fvxO#uN^El|+5Qoz^X!2MfxJ3m}vyi?> zMLLDi8+${Z6YbUg?8GNR>-+SwHKdFyr%HqWcs|X_l*-DAC^bG&KCqWg7-_`UlwQ`EdOp_LJkr`L$mHHs75uP?fSgVfsDjuE#ft2b8HDt0yFt!+;C zEgL=)G9ZFt4wa+N3Xg7FGc0~`&EEt6_%7tyzmnb9B_h1~7~GD4V-Bhx7~QKRkF>&aT>(-!Us@aJxAY@8E?HW$G8g zSz@7Jcp>iCp;lU1ieF6n7!oAa-1E!rS0 zF1lBFVS%G#ZO}b@*+bIk+7@Q|iG60vIDVpV%4tW8rKyzwRo_<25;8*Ky@n z-sX>W*b;M){5lB_Edc@m1`VHy0@dg$PTR9uE$O2&a?KAe?xRlCj&Z$iZYw>o1FUl`^eGF(ALoK@apvR@ALES^78HR@$B&M>-P5Y_4V=e^zifZ@AC5Q z@$v2U_Ve}i^85Sw`1tnr_VoSz{QUg;`uh3!`1kSe-|p?^>+0k0?&$36oE*q;kn@I-k&}bV{vSuh^^>3n?4| z;IMd1E}PHjw0g~MyWjA*d`_>=7l@jE&+q&HfPsR8goTEOh>41ejE#(BTJr4xw7TUm@OOFuz`c;&!9t#9!C>oFt6t5zwd>cgW6Pc$+rZ!o zxO3~?&AYen-@tNG7S|k~SJ3z>`o$Ddm(@N@>THSZ1l^mRxq}B^ypwDdw0~ zere{JXr`&=nrnnf=9^WrDd(JY)@f%NZo;W2ly~;&=bwOLndhE*25RV`h$b4qpoG4u z=%bKEiYB9tjw$J-m}V*mrIp61>8GHE8V0AGPATfCs76X^sZplt>Z^dR%IcG_)@rMq zvd((zuDp7gE33T*D{LLV&T8zj$R?}ovdlK?EUU#nEA6z@R%`9G*b0Edw%m5>?YH2D zEAF`DmTT_0=%%ax?z-%@>+ZYox~sqgCd6y+z4+#<@4o!@>u8O)@dg`oiyn5@f zOZ$w(NTg$xb9CJ6RgW7L9%1w;9GT zXhuesF~cnPJD=ab@q68~Jm-C%bKmdxIp;agd2Y%BGXpO6bL;>Ba2XluThcXz&bq9O zbcta`lj(}h&(Q7#0C1f7j~RgckHP@JZtkt8_uzq-Z=mlBFJC_iBRxF{zW`qk?|cu3v(}90mV#!^Y9bbb>P7@!1+ql<}?sp zNXiRm0PHg*1sRId0f{s2$@+lT9iV#r;p@8q2kUJL=^^8kT+`?l(PvbDThGW1C0HK@a+)b7UEvtILOv9*;y zFFj^-R#rg8<&;alw*0TqJQ1ZBWuDc85dbJo7o^|zfEqH!T{||Wk_zQ^x`zA73|??` zU8ik~SNUlJ06H*ok|w9ncrN-5bF>ewoG@h5b=#i1CRC(pcuPkd*Jt9Z0>%3 z4_jQ^z+e`PdvxtxhHN8fp1+*BY^nbqN2*hZgw@V9sTd{47y~BK>aUT*`=w&zAK2nu zk(+4-lx7Z)B0hbg$H)~1kr7z8;P+3}&wqQMRC*yr_rulROH-iR8cL4LsEN7>e1EFR z5T1Um-0=zHk;xTaNMP3*5dikve7k3)SsA0f;?U#4;I0_7sh5Cg~Dz=&cb_wCsWUA6tclC0LG zEr*^Oi)`?2C~q*k=PK#ge95<5F8^%JcQfsgZp~+?Wt~M*`5EP)e6`UyAtRI0nv$&P zb6#h?h~9O-16%o)v(B64OxR8hV-0@i{AN51=HyBgjO$PKlolxvW)b!j2^Ox)z5h*Q z`i)4x^>tOn?cA+Ao;+V0hzwNbm0Gm}n?0B7M;BkclxfSQinqPdsI2&`rgy{mhHazeL8gZm%X+Rq>0_W7 z+m>`$&Ozks6@lHWYga|TDc^@Fx;s3p%+AS%R2f!TR2gh{sMPM16@Kfu+h#|O;nwLl zzT$Ajz%y;^bm5lOqSbO4dzp}_#%)5aeC4xJ(a&xA!9Smu;d6^RA4eD6_bpoq?btdI zi%_6iQ+-a#2nL)G=0;8_W(4P$uzK%Je_wTRg?_}Ig`Oi^Td&k5%OwXLpAMT;|1x{; z-94VS-hB@1QtLi_K7C&K>Z&*t7*I6k8zBce6p9aV#cD`}CtO8k*{ zNf!hynujG$?#A`+L9%f?|JR#$};|n*|p=XA#_IMXs6-*m=p7n&ih&xDrlVTD( zET5w(Um)7IJkWtL4kY+HqQj;Lg$0cTzjn$Ib$AuLH$DmZX+-(c)grqaFDBpvdaD*2 zlUf{~vaUZvRY#iZna6nk*t)3jL?PX_X8wC~X>cXcW%sP+k!HZBbK zshD#!coM1i0;PYVpRK=A;HhY?R(H+#ri^B#{8RNM)mG(Jtv-1VyOCK)A;jok6EQV; znOc?S|8}A%I|oT?g=-w^;b(Id1|0oDKac%7Oehnokmr}XovnR8+3Z&4UmaeVa-p}E z_Rj=gN@WlICH~9vg2JTAWb%TZgUoreeM1@3un&LI+i!+S_1-9z+knMisd(RhpX>f| z!R;cU{Ff3wN*cF26yrXmzxUUzlr+tNdg44cJzfr1yC*czdY`{(Ryd!j3;z2!Aj#%I>NYR5LGHnQV#nCY{a$K6A*-9H$fZFAVL zZzM!)BjoMz2HX=6?wQ5r;v7~IW zk7JFQkN-|T;}j#6AtAU4j}w%F#^-FEW91>)3c8Pn$dZ6Dk6Yhe!0VEC|(AK@NEtZ0$y*z#dV=$;Tb zH(R8pvD|SG=1c4)5>P_RkpWkzW5aEW!B_A#?dI)HhuS+ji+amRvs(5vSH%?0@r19vTPRmOhPUK45F1n?urnaUPK*dtZ^v2!BFBhGqmC%N3&k89- zl4iH($0l7bRZ7KmZHv?)`hNAD?;H%dq4@alA$g}e7#S?S`vt{gj(H^! zB@KEV*AuKJ%E%ca85tlGW9|Xv$&G6W`n<{Hsbi`G0QIS_$QBuNTjGhKr6~Y}T>^mU zH~=^X=^6_FLDvBQ=L`V1a{=J2?+2&edjP-)Jh*Rtm+k|CAYv?U2)S3+gNn<9$7R6d zGkfAQ;RVgB#qF4^y4m8kwd}f?mf@`h3}F>}^f03SQ`_37Hgs|OT5;P-_YA&s64x<- zZ6E&)pWFR4i|?M<>72lJPygwi|2u>vOrVLQ%lnh7hqLQPOIyc_o5XnxVHrn8Voy-p z*ZAwRXP6t}N@YFlm^TnWt~D zGk`egUHCh^a@4o@w|8N86m>MZvOk78nA;%DVu(}d!#T{+_%eQdm$rtdqIW3hKPQ-7 z%J9nJ0AjCyiSBqXh};`q-XB8Xr`8T9(FYT#-Ld7JQRJU_%)!zY0rQuJ+9nMk@I%Pm z$u;`P_g1iU-Yp4LshY z{pXGcCyc-;Q*hE0oH7F^&A{o0;H)!k)(xC<2j@J%`KRF0ODgIexb~ikP6O96spw4V zS|*6e1vfs@Ha^idiovbYV@%n}MmdOUIQiW`#x6U{V|)6?$Gq4y1zO(T6B>yV|) z`6vfbPw}q3+Oli9k0Kx~j)O))3{gIfkmt2Ggmp^zqNV~Ix}Bb6FmL*P46|cnJO3_L zK&ntl)wtFUh1IpIh1yO3Mmga3zrqe$dFs>$Wuw|d zAM*qgBkJ|a=24a7v)G0p*oi|#t)_k1G&Vq1R(4zSWbIvtjNsvp?9_+OW&bznC8?G~ z`>U@@q`iG4a5!8tCy4>p=0ZC2;3}z>xq{r&oS&GOhzO98l_k1$5eLQN&_un`)%ltE z`FSZP!p*fuz5^9i)x(3)e6Y0czbwU;e*UHrrV$z!eogIazrf*Sz<((I!ZZm1ri)T3 z60EWBrBdi5!J4ufj>}A4OGb)crwEk`Amb%iL*u24;`I&rbqtww4AraVJP=t7QTq6d z>y*poqR#v}l}3C9sS;8tyHA^D@ng}bOTj=Qit{wwVBjggj((N^&w7zu!Bi?rGPq2| z;jQR{IEK-F|2T$T3&z)Lw>pD!b|5~N->%=H_h>P5^17g)AOiqM%gD$WcYkW-LL|8e zC%PnkpLb3A9znj&i70S?X1$=8=wb>)U*-%45;-_HyaB)w0)epZEJUxhFc|oY-7IeD zcGmW1Yz@w-namFDJ57gaaYb?Qs=P21A}4fiLg-DeYs_K^`(YJfdUCnlAER#tFZ>_a$BB99{ContEgmwxirsvI>X=!^5T?R>zTY!*gEY z?#v$*h);#T6+16v`qF3ak z={=Z8t;w7w2ERn97HO>ooYkViN0~zj2fl98uF^MPEaIB(7uwbusz zWn#>5-vr}sCLIhP3tOy2GJi?@Ekj;?HXR7PDwS57OQ+6%3yY{Vs~aAj!!{CNux4D) z;$m1K?QU;_l@1DjUp7eKd2<_z>h}||gWnBq`-y)^Y$GoZ{q^j;aM~PO_$kr28z0HD z?jroHxg!VbPET|0%S4OBf;$;ERm-}aGUHYw`=-Z2)OU&=f6MXq6z*GhQ9mz8YMN1X zA$2PZXynHJ^IR>G($dlUycyvgZo;wb+T7fWhm?nCmxHOjL%Q%Bu zOK(rFjt}Yh`CdOXlont=9hb%w*X=AV%+9PQDM<3K;1+&PYj?QOwElp;mJmC5Q-Cu; z_j9olaxZtLLYY(*z>8E>q2uLahjEinHmgPzzFu(iu#W2aZ97xl03at>J=w%BI-jLfSG(1)qZm4EQ@^MeoM-{P7PPn*+hB6S1 z$6~RD-3$-s+N*89cF6q2kVv<3}ah#beYOWC@IP(&*Fr{z^Yi3P$4r(ZGr z)LJF7oQl!zI{TMQ(fsKo!tIoeOG1zRGaRJrhbmuC^H&Rg9vB#CEfRTR*&u7{OoEkR zisJ4~`?qx@K&Ov{mR2rkWD{lJJP~%dl_vXhPp>GK^6)dI=NKe!Y;5r9KQ2;wbv^6o zx~UXDXe31|FqG;sSD^m@>ETfDG?r~%54#7pMLIsno7!iB*^92MAdyRSUZKnXfTWvC zmN5l+Zdc5_;G)~x+w*ht^L0KBh!$vPeSIgLKQl*};uL*IDC3GQE7XVlnZ)^r^K*2f z)wjw-LL43K?QLT2Z0OJ&eL~W=LL>KN#t+`8kAv^FLW{O$SADOL$LgBUAr8DuI?13F zZ~WG2$@6E|bSa@(lZRFnPAdXpX&kx^yzwD8gVUM{gcm-y*j~Sp=vj}I=&@NHi=o#M zz{qI+6h3S+Y(gjcGf4Z<-c$`;k6}0mXrlzg?Cnx|AG$`R^}5z)Wi1%XK^yq3j@M1O zxw)sJ&x?s2dc$q$M+xY{hKhXJvDP!VSq^+7 zK&?R^^LjkaF&C#6}U3!=r%%BB}_0cs!R4XTDW0&iQR%Q6@v0$p`QJ2%{H zgKg&rYinyWmanw^A6i?jSCcxWg6dT6^XeP1(R-DC3dvVF-5`_qzXBjm0c$D&qniSn R!Sp}^Mt9BhYjvGt{|88cricIl literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_black.png b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_black.png new file mode 100644 index 0000000000000000000000000000000000000000..8996c7493e8a58c9c40845cbe8abdc3e6730716d GIT binary patch literal 3736 zcmV;J4rlR+P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}000BCNkl)#*re`t|z!@uXQTe7P#;w#Wn=3>BNw{8@$8{@lQTY-PZN7P@?K?Gj zwyh>rjW7nIn1{^QG`8%on(qc8CV(xigUr`7w(PH(?}{LZ1z=n2AoDeiE&HqHGlS6# z<{k|0!N^@1vHK(QHH|I%tL8I<@eCF*F<4lQb18Ga?Qf;>3u`&*#FuMQ)tDj@gnL?+ zxAm_gB0;6{hE)7Um$l7e>&Ne1W6JjfLOsnUkHcDX{8g_)L`17zrR&;ZV(Y}$snNA{ zh3$QHu0!IiJXwRq?iF9_s_e%Eu&s5F`I^R-{Z;c5&)|OMsK;PGCI(wt2br&FY}sEm zpBW5iF!x~Y!Q6ut_Urebmhr)lp99~6uV1}lr)GVVYyceilo$(Yz}V4n zP`(d_C!HvOqs3NgayGsi@d6C|wnfB2sVXyr<6toNU~muS7GbAF2yPMB7SWl(e&QJH zTzt^Zpl3HDGWZw==T!UMK)8pl`DTW@K7`0`L2pUzihK1EnL zMfjcHMI@KOgLH~u2BR754+FqR2IF2=GJ|d4;MbYKePZzLx8wl)_h4WFR;tSRy$mGR z93ZCWc_TZAw{Yw49Y)Ger7An9-zuB_R#?|izg0$=tF6+SS{PMV2RLmN{Qf|6v_=os zQEE*rtg5SHItn;a)eZ$PAJZ6MTW8fi0h}OKh#E7P8O%MHTLiZVZV|)E;3HKzgzDQ5 zOHtxXNA+a}TiN79wLs43?6K-Quq{H=6GY(F9&DoeGJ}Wq6pKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}000UJNklsV|cYlY&q4zsSqY(=s&=iZ>cW|Jxv$MmG9zDvBot+(KW~|_7TD<6H{cAkN3K|aG zcrux+oO=g@0Ya4~{cSpH8q)S^C!RJ4&uZ})*9T~k*=eimkK)R(5Tt1);2fRB?TM})FJ3}Q5GXUb8Lk){FF_3Wx z=iJIUQx^{h5)s+dB4+IF?&d(;*xttO?zotV+(ty0F%iZKw08@d%-%zcDVt0A1Sf#Z z!$i550O_}rB?3rfgC(+rO4veFh#~^8Hy-20_BQs$V=WfUeQHPBy1+Q2J>DBT_nOd; zg%BBtmQXJ}Okfa+99U7I2a5MoP!1ME*2}cE*xTO+2~p?`YNwur5G5ud?C!LPP@KOm{BB z#+D0KgT?0I#e@*i(sz&zP75$15rJ3S|2QI{O)t_@pSjQy1b~?`xvW2-u@wmfCWc_c z)13c;fEO-bc3xDzZd;8l6W9w42 zW<`}u<0ZaeC@-Kijls+P(6(Jz6qgLJDBi=ii9)_II9f8%T4>=@up99}kB^U{(Z*SusdxZ;9thpIi5|i%i*z7$Q42&#_|A+Sh|kzjQ25$CH1E&}eROqug=T&4vm5K@rO%+N(%@`EF2u{BU z2Qnvsn%2zW93s5e7jCOIXrWnutK12sf9DVsIqQl!K zhoN|xb6z?(C(OXNeio?91RU=H0IvOZk=t(m;#^_H#4j{gps5xS*M76PNc)#Z#YNxG ziV!N#^i_O(Q*TlwRk0u{wdK&9Q_#P8{fY~KbKOP@%m6t7Q#fr z6(&y=#~QAtQ!vp0V0x&ttt5csqa28v*RKG_N5#EX2FeV0Jl4nlM=tICkBWPb$GWXo z+@j2iWlp6fpqDxQv_v1P%!ka5<0Jz&aqHWHjHo#FZ)M=#a_bw+j+mn}px!qeOTe}Q zY!hrb(x+I|44{$-^&C&VxQs>Iq8|c?*8SU-N@Z4=h=ATktzooG$I%jf zM^9NqP`kBL{y`K^Q5aM2ED-e}OpJ=ndH@$KuK0e+hz~1_tWL#>s0WxKT0l$@h4C8d{u@yJ}>WAE3Fd(@KviX7h9|z;NfuiI1EEH+t=KPgTM3Aw^tS8%B9EP z^FIQ3GY}A4!0e!2MEv!BH|*f^eOPO4vn>O8GOk!rNj0Vl^C`K{oB$@Vy3__9;QQZu zsT%p6nI|0@Px#?8vwI>zRXr6&qMS=T9077Cn~IJ)5MpqpvI zv*Y?!y^a9vbgF8avwNRNI6?R_xcWD=lsNK`)oC{XE_1H47NP>Y@&~8_J8U8J9{vFU zaP8Kjt$p*SAL^5fKL#$m)&YR~8wE(E1t_M@-d$N4PclpTv(-N;ISMKwaxkx7!L@h) z?Ofv@=u{EZUkCL!fwc{Yb$ys~>ThPh>-m8-eczl@e;u@L&NuaSNK0aRs52VW1Ma=! zW`6IzQ`|$`4H1F0bD)atgv*kf_TDsm_bxeM`GEfvi4`EMXxeA*;pX*U0iV6+){Bk+ z%x6ReTe}PSOr2szl;!Ry`!)GE+Z)6|z#gj^AWExl?*DF~j;SAfiH08s_s-@COXCse zt1K&4O)3x&A>UQ0%;Mqbl!n9UBEXfN+*(&e#D=3fmi?ZrZcfuxmO$jOUxm5?aMX7! zfjl>t#TnF+1%XC-2r6=Uu4xg9gQtKvc9uisyY6kqWefa}R)j}lGU^Bi!vc^> z9-S($V$V6bv=SaqzQ4o2%)s%DcQ3_4T)pHJ_8n&Rr~9ROG-5#LxX)wLf6NO|fq`uOj7mdgJI0H2v4wf~~Kng9R* M07*qoM6N<$f@g#ZbN~PV literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css new file mode 100644 index 0000000000..bb6b6138c2 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css @@ -0,0 +1,216 @@ +/* Reset */ +.o2k7Skin table, .o2k7Skin tbody, .o2k7Skin a, .o2k7Skin img, .o2k7Skin tr, .o2k7Skin div, .o2k7Skin td, .o2k7Skin iframe, .o2k7Skin span, .o2k7Skin *, .o2k7Skin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left} +.o2k7Skin a:hover, .o2k7Skin a:link, .o2k7Skin a:visited, .o2k7Skin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000} +.o2k7Skin table td {vertical-align:middle} + +/* Containers */ +.o2k7Skin table {background:#E5EFFD} +.o2k7Skin iframe {display:block; background:#FFF} +.o2k7Skin .mceToolbar {height:26px} + +/* External */ +.o2k7Skin .mceExternalToolbar {position:absolute; border:1px solid #ABC6DD; border-bottom:0; display:none} +.o2k7Skin .mceExternalToolbar td.mceToolbar {padding-right:13px;} +.o2k7Skin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0} + +/* Layout */ +.o2k7Skin table.mceLayout {border:0; border-left:1px solid #ABC6DD; border-right:1px solid #ABC6DD} +.o2k7Skin table.mceLayout tr.mceFirst td {border-top:1px solid #ABC6DD} +.o2k7Skin table.mceLayout tr.mceLast td {border-bottom:1px solid #ABC6DD} +.o2k7Skin table.mceToolbar, .o2k7Skin tr.mceFirst .mceToolbar tr td, .o2k7Skin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0} +.o2k7Skin .mceIframeContainer {border-top:1px solid #ABC6DD; border-bottom:1px solid #ABC6DD} +.o2k7Skin .mceStatusbar {display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px} +.o2k7Skin .mceStatusbar div {float:left; padding:2px} +.o2k7Skin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize} +.o2k7Skin .mceStatusbar a:hover {text-decoration:underline} +.o2k7Skin table.mceToolbar {margin-left:3px} +.o2k7Skin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; margin-left:3px;} +.o2k7Skin .mceToolbar td.mceFirst span {margin:0} +.o2k7Skin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px} +.o2k7Skin .mceToolbar .mceToolbarEndListBox span, .o2k7Skin .mceToolbar .mceToolbarStartListBox span {display:none} +.o2k7Skin span.mceIcon, .o2k7Skin img.mceIcon {display:block; width:20px; height:20px} +.o2k7Skin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px} +.o2k7Skin td.mceCenter {text-align:center;} +.o2k7Skin td.mceCenter table {margin:0 auto; text-align:left;} +.o2k7Skin td.mceRight table {margin:0 0 0 auto;} + +/* Button */ +.o2k7Skin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px} +.o2k7Skin a.mceButton span, .o2k7Skin a.mceButton img {margin-left:1px} +.o2k7Skin .mceOldBoxModel a.mceButton span, .o2k7Skin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px} +.o2k7Skin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px} +.o2k7Skin a.mceButtonActive, .o2k7Skin a.mceButtonSelected {background-position:0 -44px} +.o2k7Skin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} +.o2k7Skin .mceButtonLabeled {width:auto} +.o2k7Skin .mceButtonLabeled span.mceIcon {float:left} +.o2k7Skin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica} +.o2k7Skin .mceButtonDisabled .mceButtonLabel {color:#888} + +/* Separator */ +.o2k7Skin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px} + +/* ListBox */ +.o2k7Skin .mceListBox {margin-left:3px} +.o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block} +.o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden} +.o2k7Skin .mceListBox .mceOpen {width:14px; height:22px; background:url(img/button_bg.png) -66px 0} +.o2k7Skin table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF} +.o2k7Skin table.mceListBoxEnabled:hover .mceOpen, .o2k7Skin .mceListBoxHover .mceOpen, .o2k7Skin .mceListBoxSelected .mceOpen {background-position:-66px -22px} +.o2k7Skin .mceListBoxDisabled .mceText {color:gray} +.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden} +.o2k7Skin .mceOldBoxModel .mceListBox .mceText {height:22px} +.o2k7Skin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px; border:1px solid #b3c7e1; background:#FFF;} + +/* SplitButton */ +.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px} +.o2k7Skin .mceSplitButton {background:url(img/button_bg.png)} +.o2k7Skin .mceSplitButton a.mceAction {width:22px} +.o2k7Skin .mceSplitButton span.mceAction {width:22px; background-image:url(../../img/icons.gif)} +.o2k7Skin .mceSplitButton a.mceOpen {width:10px; background:url(img/button_bg.png) -44px 0} +.o2k7Skin .mceSplitButton span.mceOpen {display:none} +.o2k7Skin table.mceSplitButtonEnabled:hover a.mceAction, .o2k7Skin .mceSplitButtonHover a.mceAction, .o2k7Skin .mceSplitButtonSelected {background:url(img/button_bg.png) 0 -22px} +.o2k7Skin table.mceSplitButtonEnabled:hover a.mceOpen, .o2k7Skin .mceSplitButtonHover a.mceOpen, .o2k7Skin .mceSplitButtonSelected a.mceOpen {background-position:-44px -44px} +.o2k7Skin .mceSplitButtonDisabled .mceAction {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} +.o2k7Skin .mceSplitButtonActive {background-position:0 -44px} + +/* ColorSplitButton */ +.o2k7Skin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray} +.o2k7Skin .mceColorSplitMenu td {padding:2px} +.o2k7Skin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080} +.o2k7Skin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px} +.o2k7Skin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF} +.o2k7Skin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2} +.o2k7Skin a.mceMoreColors:hover {border:1px solid #0A246A} +.o2k7Skin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a;overflow:hidden} +.o2k7Skin .mce_forecolor span.mceAction, .o2k7Skin .mce_backcolor span.mceAction {height:15px;overflow:hidden} + +/* Menu */ +.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD} +.o2k7Skin .mceNoIcons span.mceIcon {width:0;} +.o2k7Skin .mceNoIcons a .mceText {padding-left:10px} +.o2k7Skin .mceMenu table {background:#FFF} +.o2k7Skin .mceMenu a, .o2k7Skin .mceMenu span, .o2k7Skin .mceMenu {display:block} +.o2k7Skin .mceMenu td {height:20px} +.o2k7Skin .mceMenu a {position:relative;padding:3px 0 4px 0} +.o2k7Skin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block} +.o2k7Skin .mceMenu span.mceText, .o2k7Skin .mceMenu .mcePreview {font-size:11px} +.o2k7Skin .mceMenu pre.mceText {font-family:Monospace} +.o2k7Skin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;} +.o2k7Skin .mceMenu .mceMenuItemEnabled a:hover, .o2k7Skin .mceMenu .mceMenuItemActive {background-color:#dbecf3} +.o2k7Skin td.mceMenuItemSeparator {background:#DDD; height:1px} +.o2k7Skin .mceMenuItemTitle a {border:0; background:#E5EFFD; border-bottom:1px solid #ABC6DD} +.o2k7Skin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px} +.o2k7Skin .mceMenuItemDisabled .mceText {color:#888} +.o2k7Skin .mceMenuItemSelected .mceIcon {background:url(../default/img/menu_check.gif)} +.o2k7Skin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.gif) no-repeat -6px center} +.o2k7Skin .mceMenu span.mceMenuLine {display:none} +.o2k7Skin .mceMenuItemSub a {background:url(../default/img/menu_arrow.gif) no-repeat top right;} + +/* Progress,Resize */ +.o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF} +.o2k7Skin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px} +.o2k7Skin .mcePlaceHolder {border:1px dotted gray} + +/* Formats */ +.o2k7Skin .mce_formatPreview a {font-size:10px} +.o2k7Skin .mce_p span.mceText {} +.o2k7Skin .mce_address span.mceText {font-style:italic} +.o2k7Skin .mce_pre span.mceText {font-family:monospace} +.o2k7Skin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em} +.o2k7Skin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em} +.o2k7Skin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em} +.o2k7Skin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em} +.o2k7Skin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em} +.o2k7Skin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em} + +/* Theme */ +.o2k7Skin span.mce_bold {background-position:0 0} +.o2k7Skin span.mce_italic {background-position:-60px 0} +.o2k7Skin span.mce_underline {background-position:-140px 0} +.o2k7Skin span.mce_strikethrough {background-position:-120px 0} +.o2k7Skin span.mce_undo {background-position:-160px 0} +.o2k7Skin span.mce_redo {background-position:-100px 0} +.o2k7Skin span.mce_cleanup {background-position:-40px 0} +.o2k7Skin span.mce_bullist {background-position:-20px 0} +.o2k7Skin span.mce_numlist {background-position:-80px 0} +.o2k7Skin span.mce_justifyleft {background-position:-460px 0} +.o2k7Skin span.mce_justifyright {background-position:-480px 0} +.o2k7Skin span.mce_justifycenter {background-position:-420px 0} +.o2k7Skin span.mce_justifyfull {background-position:-440px 0} +.o2k7Skin span.mce_anchor {background-position:-200px 0} +.o2k7Skin span.mce_indent {background-position:-400px 0} +.o2k7Skin span.mce_outdent {background-position:-540px 0} +.o2k7Skin span.mce_link {background-position:-500px 0} +.o2k7Skin span.mce_unlink {background-position:-640px 0} +.o2k7Skin span.mce_sub {background-position:-600px 0} +.o2k7Skin span.mce_sup {background-position:-620px 0} +.o2k7Skin span.mce_removeformat {background-position:-580px 0} +.o2k7Skin span.mce_newdocument {background-position:-520px 0} +.o2k7Skin span.mce_image {background-position:-380px 0} +.o2k7Skin span.mce_help {background-position:-340px 0} +.o2k7Skin span.mce_code {background-position:-260px 0} +.o2k7Skin span.mce_hr {background-position:-360px 0} +.o2k7Skin span.mce_visualaid {background-position:-660px 0} +.o2k7Skin span.mce_charmap {background-position:-240px 0} +.o2k7Skin span.mce_paste {background-position:-560px 0} +.o2k7Skin span.mce_copy {background-position:-700px 0} +.o2k7Skin span.mce_cut {background-position:-680px 0} +.o2k7Skin span.mce_blockquote {background-position:-220px 0} +.o2k7Skin .mce_forecolor span.mceAction {background-position:-720px 0} +.o2k7Skin .mce_backcolor span.mceAction {background-position:-760px 0} +.o2k7Skin span.mce_forecolorpicker {background-position:-720px 0} +.o2k7Skin span.mce_backcolorpicker {background-position:-760px 0} + +/* Plugins */ +.o2k7Skin span.mce_advhr {background-position:-0px -20px} +.o2k7Skin span.mce_ltr {background-position:-20px -20px} +.o2k7Skin span.mce_rtl {background-position:-40px -20px} +.o2k7Skin span.mce_emotions {background-position:-60px -20px} +.o2k7Skin span.mce_fullpage {background-position:-80px -20px} +.o2k7Skin span.mce_fullscreen {background-position:-100px -20px} +.o2k7Skin span.mce_iespell {background-position:-120px -20px} +.o2k7Skin span.mce_insertdate {background-position:-140px -20px} +.o2k7Skin span.mce_inserttime {background-position:-160px -20px} +.o2k7Skin span.mce_absolute {background-position:-180px -20px} +.o2k7Skin span.mce_backward {background-position:-200px -20px} +.o2k7Skin span.mce_forward {background-position:-220px -20px} +.o2k7Skin span.mce_insert_layer {background-position:-240px -20px} +.o2k7Skin span.mce_insertlayer {background-position:-260px -20px} +.o2k7Skin span.mce_movebackward {background-position:-280px -20px} +.o2k7Skin span.mce_moveforward {background-position:-300px -20px} +.o2k7Skin span.mce_media {background-position:-320px -20px} +.o2k7Skin span.mce_nonbreaking {background-position:-340px -20px} +.o2k7Skin span.mce_pastetext {background-position:-360px -20px} +.o2k7Skin span.mce_pasteword {background-position:-380px -20px} +.o2k7Skin span.mce_selectall {background-position:-400px -20px} +.o2k7Skin span.mce_preview {background-position:-420px -20px} +.o2k7Skin span.mce_print {background-position:-440px -20px} +.o2k7Skin span.mce_cancel {background-position:-460px -20px} +.o2k7Skin span.mce_save {background-position:-480px -20px} +.o2k7Skin span.mce_replace {background-position:-500px -20px} +.o2k7Skin span.mce_search {background-position:-520px -20px} +.o2k7Skin span.mce_styleprops {background-position:-560px -20px} +.o2k7Skin span.mce_table {background-position:-580px -20px} +.o2k7Skin span.mce_cell_props {background-position:-600px -20px} +.o2k7Skin span.mce_delete_table {background-position:-620px -20px} +.o2k7Skin span.mce_delete_col {background-position:-640px -20px} +.o2k7Skin span.mce_delete_row {background-position:-660px -20px} +.o2k7Skin span.mce_col_after {background-position:-680px -20px} +.o2k7Skin span.mce_col_before {background-position:-700px -20px} +.o2k7Skin span.mce_row_after {background-position:-720px -20px} +.o2k7Skin span.mce_row_before {background-position:-740px -20px} +.o2k7Skin span.mce_merge_cells {background-position:-760px -20px} +.o2k7Skin span.mce_table_props {background-position:-980px -20px} +.o2k7Skin span.mce_row_props {background-position:-780px -20px} +.o2k7Skin span.mce_split_cells {background-position:-800px -20px} +.o2k7Skin span.mce_template {background-position:-820px -20px} +.o2k7Skin span.mce_visualchars {background-position:-840px -20px} +.o2k7Skin span.mce_abbr {background-position:-860px -20px} +.o2k7Skin span.mce_acronym {background-position:-880px -20px} +.o2k7Skin span.mce_attribs {background-position:-900px -20px} +.o2k7Skin span.mce_cite {background-position:-920px -20px} +.o2k7Skin span.mce_del {background-position:-940px -20px} +.o2k7Skin span.mce_ins {background-position:-960px -20px} +.o2k7Skin span.mce_pagebreak {background-position:0 -40px} +.o2k7Skin span.mce_restoredraft {background-position:-20px -40px} +.o2k7Skin .mce_spellchecker span.mceAction {background-position:-540px -20px} diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css new file mode 100644 index 0000000000..153f0c38a6 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css @@ -0,0 +1,8 @@ +/* Black */ +.o2k7SkinBlack .mceToolbar .mceToolbarStart span, .o2k7SkinBlack .mceToolbar .mceToolbarEnd span, .o2k7SkinBlack .mceButton, .o2k7SkinBlack .mceSplitButton, .o2k7SkinBlack .mceSeparator, .o2k7SkinBlack .mceSplitButton a.mceOpen, .o2k7SkinBlack .mceListBox a.mceOpen {background-image:url(img/button_bg_black.png)} +.o2k7SkinBlack table, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack .mceMenuItemTitle span.mceText, .o2k7SkinBlack .mceStatusbar div, .o2k7SkinBlack .mceStatusbar span, .o2k7SkinBlack .mceStatusbar a {background:#535353; color:#FFF} +.o2k7SkinBlack table.mceListBoxEnabled .mceText, o2k7SkinBlack .mceListBox .mceText {background:#FFF; border:1px solid #CBCFD4; border-bottom-color:#989FA9; border-right:0} +.o2k7SkinBlack table.mceListBoxEnabled:hover .mceText, .o2k7SkinBlack .mceListBoxHover .mceText, .o2k7SkinBlack .mceListBoxSelected .mceText {background:#FFF; border:1px solid #FFBD69; border-right:0} +.o2k7SkinBlack .mceExternalToolbar, .o2k7SkinBlack .mceListBox .mceText, .o2k7SkinBlack div.mceMenu, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceFirst td, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceLast td, .o2k7SkinBlack .mceIframeContainer {border-color: #535353;} +.o2k7SkinBlack table.mceSplitButtonEnabled:hover a.mceAction, .o2k7SkinBlack .mceSplitButtonHover a.mceAction, .o2k7SkinBlack .mceSplitButtonSelected {background-image:url(img/button_bg_black.png)} +.o2k7SkinBlack .mceMenu .mceMenuItemEnabled a:hover, .o2k7SkinBlack .mceMenu .mceMenuItemActive {background-color:#FFE7A1} \ No newline at end of file diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css new file mode 100644 index 0000000000..7fe3b45e12 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css @@ -0,0 +1,5 @@ +/* Silver */ +.o2k7SkinSilver .mceToolbar .mceToolbarStart span, .o2k7SkinSilver .mceButton, .o2k7SkinSilver .mceSplitButton, .o2k7SkinSilver .mceSeparator, .o2k7SkinSilver .mceSplitButton a.mceOpen, .o2k7SkinSilver .mceListBox a.mceOpen {background-image:url(img/button_bg_silver.png)} +.o2k7SkinSilver table, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee} +.o2k7SkinSilver .mceListBox .mceText {background:#FFF} +.o2k7SkinSilver .mceExternalToolbar, .o2k7SkinSilver .mceListBox .mceText, .o2k7SkinSilver div.mceMenu, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceFirst td, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceLast td, .o2k7SkinSilver .mceIframeContainer {border-color: #bbb} diff --git a/plugins/TinyMCE/js/themes/advanced/source_editor.htm b/plugins/TinyMCE/js/themes/advanced/source_editor.htm new file mode 100644 index 0000000000..1c81d23ee7 --- /dev/null +++ b/plugins/TinyMCE/js/themes/advanced/source_editor.htm @@ -0,0 +1,26 @@ + + + + {#advanced_dlg.code_title} + + + + +
+
{#advanced_dlg.code_title}
+ +
+ +
+ +
+ + + +
+ + +
+
+ + diff --git a/plugins/TinyMCE/js/themes/simple/editor_template.js b/plugins/TinyMCE/js/themes/simple/editor_template.js new file mode 100644 index 0000000000..ed89abc067 --- /dev/null +++ b/plugins/TinyMCE/js/themes/simple/editor_template.js @@ -0,0 +1 @@ +(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})});c.dom.loadCSS(d+"/skins/"+f.skin+"/content.css")});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,deltaHeight:-20}},getInfo:function(){return{longname:"Simple theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add("simple",tinymce.themes.SimpleTheme)})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/themes/simple/editor_template_src.js b/plugins/TinyMCE/js/themes/simple/editor_template_src.js new file mode 100644 index 0000000000..4b862d49d6 --- /dev/null +++ b/plugins/TinyMCE/js/themes/simple/editor_template_src.js @@ -0,0 +1,85 @@ +/** + * editor_template_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +(function() { + var DOM = tinymce.DOM; + + // Tell it to load theme specific language pack(s) + tinymce.ThemeManager.requireLangPack('simple'); + + tinymce.create('tinymce.themes.SimpleTheme', { + init : function(ed, url) { + var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings; + + t.editor = ed; + + ed.onInit.add(function() { + ed.onNodeChange.add(function(ed, cm) { + tinymce.each(states, function(c) { + cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c)); + }); + }); + + ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css"); + }); + + DOM.loadCSS((s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css"); + }, + + renderUI : function(o) { + var t = this, n = o.targetNode, ic, tb, ed = t.editor, cf = ed.controlManager, sc; + + n = DOM.insertAfter(DOM.create('span', {id : ed.id + '_container', 'class' : 'mceEditor ' + ed.settings.skin + 'SimpleSkin'}), n); + n = sc = DOM.add(n, 'table', {cellPadding : 0, cellSpacing : 0, 'class' : 'mceLayout'}); + n = tb = DOM.add(n, 'tbody'); + + // Create iframe container + n = DOM.add(tb, 'tr'); + n = ic = DOM.add(DOM.add(n, 'td'), 'div', {'class' : 'mceIframeContainer'}); + + // Create toolbar container + n = DOM.add(DOM.add(tb, 'tr', {'class' : 'last'}), 'td', {'class' : 'mceToolbar mceLast', align : 'center'}); + + // Create toolbar + tb = t.toolbar = cf.createToolbar("tools1"); + tb.add(cf.createButton('bold', {title : 'simple.bold_desc', cmd : 'Bold'})); + tb.add(cf.createButton('italic', {title : 'simple.italic_desc', cmd : 'Italic'})); + tb.add(cf.createButton('underline', {title : 'simple.underline_desc', cmd : 'Underline'})); + tb.add(cf.createButton('strikethrough', {title : 'simple.striketrough_desc', cmd : 'Strikethrough'})); + tb.add(cf.createSeparator()); + tb.add(cf.createButton('undo', {title : 'simple.undo_desc', cmd : 'Undo'})); + tb.add(cf.createButton('redo', {title : 'simple.redo_desc', cmd : 'Redo'})); + tb.add(cf.createSeparator()); + tb.add(cf.createButton('cleanup', {title : 'simple.cleanup_desc', cmd : 'mceCleanup'})); + tb.add(cf.createSeparator()); + tb.add(cf.createButton('insertunorderedlist', {title : 'simple.bullist_desc', cmd : 'InsertUnorderedList'})); + tb.add(cf.createButton('insertorderedlist', {title : 'simple.numlist_desc', cmd : 'InsertOrderedList'})); + tb.renderTo(n); + + return { + iframeContainer : ic, + editorContainer : ed.id + '_container', + sizeContainer : sc, + deltaHeight : -20 + }; + }, + + getInfo : function() { + return { + longname : 'Simple theme', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + version : tinymce.majorVersion + "." + tinymce.minorVersion + } + } + }); + + tinymce.ThemeManager.add('simple', tinymce.themes.SimpleTheme); +})(); \ No newline at end of file diff --git a/plugins/TinyMCE/js/themes/simple/img/icons.gif b/plugins/TinyMCE/js/themes/simple/img/icons.gif new file mode 100644 index 0000000000000000000000000000000000000000..16af141ff0eea376a889b1e8d28e9c1cacaaab16 GIT binary patch literal 1440 zcmV;R1z-9{Nk%w1VaNa!0QUd@Ib*`7v&H}b0P*i`B{WZ*I4YI8{iDPCZ*XyWj;?N! z&ooP8CcKTM%}ImAk&d@bUef&=iA% zhPA3sm56OYcjMRI^s}jof~E0n!SIozxs`y)bZpaM%~elOt(xIz_1F@`xREtxwxO@X zElsNLx;f_MIwnTOux@bk@5r<-;@s){f~fMSskU>S&vlpdmZGk)n^Ks084*pfMo5}`Y)@uBrt7q^ z_xb)XxI@^-XhLVQWPPfUtMQSg&Xb6UQhU2=S3pa1!Lhs1Kwz1)!P59aI6r5pthLM4 zE-ud4`aC>8zybolqcQ$sRq*)W>+kl^)!br%x2LJkVv+Dui1Oh7|6z>ag023Luhg%= z;=sbh)RP30t>V}2$H?fg=;-%zOTU8v0MO8l85I$+z}bYP#G9DS_#hs}n3hj*tissz zAwYQh{QX~VkH5&*9YTcu{{H^`{_yYcW|;u|{Qilm^upTyi?sd!nVG)6{{LrW`s5%! zQETJeu@Y0sB3Qy+jGVB@-BWO)C1U{h_4v@?@UEu*S8lPiucH6>|4vxO2|0#LaF@v0 z@ZaCy@c8hkxVXaB{z|fT@U~;Hv$d$T$J*xpqPpE8TH+G^0=vlI+KzIEuZN}B@UYO} z&dtoGp5{=vw)ErQRcDJbQgSxGf8JYL_`X^{uFH_9uqY`f`}_Of)zF}&w4mVd!0r05 zoM3>k!2kdMA^8LW00930EC2ui0LTCo000R80RIUbNU)&6g9sBUT*$DY!-o(fN}Ncs zqQ#3CGiuz(v7^V2AVW@EluM+^lPFV4B&kwhfCK?JZW}S8Lq-x8D(>2KU{_0tBn}8A zagb%p1Q&P-6u`78(}*2LRH3FT;{^Z%ooYoWl!#X%K7Tem@Rf*AgGMWAZK^N;uLKrJ zgqs_6Dufyfw<06~AZA3KR{>nO09GJYj!yq2Mo2^;St0-;UpPxp*8_}f6+Z>JE!?&a z+dPb*b~hYDra%-%J`C}|)xna%9$;-yz|zc`Z6DmMS)p07fiENwe4t=jwVQEwY|=zo zxL=@s=&E6Qp)TGXT_1)l*emUVx)m?~6;Hl)c5^2e&KlH&3v877L9rfP;Fp}T4iu?af8AOXd@5C0(U&fK3z8Av u{UxbK~bzVrJ#-t*jZ&pr2fKKGn^&V9~vZo*x2BQEx{>;M38nHcL^F{BiObs@}* z`J{#WLxwovXYBAC060$l$4o$8!D#?sw|K0lclYii-vHm|k9_^aO!V}`{GR!GKKAwi zfM8^yH4JKv6VxCt?&+GwM`W1#S_weJtaOti_){-Si=W`V9WVZ2Ucj=G&%l61xW6Qx zIXOAvt$?KrXCnI?8&>>da`dP8#6ikZ*e9=Xj!Y3TOdSEKH%uWB{D5|7vhEi^+mI=uFz2#0P{IPZ3_WyP0q)8IE|RbRP5}{x z2f1NP!2Jwy0j82vKX1B3cwNuxb$DV7!1VZ0{n)%cIrDj8dcu&mZD20F_l+P$K~x|}=gXx@k6>Qpl6&#z^PNTmmnMl1(^x`y}el%5+)I}ziC z{+nV%ZRP-}B2yQ-P25`SrTJGZPx>e8=e;E=m0n2DO}o-_X%ci_#>h~ZH8IzKuTM0Y z!ct|+A3S80mwAc^uuzL3L4$(Us`#(&g1vdn3IGLcQB-!%*n8~-# z(8-gNhLb*47jZHb`6|X|FQyM5-M#AB)G}nmuJ*sd7Ge=tWvnn(eD^+kp_{h<=L73y zDXYOJx6iEduBxoEdgLhS*nG;fS}6Yj<-3-0Pq*enlU1E%T=^-L7kO$U(SjzXr8OTj zr_MeSdPII)w;u45Zy{6EJbT=3atLR%p1sbz7sSaGD-him50g5Rf12$y>`c(4Pd?@RJM(g;u(Uk1qVh}SVkL(S(PjvmQsHF% zs@Bj(*?Oho#P6&so65qwo7TeCu!>vdah0%gU#QmSa0glfs{`T=!b0z}Wyv?^mDXM{ zj)!Ny2g`_iaaF~>h`iQ)`P<0+%Rp&(4ow7}q)}P%K}}EjwzA!KD`JMH7TZdW|3N{3 z`H3~DvTR~_;v)a{mE|kKUsUe2D0(=0Rc2*p*;g4?SymZswyD1=8NeMVk=#0c zwL3k?%w8Sn54MXzP`_X1ZoC#iX`OsDGL^ zd}qk>_HnP{ip0v(-lx5vF0)=1zieu@VMfTaGHdyA<;$%*x9;?f43B&qnaRDDuc0`r zw3fe?KbwzfcDWaPPo}B7>4%3&J@(!g2SQV;&zpN{4yE=s_a1yVtSPLyGy|`Jm+_Ug zn5Uap70tj9Uw4`Ynkt&ld|jPmMb$PvZF=Pja}$C!_tYW?>22w+e!hA~(_rI@o9C_) zxhE3-yx|%DP1~D`d7}jctyevJSvYx^{TT1qobpQ3si7;~j|;8yr;K1iu$Jf1#Q3BH z)2Jc2Y)!d*;ogP*Htg*HlK+FH&`DBZ{`dSYd^xI)ph|d5h(i|-s}x@;a!`Igj_B9> zW4St^#ZjE8;DxCUx6reQgf*^Rlz%9nYF9J+wYfB?lI*%Iq`9y8tawFpMg97s(xQX& z@b!-7{^lVIgm01a8;suTi=aCg3QhoJ5to=?%n6Y?k@t^L4nkjwwUdtIx9evFG=5F}<%s89tU)Ll=IH%;BxHopOTFHL# z_Gc#)v#$kBp!J?(^pEtj^cVACiWX{hvbV2EYgWoVQAb|?sq#~+SI*O6c-p?u-o)GV zoSK|;t*VdrFANn=j9V^T=2!_6%8~DX;1}{?v}^B8nP7$7Ntv5j+IQm3Z)E(_;gv2I ze0yp4RM4el_K+@-F4zV63Dt@CIXy>dQS)76X|vF@t<=_QArd{xr8286F_IPUTkmk) zS;)UxB$yW{_EbsZW}9MkTIzd$-AZw@^d{H_?5}6wP_@UKdU}sfQnS2hCfk75_xIJu z9c0;?bib@a?@7%{v(>{q>^$2?5(d?>s*0|T;D^5tqTXLG*e(X~C%aBAr8Sktn%c>V z*#B*-exg>d?jM3;UlBNdHP)83TKz|2ll0SRiz>Wbc5QguA2Nw474wy#Qqu4@WO@V~OT7HyJw!rH-DRl6vaGdX8doDVop`xn0#eK|k z(i8W0QMTwlcUEQg-)wFlu6bkw7sj>$Pue#?$!Cv9q2SR?dM%&Y)qk{llnsoI+|q)6 zhVDU+psIw)g+|xe1D^?ka9HcU%GNaMek+-#Iq(Z*!(?MN?K$m1F`;}XYt<%H;tsMX zPao8nKlR7=F;6nn*e-H6&9?lW7Maw5TBXcf-8ACvJO7JbxE&U z7DqmTA&YX|L1m~Wj&x$k!Wr^T@5#LUKGDAfpco~J-X z-67;Q5jyY~iHn*_hwYBNEzB%@6)ty(c0qk?3R`FHAzeeeQ!UTuq`R|_Gutuf4#j1w-pKDw~i7P2D< z&P*4nX)Lr6Lw(6TWD-VjA^e#nZFC4eA0$brX|-r|-qXhG%5n!qvy8Kub*@T zl@KS;Mr77E(PQ*fQVNgW@s!+@p;)fi&7vEcYHG_`&uBPmnckTD*ySQ2`bYXut&pI6 z_`&q%?C3 zL<7Jf$dEVyc%c9Q8!iBFGY0^KeAAqJ3;}={xO)d`z`%eYh#JiuMDNsfW1=$<(dmeo zjP95WM1J$1l2&YH-E;|jIjipXkD;|WEa?w!-}cqFV)$|~e5s^$xdgu0`J3=-Vxw&w z*E+V2nAz@{CUpMB{~E`2PHpwf{u@M-#+S$=3%e74_NG_%k!y$Zf6230(!vG>jXT0@ zQWkKBD|iY9x4*ta!{QHDwhjtf(8ch@lGepy_(H?L@-N2uQ~0)tjbD=+0}K1zvkVjX zeiX51?%&Yje((Ihp1JK2%>KyY?kI*hvwAR%B~LEx&0zP(76>cb^ko8V2~SK&K zhZgtxQ9FG|29P*_-Wgih9Yhf(m-i-?h~t>;(FObndTSO-M6Qvr|LB;_gMJiY5WPLI z%qL(;yWI9`%6K1(3Q7(n;XqFi2emX?T!M z21(7}!4Q3a5TtI4U6L8WDoG=3?&A|zCaLN{(cA-zZgEJoBj3+qz1VjeXFz>+S_q3%Ha5;mvltEk0 z0I@mXY5{${dec;X@b$bxp z9RrC|)SYo~Z-z#k2KN_0G6p0sfm9+m{{oy329Ym8bR>w5rp-swkufx642VghGpsLV zfa_J@<_~aZ7~Go&NhpxA1I~ni(;>9q!Qf0NZ9WD(+@ue@p!NmO2Lh@6FQ{;5TB{2k z@raIiLhE`Aj>gePV!^R^N`noh!Is)&M{TsD!Ck=LIkdTQ5Lr3ckUh|l1I||*p_&en zje`w21K)GDrW!Y=8jp~TjF;a|x}gsMOhAB@xiv%meO2x_!p66W8|!3F z3K<7F$K0Opu&RXCgY0kj(}Md=k40Ax3**GROT%0zW&NB3QY@Ac&kyGl^e-&ALU@lcY9Q}1h&TWo z+k?8hnE8OA{@y=VwBtoF@ihygu@)0b$2x5Lov1td z-k(2Ze}N=k@O+&25t3H|iTZ-W?aUDy#Sicgc12CnBuq5L+a-$MlL@I3Y8rf~(>P;3 z6|)Hzvs3&!*8B$J{E8Z)sCX_~-HCM8E*6rI;^47^s=UobI%jJMp zUEHb>8saG^lr1R4=HWje>a6xd&1c<7%aN7wAskl%AhM|DwH^LGE<~=j0xyL1Sf`8F zffz3*Ycx-kPN=ks(AiKa(byk%<5z5p{T<`)uilX3XZL^m(C70?&g>>B^n3^&aS>j9 z(=a=hH}sEs46p9_z0MHG2c9n8K7X{?dLX>Or_5^-R}=tu3__0%m^4q(9!oU$T2(;h zNEfnimp*HOZcw1o*@LAD3YkNR4wn4n!2NCwOMU}OG@k+IaKgNZV*bJaAt7uzSt@b9 zI%mY~Pg3{HjIBCfO5aNUj=q~RUy9^Of6ie-JM#Qs73~!#+PX12@5|%LBP$yl8|!N} z(<+WeX4cottl1cv*%Xu$t)~l`4PMZ6FIm&W3$-3l_^?6o_l`b`;8X`NC zCSjT;Go-{Vy}Ran$)Ua?Ci?hcquG{?heOssk(AxT=;)W4uiuZYVX$@4afkW;MwkRe zg#{4hP)@|byaFde!CYEWl9lzz>a&*5*_D^tDmPctYVAn%wGT@|gM)()rq-0of86@S zpW$YCMNq)NG9$`LhM%M70yp9Oe27W3YD3n< zV?=oxR(68L_JS3@&Ti7CH)#u-q^YxN7b22`Or8ynbtoJ~GYNN6M}36p0QHtFr;sN(-`SjCLE z^;=~`c}nHAqS=&+**WhTU?amp#_E%kugb=cbTvjcRPdpJo_T*OLJ~E+ z!ioz{$NIZL-zNH7DRMHiRe7{kW|Putvu{sV*4mj)KM`Q#@$FtzjJr`TWl&lobv$g0 zKk0a>J=E{+oZtaA(2AEuGZ)*O-YVuT>7N}ZloloSuk}6lP(mKk+94U@XrwtnRBxAs zm^c~xa2y+x-0}0iUT9JlG=jv-)(>n)f262E!2209 VmjT$ODWe$zObpERYjs_s{s;8{A&me4 literal 0 HcmV?d00001 diff --git a/plugins/TinyMCE/js/themes/simple/skins/o2k7/ui.css b/plugins/TinyMCE/js/themes/simple/skins/o2k7/ui.css new file mode 100644 index 0000000000..cf6c35d109 --- /dev/null +++ b/plugins/TinyMCE/js/themes/simple/skins/o2k7/ui.css @@ -0,0 +1,35 @@ +/* Reset */ +.o2k7SimpleSkin table, .o2k7SimpleSkin tbody, .o2k7SimpleSkin a, .o2k7SimpleSkin img, .o2k7SimpleSkin tr, .o2k7SimpleSkin div, .o2k7SimpleSkin td, .o2k7SimpleSkin iframe, .o2k7SimpleSkin span, .o2k7SimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000} + +/* Containers */ +.o2k7SimpleSkin {position:relative} +.o2k7SimpleSkin table.mceLayout {background:#E5EFFD; border:1px solid #ABC6DD;} +.o2k7SimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #ABC6DD;} +.o2k7SimpleSkin .mceToolbar {height:26px;} + +/* Layout */ +.o2k7SimpleSkin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; } +.o2k7SimpleSkin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px} +.o2k7SimpleSkin span.mceIcon, .o2k7SimpleSkin img.mceIcon {display:block; width:20px; height:20px} +.o2k7SimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px} + +/* Button */ +.o2k7SimpleSkin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px} +.o2k7SimpleSkin a.mceButton span, .o2k7SimpleSkin a.mceButton img {margin:1px 0 0 1px} +.o2k7SimpleSkin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px} +.o2k7SimpleSkin a.mceButtonActive {background-position:0 -44px} +.o2k7SimpleSkin .mceButtonDisabled span {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} + +/* Separator */ +.o2k7SimpleSkin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px} + +/* Theme */ +.o2k7SimpleSkin span.mce_bold {background-position:0 0} +.o2k7SimpleSkin span.mce_italic {background-position:-60px 0} +.o2k7SimpleSkin span.mce_underline {background-position:-140px 0} +.o2k7SimpleSkin span.mce_strikethrough {background-position:-120px 0} +.o2k7SimpleSkin span.mce_undo {background-position:-160px 0} +.o2k7SimpleSkin span.mce_redo {background-position:-100px 0} +.o2k7SimpleSkin span.mce_cleanup {background-position:-40px 0} +.o2k7SimpleSkin span.mce_insertunorderedlist {background-position:-20px 0} +.o2k7SimpleSkin span.mce_insertorderedlist {background-position:-80px 0} diff --git a/plugins/TinyMCE/js/tiny_mce.js b/plugins/TinyMCE/js/tiny_mce.js new file mode 100644 index 0000000000..173fff78e1 --- /dev/null +++ b/plugins/TinyMCE/js/tiny_mce.js @@ -0,0 +1 @@ +(function(b){var a=/^\s*|\s*$/g,c;b.tinymce=b.tinyMCE={majorVersion:"3",minorVersion:"3rc1",releaseDate:"2010-02-23",_init:function(){var r=this,o=document,m=navigator,f=m.userAgent,l,e,k,j,h,q;r.isOpera=b.opera&&opera.buildNumber;r.isWebKit=/WebKit/.test(f);r.isIE=!r.isWebKit&&!r.isOpera&&(/MSIE/gi).test(f)&&(/Explorer/gi).test(m.appName);r.isIE6=r.isIE&&/MSIE [56]/.test(f);r.isGecko=!r.isWebKit&&/Gecko/.test(f);r.isMac=f.indexOf("Mac")!=-1;r.isAir=/adobeair/i.test(f);if(b.tinyMCEPreInit){r.suffix=tinyMCEPreInit.suffix;r.baseURL=tinyMCEPreInit.base;r.query=tinyMCEPreInit.query;return}r.suffix="";e=o.getElementsByTagName("base");for(l=0;l=c.length){for(e=0,b=g.length;e=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();tinymce.create("static tinymce.util.JSON",{serialize:function(e){var c,a,d=tinymce.util.JSON.serialize,b;if(e==null){return"null"}b=typeof e;if(b=="string"){a="\bb\tt\nn\ff\rr\"\"''\\\\";return'"'+e.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g,function(g,f){c=a.indexOf(f);if(c+1){return"\\"+a.charAt(c+1)}g=f.charCodeAt().toString(16);return"\\u"+"0000".substring(g.length)+g})+'"'}if(b=="object"){if(e.hasOwnProperty&&e instanceof Array){for(c=0,a="[";c0?",":"")+d(e[c])}return a+"]"}a="{";for(c in e){a+=typeof e[c]!="function"?(a.length>1?',"':'"')+c+'":'+d(e[c]):""}return a+"}"}return""+e},parse:function(s){try{return eval("("+s+")")}catch(ex){}}});tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){e.call(f.error_scope||f.scope,h,g)};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(m){var k=m.each,j=m.is,i=m.isWebKit,d=m.isIE,a=/^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/,e=g("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),f=g("src,href,style,coords,shape"),c={"&":"&",'"':""","<":"<",">":">"},n=/[<>&\"]/g,b=/^([a-z0-9],?)+$/i,h=/<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)(\s*\/?)>/g,l=/(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;function g(q){var p={},o;q=q.split(",");for(o=q.length;o>=0;o--){p[q[o]]=1}return p}m.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(u,q){var p=this,o;p.doc=u;p.win=window;p.files={};p.cssFlicker=false;p.counter=0;p.boxModel=!m.isIE||u.compatMode=="CSS1Compat";p.stdMode=u.documentMode===8;p.settings=q=m.extend({keep_values:false,hex_colors:1,process_html:1},q);if(m.isIE6){try{u.execCommand("BackgroundImageCache",false,true)}catch(r){p.cssFlicker=true}}if(q.valid_styles){p._styles={};k(q.valid_styles,function(t,s){p._styles[s]=m.explode(t)})}m.addUnload(p.destroy,p)},getRoot:function(){var o=this,p=o.settings;return(p&&o.get(p.root_element))||o.doc.body},getViewPort:function(p){var q,o;p=!p?this.win:p;q=p.document;o=this.boxModel?q.documentElement:q.body;return{x:p.pageXOffset||o.scrollLeft,y:p.pageYOffset||o.scrollTop,w:p.innerWidth||o.clientWidth,h:p.innerHeight||o.clientHeight}},getRect:function(s){var r,o=this,q;s=o.get(s);r=o.getPos(s);q=o.getSize(s);return{x:r.x,y:r.y,w:q.w,h:q.h}},getSize:function(r){var p=this,o,q;r=p.get(r);o=p.getStyle(r,"width");q=p.getStyle(r,"height");if(o.indexOf("px")===-1){o=0}if(q.indexOf("px")===-1){q=0}return{w:parseInt(o)||r.offsetWidth||r.clientWidth,h:parseInt(q)||r.offsetHeight||r.clientHeight}},getParent:function(q,p,o){return this.getParents(q,p,o,false)},getParents:function(z,v,s,y){var q=this,p,u=q.settings,x=[];z=q.get(z);y=y===undefined;if(u.strict_root){s=s||q.getRoot()}if(j(v,"string")){p=v;if(v==="*"){v=function(o){return o.nodeType==1}}else{v=function(o){return q.is(o,p)}}}while(z){if(z==s||!z.nodeType||z.nodeType===9){break}if(!v||v(z)){if(y){x.push(z)}else{return z}}z=z.parentNode}return y?x:null},get:function(o){var p;if(o&&this.doc&&typeof(o)=="string"){p=o;o=this.doc.getElementById(o);if(o&&o.id!==p){return this.doc.getElementsByName(p)[1]}}return o},getNext:function(p,o){return this._findSib(p,o,"nextSibling")},getPrev:function(p,o){return this._findSib(p,o,"previousSibling")},add:function(s,v,o,r,u){var q=this;return this.run(s,function(y){var x,t;x=j(v,"string")?q.doc.createElement(v):v;q.setAttribs(x,o);if(r){if(r.nodeType){x.appendChild(r)}else{q.setHTML(x,r)}}return !u?y.appendChild(x):x})},create:function(q,o,p){return this.add(this.doc.createElement(q),q,o,p,1)},createHTML:function(v,p,s){var u="",r=this,q;u+="<"+v;for(q in p){if(p.hasOwnProperty(q)){u+=" "+q+'="'+r.encode(p[q])+'"'}}if(m.is(s)){return u+">"+s+""}return u+" />"},remove:function(q,o){var p=this;return this.run(q,function(u){var t,s,r;t=u.parentNode;if(!t){return null}if(o){for(r=u.childNodes.length-1;r>=0;r--){p.insertAfter(u.childNodes[r],u)}}if(p.fixPsuedoLeaks){t=u.cloneNode(true);o="IELeakGarbageBin";s=p.get(o)||p.add(p.doc.body,"div",{id:o,style:"display:none"});s.appendChild(u);s.innerHTML="";return t}return t.removeChild(u)})},setStyle:function(r,o,p){var q=this;return q.run(r,function(v){var u,t;u=v.style;o=o.replace(/-(\D)/g,function(x,s){return s.toUpperCase()});if(q.pixelStyles.test(o)&&(m.is(p,"number")||/^[\-0-9\.]+$/.test(p))){p+="px"}switch(o){case"opacity":if(d){u.filter=p===""?"":"alpha(opacity="+(p*100)+")";if(!r.currentStyle||!r.currentStyle.hasLayout){u.display="inline-block"}}u[o]=u["-moz-opacity"]=u["-khtml-opacity"]=p||"";break;case"float":d?u.styleFloat=p:u.cssFloat=p;break;default:u[o]=p||""}if(q.settings.update_styles){q.setAttrib(v,"_mce_style")}})},getStyle:function(r,o,q){r=this.get(r);if(!r){return false}if(this.doc.defaultView&&q){o=o.replace(/[A-Z]/g,function(s){return"-"+s});try{return this.doc.defaultView.getComputedStyle(r,null).getPropertyValue(o)}catch(p){return null}}o=o.replace(/-(\D)/g,function(t,s){return s.toUpperCase()});if(o=="float"){o=d?"styleFloat":"cssFloat"}if(r.currentStyle&&q){return r.currentStyle[o]}return r.style[o]},setStyles:function(u,v){var q=this,r=q.settings,p;p=r.update_styles;r.update_styles=0;k(v,function(o,s){q.setStyle(u,s,o)});r.update_styles=p;if(r.update_styles){q.setAttrib(u,r.cssText)}},setAttrib:function(q,r,o){var p=this;if(!q||!r){return}if(p.settings.strict){r=r.toLowerCase()}return this.run(q,function(u){var t=p.settings;switch(r){case"style":if(!j(o,"string")){k(o,function(s,x){p.setStyle(u,x,s)});return}if(t.keep_values){if(o&&!p._isRes(o)){u.setAttribute("_mce_style",o,2)}else{u.removeAttribute("_mce_style",2)}}u.style.cssText=o;break;case"class":u.className=o||"";break;case"src":case"href":if(t.keep_values){if(t.url_converter){o=t.url_converter.call(t.url_converter_scope||p,o,r,u)}p.setAttrib(u,"_mce_"+r,o,2)}break;case"shape":u.setAttribute("_mce_style",o);break}if(j(o)&&o!==null&&o.length!==0){u.setAttribute(r,""+o,2)}else{u.removeAttribute(r,2)}})},setAttribs:function(q,r){var p=this;return this.run(q,function(o){k(r,function(s,t){p.setAttrib(o,t,s)})})},getAttrib:function(r,s,q){var o,p=this;r=p.get(r);if(!r||r.nodeType!==1){return false}if(!j(q)){q=""}if(/^(src|href|style|coords|shape)$/.test(s)){o=r.getAttribute("_mce_"+s);if(o){return o}}if(d&&p.props[s]){o=r[p.props[s]];o=o&&o.nodeValue?o.nodeValue:o}if(!o){o=r.getAttribute(s,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(s)){if(r[p.props[s]]===true&&o===""){return s}return o?s:""}if(r.nodeName==="FORM"&&r.getAttributeNode(s)){return r.getAttributeNode(s).nodeValue}if(s==="style"){o=o||r.style.cssText;if(o){o=p.serializeStyle(p.parseStyle(o),r.nodeName);if(p.settings.keep_values&&!p._isRes(o)){r.setAttribute("_mce_style",o)}}}if(i&&s==="class"&&o){o=o.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(d){switch(s){case"rowspan":case"colspan":if(o===1){o=""}break;case"size":if(o==="+0"||o===20||o===0){o=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(o===0){o=""}break;case"hspace":if(o===-1){o=""}break;case"maxlength":case"tabindex":if(o===32768||o===2147483647||o==="32768"){o=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(o===65535){return s}return q;case"shape":o=o.toLowerCase();break;default:if(s.indexOf("on")===0&&o){o=(""+o).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1")}}}return(o!==undefined&&o!==null&&o!=="")?""+o:q},getPos:function(A,s){var p=this,o=0,z=0,u,v=p.doc,q;A=p.get(A);s=s||v.body;if(A){if(d&&!p.stdMode){A=A.getBoundingClientRect();u=p.boxModel?v.documentElement:v.body;o=p.getStyle(p.select("html")[0],"borderWidth");o=(o=="medium"||p.boxModel&&!p.isIE6)&&2||o;A.top+=p.win.self!=p.win.top?2:0;return{x:A.left+u.scrollLeft-o,y:A.top+u.scrollTop-o}}q=A;while(q&&q!=s&&q.nodeType){o+=q.offsetLeft||0;z+=q.offsetTop||0;q=q.offsetParent}q=A.parentNode;while(q&&q!=s&&q.nodeType){o-=q.scrollLeft||0;z-=q.scrollTop||0;q=q.parentNode}}return{x:o,y:z}},parseStyle:function(r){var u=this,v=u.settings,x={};if(!r){return x}function p(D,A,C){var z,B,o,y;z=x[D+"-top"+A];if(!z){return}B=x[D+"-right"+A];if(z!=B){return}o=x[D+"-bottom"+A];if(B!=o){return}y=x[D+"-left"+A];if(o!=y){return}x[C]=y;delete x[D+"-top"+A];delete x[D+"-right"+A];delete x[D+"-bottom"+A];delete x[D+"-left"+A]}function q(y,s,o,A){var z;z=x[s];if(!z){return}z=x[o];if(!z){return}z=x[A];if(!z){return}x[y]=x[s]+" "+x[o]+" "+x[A];delete x[s];delete x[o];delete x[A]}r=r.replace(/&(#?[a-z0-9]+);/g,"&$1_MCE_SEMI_");k(r.split(";"),function(s){var o,t=[];if(s){s=s.replace(/_MCE_SEMI_/g,";");s=s.replace(/url\([^\)]+\)/g,function(y){t.push(y);return"url("+t.length+")"});s=s.split(":");o=m.trim(s[1]);o=o.replace(/url\(([^\)]+)\)/g,function(z,y){return t[parseInt(y)-1]});o=o.replace(/rgb\([^\)]+\)/g,function(y){return u.toHex(y)});if(v.url_converter){o=o.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g,function(y,z){return"url("+v.url_converter.call(v.url_converter_scope||u,u.decode(z),"style",null)+")"})}x[m.trim(s[0]).toLowerCase()]=o}});p("border","","border");p("border","-width","border-width");p("border","-color","border-color");p("border","-style","border-style");p("padding","","padding");p("margin","","margin");q("border","border-width","border-style","border-color");if(d){if(x.border=="medium none"){x.border=""}}return x},serializeStyle:function(v,p){var q=this,r="";function u(s,o){if(o&&s){if(o.indexOf("-")===0){return}switch(o){case"font-weight":if(s==700){s="bold"}break;case"color":case"background-color":s=s.toLowerCase();break}r+=(r?" ":"")+o+": "+s+";"}}if(p&&q._styles){k(q._styles["*"],function(o){u(v[o],o)});k(q._styles[p.toLowerCase()],function(o){u(v[o],o)})}else{k(v,u)}return r},loadCSS:function(o){var q=this,r=q.doc,p;if(!o){o=""}p=q.select("head")[0];k(o.split(","),function(s){var t;if(q.files[s]){return}q.files[s]=true;t=q.create("link",{rel:"stylesheet",href:m._addVer(s)});if(d&&r.documentMode){t.onload=function(){r.recalc();t.onload=null}}p.appendChild(t)})},addClass:function(o,p){return this.run(o,function(q){var r;if(!p){return 0}if(this.hasClass(q,p)){return q.className}r=this.removeClass(q,p);return q.className=(r!=""?(r+" "):"")+p})},removeClass:function(q,r){var o=this,p;return o.run(q,function(t){var s;if(o.hasClass(t,r)){if(!p){p=new RegExp("(^|\\s+)"+r+"(\\s+|$)","g")}s=t.className.replace(p," ");s=m.trim(s!=" "?s:"");t.className=s;if(!s){t.removeAttribute("class")}return s}return t.className})},hasClass:function(p,o){p=this.get(p);if(!p||!o){return false}return(" "+p.className+" ").indexOf(" "+o+" ")!==-1},show:function(o){return this.setStyle(o,"display","block")},hide:function(o){return this.setStyle(o,"display","none")},isHidden:function(o){o=this.get(o);return !o||o.style.display=="none"||this.getStyle(o,"display")=="none"},uniqueId:function(o){return(!o?"mce_":o)+(this.counter++)},setHTML:function(q,p){var o=this;return this.run(q,function(v){var r,t,s,z,u,r;p=o.processHTML(p);if(d){function y(){while(v.firstChild){v.firstChild.removeNode()}try{v.innerHTML="
"+p;v.removeChild(v.firstChild)}catch(x){r=o.create("div");r.innerHTML="
"+p;k(r.childNodes,function(B,A){if(A){v.appendChild(B)}})}}if(o.settings.fix_ie_paragraphs){p=p.replace(/

<\/p>|]+)><\/p>|/gi,' 

')}y();if(o.settings.fix_ie_paragraphs){s=v.getElementsByTagName("p");for(t=s.length-1,r=0;t>=0;t--){z=s[t];if(!z.hasChildNodes()){if(!z._mce_keep){r=1;break}z.removeAttribute("_mce_keep")}}}if(r){p=p.replace(/

]+)>|

/ig,'

');p=p.replace(/<\/p>/g,"
");y();if(o.settings.fix_ie_paragraphs){s=v.getElementsByTagName("DIV");for(t=s.length-1;t>=0;t--){z=s[t];if(z._mce_tmp){u=o.doc.createElement("p");z.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi,function(A,x){var B;if(x!=="_mce_tmp"){B=z.getAttribute(x);if(!B&&x==="class"){B=z.className}u.setAttribute(x,B)}});for(r=0;r]+)\/>|/gi,"");if(q.keep_values){if(/)/g,"\n");t=t.replace(/^[\r\n]*|[\r\n]*$/g,"");t=t.replace(/^\s*(\/\/\s*|\]\]>|-->|\]\]-->)\s*$/g,"");return t}r=r.replace(/]+|)>([\s\S]*?)<\/script>/gi,function(s,x,t){if(!x){x=' type="text/javascript"'}x=x.replace(/src=\"([^\"]+)\"?/i,function(y,z){if(q.url_converter){z=p.encode(q.url_converter.call(q.url_converter_scope||p,p.decode(z),"src","script"))}return'_mce_src="'+z+'"'});if(m.trim(t)){v.push(o(t));t=""}return""+t+""});r=r.replace(/]+|)>([\s\S]*?)<\/style>/gi,function(s,x,t){if(t){v.push(o(t));t=""}return""+t+""});r=r.replace(/]+|)>([\s\S]*?)<\/noscript>/g,function(s,x,t){return""})}r=r.replace(//g,"");function u(s){return s.replace(h,function(y,z,x,t){return"<"+z+x.replace(l,function(B,A,E,D,C){var F;A=A.toLowerCase();E=E||D||C||"";if(e[A]){if(E==="false"||E==="0"){return}return A+'="'+A+'"'}if(f[A]&&x.indexOf("_mce_"+A)==-1){F=p.decode(E);if(q.url_converter&&(A=="src"||A=="href")){F=q.url_converter.call(q.url_converter_scope||p,F,A,z)}if(A=="style"){F=p.serializeStyle(p.parseStyle(F),A)}return A+'="'+E+'" _mce_'+A+'="'+p.encode(F)+'"'}return B})+t+">"})}r=u(r);r=r.replace(/MCE_SCRIPT:([0-9]+)/g,function(t,s){return v[s]})}return r},getOuterHTML:function(o){var p;o=this.get(o);if(!o){return null}if(o.outerHTML!==undefined){return o.outerHTML}p=(o.ownerDocument||this.doc).createElement("body");p.appendChild(o.cloneNode(true));return p.innerHTML},setOuterHTML:function(r,p,s){var o=this;function q(u,t,x){var y,v;v=x.createElement("body");v.innerHTML=t;y=v.lastChild;while(y){o.insertAfter(y.cloneNode(true),u);y=y.previousSibling}o.remove(u)}return this.run(r,function(u){u=o.get(u);if(u.nodeType==1){s=s||u.ownerDocument||o.doc;if(d){try{if(d&&u.nodeType==1){u.outerHTML=p}else{q(u,p,s)}}catch(t){q(u,p,s)}}else{q(u,p,s)}}})},decode:function(p){var q,r,o;if(/&[\w#]+;/.test(p)){q=this.doc.createElement("div");q.innerHTML=p;r=q.firstChild;o="";if(r){do{o+=r.nodeValue}while(r=r.nextSibling)}return o||p}return p},encode:function(o){return(""+o).replace(n,function(p){return c[p]})},insertAfter:function(q,p){var o=this;p=o.get(p);return this.run(q,function(t){var s,r;s=p.parentNode;r=p.nextSibling;if(r){s.insertBefore(t,r)}else{s.appendChild(t)}return t})},isBlock:function(o){if(o.nodeType&&o.nodeType!==1){return false}o=o.nodeName||o;return a.test(o)},replace:function(s,r,p){var q=this;if(j(r,"array")){s=s.cloneNode(true)}return q.run(r,function(t){if(p){k(m.grep(t.childNodes),function(o){s.appendChild(o)})}if(q.fixPsuedoLeaks&&t.nodeType===1){t.parentNode.insertBefore(s,t);q.remove(t);return s}return t.parentNode.replaceChild(s,t)})},rename:function(r,o){var q=this,p;if(r.nodeName!=o.toUpperCase()){p=q.create(o);k(q.getAttribs(r),function(s){q.setAttrib(p,s.nodeName,q.getAttrib(r,s.nodeName))});q.replace(p,r,1)}return p||r},findCommonAncestor:function(q,o){var r=q,p;while(r){p=o;while(p&&r!=p){p=p.parentNode}if(r==p){break}r=r.parentNode}if(!r&&q.ownerDocument){return q.ownerDocument.documentElement}return r},toHex:function(o){var q=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(o);function p(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}if(q){o="#"+p(q[1])+p(q[2])+p(q[3]);return o}return o},getClasses:function(){var s=this,o=[],r,u={},v=s.settings.class_filter,q;if(s.classes){return s.classes}function x(t){k(t.imports,function(y){x(y)});k(t.cssRules||t.rules,function(y){switch(y.type||1){case 1:if(y.selectorText){k(y.selectorText.split(","),function(z){z=z.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(z)||!/\.[\w\-]+$/.test(z)){return}q=z;z=z.replace(/.*\.([a-z0-9_\-]+).*/i,"$1");if(v&&!(z=v(z,q))){return}if(!u[z]){o.push({"class":z});u[z]=1}})}break;case 3:x(y.styleSheet);break}})}try{k(s.doc.styleSheets,x)}catch(p){}if(o.length>0){s.classes=o}return o},run:function(u,r,q){var p=this,v;if(p.doc&&typeof(u)==="string"){u=p.get(u)}if(!u){return false}q=q||this;if(!u.nodeType&&(u.length||u.length===0)){v=[];k(u,function(s,o){if(s){if(typeof(s)=="string"){s=p.doc.getElementById(s)}v.push(r.call(q,s,o))}});return v}return r.call(q,u)},getAttribs:function(q){var p;q=this.get(q);if(!q){return[]}if(d){p=[];if(q.nodeName=="OBJECT"){return q.attributes}if(q.nodeName==="OPTION"&&this.getAttrib(q,"selected")){p.push({specified:1,nodeName:"selected"})}q.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(o){p.push({specified:1,nodeName:o})});return p}return q.attributes},destroy:function(p){var o=this;if(o.events){o.events.destroy()}o.win=o.doc=o.root=o.events=null;if(!p){m.removeUnload(o.destroy)}},createRng:function(){var o=this.doc;return o.createRange?o.createRange():new m.dom.Range(this)},nodeIndex:function(r,s){var o=0,q,p;if(r){for(r=r.previousSibling,q=r;r;r=r.previousSibling){p=r.nodeType;if(s&&p==3){if(r.nodeValue.length>0&&(q.nodeType!=p||q.nodeValue.length===0)){o++}}else{o++}q=r}}return o},split:function(u,s,y){var z=this,o=z.createRng(),v,q,x;function p(A){var t,r=A.childNodes;if(A.nodeType==1&&A.getAttribute("_mce_type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){p(r[t])}if(A.nodeType!=9){if(A.nodeType==3&&A.nodeValue.length>0){return}if(A.nodeType==1){r=A.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("_mce_type")=="bookmark"){A.parentNode.insertBefore(r[0],A)}if(r.length||/^(br|hr|input|img)$/i.test(A.nodeName)){return}}z.remove(A)}return A}if(u&&s){o.setStart(u.parentNode,z.nodeIndex(u));o.setEnd(s.parentNode,z.nodeIndex(s));v=o.extractContents();o=z.createRng();o.setStart(s.parentNode,z.nodeIndex(s)+1);o.setEnd(u.parentNode,z.nodeIndex(u)+1);q=o.extractContents();x=u.parentNode;x.insertBefore(p(v),u);if(y){x.replaceChild(y,s)}else{x.insertBefore(s,u)}x.insertBefore(p(q),u);z.remove(u);return y||s}},bind:function(s,o,r,q){var p=this;if(!p.events){p.events=new m.dom.EventUtils()}return p.events.add(s,o,r,q||this)},unbind:function(r,o,q){var p=this;if(!p.events){p.events=new m.dom.EventUtils()}return p.events.remove(r,o,q)},_findSib:function(r,o,p){var q=this,s=o;if(r){if(j(s,"string")){s=function(t){return q.is(t,o)}}for(r=r[p];r;r=r[p]){if(s(r)){return r}}}return null},_isRes:function(o){return/^(top|left|bottom|right|width|height)/i.test(o)||/;\s*(top|left|bottom|right|width|height)/i.test(o)}});m.DOM=new m.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(W,X){var Z=N[h],Y=N[U],V=N[P],t=N[z];if(W===0){return G(Z,Y,Z,Y)}if(W===1){return G(Z,Y,V,t)}if(W===2){return G(V,t,V,t)}if(W===3){return G(V,t,Z,Y)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(h){var j=this,k="\uFEFF",f,i,e=h.dom,d=true,g=false;function c(m,l){if(m&&l){if(m.item&&l.item&&m.item(0)===l.item(0)){return d}if(m.isEqual&&l.isEqual&&l.isEqual(m)){try{f.startContainer.nextSibling;return d}catch(n){}}}return g}function b(){var p=h.getRng(),l=e.createRng(),m,n,r,q;n=p.item?p.item(0):p.parentElement();if(n.ownerDocument!=e.doc){return l}if(p.item||!n.hasChildNodes()){l.setStart(n.parentNode,e.nodeIndex(n));l.setEnd(l.startContainer,l.startOffset+1);return l}m=p.duplicate();r=h.isCollapsed();p.collapse();p.pasteHTML('");if(!r){m.collapse(g);m.pasteHTML('")}function o(x){var t,v,s,u;s=e.get("_mce_"+(x?"start":"end"));u=s.previousSibling;if(u&&u.nodeType==3){t=u;v=t.nodeValue.length;e.remove(s);u=t.nextSibling;if(u&&u.nodeType==3){q=d;t.appendData(u.nodeValue);e.remove(u)}}else{u=s.nextSibling;if(u&&u.nodeType==3){t=u;v=0}else{if(u){v=e.nodeIndex(u)-1}else{v=e.nodeIndex(s)}t=s.parentNode}e.remove(s)}if(x){l.setStart(t,v)}if(!x||r){l.setEnd(t,v)}}o(d);if(!r){o(g)}if(q){j.addRange(l)}return l}this.addRange=function(m){var u,A,z=h.dom.doc,s=z.body,v,o,y,p,t,l,q,r,x,n;this.destroy();y=m.startContainer;p=m.startOffset;t=m.endContainer;l=m.endOffset;u=s.createTextRange();if(y==z||t==z){u=s.createTextRange();u.collapse();u.select();return}if(y.nodeType==1&&y.hasChildNodes()){r=y.childNodes.length-1;if(p>r){x=1;y=y.childNodes[r]}else{y=y.childNodes[p]}if(y.nodeType==3){p=0}}if(t.nodeType==1&&t.hasChildNodes()){r=t.childNodes.length-1;if(l==0){n=1;t=t.childNodes[0]}else{t=t.childNodes[Math.min(r,l-1)];if(t.nodeType==3){l=t.nodeValue.length}}}if(y==t&&y.nodeType==1){if(/^(IMG|TABLE)$/.test(y.nodeName)&&p!=l){u=s.createControlRange();u.addElement(y)}else{u=s.createTextRange();if(!y.hasChildNodes()&&y.canHaveHTML){y.innerHTML=k}u.moveToElementText(y);if(y.innerHTML==k){u.collapse(d);y.removeChild(y.firstChild)}}if(p==l){u.collapse(l<=m.endContainer.childNodes.length-1)}u.select();u.scrollIntoView();return}u=s.createTextRange();q=z.createElement("span");q.innerHTML=" ";if(y.nodeType==3){if(x){e.insertAfter(q,y)}else{y.parentNode.insertBefore(q,y)}u.moveToElementText(q);q.parentNode.removeChild(q);u.move("character",p)}else{u.moveToElementText(y);if(x){u.collapse(g)}}if(y==t&&y.nodeType==3){u.moveEnd("character",l-p);u.select();u.scrollIntoView();return}A=s.createTextRange();if(t.nodeType==3){t.parentNode.insertBefore(q,t);A.moveToElementText(q);q.parentNode.removeChild(q);A.move("character",l);u.setEndPoint("EndToStart",A)}else{A.moveToElementText(t);A.collapse(!!n);u.setEndPoint("EndToEnd",A)}u.select();u.scrollIntoView()};this.getRangeAt=function(){if(!f||!c(i,h.getRng())){f=b();i=h.getRng()}return f};this.destroy=function(){i=f=null};if(h.dom.boxModel){(function(){var r=e.doc,m=r.body,o,p;r.documentElement.unselectable=d;function q(s,v){var t=m.createTextRange();try{t.moveToPoint(s,v)}catch(u){t=null}return t}function n(t){var s;if(t.button){s=q(t.x,t.y);if(s){if(s.compareEndPoints("StartToStart",p)>0){s.setEndPoint("StartToStart",p)}else{s.setEndPoint("EndToEnd",p)}s.select()}}else{l()}}function l(){e.unbind(r,"mouseup",l);e.unbind(r,"mousemove",n);o=0}e.bind(r,"mousedown",function(s){if(s.target.nodeName==="HTML"){if(o){l()}o=1;p=q(s.x,s.y);if(p){e.bind(r,"mouseup",l);e.bind(r,"mousemove",n);p.select()}}})})()}}tinymce.dom.TridentSelection=a})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j_';if(j.startContainer==k&&j.endContainer==k){k.body.innerHTML=i}else{j.deleteContents();j.insertNode(f.getRng().createContextualFragment(i))}l=f.dom.get("__caret");j=k.createRange();j.setStartBefore(l);j.setEndBefore(l);f.setRng(j);f.dom.remove("__caret")}else{if(j.item){k.execCommand("Delete",false,null);j=f.getRng()}j.pasteHTML(i)}f.onSetContent.dispatch(f,g)},getStart:function(){var f=this,g=f.getRng(),h;if(a){if(g.item){return g.item(0)}g=g.duplicate();g.collapse(1);h=g.parentElement();if(h&&h.nodeName=="BODY"){return h.firstChild||h}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(a){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(q,r){var u=this,m=u.dom,g,j,i,n,h,o,p,l="\uFEFF",s;function f(v,x){var t=0;d(m.select(v),function(z,y){if(z==x){t=y}});return t}if(q==2){function k(){var v=u.getRng(true),t=m.getRoot(),x={};function y(z,B){var F=[],D,H,A=z[B?"startContainer":"endContainer"],E=z[B?"startOffset":"endOffset"],C,G={};if(A.nodeType==1&&A.hasChildNodes()){H=A.childNodes.length-1;G.exclude=(B&&E>H)||(!B&&E==0);if(!B&&E){E--}A=A.childNodes[E>H?H:E];if(A.nodeType==3){E=B?0:A.nodeValue.length}}if(A.nodeType==3){if(r){for(D=A.previousSibling;D&&D.nodeType==3;D=D.previousSibling){E+=D.nodeValue.length}}G.offset=E}for(;A&&A!=t;A=A.parentNode){F.push(u.dom.nodeIndex(A,r))}G.indexes=F;return G}x.start=y(v,true);if(!u.isCollapsed()){x.end=y(v)}return x}return k()}if(q){return{rng:u.getRng()}}g=u.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();s="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();g.collapse();g.pasteHTML(''+l+"");if(!n){j.collapse(false);j.pasteHTML(''+l+"")}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=u.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{_mce_type:"bookmark",id:i+"_end",style:s},l))}g.collapse(true);g.insertNode(m.create("span",{_mce_type:"bookmark",id:i+"_start",style:s},l))}u.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(l){var n=this,k=n.dom,i,h,f,m;if(n.tridentSel){n.tridentSel.destroy()}if(l){if(l.start){f=k.createRng();m=k.getRoot();function g(s){var o=l[s?"start":"end"],p,q,r;if(o){for(q=m,p=o.indexes.length-1;p>=0;p--){q=q.childNodes[o.indexes[p]]||q}if(s){if(q.nodeType==3&&o.offset){f.setStart(q,o.offset)}else{if(o.exclude){f.setStartAfter(q)}else{f.setStartBefore(q)}}}else{if(q.nodeType==3&&o.offset){f.setEnd(q,o.offset)}else{if(o.exclude){f.setEndBefore(q)}else{f.setEndAfter(q)}}}}}g(true);g();n.setRng(f)}else{if(l.id){f=k.createRng();function j(u){var p=k.get(l.id+"_"+u),t,o,r,s,q=l.keep;if(p){t=p.parentNode;if(u=="start"){if(!q){o=k.nodeIndex(p);if(o>0){o++}}else{t=p;o=1}f.setStart(t,o);f.setEnd(t,o)}else{if(!q){o=k.nodeIndex(p)}else{t=p;o=1}f.setEnd(t,o)}if(!q){s=p.previousSibling;r=p.nextSibling;d(c.grep(p.childNodes),function(v){if(v.nodeType==3){v.nodeValue=v.nodeValue.replace(/\uFEFF/g,"")}});while(p=k.get(l.id+"_"+u)){k.remove(p,1)}if(s&&r&&s.nodeType==r.nodeType&&s.nodeType==3){o=s.nodeValue.length;s.appendData(r.nodeValue);k.remove(r);if(u=="start"){f.setStart(s,o);f.setEnd(s,o)}else{f.setEnd(s,o)}}}}}j("start");j("end");n.setRng(f)}else{if(l.name){n.select(k.select(l.name)[l.index])}else{if(l.rng){n.setRng(l.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g);return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var g=this,h=g.getRng(),i;if(h.item){i=h.item(0);h=this.win.document.body.createTextRange();h.moveToElementText(i)}h.collapse(!!f);g.setRng(h)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(j){var g=this,h,i;if(j&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():g.win.document.createRange())}}catch(f){}if(!i){i=a?g.win.document.body.createTextRange():g.win.document.createRange()}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){h.removeAllRanges();h.addRange(i)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var g=this,f=g.getRng(),h=g.getSel(),i;if(!a){if(!f){return g.dom.getRoot()}i=f.commonAncestorContainer;if(!f.collapsed){if(f.startContainer==f.endContainer){if(f.startOffset-f.endOffset<2){if(f.startContainer.hasChildNodes()){i=f.startContainer.childNodes[f.startOffset]}}}if(c.isWebKit&&h.anchorNode&&h.anchorNode.nodeType==1){return h.anchorNode.childNodes[h.anchorOffset]}}if(i&&i.nodeType==3){return i.parentNode}return i}return f.item?f.item(0):f.parentElement()},getSelectedBlocks:function(g,f){var i=this,j=i.dom,m,h,l,k=[];m=j.getParent(g||i.getStart(),j.isBlock);h=j.getParent(f||i.getEnd(),j.isBlock);if(m){k.push(m)}if(m&&h&&m!=h){l=m;while((l=l.nextSibling)&&l!=h){if(j.isBlock(l)){k.push(l)}}}if(h&&m!=h){k.push(h)}return k},destroy:function(g){var f=this;f.win=null;if(f.tridentSel){f.tridentSel.destroy()}if(!g){c.removeUnload(f.destroy)}}})})(tinymce);(function(a){a.create("tinymce.dom.XMLWriter",{node:null,XMLWriter:function(c){function b(){var e=document.implementation;if(!e||!e.createDocument){try{return new ActiveXObject("MSXML2.DOMDocument")}catch(d){}try{return new ActiveXObject("Microsoft.XmlDom")}catch(d){}}else{return e.createDocument("","",null)}}this.doc=b();this.valid=a.isOpera||a.isWebKit;this.reset()},reset:function(){var b=this,c=b.doc;if(c.firstChild){c.removeChild(c.firstChild)}b.node=c.appendChild(c.createElement("html"))},writeStartElement:function(c){var b=this;b.node=b.node.appendChild(b.doc.createElement(c))},writeAttribute:function(c,b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.setAttribute(c,b)},writeEndElement:function(){this.node=this.node.parentNode},writeFullEndElement:function(){var b=this,c=b.node;c.appendChild(b.doc.createTextNode(""));b.node=c.parentNode},writeText:function(b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.appendChild(this.doc.createTextNode(b))},writeCDATA:function(b){this.node.appendChild(this.doc.createCDATASection(b))},writeComment:function(b){if(a.isIE){b=b.replace(/^\-|\-$/g," ")}this.node.appendChild(this.doc.createComment(b.replace(/\-\-/g," ")))},getContent:function(){var b;b=this.doc.xml||new XMLSerializer().serializeToString(this.doc);b=b.replace(/<\?[^?]+\?>||<\/html>||]+>/g,"");b=b.replace(/ ?\/>/g," />");if(this.valid){b=b.replace(/\%MCGT%/g,">")}return b}})})(tinymce);(function(a){a.create("tinymce.dom.StringWriter",{str:null,tags:null,count:0,settings:null,indent:null,StringWriter:function(b){this.settings=a.extend({indent_char:" ",indentation:0},b);this.reset()},reset:function(){this.indent="";this.str="";this.tags=[];this.count=0},writeStartElement:function(b){this._writeAttributesEnd();this.writeRaw("<"+b);this.tags.push(b);this.inAttr=true;this.count++;this.elementCount=this.count},writeAttribute:function(d,b){var c=this;c.writeRaw(" "+c.encode(d)+'="'+c.encode(b)+'"')},writeEndElement:function(){var b;if(this.tags.length>0){b=this.tags.pop();if(this._writeAttributesEnd(1)){this.writeRaw("")}if(this.settings.indentation>0){this.writeRaw("\n")}}},writeFullEndElement:function(){if(this.tags.length>0){this._writeAttributesEnd();this.writeRaw("");if(this.settings.indentation>0){this.writeRaw("\n")}}},writeText:function(b){this._writeAttributesEnd();this.writeRaw(this.encode(b));this.count++},writeCDATA:function(b){this._writeAttributesEnd();this.writeRaw("");this.count++},writeComment:function(b){this._writeAttributesEnd();this.writeRaw("");this.count++},writeRaw:function(b){this.str+=b},encode:function(b){return b.replace(/[<>&"]/g,function(c){switch(c){case"<":return"<";case">":return">";case"&":return"&";case'"':return"""}return c})},getContent:function(){return this.str},_writeAttributesEnd:function(b){if(!this.inAttr){return}this.inAttr=false;if(b&&this.elementCount==this.count){this.writeRaw(" />");return false}this.writeRaw(">");return true}})})(tinymce);(function(e){var g=e.extend,f=e.each,b=e.util.Dispatcher,d=e.isIE,a=e.isGecko;function c(h){return h.replace(/([?+*])/g,".$1")}e.create("tinymce.dom.Serializer",{Serializer:function(j){var i=this;i.key=0;i.onPreProcess=new b(i);i.onPostProcess=new b(i);try{i.writer=new e.dom.XMLWriter()}catch(h){i.writer=new e.dom.StringWriter()}i.settings=j=g({dom:e.DOM,valid_nodes:0,node_filter:0,attr_filter:0,invalid_attrs:/^(_mce_|_moz_|sizset|sizcache)/,closed:/^(br|hr|input|meta|img|link|param|area)$/,entity_encoding:"named",entities:"160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro",valid_elements:"*[*]",extended_valid_elements:0,invalid_elements:0,fix_table_elements:1,fix_list_elements:true,fix_content_duplication:true,convert_fonts_to_spans:false,font_size_classes:0,apply_source_formatting:0,indent_mode:"simple",indent_char:"\t",indent_levels:1,remove_linebreaks:1,remove_redundant_brs:1,element_format:"xhtml"},j);i.dom=j.dom;i.schema=j.schema;if(j.entity_encoding=="named"&&!j.entities){j.entity_encoding="raw"}if(j.remove_redundant_brs){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/(
\s*)+<\/(p|h[1-6]|div|li)>/gi,function(n,m,o){if(/^
\s*<\//.test(n)){return""}return n})})}if(j.element_format=="html"){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/<([^>]+) \/>/g,"<$1>")})}if(j.fix_list_elements){i.onPreProcess.add(function(v,s){var l,z,y=["ol","ul"],u,t,q,k=/^(OL|UL)$/,A;function m(r,x){var o=x.split(","),p;while((r=r.previousSibling)!=null){for(p=0;p=1767){f(i.dom.select("p table",l.node).reverse(),function(p){var o=i.dom.getParent(p.parentNode,"table,p");if(o.nodeName!="TABLE"){try{i.dom.split(o,p)}catch(m){}}})}})}},setEntities:function(o){var n=this,j,m,h={},k;if(n.entityLookup){return}j=o.split(",");for(m=0;m1){f(q[1].split("|"),function(u){var p={},t;k=k||[];u=u.replace(/::/g,"~");u=/^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(u);u[2]=u[2].replace(/~/g,":");if(u[1]=="!"){r=r||[];r.push(u[2])}if(u[1]=="-"){for(t=0;t=1767)){p=j.createHTMLDocument("");f(r.nodeName=="BODY"?r.childNodes:[r],function(h){p.body.appendChild(p.importNode(h,true))});if(r.nodeName!="BODY"){r=p.body.firstChild}else{r=p.body}i=k.dom.doc;k.dom.doc=p}k.key=""+(parseInt(k.key)+1);if(!q.no_events){q.node=r;k.onPreProcess.dispatch(k,q)}k.writer.reset();k._info=q;k._serializeNode(r,q.getInner);q.content=k.writer.getContent();if(i){k.dom.doc=i}if(!q.no_events){k.onPostProcess.dispatch(k,q)}k._postProcess(q);q.node=null;return e.trim(q.content)},_postProcess:function(n){var i=this,k=i.settings,j=n.content,m=[],l;if(n.format=="html"){l=i._protect({content:j,patterns:[{pattern:/(]*>)(.*?)(<\/script>)/g},{pattern:/(]*>)(.*?)(<\/noscript>)/g},{pattern:/(]*>)(.*?)(<\/style>)/g},{pattern:/(]*>)(.*?)(<\/pre>)/g,encode:1},{pattern:/()/g}]});j=l.content;if(k.entity_encoding!=="raw"){j=i._encode(j)}if(!n.set){j=j.replace(/

\s+<\/p>|]+)>\s+<\/p>/g,k.entity_encoding=="numeric"?" 

":" 

");if(k.remove_linebreaks){j=j.replace(/\r?\n|\r/g," ");j=j.replace(/(<[^>]+>)\s+/g,"$1 ");j=j.replace(/\s+(<\/[^>]+>)/g," $1");j=j.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g,"<$1 $2>");j=j.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g,"<$1>");j=j.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g,"")}if(k.apply_source_formatting&&k.indent_mode=="simple"){j=j.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g,"\n<$1$2$3>\n");j=j.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g,"\n<$1$2>");j=j.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g,"\n");j=j.replace(/\n\n/g,"\n")}}j=i._unprotect(j,l);j=j.replace(//g,"");if(k.entity_encoding=="raw"){j=j.replace(/

 <\/p>|]+)> <\/p>/g,"\u00a0

")}j=j.replace(/]+|)>([\s\S]*?)<\/noscript>/g,function(h,p,o){return""+i.dom.decode(o.replace(//g,""))+""})}n.content=j},_serializeNode:function(D,I){var z=this,A=z.settings,x=z.writer,q,j,u,F,E,H,B,h,y,k,r,C,p,m,G,o;if(!A.node_filter||A.node_filter(D)){switch(D.nodeType){case 1:if(D.hasAttribute?D.hasAttribute("_mce_bogus"):D.getAttribute("_mce_bogus")){return}p=G=false;q=D.hasChildNodes();k=D.getAttribute("_mce_name")||D.nodeName.toLowerCase();o=D.getAttribute("_mce_type");if(o){if(!z._info.cleanup){p=true;return}else{G=1}}if(d){if(D.scopeName!=="HTML"&&D.scopeName!=="html"){k=D.scopeName+":"+k}}if(k.indexOf("mce:")===0){k=k.substring(4)}if(!G){if(!z.validElementsRE||!z.validElementsRE.test(k)||(z.invalidElementsRE&&z.invalidElementsRE.test(k))||I){p=true;break}}if(d){if(A.fix_content_duplication){if(D._mce_serialized==z.key){return}D._mce_serialized=z.key}if(k.charAt(0)=="/"){k=k.substring(1)}}else{if(a){if(D.nodeName==="BR"&&D.getAttribute("type")=="_moz"){return}}}if(A.validate_children){if(z.elementName&&!z.schema.isValid(z.elementName,k)){p=true;break}z.elementName=k}r=z.findRule(k);k=r.name||k;m=A.closed.test(k);if((!q&&r.noEmpty)||(d&&!k)){p=true;break}if(r.requiredAttribs){H=r.requiredAttribs;for(F=H.length-1;F>=0;F--){if(this.dom.getAttrib(D,H[F])!==""){break}}if(F==-1){p=true;break}}x.writeStartElement(k);if(r.attribs){for(F=0,B=r.attribs,E=B.length;F-1;F--){h=B[F];if(h.specified){H=h.nodeName.toLowerCase();if(A.invalid_attrs.test(H)||!r.validAttribsRE.test(H)){continue}C=z.findAttribRule(r,H);y=z._getAttrib(D,C,H);if(y!==null){x.writeAttribute(H,y)}}}}if(o&&G){x.writeAttribute("_mce_type",o)}if(k==="script"&&e.trim(D.innerHTML)){x.writeText("// ");x.writeCDATA(D.innerHTML.replace(/|<\[CDATA\[|\]\]>/g,""));q=false;break}if(r.padd){if(q&&(u=D.firstChild)&&u.nodeType===1&&D.childNodes.length===1){if(u.hasAttribute?u.hasAttribute("_mce_bogus"):u.getAttribute("_mce_bogus")){x.writeText("\u00a0")}}else{if(!q){x.writeText("\u00a0")}}}break;case 3:if(A.validate_children&&z.elementName&&!z.schema.isValid(z.elementName,"#text")){return}return x.writeText(D.nodeValue);case 4:return x.writeCDATA(D.nodeValue);case 8:return x.writeComment(D.nodeValue)}}else{if(D.nodeType==1){q=D.hasChildNodes()}}if(q&&!m){u=D.firstChild;while(u){z._serializeNode(u);z.elementName=k;u=u.nextSibling}}if(!p){if(!m){x.writeFullEndElement()}else{x.writeEndElement()}}},_protect:function(j){var i=this;j.items=j.items||[];function h(l){return l.replace(/[\r\n\\]/g,function(m){if(m==="\n"){return"\\n"}else{if(m==="\\"){return"\\\\"}}return"\\r"})}function k(l){return l.replace(/\\[\\rn]/g,function(m){if(m==="\\n"){return"\n"}else{if(m==="\\\\"){return"\\"}}return"\r"})}f(j.patterns,function(l){j.content=k(h(j.content).replace(l.pattern,function(n,o,m,p){m=k(m);if(l.encode){m=i._encode(m)}j.items.push(m);return o+""+p}))});return j},_unprotect:function(i,j){i=i.replace(/\"))}if(a&&j.ListBox){if(a.Button||a.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarEnd"},b.createHTML("span",null,""))}}if(b.stdMode){e+=''+j.renderHTML()+""}else{e+=""+j.renderHTML()+""}if(f&&j.ListBox){if(f.Button||f.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarStart"},b.createHTML("span",null,""))}}}g="mceToolbarEnd";if(j.Button){g+=" mceToolbarEndButton"}else{if(j.SplitButton){g+=" mceToolbarEndSplitButton"}else{if(j.ListBox){g+=" mceToolbarEndListBox"}}}e+=b.createHTML("td",{"class":g},b.createHTML("span",null,""));return b.createHTML("table",{id:l.id,"class":"mceToolbar"+(m["class"]?" "+m["class"]:""),cellpadding:"0",cellspacing:"0",align:l.settings.align||""},""+e+"")}});(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{items:[],urls:{},lookup:{},onAdd:new a(this),get:function(d){return this.lookup[d]},requireLangPack:function(e){var d=b.settings;if(d&&d.language){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(e,d){this.items.push(d);this.lookup[e]=d;this.onAdd.dispatch(this,e,d);return d},load:function(h,e,d,g){var f=this;if(f.urls[h]){return}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}f.urls[h]=e.substring(0,e.lastIndexOf("/"));b.ScriptLoader.add(e,d,g)}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);if(j.adapter){j.adapter.patchEditor(m)}return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l':"",visual_table_class:"mceItemTable",visual:1,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",valid_elements:"@[id|class|style|title|dir';if(F.document_base_url!=m.documentBaseURL){E.iframeHTML+=''}E.iframeHTML+='';if(m.relaxedDomain){E.iframeHTML+=''; + + bi = s.body_id || 'tinymce'; + if (bi.indexOf('=') != -1) { + bi = t.getParam('body_id', '', 'hash'); + bi = bi[t.id] || bi; + } + + bc = s.body_class || ''; + if (bc.indexOf('=') != -1) { + bc = t.getParam('body_class', '', 'hash'); + bc = bc[t.id] || ''; + } + + t.iframeHTML += ''; + + // Domain relaxing enabled, then set document domain + if (tinymce.relaxedDomain) { + // We need to write the contents here in IE since multiple writes messes up refresh button and back button + if (isIE || (tinymce.isOpera && parseFloat(opera.version()) >= 9.5)) + u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'; + else if (tinymce.isOpera) + u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";document.close();ed.setupIframe();})()'; + } + + // Create iframe + n = DOM.add(o.iframeContainer, 'iframe', { + id : t.id + "_ifr", + src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7 + frameBorder : '0', + style : { + width : '100%', + height : h + } + }); + + t.contentAreaContainer = o.iframeContainer; + DOM.get(o.editorContainer).style.display = t.orgDisplay; + DOM.get(t.id).style.display = 'none'; + + if (!isIE || !tinymce.relaxedDomain) + t.setupIframe(); + + e = n = o = null; // Cleanup + }, + + setupIframe : function() { + var t = this, s = t.settings, e = DOM.get(t.id), d = t.getDoc(), h, b; + + // Setup iframe body + if (!isIE || !tinymce.relaxedDomain) { + d.open(); + d.write(t.iframeHTML); + d.close(); + } + + // Design mode needs to be added here Ctrl+A will fail otherwise + if (!isIE) { + try { + if (!s.readonly) + d.designMode = 'On'; + } catch (ex) { + // Will fail on Gecko if the editor is placed in an hidden container element + // The design mode will be set ones the editor is focused + } + } + + // IE needs to use contentEditable or it will display non secure items for HTTPS + if (isIE) { + // It will not steal focus if we hide it while setting contentEditable + b = t.getBody(); + DOM.hide(b); + + if (!s.readonly) + b.contentEditable = true; + + DOM.show(b); + } + + t.dom = new tinymce.dom.DOMUtils(t.getDoc(), { + keep_values : true, + url_converter : t.convertURL, + url_converter_scope : t, + hex_colors : s.force_hex_style_colors, + class_filter : s.class_filter, + update_styles : 1, + fix_ie_paragraphs : 1, + valid_styles : s.valid_styles + }); + + t.schema = new tinymce.dom.Schema(); + + t.serializer = new tinymce.dom.Serializer(extend(s, { + valid_elements : s.verify_html === false ? '*[*]' : s.valid_elements, + dom : t.dom, + schema : t.schema + })); + + t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer); + + t.formatter = new tinymce.Formatter(this); + + // Register default formats + t.formatter.register({ + alignleft : [ + {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}}, + {selector : 'img,table', styles : {'float' : 'left'}} + ], + + aligncenter : [ + {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}}, + {selector : 'img', styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}}, + {selector : 'table', styles : {marginLeft : 'auto', marginRight : 'auto'}} + ], + + alignright : [ + {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}}, + {selector : 'img,table', styles : {'float' : 'right'}} + ], + + alignfull : [ + {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'justify'}} + ], + + bold : [ + {inline : 'strong'}, + {inline : 'span', styles : {fontWeight : 'bold'}}, + {inline : 'b'} + ], + + italic : [ + {inline : 'em'}, + {inline : 'span', styles : {fontStyle : 'italic'}}, + {inline : 'i'} + ], + + underline : [ + {inline : 'span', styles : {textDecoration : 'underline'}, exact : true}, + {inline : 'u'} + ], + + strikethrough : [ + {inline : 'span', styles : {textDecoration : 'line-through'}, exact : true}, + {inline : 'u'} + ], + + forecolor : {inline : 'span', styles : {color : '%value'}}, + hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}}, + fontname : {inline : 'span', styles : {fontFamily : '%value'}}, + fontsize : {inline : 'span', styles : {fontSize : '%value'}}, + blockquote : {block : 'blockquote', wrapper : 1}, + + removeformat : [ + {selector : 'b,strong,em,i,font,u,strike', remove : 'all', split : true, expand : false, block_expand : true, deep : true}, + {selector : 'span', attributes : ['style', 'class'], remove : 'empty', split : true, expand : false, deep : true}, + {selector : '*', attributes : ['style', 'class'], expand : false, deep : true} + ] + }); + + // Register default block formats + each('p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp'.split(/\s/), function(name) { + t.formatter.register(name, {block : name}); + }); + + // Register user defined formats + t.formatter.register(t.settings.formats); + + t.undoManager = new tinymce.UndoManager(t); + + // Pass through + t.undoManager.onAdd.add(function(um, l) { + if (!l.initial) + return t.onChange.dispatch(t, l, um); + }); + + t.undoManager.onUndo.add(function(um, l) { + return t.onUndo.dispatch(t, l, um); + }); + + t.undoManager.onRedo.add(function(um, l) { + return t.onRedo.dispatch(t, l, um); + }); + + t.forceBlocks = new tinymce.ForceBlocks(t, { + forced_root_block : s.forced_root_block + }); + + t.editorCommands = new tinymce.EditorCommands(t); + + // Pass through + t.serializer.onPreProcess.add(function(se, o) { + return t.onPreProcess.dispatch(t, o, se); + }); + + t.serializer.onPostProcess.add(function(se, o) { + return t.onPostProcess.dispatch(t, o, se); + }); + + t.onPreInit.dispatch(t); + + if (!s.gecko_spellcheck) + t.getBody().spellcheck = 0; + + if (!s.readonly) + t._addEvents(); + + t.controlManager.onPostRender.dispatch(t, t.controlManager); + t.onPostRender.dispatch(t); + + if (s.directionality) + t.getBody().dir = s.directionality; + + if (s.nowrap) + t.getBody().style.whiteSpace = "nowrap"; + + if (s.custom_elements) { + function handleCustom(ed, o) { + each(explode(s.custom_elements), function(v) { + var n; + + if (v.indexOf('~') === 0) { + v = v.substring(1); + n = 'span'; + } else + n = 'div'; + + o.content = o.content.replace(new RegExp('<(' + v + ')([^>]*)>', 'g'), '<' + n + ' _mce_name="$1"$2>'); + o.content = o.content.replace(new RegExp('', 'g'), ''); + }); + }; + + t.onBeforeSetContent.add(handleCustom); + t.onPostProcess.add(function(ed, o) { + if (o.set) + handleCustom(ed, o); + }); + } + + if (s.handle_node_change_callback) { + t.onNodeChange.add(function(ed, cm, n) { + t.execCallback('handle_node_change_callback', t.id, n, -1, -1, true, t.selection.isCollapsed()); + }); + } + + if (s.save_callback) { + t.onSaveContent.add(function(ed, o) { + var h = t.execCallback('save_callback', t.id, o.content, t.getBody()); + + if (h) + o.content = h; + }); + } + + if (s.onchange_callback) { + t.onChange.add(function(ed, l) { + t.execCallback('onchange_callback', t, l); + }); + } + + if (s.convert_newlines_to_brs) { + t.onBeforeSetContent.add(function(ed, o) { + if (o.initial) + o.content = o.content.replace(/\r?\n/g, '
'); + }); + } + + if (s.fix_nesting && isIE) { + t.onBeforeSetContent.add(function(ed, o) { + o.content = t._fixNesting(o.content); + }); + } + + if (s.preformatted) { + t.onPostProcess.add(function(ed, o) { + o.content = o.content.replace(/^\s*/, ''); + o.content = o.content.replace(/<\/pre>\s*$/, ''); + + if (o.set) + o.content = '
' + o.content + '
'; + }); + } + + if (s.verify_css_classes) { + t.serializer.attribValueFilter = function(n, v) { + var s, cl; + + if (n == 'class') { + // Build regexp for classes + if (!t.classesRE) { + cl = t.dom.getClasses(); + + if (cl.length > 0) { + s = ''; + + each (cl, function(o) { + s += (s ? '|' : '') + o['class']; + }); + + t.classesRE = new RegExp('(' + s + ')', 'gi'); + } + } + + return !t.classesRE || /(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(v) || t.classesRE.test(v) ? v : ''; + } + + return v; + }; + } + + if (s.cleanup_callback) { + t.onBeforeSetContent.add(function(ed, o) { + o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o); + }); + + t.onPreProcess.add(function(ed, o) { + if (o.set) + t.execCallback('cleanup_callback', 'insert_to_editor_dom', o.node, o); + + if (o.get) + t.execCallback('cleanup_callback', 'get_from_editor_dom', o.node, o); + }); + + t.onPostProcess.add(function(ed, o) { + if (o.set) + o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o); + + if (o.get) + o.content = t.execCallback('cleanup_callback', 'get_from_editor', o.content, o); + }); + } + + if (s.save_callback) { + t.onGetContent.add(function(ed, o) { + if (o.save) + o.content = t.execCallback('save_callback', t.id, o.content, t.getBody()); + }); + } + + if (s.handle_event_callback) { + t.onEvent.add(function(ed, e, o) { + if (t.execCallback('handle_event_callback', e, ed, o) === false) + Event.cancel(e); + }); + } + + // Add visual aids when new contents is added + t.onSetContent.add(function() { + t.addVisual(t.getBody()); + }); + + // Remove empty contents + if (s.padd_empty_editor) { + t.onPostProcess.add(function(ed, o) { + o.content = o.content.replace(/^(]*>( | |\s|\u00a0|)<\/p>[\r\n]*|
[\r\n]*)$/, ''); + }); + } + + if (isGecko) { + // Fix gecko link bug, when a link is placed at the end of block elements there is + // no way to move the caret behind the link. This fix adds a bogus br element after the link + function fixLinks(ed, o) { + each(ed.dom.select('a'), function(n) { + var pn = n.parentNode; + + if (ed.dom.isBlock(pn) && pn.lastChild === n) + ed.dom.add(pn, 'br', {'_mce_bogus' : 1}); + }); + }; + + t.onExecCommand.add(function(ed, cmd) { + if (cmd === 'CreateLink') + fixLinks(ed); + }); + + t.onSetContent.add(t.selection.onSetContent.add(fixLinks)); + + if (!s.readonly) { + try { + // Design mode must be set here once again to fix a bug where + // Ctrl+A/Delete/Backspace didn't work if the editor was added using mceAddControl then removed then added again + d.designMode = 'Off'; + d.designMode = 'On'; + } catch (ex) { + // Will fail on Gecko if the editor is placed in an hidden container element + // The design mode will be set ones the editor is focused + } + } + } + + // A small timeout was needed since firefox will remove. Bug: #1838304 + setTimeout(function () { + if (t.removed) + return; + + t.load({initial : true, format : (s.cleanup_on_startup ? 'html' : 'raw')}); + t.startContent = t.getContent({format : 'raw'}); + t.initialized = true; + + t.onInit.dispatch(t); + t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc()); + t.execCallback('init_instance_callback', t); + t.focus(true); + t.nodeChanged({initial : 1}); + + // Load specified content CSS last + if (s.content_css) { + tinymce.each(explode(s.content_css), function(u) { + t.dom.loadCSS(t.documentBaseURI.toAbsolute(u)); + }); + } + + // Handle auto focus + if (s.auto_focus) { + setTimeout(function () { + var ed = tinymce.get(s.auto_focus); + + ed.selection.select(ed.getBody(), 1); + ed.selection.collapse(1); + ed.getWin().focus(); + }, 100); + } + }, 1); + + e = null; + }, + + + focus : function(sf) { + var oed, t = this, ce = t.settings.content_editable; + + if (!sf) { + // Is not content editable or the selection is outside the area in IE + // the IE statement is needed to avoid bluring if element selections inside layers since + // the layer is like it's own document in IE + if (!ce && (!isIE || t.selection.getNode().ownerDocument != t.getDoc())) + t.getWin().focus(); + + } + + if (tinymce.activeEditor != t) { + if ((oed = tinymce.activeEditor) != null) + oed.onDeactivate.dispatch(oed, t); + + t.onActivate.dispatch(t, oed); + } + + tinymce._setActive(t); + }, + + execCallback : function(n) { + var t = this, f = t.settings[n], s; + + if (!f) + return; + + // Look through lookup + if (t.callbackLookup && (s = t.callbackLookup[n])) { + f = s.func; + s = s.scope; + } + + if (is(f, 'string')) { + s = f.replace(/\.\w+$/, ''); + s = s ? tinymce.resolve(s) : 0; + f = tinymce.resolve(f); + t.callbackLookup = t.callbackLookup || {}; + t.callbackLookup[n] = {func : f, scope : s}; + } + + return f.apply(s || t, Array.prototype.slice.call(arguments, 1)); + }, + + translate : function(s) { + var c = this.settings.language || 'en', i18n = tinymce.i18n; + + if (!s) + return ''; + + return i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) { + return i18n[c + '.' + b] || '{#' + b + '}'; + }); + }, + + getLang : function(n, dv) { + return tinymce.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}'); + }, + + getParam : function(n, dv, ty) { + var tr = tinymce.trim, v = is(this.settings[n]) ? this.settings[n] : dv, o; + + if (ty === 'hash') { + o = {}; + + if (is(v, 'string')) { + each(v.indexOf('=') > 0 ? v.split(/[;,](?![^=;,]*(?:[;,]|$))/) : v.split(','), function(v) { + v = v.split('='); + + if (v.length > 1) + o[tr(v[0])] = tr(v[1]); + else + o[tr(v[0])] = tr(v); + }); + } else + o = v; + + return o; + } + + return v; + }, + + nodeChanged : function(o) { + var t = this, s = t.selection, n = s.getNode() || t.getBody(); + + // Fix for bug #1896577 it seems that this can not be fired while the editor is loading + if (t.initialized) { + o = o || {}; + n = isIE && n.ownerDocument != t.getDoc() ? t.getBody() : n; // Fix for IE initial state + + // Get parents and add them to object + o.parents = []; + t.dom.getParent(n, function(node) { + if (node.nodeName == 'BODY') + return true; + + o.parents.push(node); + }); + + t.onNodeChange.dispatch( + t, + o ? o.controlManager || t.controlManager : t.controlManager, + n, + s.isCollapsed(), + o + ); + } + }, + + addButton : function(n, s) { + var t = this; + + t.buttons = t.buttons || {}; + t.buttons[n] = s; + }, + + addCommand : function(n, f, s) { + this.execCommands[n] = {func : f, scope : s || this}; + }, + + addQueryStateHandler : function(n, f, s) { + this.queryStateCommands[n] = {func : f, scope : s || this}; + }, + + addQueryValueHandler : function(n, f, s) { + this.queryValueCommands[n] = {func : f, scope : s || this}; + }, + + addShortcut : function(pa, desc, cmd_func, sc) { + var t = this, c; + + if (!t.settings.custom_shortcuts) + return false; + + t.shortcuts = t.shortcuts || {}; + + if (is(cmd_func, 'string')) { + c = cmd_func; + + cmd_func = function() { + t.execCommand(c, false, null); + }; + } + + if (is(cmd_func, 'object')) { + c = cmd_func; + + cmd_func = function() { + t.execCommand(c[0], c[1], c[2]); + }; + } + + each(explode(pa), function(pa) { + var o = { + func : cmd_func, + scope : sc || this, + desc : desc, + alt : false, + ctrl : false, + shift : false + }; + + each(explode(pa, '+'), function(v) { + switch (v) { + case 'alt': + case 'ctrl': + case 'shift': + o[v] = true; + break; + + default: + o.charCode = v.charCodeAt(0); + o.keyCode = v.toUpperCase().charCodeAt(0); + } + }); + + t.shortcuts[(o.ctrl ? 'ctrl' : '') + ',' + (o.alt ? 'alt' : '') + ',' + (o.shift ? 'shift' : '') + ',' + o.keyCode] = o; + }); + + return true; + }, + + execCommand : function(cmd, ui, val, a) { + var t = this, s = 0, o, st; + + if (!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd) && (!a || !a.skip_focus)) + t.focus(); + + o = {}; + t.onBeforeExecCommand.dispatch(t, cmd, ui, val, o); + if (o.terminate) + return false; + + // Command callback + if (t.execCallback('execcommand_callback', t.id, t.selection.getNode(), cmd, ui, val)) { + t.onExecCommand.dispatch(t, cmd, ui, val, a); + return true; + } + + // Registred commands + if (o = t.execCommands[cmd]) { + st = o.func.call(o.scope, ui, val); + + // Fall through on true + if (st !== true) { + t.onExecCommand.dispatch(t, cmd, ui, val, a); + return st; + } + } + + // Plugin commands + each(t.plugins, function(p) { + if (p.execCommand && p.execCommand(cmd, ui, val)) { + t.onExecCommand.dispatch(t, cmd, ui, val, a); + s = 1; + return false; + } + }); + + if (s) + return true; + + // Theme commands + if (t.theme && t.theme.execCommand && t.theme.execCommand(cmd, ui, val)) { + t.onExecCommand.dispatch(t, cmd, ui, val, a); + return true; + } + + // Execute global commands + if (tinymce.GlobalCommands.execCommand(t, cmd, ui, val)) { + t.onExecCommand.dispatch(t, cmd, ui, val, a); + return true; + } + + // Editor commands + if (t.editorCommands.execCommand(cmd, ui, val)) { + t.onExecCommand.dispatch(t, cmd, ui, val, a); + return true; + } + + // Browser commands + t.getDoc().execCommand(cmd, ui, val); + t.onExecCommand.dispatch(t, cmd, ui, val, a); + }, + + queryCommandState : function(cmd) { + var t = this, o, s; + + // Is hidden then return undefined + if (t._isHidden()) + return; + + // Registred commands + if (o = t.queryStateCommands[cmd]) { + s = o.func.call(o.scope); + + // Fall though on true + if (s !== true) + return s; + } + + // Registred commands + o = t.editorCommands.queryCommandState(cmd); + if (o !== -1) + return o; + + // Browser commands + try { + return this.getDoc().queryCommandState(cmd); + } catch (ex) { + // Fails sometimes see bug: 1896577 + } + }, + + queryCommandValue : function(c) { + var t = this, o, s; + + // Is hidden then return undefined + if (t._isHidden()) + return; + + // Registred commands + if (o = t.queryValueCommands[c]) { + s = o.func.call(o.scope); + + // Fall though on true + if (s !== true) + return s; + } + + // Registred commands + o = t.editorCommands.queryCommandValue(c); + if (is(o)) + return o; + + // Browser commands + try { + return this.getDoc().queryCommandValue(c); + } catch (ex) { + // Fails sometimes see bug: 1896577 + } + }, + + show : function() { + var t = this; + + DOM.show(t.getContainer()); + DOM.hide(t.id); + t.load(); + }, + + hide : function() { + var t = this, d = t.getDoc(); + + // Fixed bug where IE has a blinking cursor left from the editor + if (isIE && d) + d.execCommand('SelectAll'); + + // We must save before we hide so Safari doesn't crash + t.save(); + DOM.hide(t.getContainer()); + DOM.setStyle(t.id, 'display', t.orgDisplay); + }, + + isHidden : function() { + return !DOM.isHidden(this.id); + }, + + setProgressState : function(b, ti, o) { + this.onSetProgressState.dispatch(this, b, ti, o); + + return b; + }, + + load : function(o) { + var t = this, e = t.getElement(), h; + + if (e) { + o = o || {}; + o.load = true; + + // Double encode existing entities in the value + h = t.setContent(is(e.value) ? e.value : e.innerHTML, o); + o.element = e; + + if (!o.no_events) + t.onLoadContent.dispatch(t, o); + + o.element = e = null; + + return h; + } + }, + + save : function(o) { + var t = this, e = t.getElement(), h, f; + + if (!e || !t.initialized) + return; + + o = o || {}; + o.save = true; + + // Add undo level will trigger onchange event + if (!o.no_events) { + t.undoManager.typing = 0; + t.undoManager.add(); + } + + o.element = e; + h = o.content = t.getContent(o); + + if (!o.no_events) + t.onSaveContent.dispatch(t, o); + + h = o.content; + + if (!/TEXTAREA|INPUT/i.test(e.nodeName)) { + e.innerHTML = h; + + // Update hidden form element + if (f = DOM.getParent(t.id, 'form')) { + each(f.elements, function(e) { + if (e.name == t.id) { + e.value = h; + return false; + } + }); + } + } else + e.value = h; + + o.element = e = null; + + return h; + }, + + setContent : function(h, o) { + var t = this; + + o = o || {}; + o.format = o.format || 'html'; + o.set = true; + o.content = h; + + if (!o.no_events) + t.onBeforeSetContent.dispatch(t, o); + + // Padd empty content in Gecko and Safari. Commands will otherwise fail on the content + // It will also be impossible to place the caret in the editor unless there is a BR element present + if (!tinymce.isIE && (h.length === 0 || /^\s+$/.test(h))) { + o.content = t.dom.setHTML(t.getBody(), '
'); + o.format = 'raw'; + } + + o.content = t.dom.setHTML(t.getBody(), tinymce.trim(o.content)); + + if (o.format != 'raw' && t.settings.cleanup) { + o.getInner = true; + o.content = t.dom.setHTML(t.getBody(), t.serializer.serialize(t.getBody(), o)); + } + + if (!o.no_events) + t.onSetContent.dispatch(t, o); + + return o.content; + }, + + getContent : function(o) { + var t = this, h; + + o = o || {}; + o.format = o.format || 'html'; + o.get = true; + + if (!o.no_events) + t.onBeforeGetContent.dispatch(t, o); + + if (o.format != 'raw' && t.settings.cleanup) { + o.getInner = true; + h = t.serializer.serialize(t.getBody(), o); + } else + h = t.getBody().innerHTML; + + h = h.replace(/^\s*|\s*$/g, ''); + o.content = h; + + if (!o.no_events) + t.onGetContent.dispatch(t, o); + + return o.content; + }, + + isDirty : function() { + var t = this; + + return tinymce.trim(t.startContent) != tinymce.trim(t.getContent({format : 'raw', no_events : 1})) && !t.isNotDirty; + }, + + getContainer : function() { + var t = this; + + if (!t.container) + t.container = DOM.get(t.editorContainer || t.id + '_parent'); + + return t.container; + }, + + getContentAreaContainer : function() { + return this.contentAreaContainer; + }, + + getElement : function() { + return DOM.get(this.settings.content_element || this.id); + }, + + getWin : function() { + var t = this, e; + + if (!t.contentWindow) { + e = DOM.get(t.id + "_ifr"); + + if (e) + t.contentWindow = e.contentWindow; + } + + return t.contentWindow; + }, + + getDoc : function() { + var t = this, w; + + if (!t.contentDocument) { + w = t.getWin(); + + if (w) + t.contentDocument = w.document; + } + + return t.contentDocument; + }, + + getBody : function() { + return this.bodyElement || this.getDoc().body; + }, + + convertURL : function(u, n, e) { + var t = this, s = t.settings; + + // Use callback instead + if (s.urlconverter_callback) + return t.execCallback('urlconverter_callback', u, e, true, n); + + // Don't convert link href since thats the CSS files that gets loaded into the editor also skip local file URLs + if (!s.convert_urls || (e && e.nodeName == 'LINK') || u.indexOf('file:') === 0) + return u; + + // Convert to relative + if (s.relative_urls) + return t.documentBaseURI.toRelative(u); + + // Convert to absolute + u = t.documentBaseURI.toAbsolute(u, s.remove_script_host); + + return u; + }, + + addVisual : function(e) { + var t = this, s = t.settings; + + e = e || t.getBody(); + + if (!is(t.hasVisual)) + t.hasVisual = s.visual; + + each(t.dom.select('table,a', e), function(e) { + var v; + + switch (e.nodeName) { + case 'TABLE': + v = t.dom.getAttrib(e, 'border'); + + if (!v || v == '0') { + if (t.hasVisual) + t.dom.addClass(e, s.visual_table_class); + else + t.dom.removeClass(e, s.visual_table_class); + } + + return; + + case 'A': + v = t.dom.getAttrib(e, 'name'); + + if (v) { + if (t.hasVisual) + t.dom.addClass(e, 'mceItemAnchor'); + else + t.dom.removeClass(e, 'mceItemAnchor'); + } + + return; + } + }); + + t.onVisualAid.dispatch(t, e, t.hasVisual); + }, + + remove : function() { + var t = this, e = t.getContainer(); + + t.removed = 1; // Cancels post remove event execution + t.hide(); + + t.execCallback('remove_instance_callback', t); + t.onRemove.dispatch(t); + + // Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command + t.onExecCommand.listeners = []; + + tinymce.remove(t); + DOM.remove(e); + }, + + destroy : function(s) { + var t = this; + + // One time is enough + if (t.destroyed) + return; + + if (!s) { + tinymce.removeUnload(t.destroy); + tinyMCE.onBeforeUnload.remove(t._beforeUnload); + + // Manual destroy + if (t.theme && t.theme.destroy) + t.theme.destroy(); + + // Destroy controls, selection and dom + t.controlManager.destroy(); + t.selection.destroy(); + t.dom.destroy(); + + // Remove all events + + // Don't clear the window or document if content editable + // is enabled since other instances might still be present + if (!t.settings.content_editable) { + Event.clear(t.getWin()); + Event.clear(t.getDoc()); + } + + Event.clear(t.getBody()); + Event.clear(t.formElement); + } + + if (t.formElement) { + t.formElement.submit = t.formElement._mceOldSubmit; + t.formElement._mceOldSubmit = null; + } + + t.contentAreaContainer = t.formElement = t.container = t.settings.content_element = t.bodyElement = t.contentDocument = t.contentWindow = null; + + if (t.selection) + t.selection = t.selection.win = t.selection.dom = t.selection.dom.doc = null; + + t.destroyed = 1; + }, + + // Internal functions + + _addEvents : function() { + // 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset + var t = this, i, s = t.settings, lo = { + mouseup : 'onMouseUp', + mousedown : 'onMouseDown', + click : 'onClick', + keyup : 'onKeyUp', + keydown : 'onKeyDown', + keypress : 'onKeyPress', + submit : 'onSubmit', + reset : 'onReset', + contextmenu : 'onContextMenu', + dblclick : 'onDblClick', + paste : 'onPaste' // Doesn't work in all browsers yet + }; + + function eventHandler(e, o) { + var ty = e.type; + + // Don't fire events when it's removed + if (t.removed) + return; + + // Generic event handler + if (t.onEvent.dispatch(t, e, o) !== false) { + // Specific event handler + t[lo[e.fakeType || e.type]].dispatch(t, e, o); + } + }; + + // Add DOM events + each(lo, function(v, k) { + switch (k) { + case 'contextmenu': + if (tinymce.isOpera) { + // Fake contextmenu on Opera + t.dom.bind(t.getBody(), 'mousedown', function(e) { + if (e.ctrlKey) { + e.fakeType = 'contextmenu'; + eventHandler(e); + } + }); + } else + t.dom.bind(t.getBody(), k, eventHandler); + break; + + case 'paste': + t.dom.bind(t.getBody(), k, function(e) { + eventHandler(e); + }); + break; + + case 'submit': + case 'reset': + t.dom.bind(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler); + break; + + default: + t.dom.bind(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler); + } + }); + + t.dom.bind(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) { + t.focus(true); + }); + + + // Fixes bug where a specified document_base_uri could result in broken images + // This will also fix drag drop of images in Gecko + if (tinymce.isGecko) { + // Convert all images to absolute URLs +/* t.onSetContent.add(function(ed, o) { + each(ed.dom.select('img'), function(e) { + var v; + + if (v = e.getAttribute('_mce_src')) + e.src = t.documentBaseURI.toAbsolute(v); + }) + });*/ + + t.dom.bind(t.getDoc(), 'DOMNodeInserted', function(e) { + var v; + + e = e.target; + + if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('_mce_src'))) + e.src = t.documentBaseURI.toAbsolute(v); + }); + } + + // Set various midas options in Gecko + if (isGecko) { + function setOpts() { + var t = this, d = t.getDoc(), s = t.settings; + + if (isGecko && !s.readonly) { + if (t._isHidden()) { + try { + if (!s.content_editable) + d.designMode = 'On'; + } catch (ex) { + // Fails if it's hidden + } + } + + try { + // Try new Gecko method + d.execCommand("styleWithCSS", 0, false); + } catch (ex) { + // Use old method + if (!t._isHidden()) + try {d.execCommand("useCSS", 0, true);} catch (ex) {} + } + + if (!s.table_inline_editing) + try {d.execCommand('enableInlineTableEditing', false, false);} catch (ex) {} + + if (!s.object_resizing) + try {d.execCommand('enableObjectResizing', false, false);} catch (ex) {} + } + }; + + t.onBeforeExecCommand.add(setOpts); + t.onMouseDown.add(setOpts); + } + + // Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250 + // WebKit can't even do simple things like selecting an image + // This also fixes so it's possible to select mceItemAnchors + if (tinymce.isWebKit) { + t.onClick.add(function(ed, e) { + e = e.target; + + // Needs tobe the setBaseAndExtend or it will fail to select floated images + if (e.nodeName == 'IMG' || (e.nodeName == 'A' && t.dom.hasClass(e, 'mceItemAnchor'))) + t.selection.getSel().setBaseAndExtent(e, 0, e, 1); + }); + } + + // Add node change handlers + t.onMouseUp.add(t.nodeChanged); + t.onClick.add(t.nodeChanged); + t.onKeyUp.add(function(ed, e) { + var c = e.keyCode; + + if ((c >= 33 && c <= 36) || (c >= 37 && c <= 40) || c == 13 || c == 45 || c == 46 || c == 8 || (tinymce.isMac && (c == 91 || c == 93)) || e.ctrlKey) + t.nodeChanged(); + }); + + // Add reset handler + t.onReset.add(function() { + t.setContent(t.startContent, {format : 'raw'}); + }); + + // Add shortcuts + if (s.custom_shortcuts) { + if (s.custom_undo_redo_keyboard_shortcuts) { + t.addShortcut('ctrl+z', t.getLang('undo_desc'), 'Undo'); + t.addShortcut('ctrl+y', t.getLang('redo_desc'), 'Redo'); + } + + // Add default shortcuts for gecko + if (isGecko) { + t.addShortcut('ctrl+b', t.getLang('bold_desc'), 'Bold'); + t.addShortcut('ctrl+i', t.getLang('italic_desc'), 'Italic'); + t.addShortcut('ctrl+u', t.getLang('underline_desc'), 'Underline'); + } + + // BlockFormat shortcuts keys + for (i=1; i<=6; i++) + t.addShortcut('ctrl+' + i, '', ['FormatBlock', false, 'h' + i]); + + t.addShortcut('ctrl+7', '', ['FormatBlock', false, '

']); + t.addShortcut('ctrl+8', '', ['FormatBlock', false, '

']); + t.addShortcut('ctrl+9', '', ['FormatBlock', false, '
']); + + function find(e) { + var v = null; + + if (!e.altKey && !e.ctrlKey && !e.metaKey) + return v; + + each(t.shortcuts, function(o) { + if (tinymce.isMac && o.ctrl != e.metaKey) + return; + else if (!tinymce.isMac && o.ctrl != e.ctrlKey) + return; + + if (o.alt != e.altKey) + return; + + if (o.shift != e.shiftKey) + return; + + if (e.keyCode == o.keyCode || (e.charCode && e.charCode == o.charCode)) { + v = o; + return false; + } + }); + + return v; + }; + + t.onKeyUp.add(function(ed, e) { + var o = find(e); + + if (o) + return Event.cancel(e); + }); + + t.onKeyPress.add(function(ed, e) { + var o = find(e); + + if (o) + return Event.cancel(e); + }); + + t.onKeyDown.add(function(ed, e) { + var o = find(e); + + if (o) { + o.func.call(o.scope); + return Event.cancel(e); + } + }); + } + + if (tinymce.isIE) { + // Fix so resize will only update the width and height attributes not the styles of an image + // It will also block mceItemNoResize items + t.dom.bind(t.getDoc(), 'controlselect', function(e) { + var re = t.resizeInfo, cb; + + e = e.target; + + // Don't do this action for non image elements + if (e.nodeName !== 'IMG') + return; + + if (re) + t.dom.unbind(re.node, re.ev, re.cb); + + if (!t.dom.hasClass(e, 'mceItemNoResize')) { + ev = 'resizeend'; + cb = t.dom.bind(e, ev, function(e) { + var v; + + e = e.target; + + if (v = t.dom.getStyle(e, 'width')) { + t.dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, '')); + t.dom.setStyle(e, 'width', ''); + } + + if (v = t.dom.getStyle(e, 'height')) { + t.dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, '')); + t.dom.setStyle(e, 'height', ''); + } + }); + } else { + ev = 'resizestart'; + cb = t.dom.bind(e, 'resizestart', Event.cancel, Event); + } + + re = t.resizeInfo = { + node : e, + ev : ev, + cb : cb + }; + }); + + t.onKeyDown.add(function(ed, e) { + switch (e.keyCode) { + case 8: + // Fix IE control + backspace browser bug + if (t.selection.getRng().item) { + t.selection.getRng().item(0).removeNode(); + return Event.cancel(e); + } + } + }); + + /*if (t.dom.boxModel) { + t.getBody().style.height = '100%'; + + Event.add(t.getWin(), 'resize', function(e) { + var docElm = t.getDoc().documentElement; + + docElm.style.height = (docElm.offsetHeight - 10) + 'px'; + }); + }*/ + } + + if (tinymce.isOpera) { + t.onClick.add(function(ed, e) { + Event.prevent(e); + }); + } + + // Add custom undo/redo handlers + if (s.custom_undo_redo) { + function addUndo() { + t.undoManager.typing = 0; + t.undoManager.add(); + }; + + t.dom.bind(t.getDoc(), 'focusout', function(e) { + if (!t.removed && t.undoManager.typing) + addUndo(); + }); + + t.onKeyUp.add(function(ed, e) { + if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45 || e.ctrlKey) + addUndo(); + }); + + t.onKeyDown.add(function(ed, e) { + // Is caracter positon keys + if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45) { + if (t.undoManager.typing) + addUndo(); + + return; + } + + if (!t.undoManager.typing) { + t.undoManager.add(); + t.undoManager.typing = 1; + } + }); + + t.onMouseDown.add(function() { + if (t.undoManager.typing) + addUndo(); + }); + } + }, + + _isHidden : function() { + var s; + + if (!isGecko) + return 0; + + // Weird, wheres that cursor selection? + s = this.selection.getSel(); + return (!s || !s.rangeCount || s.rangeCount == 0); + }, + + // Fix for bug #1867292 + _fixNesting : function(s) { + var d = [], i; + + s = s.replace(/<(\/)?([^\s>]+)[^>]*?>/g, function(a, b, c) { + var e; + + // Handle end element + if (b === '/') { + if (!d.length) + return ''; + + if (c !== d[d.length - 1].tag) { + for (i=d.length - 1; i>=0; i--) { + if (d[i].tag === c) { + d[i].close = 1; + break; + } + } + + return ''; + } else { + d.pop(); + + if (d.length && d[d.length - 1].close) { + a = a + ''; + d.pop(); + } + } + } else { + // Ignore these + if (/^(br|hr|input|meta|img|link|param)$/i.test(c)) + return a; + + // Ignore closed ones + if (/\/>$/.test(a)) + return a; + + d.push({tag : c}); // Push start element + } + + return a; + }); + + // End all open tags + for (i=d.length - 1; i>=0; i--) + s += ''; + + return s; + } + }); +})(tinymce); +(function(tinymce) { + // Added for compression purposes + var each = tinymce.each, undefined, TRUE = true, FALSE = false; + + tinymce.EditorCommands = function(editor) { + var dom = editor.dom, + selection = editor.selection, + commands = {state: {}, exec : {}, value : {}}, + settings = editor.settings, + bookmark; + + function execCommand(command, ui, value) { + var func; + + command = command.toLowerCase(); + if (func = commands.exec[command]) { + func(command, ui, value); + return TRUE; + } + + return FALSE; + }; + + function queryCommandState(command) { + var func; + + command = command.toLowerCase(); + if (func = commands.state[command]) + return func(command); + + return -1; + }; + + function queryCommandValue(command) { + var func; + + command = command.toLowerCase(); + if (func = commands.value[command]) + return func(command); + + return FALSE; + }; + + function addCommands(command_list, type) { + type = type || 'exec'; + + each(command_list, function(callback, command) { + each(command.toLowerCase().split(','), function(command) { + commands[type][command] = callback; + }); + }); + }; + + // Expose public methods + tinymce.extend(this, { + execCommand : execCommand, + queryCommandState : queryCommandState, + queryCommandValue : queryCommandValue, + addCommands : addCommands + }); + + // Private methods + + function execNativeCommand(command, ui, value) { + if (ui === undefined) + ui = FALSE; + + if (value === undefined) + value = null; + + return editor.getDoc().execCommand(command, ui, value); + }; + + function isFormatMatch(name) { + return editor.formatter.match(name); + }; + + function toggleFormat(name, value) { + editor.formatter.toggle(name, value ? {value : value} : undefined); + }; + + function storeSelection(type) { + bookmark = selection.getBookmark(type); + }; + + function restoreSelection() { + selection.moveToBookmark(bookmark); + }; + + // Add execCommand overrides + addCommands({ + // Ignore these, added for compatibility + 'mceResetDesignMode,mceBeginUndoLevel' : function() {}, + + // Add undo manager logic + 'mceEndUndoLevel,mceAddUndoLevel' : function() { + editor.undoManager.add(); + }, + + 'Cut,Copy,Paste' : function(command) { + var doc = editor.getDoc(), failed; + + // Try executing the native command + try { + execNativeCommand(command); + } catch (ex) { + // Command failed + failed = TRUE; + } + + // Present alert message about clipboard access not being available + if (failed || !doc.queryCommandEnabled(command)) { + if (tinymce.isGecko) { + editor.windowManager.confirm(editor.getLang('clipboard_msg'), function(state) { + if (state) + open('http://www.mozilla.org/editor/midasdemo/securityprefs.html', '_blank'); + }); + } else + editor.windowManager.alert(editor.getLang('clipboard_no_support')); + } + }, + + // Override unlink command + unlink : function(command) { + if (selection.isCollapsed()) + selection.select(selection.getNode()); + + execNativeCommand(command); + selection.collapse(FALSE); + }, + + // Override justify commands to use the text formatter engine + 'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) { + var align = command.substring(7); + + // Remove all other alignments first + each('left,center,right,full'.split(','), function(name) { + if (align != name) + editor.formatter.remove('align' + name); + }); + + toggleFormat('align' + align); + }, + + // Override list commands to fix WebKit bug + 'InsertUnorderedList,InsertOrderedList' : function(command) { + var listElm, listParent; + + execNativeCommand(command); + + // WebKit produces lists within block elements so we need to split them + // we will replace the native list creation logic to custom logic later on + // TODO: Remove this when the list creation logic is removed + listElm = dom.getParent(selection.getNode(), 'ol,ul'); + if (listElm) { + listParent = listElm.parentNode; + + // If list is within a text block then split that block + if (/^(H[1-6]|P|ADDRESS|PRE)$/.test(listParent.nodeName)) { + storeSelection(); + dom.split(listParent, listElm); + restoreSelection(); + } + } + }, + + // Override commands to use the text formatter engine + 'Bold,Italic,Underline,Strikethrough' : function(command) { + toggleFormat(command); + }, + + // Override commands to use the text formatter engine + 'ForeColor,HiliteColor,FontName' : function(command, ui, value) { + toggleFormat(command, value); + }, + + FontSize : function(command, ui, value) { + var fontClasses, fontSizes; + + // Convert font size 1-7 to styles + if (value >= 1 && value <= 7) { + fontSizes = tinymce.explode(settings.font_size_style_values); + fontClasses = tinymce.explode(settings.font_size_classes); + + if (fontClasses) + value = fontClasses[value - 1] || value; + else + value = fontSizes[value - 1] || value; + } + + toggleFormat(command, value); + }, + + RemoveFormat : function(command) { + editor.formatter.remove(command); + }, + + mceBlockQuote : function(command) { + toggleFormat('blockquote'); + }, + + FormatBlock : function(command, ui, value) { + return toggleFormat(value); + }, + + mceCleanup : function() { + storeSelection(); + editor.setContent(editor.getContent({cleanup : TRUE}), {cleanup : TRUE}); + restoreSelection(); + }, + + mceRemoveNode : function(command, ui, value) { + var node = value || selection.getNode(); + + // Make sure that the body node isn't removed + if (node != ed.getBody()) { + storeSelection(); + editor.dom.remove(node, TRUE); + restoreSelection(); + } + }, + + mceSelectNodeDepth : function(command, ui, value) { + var counter = 0; + + dom.getParent(selection.getNode(), function(node) { + if (node.nodeType == 1 && counter++ == value) { + selection.select(node); + return FALSE; + } + }, editor.getBody()); + }, + + mceSelectNode : function(command, ui, value) { + selection.select(value); + }, + + mceInsertContent : function(command, ui, value) { + selection.setContent(value); + }, + + mceInsertRawHTML : function(command, ui, value) { + selection.setContent('tiny_mce_marker'); + editor.setContent(editor.getContent().replace(/tiny_mce_marker/g, value)); + }, + + mceSetContent : function(command, ui, value) { + editor.setContent(value); + }, + + 'Indent,Outdent' : function(command) { + var intentValue, indentUnit, value; + + // Setup indent level + intentValue = settings.indentation; + indentUnit = /[a-z%]+$/i.exec(intentValue); + intentValue = parseInt(intentValue); + + if (!queryCommandState('InsertUnorderedList') && !queryCommandState('InsertOrderedList')) { + each(selection.getSelectedBlocks(), function(element) { + if (command == 'outdent') { + value = Math.max(0, parseInt(element.style.paddingLeft || 0) - intentValue); + dom.setStyle(element, 'paddingLeft', value ? value + indentUnit : ''); + } else + dom.setStyle(element, 'paddingLeft', (parseInt(element.style.paddingLeft || 0) + intentValue) + indentUnit); + }); + } else + execNativeCommand(command); + }, + + mceRepaint : function() { + var bookmark; + + if (tinymce.isGecko) { + try { + storeSelection(TRUE); + + if (selection.getSel()) + selection.getSel().selectAllChildren(editor.getBody()); + + selection.collapse(TRUE); + restoreSelection(); + } catch (ex) { + // Ignore + } + } + }, + + InsertHorizontalRule : function() { + selection.setContent('
'); + }, + + mceToggleVisualAid : function() { + editor.hasVisual = !editor.hasVisual; + editor.addVisual(); + }, + + mceReplaceContent : function(command, ui, value) { + selection.setContent(value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'}))); + }, + + mceInsertLink : function(command, ui, value) { + var link = dom.getParent(selection.getNode(), 'a'); + + if (tinymce.is(value, 'string')) + value = {href : value}; + + if (!link) { + execNativeCommand('CreateLink', FALSE, 'javascript:mctmp(0);'); + each(dom.select('a[href=javascript:mctmp(0);]'), function(link) { + dom.setAttribs(link, value); + }); + } else { + if (value.href) + dom.setAttribs(link, value); + else + ed.dom.remove(link, TRUE); + } + } + }); + + // Add queryCommandState overrides + addCommands({ + // Override justify commands + 'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) { + return isFormatMatch('align' + command.substring(7)); + }, + + 'Bold,Italic,Underline,Strikethrough' : function(command) { + return isFormatMatch(command); + }, + + mceBlockQuote : function() { + return isFormatMatch('blockquote'); + }, + + Outdent : function() { + var node; + + if (settings.inline_styles) { + if ((node = dom.getParent(selection.getStart(), dom.isBlock)) && parseInt(node.style.paddingLeft) > 0) + return TRUE; + + if ((node = dom.getParent(selection.getEnd(), dom.isBlock)) && parseInt(node.style.paddingLeft) > 0) + return TRUE; + } + + return queryCommandState('InsertUnorderedList') || queryCommandState('InsertOrderedList') || (!settings.inline_styles && !!dom.getParent(selection.getNode(), 'BLOCKQUOTE')); + }, + + 'InsertUnorderedList,InsertOrderedList' : function(command) { + return dom.getParent(selection.getNode(), command == 'insertunorderedlist' ? 'UL' : 'OL'); + } + }, 'state'); + + // Add queryCommandValue overrides + addCommands({ + 'FontSize,FontName' : function(command) { + var value = 0, parent; + + if (parent = dom.getParent(selection.getNode(), 'span')) { + if (command == 'fontsize') + value = parent.style.fontSize; + else + value = parent.style.fontFamily.replace(/, /g, ',').replace(/[\'\"]/g, '').toLowerCase(); + } + + return value; + } + }, 'value'); + + // Add undo manager logic + if (settings.custom_undo_redo) { + addCommands({ + Undo : function() { + editor.undoManager.undo(); + }, + + Redo : function() { + editor.undoManager.redo(); + } + }); + } + }; +})(tinymce);(function(tinymce) { + tinymce.create('tinymce.UndoManager', { + index : 0, + data : null, + typing : 0, + + UndoManager : function(ed) { + var t = this, Dispatcher = tinymce.util.Dispatcher; + + t.editor = ed; + t.data = []; + t.onAdd = new Dispatcher(this); + t.onUndo = new Dispatcher(this); + t.onRedo = new Dispatcher(this); + }, + + add : function(l) { + var t = this, i, ed = t.editor, b, s = ed.settings, la; + + l = l || {}; + l.content = l.content || ed.getContent({format : 'raw', no_events : 1}); + l.content = l.content.replace(/^\s*|\s*$/g, ''); + + // Add undo level if needed + la = t.data[t.index]; + if (la && la.content == l.content) { + if (t.index > 0 || t.data.length == 1) + return null; + } + + // Time to compress + if (s.custom_undo_redo_levels) { + if (t.data.length > s.custom_undo_redo_levels) { + for (i = 0; i < t.data.length - 1; i++) + t.data[i] = t.data[i + 1]; + + t.data.length--; + t.index = t.data.length; + } + } + + if (s.custom_undo_redo_restore_selection) + l.bookmark = b = l.bookmark || ed.selection.getBookmark(2, true); + + // Crop array if needed + if (t.index < t.data.length - 1) { + // Treat first level as initial + if (t.index == 0) + t.data = []; + else + t.data.length = t.index + 1; + } + + t.data.push(l); + t.index = t.data.length - 1; + + t.onAdd.dispatch(t, l); + ed.isNotDirty = 0; + + //console.log(t.index); + //console.dir(t.data); + + return l; + }, + + undo : function() { + var t = this, ed = t.editor, l = l, i; + + if (t.typing) { + t.add(); + t.typing = 0; + } + + if (t.index > 0) { + l = t.data[--t.index]; + + ed.setContent(l.content, {format : 'raw'}); + ed.selection.moveToBookmark(l.bookmark); + + t.onUndo.dispatch(t, l); + } + + return l; + }, + + redo : function() { + var t = this, ed = t.editor, l = null; + + if (t.index < t.data.length - 1) { + l = t.data[++t.index]; + ed.setContent(l.content, {format : 'raw'}); + ed.selection.moveToBookmark(l.bookmark); + + t.onRedo.dispatch(t, l); + } + + return l; + }, + + clear : function() { + var t = this; + + t.data = []; + t.index = 0; + t.typing = 0; + }, + + hasUndo : function() { + return this.index > 0 || this.typing; + }, + + hasRedo : function() { + return this.index < this.data.length - 1; + } + }); +})(tinymce); +(function(tinymce) { + // Shorten names + var Event = tinymce.dom.Event, + isIE = tinymce.isIE, + isGecko = tinymce.isGecko, + isOpera = tinymce.isOpera, + each = tinymce.each, + extend = tinymce.extend, + TRUE = true, + FALSE = false; + + // Checks if the selection/caret is at the end of the specified block element + function isAtEnd(rng, par) { + var rng2 = par.ownerDocument.createRange(); + + rng2.setStart(rng.endContainer, rng.endOffset); + rng2.setEndAfter(par); + + // Get number of characters to the right of the cursor if it's zero then we are at the end and need to merge the next block element + return rng2.cloneContents().textContent.length == 0; + }; + + function isEmpty(n) { + n = n.innerHTML; + + n = n.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi, '-'); // Keep these convert them to - chars + n = n.replace(/<[^>]+>/g, ''); // Remove all tags + + return n.replace(/[ \u00a0\t\r\n]+/g, '') == ''; + }; + + function splitList(selection, dom, li) { + var listBlock, block; + + if (isEmpty(li)) { + listBlock = dom.getParent(li, 'ul,ol'); + + if (!dom.getParent(listBlock.parentNode, 'ul,ol')) { + dom.split(listBlock, li); + block = dom.create('p', 0, '
'); + dom.replace(block, li); + selection.select(block, 1); + } + + return FALSE; + } + + return TRUE; + }; + + tinymce.create('tinymce.ForceBlocks', { + ForceBlocks : function(ed) { + var t = this, s = ed.settings, elm; + + t.editor = ed; + t.dom = ed.dom; + elm = (s.forced_root_block || 'p').toLowerCase(); + s.element = elm.toUpperCase(); + + ed.onPreInit.add(t.setup, t); + + t.reOpera = new RegExp('(\\u00a0| | )<\/' + elm + '>', 'gi'); + t.rePadd = new RegExp(']+)><\\\/p>|]+)\\\/>|]+)>\\s+<\\\/p>|

<\\\/p>||

\\s+<\\\/p>'.replace(/p/g, elm), 'gi'); + t.reNbsp2BR1 = new RegExp(']+)>[\\s\\u00a0]+<\\\/p>|

[\\s\\u00a0]+<\\\/p>'.replace(/p/g, elm), 'gi'); + t.reNbsp2BR2 = new RegExp('<%p()([^>]+)>( | )<\\\/%p>|<%p>( | )<\\\/%p>'.replace(/%p/g, elm), 'gi'); + t.reBR2Nbsp = new RegExp(']+)>\\s*
\\s*<\\\/p>|

\\s*
\\s*<\\\/p>'.replace(/p/g, elm), 'gi'); + + function padd(ed, o) { + if (isOpera) + o.content = o.content.replace(t.reOpera, ''); + + o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0'); + + if (!isIE && !isOpera && o.set) { + // Use   instead of BR in padded paragraphs + o.content = o.content.replace(t.reNbsp2BR1, '<' + elm + '$1$2>
'); + o.content = o.content.replace(t.reNbsp2BR2, '<' + elm + '$1$2>
'); + } else + o.content = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0'); + }; + + ed.onBeforeSetContent.add(padd); + ed.onPostProcess.add(padd); + + if (s.forced_root_block) { + ed.onInit.add(t.forceRoots, t); + ed.onSetContent.add(t.forceRoots, t); + ed.onBeforeGetContent.add(t.forceRoots, t); + } + }, + + setup : function() { + var t = this, ed = t.editor, s = ed.settings, dom = ed.dom, selection = ed.selection; + + // Force root blocks when typing and when getting output + if (s.forced_root_block) { + ed.onBeforeExecCommand.add(t.forceRoots, t); + ed.onKeyUp.add(t.forceRoots, t); + ed.onPreProcess.add(t.forceRoots, t); + } + + if (s.force_br_newlines) { + // Force IE to produce BRs on enter + if (isIE) { + ed.onKeyPress.add(function(ed, e) { + var n; + + if (e.keyCode == 13 && selection.getNode().nodeName != 'LI') { + selection.setContent('
', {format : 'raw'}); + n = dom.get('__'); + n.removeAttribute('id'); + selection.select(n); + selection.collapse(); + return Event.cancel(e); + } + }); + } + } + + if (!isIE && s.force_p_newlines) { + ed.onKeyPress.add(function(ed, e) { + if (e.keyCode == 13 && !e.shiftKey && !t.insertPara(e)) + Event.cancel(e); + }); + + if (isGecko) { + ed.onKeyDown.add(function(ed, e) { + if ((e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey) + t.backspaceDelete(e, e.keyCode == 8); + }); + } + } + + // Workaround for missing shift+enter support, http://bugs.webkit.org/show_bug.cgi?id=16973 + if (tinymce.isWebKit) { + function insertBr(ed) { + var rng = selection.getRng(), br; + + // Insert BR element + rng.insertNode(br = dom.create('br')); + + // Place caret after BR + rng.setStartAfter(br); + rng.setEndAfter(br); + selection.setRng(rng); + + // Could not place caret after BR then insert an nbsp entity and move the caret + if (selection.getSel().focusNode == br.previousSibling) { + selection.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'), br)); + selection.collapse(TRUE); + } + + // Scroll to new position, scrollIntoView can't be used due to bug: http://bugs.webkit.org/show_bug.cgi?id=16117 + ed.getWin().scrollTo(0, dom.getPos(selection.getRng().startContainer).y); + }; + + ed.onKeyPress.add(function(ed, e) { + if (e.keyCode == 13 && (e.shiftKey || s.force_br_newlines)) { + insertBr(ed); + Event.cancel(e); + } + }); + } + + // Padd empty inline elements within block elements + // For example:

becomes

 

+ ed.onPreProcess.add(function(ed, o) { + each(dom.select('p,h1,h2,h3,h4,h5,h6,div', o.node), function(p) { + if (isEmpty(p)) { + each(dom.select('span,em,strong,b,i', o.node), function(n) { + if (!n.hasChildNodes()) { + n.appendChild(ed.getDoc().createTextNode('\u00a0')); + return FALSE; // Break the loop one padding is enough + } + }); + } + }); + }); + + // IE specific fixes + if (isIE) { + // Replaces IE:s auto generated paragraphs with the specified element name + if (s.element != 'P') { + ed.onKeyPress.add(function(ed, e) { + t.lastElm = selection.getNode().nodeName; + }); + + ed.onKeyUp.add(function(ed, e) { + var bl, n = selection.getNode(), b = ed.getBody(); + + if (b.childNodes.length === 1 && n.nodeName == 'P') { + n = dom.rename(n, s.element); + selection.select(n); + selection.collapse(); + ed.nodeChanged(); + } else if (e.keyCode == 13 && !e.shiftKey && t.lastElm != 'P') { + bl = dom.getParent(n, 'p'); + + if (bl) { + dom.rename(bl, s.element); + ed.nodeChanged(); + } + } + }); + } + } + }, + + find : function(n, t, s) { + var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, FALSE), c = -1; + + while (n = w.nextNode()) { + c++; + + // Index by node + if (t == 0 && n == s) + return c; + + // Node by index + if (t == 1 && c == s) + return n; + } + + return -1; + }, + + forceRoots : function(ed, e) { + var t = this, ed = t.editor, b = ed.getBody(), d = ed.getDoc(), se = ed.selection, s = se.getSel(), r = se.getRng(), si = -2, ei, so, eo, tr, c = -0xFFFFFF; + var nx, bl, bp, sp, le, nl = b.childNodes, i, n, eid; + + // Fix for bug #1863847 + //if (e && e.keyCode == 13) + // return TRUE; + + // Wrap non blocks into blocks + for (i = nl.length - 1; i >= 0; i--) { + nx = nl[i]; + + // Ignore internal elements + if (nx.nodeType === 1 && nx.getAttribute('_mce_type')) { + bl = null; + continue; + } + + // Is text or non block element + if (nx.nodeType === 3 || (!t.dom.isBlock(nx) && nx.nodeType !== 8 && !/^(script|mce:script|style|mce:style)$/i.test(nx.nodeName))) { + if (!bl) { + // Create new block but ignore whitespace + if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) { + // Store selection + if (si == -2 && r) { + if (!isIE) { + // If selection is element then mark it + if (r.startContainer.nodeType == 1 && (n = r.startContainer.childNodes[r.startOffset]) && n.nodeType == 1) { + // Save the id of the selected element + eid = n.getAttribute("id"); + n.setAttribute("id", "__mce"); + } else { + // If element is inside body, might not be the case in contentEdiable mode + if (ed.dom.getParent(r.startContainer, function(e) {return e === b;})) { + so = r.startOffset; + eo = r.endOffset; + si = t.find(b, 0, r.startContainer); + ei = t.find(b, 0, r.endContainer); + } + } + } else { + tr = d.body.createTextRange(); + tr.moveToElementText(b); + tr.collapse(1); + bp = tr.move('character', c) * -1; + + tr = r.duplicate(); + tr.collapse(1); + sp = tr.move('character', c) * -1; + + tr = r.duplicate(); + tr.collapse(0); + le = (tr.move('character', c) * -1) - sp; + + si = sp - bp; + ei = le; + } + } + + // Uses replaceChild instead of cloneNode since it removes selected attribute from option elements on IE + // See: http://support.microsoft.com/kb/829907 + bl = ed.dom.create(ed.settings.forced_root_block); + nx.parentNode.replaceChild(bl, nx); + bl.appendChild(nx); + } + } else { + if (bl.hasChildNodes()) + bl.insertBefore(nx, bl.firstChild); + else + bl.appendChild(nx); + } + } else + bl = null; // Time to create new block + } + + // Restore selection + if (si != -2) { + if (!isIE) { + bl = b.getElementsByTagName(ed.settings.element)[0]; + r = d.createRange(); + + // Select last location or generated block + if (si != -1) + r.setStart(t.find(b, 1, si), so); + else + r.setStart(bl, 0); + + // Select last location or generated block + if (ei != -1) + r.setEnd(t.find(b, 1, ei), eo); + else + r.setEnd(bl, 0); + + if (s) { + s.removeAllRanges(); + s.addRange(r); + } + } else { + try { + r = s.createRange(); + r.moveToElementText(b); + r.collapse(1); + r.moveStart('character', si); + r.moveEnd('character', ei); + r.select(); + } catch (ex) { + // Ignore + } + } + } else if (!isIE && (n = ed.dom.get('__mce'))) { + // Restore the id of the selected element + if (eid) + n.setAttribute('id', eid); + else + n.removeAttribute('id'); + + // Move caret before selected element + r = d.createRange(); + r.setStartBefore(n); + r.setEndBefore(n); + se.setRng(r); + } + }, + + getParentBlock : function(n) { + var d = this.dom; + + return d.getParent(n, d.isBlock); + }, + + insertPara : function(e) { + var t = this, ed = t.editor, dom = ed.dom, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body; + var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n, vp = dom.getViewPort(ed.getWin()), y, ch, car; + + // If root blocks are forced then use Operas default behavior since it's really good +// Removed due to bug: #1853816 +// if (se.forced_root_block && isOpera) +// return TRUE; + + // Setup before range + rb = d.createRange(); + + // If is before the first block element and in body, then move it into first block element + rb.setStart(s.anchorNode, s.anchorOffset); + rb.collapse(TRUE); + + // Setup after range + ra = d.createRange(); + + // If is before the first block element and in body, then move it into first block element + ra.setStart(s.focusNode, s.focusOffset); + ra.collapse(TRUE); + + // Setup start/end points + dir = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0; + sn = dir ? s.anchorNode : s.focusNode; + so = dir ? s.anchorOffset : s.focusOffset; + en = dir ? s.focusNode : s.anchorNode; + eo = dir ? s.focusOffset : s.anchorOffset; + + // If selection is in empty table cell + if (sn === en && /^(TD|TH)$/.test(sn.nodeName)) { + if (sn.firstChild.nodeName == 'BR') + dom.remove(sn.firstChild); // Remove BR + + // Create two new block elements + if (sn.childNodes.length == 0) { + ed.dom.add(sn, se.element, null, '
'); + aft = ed.dom.add(sn, se.element, null, '
'); + } else { + n = sn.innerHTML; + sn.innerHTML = ''; + ed.dom.add(sn, se.element, null, n); + aft = ed.dom.add(sn, se.element, null, '
'); + } + + // Move caret into the last one + r = d.createRange(); + r.selectNodeContents(aft); + r.collapse(1); + ed.selection.setRng(r); + + return FALSE; + } + + // If the caret is in an invalid location in FF we need to move it into the first block + if (sn == b && en == b && b.firstChild && ed.dom.isBlock(b.firstChild)) { + sn = en = sn.firstChild; + so = eo = 0; + rb = d.createRange(); + rb.setStart(sn, 0); + ra = d.createRange(); + ra.setStart(en, 0); + } + + // Never use body as start or end node + sn = sn.nodeName == "HTML" ? d.body : sn; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes + sn = sn.nodeName == "BODY" ? sn.firstChild : sn; + en = en.nodeName == "HTML" ? d.body : en; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes + en = en.nodeName == "BODY" ? en.firstChild : en; + + // Get start and end blocks + sb = t.getParentBlock(sn); + eb = t.getParentBlock(en); + bn = sb ? sb.nodeName : se.element; // Get block name to create + + // Return inside list use default browser behavior + if (n = t.dom.getParent(sb, 'li,pre')) { + if (n.nodeName == 'LI') + return splitList(ed.selection, t.dom, n); + + return TRUE; + } + + // If caption or absolute layers then always generate new blocks within + if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) { + bn = se.element; + sb = null; + } + + // If caption or absolute layers then always generate new blocks within + if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) { + bn = se.element; + eb = null; + } + + // Use P instead + if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(dom.getStyle(sb, 'float', 1)))) { + bn = se.element; + sb = eb = null; + } + + // Setup new before and after blocks + bef = (sb && sb.nodeName == bn) ? sb.cloneNode(0) : ed.dom.create(bn); + aft = (eb && eb.nodeName == bn) ? eb.cloneNode(0) : ed.dom.create(bn); + + // Remove id from after clone + aft.removeAttribute('id'); + + // Is header and cursor is at the end, then force paragraph under + if (/^(H[1-6])$/.test(bn) && isAtEnd(r, sb)) + aft = ed.dom.create(se.element); + + // Find start chop node + n = sc = sn; + do { + if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName)) + break; + + sc = n; + } while ((n = n.previousSibling ? n.previousSibling : n.parentNode)); + + // Find end chop node + n = ec = en; + do { + if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName)) + break; + + ec = n; + } while ((n = n.nextSibling ? n.nextSibling : n.parentNode)); + + // Place first chop part into before block element + if (sc.nodeName == bn) + rb.setStart(sc, 0); + else + rb.setStartBefore(sc); + + rb.setEnd(sn, so); + bef.appendChild(rb.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari + + // Place secnd chop part within new block element + try { + ra.setEndAfter(ec); + } catch(ex) { + //console.debug(s.focusNode, s.focusOffset); + } + + ra.setStart(en, eo); + aft.appendChild(ra.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari + + // Create range around everything + r = d.createRange(); + if (!sc.previousSibling && sc.parentNode.nodeName == bn) { + r.setStartBefore(sc.parentNode); + } else { + if (rb.startContainer.nodeName == bn && rb.startOffset == 0) + r.setStartBefore(rb.startContainer); + else + r.setStart(rb.startContainer, rb.startOffset); + } + + if (!ec.nextSibling && ec.parentNode.nodeName == bn) + r.setEndAfter(ec.parentNode); + else + r.setEnd(ra.endContainer, ra.endOffset); + + // Delete and replace it with new block elements + r.deleteContents(); + + if (isOpera) + ed.getWin().scrollTo(0, vp.y); + + // Never wrap blocks in blocks + if (bef.firstChild && bef.firstChild.nodeName == bn) + bef.innerHTML = bef.firstChild.innerHTML; + + if (aft.firstChild && aft.firstChild.nodeName == bn) + aft.innerHTML = aft.firstChild.innerHTML; + + // Padd empty blocks + if (isEmpty(bef)) + bef.innerHTML = '
'; + + function appendStyles(e, en) { + var nl = [], nn, n, i; + + e.innerHTML = ''; + + // Make clones of style elements + if (se.keep_styles) { + n = en; + do { + // We only want style specific elements + if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(n.nodeName)) { + nn = n.cloneNode(FALSE); + dom.setAttrib(nn, 'id', ''); // Remove ID since it needs to be unique + nl.push(nn); + } + } while (n = n.parentNode); + } + + // Append style elements to aft + if (nl.length > 0) { + for (i = nl.length - 1, nn = e; i >= 0; i--) + nn = nn.appendChild(nl[i]); + + // Padd most inner style element + nl[0].innerHTML = isOpera ? ' ' : '
'; // Extra space for Opera so that the caret can move there + return nl[0]; // Move caret to most inner element + } else + e.innerHTML = isOpera ? ' ' : '
'; // Extra space for Opera so that the caret can move there + }; + + // Fill empty afterblook with current style + if (isEmpty(aft)) + car = appendStyles(aft, en); + + // Opera needs this one backwards for older versions + if (isOpera && parseFloat(opera.version()) < 9.5) { + r.insertNode(bef); + r.insertNode(aft); + } else { + r.insertNode(aft); + r.insertNode(bef); + } + + // Normalize + aft.normalize(); + bef.normalize(); + + function first(n) { + return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, FALSE).nextNode() || n; + }; + + // Move cursor and scroll into view + r = d.createRange(); + r.selectNodeContents(isGecko ? first(car || aft) : car || aft); + r.collapse(1); + s.removeAllRanges(); + s.addRange(r); + + // scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs + y = ed.dom.getPos(aft).y; + ch = aft.clientHeight; + + // Is element within viewport + if (y < vp.y || y + ch > vp.y + vp.h) { + ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks + //console.debug('SCROLL!', 'vp.y: ' + vp.y, 'y' + y, 'vp.h' + vp.h, 'clientHeight' + aft.clientHeight, 'yyy: ' + (y < vp.y ? y : y - vp.h + aft.clientHeight)); + } + + return FALSE; + }, + + backspaceDelete : function(e, bs) { + var t = this, ed = t.editor, b = ed.getBody(), dom = ed.dom, n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn; + + // The caret sometimes gets stuck in Gecko if you delete empty paragraphs + // This workaround removes the element by hand and moves the caret to the previous element + if (sc && ed.dom.isBlock(sc) && !/^(TD|TH)$/.test(sc.nodeName) && bs) { + if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) { + // Find previous block element + n = sc; + while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ; + + if (n) { + if (sc != b.firstChild) { + // Find last text node + w = ed.dom.doc.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, FALSE); + while (tn = w.nextNode()) + n = tn; + + // Place caret at the end of last text node + r = ed.getDoc().createRange(); + r.setStart(n, n.nodeValue ? n.nodeValue.length : 0); + r.setEnd(n, n.nodeValue ? n.nodeValue.length : 0); + se.setRng(r); + + // Remove the target container + ed.dom.remove(sc); + } + + return Event.cancel(e); + } + } + } + + // Gecko generates BR elements here and there, we don't like those so lets remove them + function handler(e) { + var pr; + + e = e.target; + + // A new BR was created in a block element, remove it + if (e && e.parentNode && e.nodeName == 'BR' && (n = t.getParentBlock(e))) { + pr = e.previousSibling; + + Event.remove(b, 'DOMNodeInserted', handler); + + // Is there whitespace at the end of the node before then we might need the pesky BR + // to place the caret at a correct location see bug: #2013943 + if (pr && pr.nodeType == 3 && /\s+$/.test(pr.nodeValue)) + return; + + // Only remove BR elements that got inserted in the middle of the text + if (e.previousSibling || e.nextSibling) + ed.dom.remove(e); + } + }; + + // Listen for new nodes + Event._add(b, 'DOMNodeInserted', handler); + + // Remove listener + window.setTimeout(function() { + Event._remove(b, 'DOMNodeInserted', handler); + }, 1); + } + }); +})(tinymce); +(function(tinymce) { + // Shorten names + var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, extend = tinymce.extend; + + tinymce.create('tinymce.ControlManager', { + ControlManager : function(ed, s) { + var t = this, i; + + s = s || {}; + t.editor = ed; + t.controls = {}; + t.onAdd = new tinymce.util.Dispatcher(t); + t.onPostRender = new tinymce.util.Dispatcher(t); + t.prefix = s.prefix || ed.id + '_'; + t._cls = {}; + + t.onPostRender.add(function() { + each(t.controls, function(c) { + c.postRender(); + }); + }); + }, + + get : function(id) { + return this.controls[this.prefix + id] || this.controls[id]; + }, + + setActive : function(id, s) { + var c = null; + + if (c = this.get(id)) + c.setActive(s); + + return c; + }, + + setDisabled : function(id, s) { + var c = null; + + if (c = this.get(id)) + c.setDisabled(s); + + return c; + }, + + add : function(c) { + var t = this; + + if (c) { + t.controls[c.id] = c; + t.onAdd.dispatch(c, t); + } + + return c; + }, + + createControl : function(n) { + var c, t = this, ed = t.editor; + + each(ed.plugins, function(p) { + if (p.createControl) { + c = p.createControl(n, t); + + if (c) + return false; + } + }); + + switch (n) { + case "|": + case "separator": + return t.createSeparator(); + } + + if (!c && ed.buttons && (c = ed.buttons[n])) + return t.createButton(n, c); + + return t.add(c); + }, + + createDropMenu : function(id, s, cc) { + var t = this, ed = t.editor, c, bm, v, cls; + + s = extend({ + 'class' : 'mceDropDown', + constrain : ed.settings.constrain_menus + }, s); + + s['class'] = s['class'] + ' ' + ed.getParam('skin') + 'Skin'; + if (v = ed.getParam('skin_variant')) + s['class'] += ' ' + ed.getParam('skin') + 'Skin' + v.substring(0, 1).toUpperCase() + v.substring(1); + + id = t.prefix + id; + cls = cc || t._cls.dropmenu || tinymce.ui.DropMenu; + c = t.controls[id] = new cls(id, s); + c.onAddItem.add(function(c, o) { + var s = o.settings; + + s.title = ed.getLang(s.title, s.title); + + if (!s.onclick) { + s.onclick = function(v) { + if (s.cmd) + ed.execCommand(s.cmd, s.ui || false, s.value); + }; + } + }); + + ed.onRemove.add(function() { + c.destroy(); + }); + + // Fix for bug #1897785, #1898007 + if (tinymce.isIE) { + c.onShowMenu.add(function() { + // IE 8 needs focus in order to store away a range with the current collapsed caret location + ed.focus(); + + bm = ed.selection.getBookmark(1); + }); + + c.onHideMenu.add(function() { + if (bm) { + ed.selection.moveToBookmark(bm); + bm = 0; + } + }); + } + + return t.add(c); + }, + + createListBox : function(id, s, cc) { + var t = this, ed = t.editor, cmd, c, cls; + + if (t.get(id)) + return null; + + s.title = ed.translate(s.title); + s.scope = s.scope || ed; + + if (!s.onselect) { + s.onselect = function(v) { + ed.execCommand(s.cmd, s.ui || false, v || s.value); + }; + } + + s = extend({ + title : s.title, + 'class' : 'mce_' + id, + scope : s.scope, + control_manager : t + }, s); + + id = t.prefix + id; + + if (ed.settings.use_native_selects) + c = new tinymce.ui.NativeListBox(id, s); + else { + cls = cc || t._cls.listbox || tinymce.ui.ListBox; + c = new cls(id, s); + } + + t.controls[id] = c; + + // Fix focus problem in Safari + if (tinymce.isWebKit) { + c.onPostRender.add(function(c, n) { + // Store bookmark on mousedown + Event.add(n, 'mousedown', function() { + ed.bookmark = ed.selection.getBookmark(1); + }); + + // Restore on focus, since it might be lost + Event.add(n, 'focus', function() { + ed.selection.moveToBookmark(ed.bookmark); + ed.bookmark = null; + }); + }); + } + + if (c.hideMenu) + ed.onMouseDown.add(c.hideMenu, c); + + return t.add(c); + }, + + createButton : function(id, s, cc) { + var t = this, ed = t.editor, o, c, cls; + + if (t.get(id)) + return null; + + s.title = ed.translate(s.title); + s.label = ed.translate(s.label); + s.scope = s.scope || ed; + + if (!s.onclick && !s.menu_button) { + s.onclick = function() { + ed.execCommand(s.cmd, s.ui || false, s.value); + }; + } + + s = extend({ + title : s.title, + 'class' : 'mce_' + id, + unavailable_prefix : ed.getLang('unavailable', ''), + scope : s.scope, + control_manager : t + }, s); + + id = t.prefix + id; + + if (s.menu_button) { + cls = cc || t._cls.menubutton || tinymce.ui.MenuButton; + c = new cls(id, s); + ed.onMouseDown.add(c.hideMenu, c); + } else { + cls = t._cls.button || tinymce.ui.Button; + c = new cls(id, s); + } + + return t.add(c); + }, + + createMenuButton : function(id, s, cc) { + s = s || {}; + s.menu_button = 1; + + return this.createButton(id, s, cc); + }, + + createSplitButton : function(id, s, cc) { + var t = this, ed = t.editor, cmd, c, cls; + + if (t.get(id)) + return null; + + s.title = ed.translate(s.title); + s.scope = s.scope || ed; + + if (!s.onclick) { + s.onclick = function(v) { + ed.execCommand(s.cmd, s.ui || false, v || s.value); + }; + } + + if (!s.onselect) { + s.onselect = function(v) { + ed.execCommand(s.cmd, s.ui || false, v || s.value); + }; + } + + s = extend({ + title : s.title, + 'class' : 'mce_' + id, + scope : s.scope, + control_manager : t + }, s); + + id = t.prefix + id; + cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton; + c = t.add(new cls(id, s)); + ed.onMouseDown.add(c.hideMenu, c); + + return c; + }, + + createColorSplitButton : function(id, s, cc) { + var t = this, ed = t.editor, cmd, c, cls, bm; + + if (t.get(id)) + return null; + + s.title = ed.translate(s.title); + s.scope = s.scope || ed; + + if (!s.onclick) { + s.onclick = function(v) { + if (tinymce.isIE) + bm = ed.selection.getBookmark(1); + + ed.execCommand(s.cmd, s.ui || false, v || s.value); + }; + } + + if (!s.onselect) { + s.onselect = function(v) { + ed.execCommand(s.cmd, s.ui || false, v || s.value); + }; + } + + s = extend({ + title : s.title, + 'class' : 'mce_' + id, + 'menu_class' : ed.getParam('skin') + 'Skin', + scope : s.scope, + more_colors_title : ed.getLang('more_colors') + }, s); + + id = t.prefix + id; + cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton; + c = new cls(id, s); + ed.onMouseDown.add(c.hideMenu, c); + + // Remove the menu element when the editor is removed + ed.onRemove.add(function() { + c.destroy(); + }); + + // Fix for bug #1897785, #1898007 + if (tinymce.isIE) { + c.onShowMenu.add(function() { + // IE 8 needs focus in order to store away a range with the current collapsed caret location + ed.focus(); + bm = ed.selection.getBookmark(1); + }); + + c.onHideMenu.add(function() { + if (bm) { + ed.selection.moveToBookmark(bm); + bm = 0; + } + }); + } + + return t.add(c); + }, + + createToolbar : function(id, s, cc) { + var c, t = this, cls; + + id = t.prefix + id; + cls = cc || t._cls.toolbar || tinymce.ui.Toolbar; + c = new cls(id, s); + + if (t.get(id)) + return null; + + return t.add(c); + }, + + createSeparator : function(cc) { + var cls = cc || this._cls.separator || tinymce.ui.Separator; + + return new cls(); + }, + + setControlType : function(n, c) { + return this._cls[n.toLowerCase()] = c; + }, + + destroy : function() { + each(this.controls, function(c) { + c.destroy(); + }); + + this.controls = null; + } + }); +})(tinymce); +(function(tinymce) { + var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isIE = tinymce.isIE, isOpera = tinymce.isOpera; + + tinymce.create('tinymce.WindowManager', { + WindowManager : function(ed) { + var t = this; + + t.editor = ed; + t.onOpen = new Dispatcher(t); + t.onClose = new Dispatcher(t); + t.params = {}; + t.features = {}; + }, + + open : function(s, p) { + var t = this, f = '', x, y, mo = t.editor.settings.dialog_type == 'modal', w, sw, sh, vp = tinymce.DOM.getViewPort(), u; + + // Default some options + s = s || {}; + p = p || {}; + sw = isOpera ? vp.w : screen.width; // Opera uses windows inside the Opera window + sh = isOpera ? vp.h : screen.height; + s.name = s.name || 'mc_' + new Date().getTime(); + s.width = parseInt(s.width || 320); + s.height = parseInt(s.height || 240); + s.resizable = true; + s.left = s.left || parseInt(sw / 2.0) - (s.width / 2.0); + s.top = s.top || parseInt(sh / 2.0) - (s.height / 2.0); + p.inline = false; + p.mce_width = s.width; + p.mce_height = s.height; + p.mce_auto_focus = s.auto_focus; + + if (mo) { + if (isIE) { + s.center = true; + s.help = false; + s.dialogWidth = s.width + 'px'; + s.dialogHeight = s.height + 'px'; + s.scroll = s.scrollbars || false; + } + } + + // Build features string + each(s, function(v, k) { + if (tinymce.is(v, 'boolean')) + v = v ? 'yes' : 'no'; + + if (!/^(name|url)$/.test(k)) { + if (isIE && mo) + f += (f ? ';' : '') + k + ':' + v; + else + f += (f ? ',' : '') + k + '=' + v; + } + }); + + t.features = s; + t.params = p; + t.onOpen.dispatch(t, s, p); + + u = s.url || s.file; + u = tinymce._addVer(u); + + try { + if (isIE && mo) { + w = 1; + window.showModalDialog(u, window, f); + } else + w = window.open(u, s.name, f); + } catch (ex) { + // Ignore + } + + if (!w) + alert(t.editor.getLang('popup_blocked')); + }, + + close : function(w) { + w.close(); + this.onClose.dispatch(this); + }, + + createInstance : function(cl, a, b, c, d, e) { + var f = tinymce.resolve(cl); + + return new f(a, b, c, d, e); + }, + + confirm : function(t, cb, s, w) { + w = w || window; + + cb.call(s || this, w.confirm(this._decode(this.editor.getLang(t, t)))); + }, + + alert : function(tx, cb, s, w) { + var t = this; + + w = w || window; + w.alert(t._decode(t.editor.getLang(tx, tx))); + + if (cb) + cb.call(s || t); + }, + + resizeBy : function(dw, dh, win) { + win.resizeBy(dw, dh); + }, + + // Internal functions + + _decode : function(s) { + return tinymce.DOM.decode(s).replace(/\\n/g, '\n'); + } + }); +}(tinymce));(function(tinymce) { + function CommandManager() { + var execCommands = {}, queryStateCommands = {}, queryValueCommands = {}; + + function add(collection, cmd, func, scope) { + if (typeof(cmd) == 'string') + cmd = [cmd]; + + tinymce.each(cmd, function(cmd) { + collection[cmd.toLowerCase()] = {func : func, scope : scope}; + }); + }; + + tinymce.extend(this, { + add : function(cmd, func, scope) { + add(execCommands, cmd, func, scope); + }, + + addQueryStateHandler : function(cmd, func, scope) { + add(queryStateCommands, cmd, func, scope); + }, + + addQueryValueHandler : function(cmd, func, scope) { + add(queryValueCommands, cmd, func, scope); + }, + + execCommand : function(scope, cmd, ui, value, args) { + if (cmd = execCommands[cmd.toLowerCase()]) { + if (cmd.func.call(scope || cmd.scope, ui, value, args) !== false) + return true; + } + }, + + queryCommandValue : function() { + if (cmd = queryValueCommands[cmd.toLowerCase()]) + return cmd.func.call(scope || cmd.scope, ui, value, args); + }, + + queryCommandState : function() { + if (cmd = queryStateCommands[cmd.toLowerCase()]) + return cmd.func.call(scope || cmd.scope, ui, value, args); + } + }); + }; + + tinymce.GlobalCommands = new CommandManager(); +})(tinymce);(function(tinymce) { + tinymce.Formatter = function(ed) { + var formats = {}, + each = tinymce.each, + dom = ed.dom, + selection = ed.selection, + TreeWalker = tinymce.dom.TreeWalker, + rangeUtils = new tinymce.dom.RangeUtils(dom), + isValid = ed.schema.isValid, + isBlock = dom.isBlock, + forcedRootBlock = ed.settings.forced_root_block, + nodeIndex = dom.nodeIndex, + INVISIBLE_CHAR = '\uFEFF', + MCE_ATTR_RE = /^(src|href|style)$/, + FALSE = false, + TRUE = true, + undefined, + caretHandler, + pendingFormats; + + function getParents(node, selector) { + return dom.getParents(node, selector, dom.getRoot()); + }; + + function resetPending() { + // Needs reset + if (!pendingFormats || pendingFormats.apply.length || pendingFormats.remove.length) + pendingFormats = {apply : [], remove : []}; + }; + + ed.onMouseUp.add(resetPending); + resetPending(); + + // Public functions + + function get(name) { + return name ? formats[name] : formats; + }; + + function register(name, format) { + if (name) { + if (typeof(name) !== 'string') { + each(name, function(format, name) { + register(name, format); + }); + } else { + // Force format into array and add it to internal collection + format = format.length ? format : [format]; + + each(format, function(format) { + // Set deep to false by default on selector formats this to avoid removing + // alignment on images inside paragraphs when alignment is changed on paragraphs + if (format.deep === undefined) + format.deep = !format.selector; + + // Default to true + if (format.split === undefined) + format.split = !format.selector; + + // Default to true + if (format.remove === undefined && format.selector) + format.remove = 'none'; + + // Split classes if needed + if (typeof(format.classes) === 'string') + format.classes = format.classes.split(/\s+/); + }); + + formats[name] = format; + } + } + }; + + function apply(name, vars, node) { + var formatList = get(name), format = formatList[0], bookmark, rng, i; + + function moveStart(rng) { + var container = rng.startContainer, + offset = rng.startOffset, + walker, node; + + // Move startContainer/startOffset in to a suitable node + if (container.nodeType == 1 || container.nodeValue === "") { + walker = new TreeWalker(container.childNodes[offset]); + for (node = walker.current(); node; node = walker.next()) { + if (node.nodeType == 3 && !isBlock(node.parentNode) && !isWhiteSpaceNode(node)) { + rng.setStart(node, 0); + break; + } + } + } + + return rng; + }; + + function setElementFormat(elm, fmt) { + fmt = fmt || format; + + if (elm) { + each(fmt.styles, function(value, name) { + dom.setStyle(elm, name, replaceVars(value, vars)); + }); + + each(fmt.attributes, function(value, name) { + dom.setAttrib(elm, name, replaceVars(value, vars)); + }); + + each(fmt.classes, function(value) { + value = replaceVars(value, vars); + + if (!dom.hasClass(elm, value)) + dom.addClass(elm, value); + }); + } + }; + + function applyRngStyle(rng) { + var newWrappers = [], wrapName, wrapElm; + + // Setup wrapper element + wrapName = format.inline || format.block; + wrapElm = dom.create(wrapName); + setElementFormat(wrapElm); + + rangeUtils.walk(rng, function(nodes) { + var currentWrapElm; + + function process(node) { + var nodeName = node.nodeName.toLowerCase(), parentName = node.parentNode.nodeName.toLowerCase(); + + // Stop wrapping on br elements + if (isEq(nodeName, 'br')) { + currentWrapElm = 0; + + // Remove any br elements when we wrap things + if (format.block) + dom.remove(node); + + return; + } + + // If node is wrapper type + if (format.wrapper && matchNode(node, name, vars)) { + currentWrapElm = 0; + return; + } + + // Can we rename the block + if (format.block && !format.wrapper && isTextBlock(nodeName)) { + node = dom.rename(node, wrapName); + setElementFormat(node); + newWrappers.push(node); + currentWrapElm = 0; + return; + } + + // Handle selector patterns + if (format.selector) { + // Look for matching formats + each(formatList, function(format) { + if (dom.is(node, format.selector)) + setElementFormat(node, format); + }); + + return; + } + + // Is it valid to wrap this item + if (isValid(wrapName, nodeName) && isValid(parentName, wrapName)) { + // Start wrapping + if (!currentWrapElm) { + // Wrap the node + currentWrapElm = wrapElm.cloneNode(FALSE); + node.parentNode.insertBefore(currentWrapElm, node); + newWrappers.push(currentWrapElm); + } + + currentWrapElm.appendChild(node); + } else { + // Start a new wrapper for possible children + currentWrapElm = 0; + + each(tinymce.grep(node.childNodes), process); + + // End the last wrapper + currentWrapElm = 0; + } + }; + + // Process siblings from range + each(nodes, process); + }); + + // Cleanup + each(newWrappers, function(node) { + var childCount; + + function getChildCount(node) { + var count = 0; + + each(node.childNodes, function(node) { + if (!isWhiteSpaceNode(node) && !isBookmarkNode(node)) + count++; + }); + + return count; + }; + + function mergeStyles(node) { + var child, clone; + + each(node.childNodes, function(node) { + if (node.nodeType == 1 && !isBookmarkNode(node)) { + child = node; + return FALSE; // break loop + } + }); + + // If child was found and of the same type as the current node + if (child && matchName(child, format)) { + clone = child.cloneNode(FALSE); + setElementFormat(clone); + + dom.replace(clone, node, TRUE); + dom.remove(child, 1); + + return TRUE; + } + }; + + childCount = getChildCount(node); + + // Remove empty nodes + if (childCount === 0) { + dom.remove(node, 1); + return; + } + + if (format.inline || format.wrapper) { + // Merges the current node with it's children of similar type to reduce the number of elements + if (!format.exact && childCount === 1) { + if (mergeStyles(node)) + return; + } + + // Remove/merge children + each(formatList, function(format) { + // Merge all children of similar type will move styles from child to parent + // this: text + // will become: text + each(dom.select(format.inline, node), function(child) { + removeFormat(format, vars, child, format.exact ? child : null); + }); + }); + + // Look for parent with similar style format + dom.getParent(node.parentNode, function(parent) { + if (matchNode(parent, name, vars)) { + dom.remove(node, 1); + node = 0; + return TRUE; + } + }); + + // Merge next and previous siblings if they are similar texttext becomes texttext + if (node) { + node = mergeSiblings(getNonWhiteSpaceSibling(node), node); + node = mergeSiblings(node, getNonWhiteSpaceSibling(node, TRUE)); + } + } + }); + }; + + if (format) { + if (node) { + rng = dom.createRng(); + + rng.setStartBefore(node); + rng.setEndAfter(node); + + applyRngStyle(rng); + } else { + if (!selection.isCollapsed() || !format.inline) { + // Apply formatting to selection + bookmark = selection.getBookmark(); + applyRngStyle(expandRng(selection.getRng(TRUE), formatList)); + + selection.moveToBookmark(bookmark); + selection.setRng(moveStart(selection.getRng(TRUE))); + ed.nodeChanged(); + } else + performCaretAction('apply', name, vars); + } + } + }; + + function remove(name, vars, node) { + var formatList = get(name), format = formatList[0], bookmark, i, rng; + + // Merges the styles for each node + function process(node) { + var children, i, l; + + // Grab the children first since the nodelist might be changed + children = tinymce.grep(node.childNodes); + + // Process current node + for (i = 0, l = formatList.length; i < l; i++) { + if (removeFormat(formatList[i], vars, node, node)) + break; + } + + // Process the children + if (format.deep) { + for (i = 0, l = children.length; i < l; i++) + process(children[i]); + } + }; + + function findFormatRoot(container) { + var formatRoot; + + // Find format root + each(getParents(container.parentNode).reverse(), function(parent) { + // Find format root element + if (!formatRoot && parent.id != '_start' && parent.id != '_end') { + // If the matched format has a remove none flag we shouldn't split it + if (!isBlock(parent) && matchNode(parent, name, vars)) + formatRoot = parent; + } + }); + + return formatRoot; + }; + + function wrapAndSplit(format_root, container, target, split) { + var parent, clone, lastClone, firstClone, i, formatRootParent; + + // Format root found then clone formats and split it + if (format_root) { + formatRootParent = format_root.parentNode; + + for (parent = container.parentNode; parent && parent != formatRootParent; parent = parent.parentNode) { + clone = parent.cloneNode(FALSE); + + for (i = 0; i < formatList.length; i++) { + if (removeFormat(formatList[i], vars, clone, clone)) { + clone = 0; + break; + } + } + + // Build wrapper node + if (clone) { + if (lastClone) + clone.appendChild(lastClone); + + if (!firstClone) + firstClone = clone; + + lastClone = clone; + } + } + + if (split) + container = dom.split(format_root, container); + + // Wrap container in cloned formats + if (lastClone) { + target.parentNode.insertBefore(lastClone, target); + firstClone.appendChild(target); + } + } + + return container; + }; + + function splitToFormatRoot(container) { + return wrapAndSplit(findFormatRoot(container), container, container, true); + }; + + function unwrap(start) { + var node = dom.get(start ? '_start' : '_end'), + out = node[start ? 'firstChild' : 'lastChild']; + + dom.remove(node, 1); + + return out; + }; + + function removeRngStyle(rng) { + var startContainer, endContainer; + + rng = expandRng(rng, formatList, TRUE); + + if (format.split) { + startContainer = getContainer(rng, TRUE); + endContainer = getContainer(rng); + + if (startContainer != endContainer) { + // Wrap start/end nodes in span element since these might be cloned/moved + startContainer = wrap(startContainer, 'span', {id : '_start', _mce_type : 'bookmark'}); + endContainer = wrap(endContainer, 'span', {id : '_end', _mce_type : 'bookmark'}); + + // Split start/end + splitToFormatRoot(startContainer); + splitToFormatRoot(endContainer); + + // Unwrap start/end to get real elements again + startContainer = unwrap(TRUE); + endContainer = unwrap(); + } else + startContainer = endContainer = splitToFormatRoot(startContainer); + + // Update range positions since they might have changed after the split operations + rng.startContainer = startContainer.parentNode; + rng.startOffset = nodeIndex(startContainer); + rng.endContainer = endContainer.parentNode; + rng.endOffset = nodeIndex(endContainer) + 1; + } + + // Remove items between start/end + rangeUtils.walk(rng, function(nodes) { + each(nodes, function(node) { + process(node); + }); + }); + }; + + // Handle node + if (node) { + rng = dom.createRng(); + rng.setStartBefore(node); + rng.setEndAfter(node); + removeRngStyle(rng); + return; + } + + if (!selection.isCollapsed() || !format.inline) { + bookmark = selection.getBookmark(); + removeRngStyle(selection.getRng(TRUE)); + selection.moveToBookmark(bookmark); + ed.nodeChanged(); + } else + performCaretAction('remove', name, vars); + }; + + function toggle(name, vars, node) { + if (match(name, vars, node)) + remove(name, vars, node); + else + apply(name, vars, node); + }; + + function matchNode(node, name, vars) { + var formatList = get(name), format, i, classes; + + function matchItems(node, format, item_name) { + var key, value, items = format[item_name], i; + + // Check all items + if (items) { + // Non indexed object + if (items.length === undefined) { + for (key in items) { + if (items.hasOwnProperty(key)) { + if (item_name === 'attributes') + value = dom.getAttrib(node, key); + else + value = getStyle(node, key); + + if (!isEq(value, replaceVars(items[key], vars))) + return; + } + } + } else { + // Only one match needed for indexed arrays + for (i = 0; i < items.length; i++) { + if (item_name === 'attributes' ? dom.getAttrib(node, items[i]) : getStyle(node, items[i])) + return TRUE; + } + } + } + + return TRUE; + }; + + if (formatList && node) { + // Check each format in list + for (i = 0; i < formatList.length; i++) { + format = formatList[i]; + + // Name name, attributes, styles and classes + if (matchName(node, format) && matchItems(node, format, 'attributes') && matchItems(node, format, 'styles')) { + // Match classes + if (classes = format.classes) { + for (i = 0; i < classes.length; i++) { + if (!dom.hasClass(node, classes[i])) + return; + } + } + + return TRUE; + } + } + } + }; + + function match(name, vars, node) { + var startNode, i; + + function matchParents(node) { + // Find first node with similar format settings + node = dom.getParent(node, function(node) { + return !!matchNode(node, name, vars); + }); + + // Do an exact check on the similar format element + return matchNode(node, name, vars); + }; + + // Check specified node + if (node) + return matchParents(node); + + // Check pending formats + if (selection.isCollapsed()) { + for (i = pendingFormats.apply.length - 1; i >= 0; i--) { + if (pendingFormats.apply[i].name == name) + return true; + } + + for (i = pendingFormats.remove.length - 1; i >= 0; i--) { + if (pendingFormats.remove[i].name == name) + return false; + } + + return matchParents(selection.getNode()); + } + + // Check selected node + node = selection.getNode(); + if (matchParents(node)) + return TRUE; + + // Check start node if it's different + startNode = selection.getStart(); + if (startNode != node) { + if (matchParents(startNode)) + return TRUE; + } + + return FALSE; + }; + + function canApply(name) { + var formatList = get(name), startNode, parents, i, x, selector; + + if (formatList) { + startNode = selection.getStart(); + parents = getParents(startNode); + + for (x = formatList.length - 1; x >= 0; x--) { + selector = formatList[x].selector; + + // Format is not selector based, then always return TRUE + if (!selector) + return TRUE; + + for (i = parents.length - 1; i >= 0; i--) { + if (dom.is(parents[i], selector)) + return TRUE; + } + } + } + + return FALSE; + }; + + // Expose to public + tinymce.extend(this, { + get : get, + register : register, + apply : apply, + remove : remove, + toggle : toggle, + match : match, + matchNode : matchNode, + canApply : canApply + }); + + // Private functions + + function matchName(node, format) { + // Check for inline match + if (isEq(node, format.inline)) + return TRUE; + + // Check for block match + if (isEq(node, format.block)) + return TRUE; + + // Check for selector match + if (format.selector) + return dom.is(node, format.selector); + }; + + function isEq(str1, str2) { + str1 = str1 || ''; + str2 = str2 || ''; + + str1 = str1.nodeName || str1; + str2 = str2.nodeName || str2; + + return str1.toLowerCase() == str2.toLowerCase(); + }; + + function getStyle(node, name) { + var styleVal = dom.getStyle(node, name); + + // Force the format to hex + if (name == 'color' || name == 'backgroundColor') + styleVal = dom.toHex(styleVal); + + // Opera will return bold as 700 + if (name == 'fontWeight' && styleVal == 700) + styleVal = 'bold'; + + return '' + styleVal; + }; + + function replaceVars(value, vars) { + if (typeof(value) != "string") + value = value(vars); + else if (vars) { + value = value.replace(/%(\w+)/g, function(str, name) { + return vars[name] || str; + }); + } + + return value; + }; + + function isWhiteSpaceNode(node) { + return node && node.nodeType === 3 && /^\s*$/.test(node.nodeValue); + }; + + function wrap(node, name, attrs) { + var wrapper = dom.create(name, attrs); + + node.parentNode.insertBefore(wrapper, node); + wrapper.appendChild(node); + + return wrapper; + }; + + function expandRng(rng, format, remove) { + var startContainer = rng.startContainer, + startOffset = rng.startOffset, + endContainer = rng.endContainer, + endOffset = rng.endOffset, sibling, lastIdx; + + // This function walks up the tree if there is no siblings before/after the node + function findParentContainer(container, child_name, sibling_name, root) { + var parent, child; + + root = root || dom.getRoot(); + + for (;;) { + // Check if we can move up are we at root level or body level + parent = container.parentNode; + + // Stop expanding on block elements or root depending on format + if (parent == root || (!format[0].block_expand && isBlock(parent))) + return container; + + for (sibling = parent[child_name]; sibling && sibling != container; sibling = sibling[sibling_name]) { + if (sibling.nodeType == 1 && !isBookmarkNode(sibling)) + return container; + + if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling)) + return container; + } + + container = container.parentNode; + } + + return container; + }; + + // If index based start position then resolve it + if (startContainer.nodeType == 1 && startContainer.hasChildNodes()) { + lastIdx = startContainer.childNodes.length - 1; + startContainer = startContainer.childNodes[startOffset > lastIdx ? lastIdx : startOffset]; + + if (startContainer.nodeType == 3) + startOffset = 0; + } + + // If index based end position then resolve it + if (endContainer.nodeType == 1 && endContainer.hasChildNodes()) { + lastIdx = endContainer.childNodes.length - 1; + endContainer = endContainer.childNodes[endOffset > lastIdx ? lastIdx : endOffset - 1]; + + if (endContainer.nodeType == 3) + endOffset = endContainer.nodeValue.length; + } + + // Exclude bookmark nodes if possible + if (isBookmarkNode(startContainer.parentNode)) + startContainer = startContainer.parentNode; + + if (isBookmarkNode(startContainer)) + startContainer = startContainer.nextSibling || startContainer; + + if (isBookmarkNode(endContainer.parentNode)) + endContainer = endContainer.parentNode; + + if (isBookmarkNode(endContainer)) + endContainer = endContainer.previousSibling || endContainer; + + // Move start/end point up the tree if the leaves are sharp and if we are in different containers + // Example * becomes !: !

*texttext*

! + // This will reduce the number of wrapper elements that needs to be created + // Move start point up the tree + if (format[0].inline || format[0].block_expand) { + startContainer = findParentContainer(startContainer, 'firstChild', 'nextSibling'); + endContainer = findParentContainer(endContainer, 'lastChild', 'previousSibling'); + } + + // Expand start/end container to matching selector + if (format[0].selector && format[0].expand !== FALSE) { + function findSelectorEndPoint(container, sibling_name) { + var parents, i, y; + + if (container.nodeType == 3 && container.nodeValue.length == 0 && container[sibling_name]) + container = container[sibling_name]; + + parents = getParents(container); + for (i = 0; i < parents.length; i++) { + for (y = 0; y < format.length; y++) { + if (dom.is(parents[i], format[y].selector)) + return parents[i]; + } + } + + return container; + }; + + // Find new startContainer/endContainer if there is better one + startContainer = findSelectorEndPoint(startContainer, 'previousSibling'); + endContainer = findSelectorEndPoint(endContainer, 'nextSibling'); + } + + // Expand start/end container to matching block element or text node + if (format[0].block || format[0].selector) { + function findBlockEndPoint(container, sibling_name, sibling_name2) { + var node; + + // Expand to block of similar type + if (!format[0].wrapper) + node = dom.getParent(container, format[0].block); + + // Expand to first wrappable block element or any block element + if (!node) + node = dom.getParent(container.nodeType == 3 ? container.parentNode : container, isBlock); + + // Exclude inner lists from wrapping + if (node && format[0].wrapper) + node = getParents(node, 'ul,ol').reverse()[0] || node; + + // Didn't find a block element look for first/last wrappable element + if (!node) { + node = container; + + while (node[sibling_name] && !isBlock(node[sibling_name])) { + node = node[sibling_name]; + + // Break on BR but include it will be removed later on + // we can't remove it now since we need to check if it can be wrapped + if (isEq(node, 'br')) + break; + } + } + + return node || container; + }; + + // Find new startContainer/endContainer if there is better one + startContainer = findBlockEndPoint(startContainer, 'previousSibling'); + endContainer = findBlockEndPoint(endContainer, 'nextSibling'); + + // Non block element then try to expand up the leaf + if (format[0].block) { + if (!isBlock(startContainer)) + startContainer = findParentContainer(startContainer, 'firstChild', 'nextSibling'); + + if (!isBlock(endContainer)) + endContainer = findParentContainer(endContainer, 'lastChild', 'previousSibling'); + } + } + + // Setup index for startContainer + if (startContainer.nodeType == 1) { + startOffset = nodeIndex(startContainer); + startContainer = startContainer.parentNode; + } + + // Setup index for endContainer + if (endContainer.nodeType == 1) { + endOffset = nodeIndex(endContainer) + 1; + endContainer = endContainer.parentNode; + } + + // Return new range like object + return { + startContainer : startContainer, + startOffset : startOffset, + endContainer : endContainer, + endOffset : endOffset + }; + } + + function removeFormat(format, vars, node, compare_node) { + var i, attrs, stylesModified; + + // Check if node matches format + if (!matchName(node, format)) + return FALSE; + + // Should we compare with format attribs and styles + if (format.remove != 'all') { + // Remove styles + each(format.styles, function(value, name) { + value = replaceVars(value, vars); + + // Indexed array + if (typeof(name) === 'number') { + name = value; + compare_node = 0; + } + + if (!compare_node || isEq(getStyle(compare_node, name), value)) + dom.setStyle(node, name, ''); + + stylesModified = 1; + }); + + // Remove style attribute if it's empty + if (stylesModified && dom.getAttrib(node, 'style') == '') { + node.removeAttribute('style'); + node.removeAttribute('_mce_style'); + } + + // Remove attributes + each(format.attributes, function(value, name) { + var valueOut; + + value = replaceVars(value, vars); + + // Indexed array + if (typeof(name) === 'number') { + name = value; + compare_node = 0; + } + + if (!compare_node || isEq(dom.getAttrib(compare_node, name), value)) { + // Keep internal classes + if (name == 'class') { + value = dom.getAttrib(node, name); + if (value) { + // Build new class value where everything is removed except the internal prefixed classes + valueOut = ''; + each(value.split(/\s+/), function(cls) { + if (/mce\w+/.test(cls)) + valueOut += (valueOut ? ' ' : '') + cls; + }); + + // We got some internal classes left + if (valueOut) { + dom.setAttrib(node, name, valueOut); + return; + } + } + } + + // IE6 has a bug where the attribute doesn't get removed correctly + if (name == "class") + node.removeAttribute('className'); + + // Remove mce prefixed attributes + if (MCE_ATTR_RE.test(name)) + node.removeAttribute('_mce_' + name); + + node.removeAttribute(name); + } + }); + + // Remove classes + each(format.classes, function(value) { + value = replaceVars(value, vars); + + if (!compare_node || dom.hasClass(compare_node, value)) + dom.removeClass(node, value); + }); + + // Check for non internal attributes + attrs = dom.getAttribs(node); + for (i = 0; i < attrs.length; i++) { + if (attrs[i].nodeName.indexOf('_') !== 0) + return FALSE; + } + } + + // Remove the inline child if it's empty for example or + if (format.remove != 'none') { + removeNode(node, format); + return TRUE; + } + }; + + function removeNode(node, format) { + var parentNode = node.parentNode, rootBlockElm; + + if (format.block) { + if (!forcedRootBlock) { + function find(node, next, inc) { + node = getNonWhiteSpaceSibling(node, next, inc); + + return !node || (node.nodeName == 'BR' || isBlock(node)); + }; + + // Append BR elements if needed before we remove the block + if (isBlock(node) && !isBlock(parentNode)) { + if (!find(node, FALSE) && !find(node.firstChild, TRUE, 1)) + node.insertBefore(dom.create('br'), node.firstChild); + + if (!find(node, TRUE) && !find(node.lastChild, FALSE, 1)) + node.appendChild(dom.create('br')); + } + } else { + // Wrap the block in a forcedRootBlock if we are at the root of document + if (parentNode == dom.getRoot()) { + if (!format.list_block || !isEq(node, format.list_block)) { + each(tinymce.grep(node.childNodes), function(node) { + if (isValid(forcedRootBlock, node.nodeName.toLowerCase())) { + if (!rootBlockElm) + rootBlockElm = wrap(node, forcedRootBlock); + else + rootBlockElm.appendChild(node); + } else + rootBlockElm = 0; + }); + } + } + } + } + + dom.remove(node, 1); + }; + + function getNonWhiteSpaceSibling(node, next, inc) { + if (node) { + next = next ? 'nextSibling' : 'previousSibling'; + + for (node = inc ? node : node[next]; node; node = node[next]) { + if (node.nodeType == 1 || !isWhiteSpaceNode(node)) + return node; + } + } + }; + + function isBookmarkNode(node) { + return node && node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark'; + }; + + function mergeSiblings(prev, next) { + var marker, sibling, tmpSibling; + + function compareElements(node1, node2) { + // Not the same name + if (node1.nodeName != node2.nodeName) + return FALSE; + + function getAttribs(node) { + var attribs = {}; + + each(dom.getAttribs(node), function(attr) { + var name = attr.nodeName.toLowerCase(); + + // Don't compare internal attributes or style/class + if (name.indexOf('_') !== 0 && name !== 'class' && name !== 'style') + attribs[name] = dom.getAttrib(node, name); + }); + + return attribs; + }; + + function compareObjects(obj1, obj2) { + var value, name; + + for (name in obj1) { + // Obj1 has item obj2 doesn't have + if (obj1.hasOwnProperty(name)) { + value = obj2[name]; + + // Obj2 doesn't have obj1 item + if (value === undefined) + return FALSE; + + // Obj2 item has a different value + if (obj1[name] != value) + return FALSE; + + // Delete similar value + delete obj2[name]; + } + } + + // Check if obj 2 has something obj 1 doesn't have + for (name in obj2) { + // Obj2 has item obj1 doesn't have + if (obj2.hasOwnProperty(name)) + return FALSE; + } + + return TRUE; + }; + + // Attribs are not the same + if (!compareObjects(getAttribs(node1), getAttribs(node2))) + return FALSE; + + // Styles are not the same + if (!compareObjects(dom.parseStyle(dom.getAttrib(node1, 'style')), dom.parseStyle(dom.getAttrib(node2, 'style')))) + return FALSE; + + return TRUE; + }; + + // Check if next/prev exists and that they are elements + if (prev && next) { + function findElementSibling(node, sibling_name) { + for (sibling = node; sibling; sibling = sibling[sibling_name]) { + if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling)) + return node; + + if (sibling.nodeType == 1 && !isBookmarkNode(sibling)) + return sibling; + } + + return node; + }; + + // If previous sibling is empty then jump over it + prev = findElementSibling(prev, 'previousSibling'); + next = findElementSibling(next, 'nextSibling'); + + // Compare next and previous nodes + if (compareElements(prev, next)) { + // Append nodes between + for (sibling = prev.nextSibling; sibling && sibling != next;) { + tmpSibling = sibling; + sibling = sibling.nextSibling; + prev.appendChild(tmpSibling); + } + + // Remove next node + dom.remove(next); + + // Move children into prev node + each(tinymce.grep(next.childNodes), function(node) { + prev.appendChild(node); + }); + + return prev; + } + } + + return next; + }; + + function isTextBlock(name) { + return /^(h[1-6]|p|div|pre|address)$/.test(name); + }; + + function getContainer(rng, start) { + var container, offset, lastIdx; + + container = rng[start ? 'startContainer' : 'endContainer']; + offset = rng[start ? 'startOffset' : 'endOffset']; + + if (container.nodeType == 1) { + lastIdx = container.childNodes.length - 1; + + if (!start && offset) + offset--; + + container = container.childNodes[offset > lastIdx ? lastIdx : offset]; + } + + return container; + }; + + function performCaretAction(type, name, vars) { + var i, rng, selectedNode = selection.getNode().parentNode, + doc = ed.getDoc(), marker = 'mceinline', + events = ['onKeyDown', 'onKeyUp', 'onKeyPress'], + currentPendingFormats = pendingFormats[type], + otherPendingFormats = pendingFormats[type == 'apply' ? 'remove' : 'apply']; + + // Check if it already exists + for (i = currentPendingFormats.length - 1; i >= 0; i--) { + if (currentPendingFormats[i].name == name) + return; + } + + currentPendingFormats.push({name : name, vars : vars}); + + // Check if it's in the oter type + for (i = otherPendingFormats.length - 1; i >= 0; i--) { + if (otherPendingFormats[i].name == name) + otherPendingFormats.splice(i, 1); + } + + function unbind() { + if (caretHandler) { + each(events, function(event) { + ed[event].remove(caretHandler); + }); + + caretHandler = 0; + } + }; + + function perform(caret_node) { + // Apply pending formats + each(pendingFormats.apply.reverse(), function(item) { + apply(item.name, item.vars, caret_node); + }); + + // Remove pending formats + each(pendingFormats.remove.reverse(), function(item) { + remove(item.name, item.vars, caret_node); + }); + + dom.remove(caret_node, 1); + resetPending(); + }; + + function isMarker(node) { + return node.face == marker || node.style.fontFamily == marker; + }; + + unbind(); + + doc.execCommand('FontName', false, marker); + + // IE will convert the current word + each(dom.select('font,span', selectedNode), function(node) { + var bookmark; + + if (isMarker(node)) { + bookmark = selection.getBookmark(); + perform(node); + selection.moveToBookmark(bookmark); + ed.nodeChanged(); + selectedNode = 0; + } + }); + + if (selectedNode) { + caretHandler = function(ed, e) { + each(dom.select('font,span', selectedNode), function(node) { + var bookmark, textNode; + + // Look for marker + if (node.face == marker || node.style.fontFamily == marker) { + textNode = node.firstChild; + + perform(node); + + rng = dom.createRng(); + rng.setStart(textNode, textNode.nodeValue.length); + rng.setEnd(textNode, textNode.nodeValue.length); + selection.setRng(rng); + ed.nodeChanged(); + + unbind(); + } + }); + + // Always unbind and clear pending styles on keyup + if (e.type == 'keyup') { + unbind(); + resetPending(); + } + }; + + each(events, function(event) { + ed[event].addToTop(caretHandler); + }); + } + } + }; +})(tinymce); +tinymce.onAddEditor.add(function(tinymce, ed) { + var filters, fontSizes, dom, settings = ed.settings; + + if (settings.inline_styles) { + fontSizes = tinymce.explode(settings.font_size_style_values); + + function replaceWithSpan(node, styles) { + dom.replace(dom.create('span', { + style : styles + }), node, 1); + }; + + filters = { + font : function(dom, node) { + replaceWithSpan(node, { + backgroundColor : node.style.backgroundColor, + color : node.color, + fontFamily : node.face, + fontSize : fontSizes[parseInt(node.size) - 1] + }); + }, + + u : function(dom, node) { + replaceWithSpan(node, { + textDecoration : 'underline' + }); + }, + + strike : function(dom, node) { + replaceWithSpan(node, { + textDecoration : 'line-through' + }); + } + }; + + function convert(editor, params) { + dom = editor.dom; + + if (settings.convert_fonts_to_spans) { + tinymce.each(dom.select('font,u,strike', params.node), function(node) { + filters[node.nodeName.toLowerCase()](ed.dom, node); + }); + } + }; + + ed.onPreProcess.add(convert); + + ed.onInit.add(function() { + ed.selection.onSetContent.add(convert); + }); + } +}); diff --git a/plugins/TinyMCE/js/utils/editable_selects.js b/plugins/TinyMCE/js/utils/editable_selects.js new file mode 100644 index 0000000000..fd943c0f87 --- /dev/null +++ b/plugins/TinyMCE/js/utils/editable_selects.js @@ -0,0 +1,70 @@ +/** + * editable_selects.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +var TinyMCE_EditableSelects = { + editSelectElm : null, + + init : function() { + var nl = document.getElementsByTagName("select"), i, d = document, o; + + for (i=0; i'; + h += ' '; + + return h; +} + +function updateColor(img_id, form_element_id) { + document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value; +} + +function setBrowserDisabled(id, state) { + var img = document.getElementById(id); + var lnk = document.getElementById(id + "_link"); + + if (lnk) { + if (state) { + lnk.setAttribute("realhref", lnk.getAttribute("href")); + lnk.removeAttribute("href"); + tinyMCEPopup.dom.addClass(img, 'disabled'); + } else { + if (lnk.getAttribute("realhref")) + lnk.setAttribute("href", lnk.getAttribute("realhref")); + + tinyMCEPopup.dom.removeClass(img, 'disabled'); + } + } +} + +function getBrowserHTML(id, target_form_element, type, prefix) { + var option = prefix + "_" + type + "_browser_callback", cb, html; + + cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback")); + + if (!cb) + return ""; + + html = ""; + html += ''; + html += ' '; + + return html; +} + +function openBrowser(img_id, target_form_element, type, option) { + var img = document.getElementById(img_id); + + if (img.className != "mceButtonDisabled") + tinyMCEPopup.openBrowser(target_form_element, type, option); +} + +function selectByValue(form_obj, field_name, value, add_custom, ignore_case) { + if (!form_obj || !form_obj.elements[field_name]) + return; + + var sel = form_obj.elements[field_name]; + + var found = false; + for (var i=0; i parseInt(v)) + st = this.mark(f, n); + } + } + + return st; + }, + + hasClass : function(n, c, d) { + return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className); + }, + + getNum : function(n, c) { + c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0]; + c = c.replace(/[^0-9]/g, ''); + + return c; + }, + + addClass : function(n, c, b) { + var o = this.removeClass(n, c); + n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c; + }, + + removeClass : function(n, c) { + c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' '); + return n.className = c != ' ' ? c : ''; + }, + + tags : function(f, s) { + return f.getElementsByTagName(s); + }, + + mark : function(f, n) { + var s = this.settings; + + this.addClass(n, s.invalid_cls); + this.markLabels(f, n, s.invalid_cls); + + return false; + }, + + markLabels : function(f, n, ic) { + var nl, i; + + nl = this.tags(f, "label"); + for (i=0; i, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: hello.php:115 SamplePlugin.php:266 +msgid "Hello" +msgstr "" + +#: hello.php:117 hello.php:141 +#, php-format +msgid "Hello, %s" +msgstr "" + +#: hello.php:138 +msgid "Hello, stranger!" +msgstr "" + +#: hello.php:143 +#, php-format +msgid "I have greeted you %d time." +msgid_plural "I have greeted you %d times." +msgstr[0] "" +msgstr[1] "" + +#: SamplePlugin.php:266 +msgid "A warm greeting" +msgstr "" + +#: SamplePlugin.php:277 +msgid "A sample plugin to show basics of development for new hackers." +msgstr "" + +#: User_greeting_count.php:163 +#, php-format +msgid "Could not save new greeting count for %d" +msgstr "" + +#: User_greeting_count.php:176 +#, php-format +msgid "Could not increment greeting count for %d" +msgstr "" From dfa785e9ae6116e51fcab96d36288334f0503970 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 11 Mar 2010 11:31:54 -0500 Subject: [PATCH 002/730] save the data from TinyMCE --- plugins/TinyMCE/TinyMCEPlugin.php | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php index 1d9d4a2882..c0fd8506ed 100644 --- a/plugins/TinyMCE/TinyMCEPlugin.php +++ b/plugins/TinyMCE/TinyMCEPlugin.php @@ -49,6 +49,8 @@ if (!defined('STATUSNET')) { class TinyMCEPlugin extends Plugin { + var $html; + function onEndShowScripts($action) { if (common_logged_in()) { @@ -76,6 +78,39 @@ class TinyMCEPlugin extends Plugin return true; } + function onArgsInitialize(&$args) + { + if (!array_key_exists('action', $args) || + $args['action'] != 'newnotice') { + return true; + } + + $raw = $args['status_textarea']; + + require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; + + $config = array('safe' => 1, + 'deny_attribute' => 'id,style,on*'); + + $this->html = htmLawed($raw, $config); + + $text = html_entity_decode(strip_tags($this->html)); + + $args['status_textarea'] = $text; + + return true; + } + + function onStartNoticeSave($notice) + { + if (!empty($this->html)) { + // Stomp on any rendering + $notice->rendered = $this->html; + } + + return true; + } + function _inlineScript() { $path = common_path('plugins/TinyMCE/js/tiny_mce.js'); From 8f071b2818e8321ea910df612016175f65093402 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 11 Mar 2010 11:54:04 -0500 Subject: [PATCH 003/730] scrub magic quotes from HTML in TinyMCE --- plugins/TinyMCE/TinyMCEPlugin.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php index c0fd8506ed..f8d85c1ba0 100644 --- a/plugins/TinyMCE/TinyMCEPlugin.php +++ b/plugins/TinyMCE/TinyMCEPlugin.php @@ -85,7 +85,7 @@ class TinyMCEPlugin extends Plugin return true; } - $raw = $args['status_textarea']; + $raw = $this->_scrub($args['status_textarea']); require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; @@ -127,5 +127,15 @@ END_OF_SCRIPT; return $scr; } + + function _scrub($txt) + { + $strip = get_magic_quotes_gpc(); + if ($strip) { + return stripslashes($txt); + } else { + return $txt; + } + } } From 83edc126c04c544a577675507e0ca01ca5c2e665 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 18 Apr 2010 22:07:51 +0200 Subject: [PATCH 004/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/af/LC_MESSAGES/statusnet.po | 14 +- locale/ar/LC_MESSAGES/statusnet.po | 90 ++-- locale/arz/LC_MESSAGES/statusnet.po | 14 +- locale/bg/LC_MESSAGES/statusnet.po | 14 +- locale/br/LC_MESSAGES/statusnet.po | 14 +- locale/ca/LC_MESSAGES/statusnet.po | 14 +- locale/cs/LC_MESSAGES/statusnet.po | 14 +- locale/de/LC_MESSAGES/statusnet.po | 208 +++++---- locale/el/LC_MESSAGES/statusnet.po | 14 +- locale/en_GB/LC_MESSAGES/statusnet.po | 268 ++++------- locale/es/LC_MESSAGES/statusnet.po | 19 +- locale/fa/LC_MESSAGES/statusnet.po | 14 +- locale/fi/LC_MESSAGES/statusnet.po | 14 +- locale/fr/LC_MESSAGES/statusnet.po | 20 +- locale/ga/LC_MESSAGES/statusnet.po | 14 +- locale/gl/LC_MESSAGES/statusnet.po | 181 +++++--- locale/he/LC_MESSAGES/statusnet.po | 14 +- locale/hsb/LC_MESSAGES/statusnet.po | 166 +++---- locale/ia/LC_MESSAGES/statusnet.po | 212 +++++---- locale/is/LC_MESSAGES/statusnet.po | 14 +- locale/it/LC_MESSAGES/statusnet.po | 97 ++-- locale/ja/LC_MESSAGES/statusnet.po | 14 +- locale/ko/LC_MESSAGES/statusnet.po | 21 +- locale/mk/LC_MESSAGES/statusnet.po | 16 +- locale/nb/LC_MESSAGES/statusnet.po | 621 ++++++++++++++------------ locale/nl/LC_MESSAGES/statusnet.po | 16 +- locale/nn/LC_MESSAGES/statusnet.po | 20 +- locale/pl/LC_MESSAGES/statusnet.po | 18 +- locale/pt/LC_MESSAGES/statusnet.po | 14 +- locale/pt_BR/LC_MESSAGES/statusnet.po | 14 +- locale/ru/LC_MESSAGES/statusnet.po | 20 +- locale/statusnet.pot | 10 +- locale/sv/LC_MESSAGES/statusnet.po | 18 +- locale/te/LC_MESSAGES/statusnet.po | 29 +- locale/tr/LC_MESSAGES/statusnet.po | 14 +- locale/uk/LC_MESSAGES/statusnet.po | 18 +- locale/vi/LC_MESSAGES/statusnet.po | 14 +- locale/zh_CN/LC_MESSAGES/statusnet.po | 35 +- locale/zh_TW/LC_MESSAGES/statusnet.po | 14 +- 39 files changed, 1147 insertions(+), 1208 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index b9bae52129..a9c8d84a48 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:00+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:04+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -2455,8 +2455,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "" @@ -4606,13 +4606,13 @@ msgstr "" msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index f6bf14d12e..57b2094d0a 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:04+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:07+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -51,7 +51,7 @@ msgstr "خاص" #. TRANS: Checkbox instructions for admin setting "Invite only" #: actions/accessadminpanel.php:174 msgid "Make registration invitation only." -msgstr "" +msgstr "اجعل التسجيل عبر الدعوة فقط." #. TRANS: Checkbox label for configuring site as invite only. #: actions/accessadminpanel.php:176 @@ -87,9 +87,8 @@ msgstr "احفظ" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -#, fuzzy msgid "No such page." -msgstr "لا صفحة كهذه" +msgstr "لا صفحة كهذه." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -448,9 +447,8 @@ msgstr "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found." -msgstr "لم توجد المجموعة!" +msgstr "المجموعة غير موجودة." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." @@ -819,7 +817,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "لا" @@ -838,7 +835,6 @@ msgstr "لا تمنع هذا المستخدم" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "نعم" @@ -894,9 +890,9 @@ msgstr "ألغِ منع هذا المستخدم" #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 -#, fuzzy, php-format +#, php-format msgid "Post to %s" -msgstr "مجموعات %s" +msgstr "أرسل إلى %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -1078,7 +1074,7 @@ msgid "Invalid logo URL." msgstr "مسار شعار غير صالح." #: actions/designadminpanel.php:280 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s." msgstr "السمة غير متوفرة: %s" @@ -1332,7 +1328,6 @@ msgstr "عنوان البريد الإلكتروني المُؤكد الحالي #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "أزل" @@ -1349,7 +1344,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "ألغِ" @@ -1364,7 +1358,6 @@ msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "أضف" @@ -1390,16 +1383,14 @@ msgstr "أنشئ عنوان بريد إلكتروني لترسل إليه؛ أل #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "جديد" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "التفضيلات" +msgstr "تفضيلات البريد الإلكتروني" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1438,9 +1429,8 @@ msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكترو #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "حُفظت تفضيلات التصميم." +msgstr "حُفظت تفضيلات البريد الإلكرتوني." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1493,15 +1483,13 @@ msgstr "" #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." -msgstr "هذا عنوان محادثة فورية خاطئ." +msgstr "هذا عنوان بريد إلكتروني خطأ." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "أُلغي التأكيد." +msgstr "أُلغي تأكيد البريد الإلكتروني." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1511,9 +1499,8 @@ msgstr "هذا ليس عنوان بريدك الإلكتروني." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "أزيل هذا العنوان." +msgstr "أزيل عنوان البريد الإلكتروني." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1809,7 +1796,7 @@ msgstr "اجعل المستخدم إداريًا في المجموعة" #: actions/groupmembers.php:519 msgid "Make Admin" -msgstr "" +msgstr "اجعله إداريًا" #: actions/groupmembers.php:519 msgid "Make this user an admin" @@ -1930,7 +1917,7 @@ msgstr "عنوان المراسلة الفورية" #: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." -msgstr "" +msgstr "عنوان جابر أو محادثة غوغل المعتمد حاليًا." #. TRANS: Form note in IM settings form. #. TRANS: %s is the IM address set for the site. @@ -1952,9 +1939,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "التفضيلات" +msgstr "تفضيلات المحادثة الفورية" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2463,8 +2449,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -3321,9 +3307,9 @@ msgid "Replies to %s" msgstr "الردود على %s" #: actions/replies.php:128 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "الردود على %s" +msgstr "الردود على %1$s، الصفحة %2$d" #: actions/replies.php:145 #, php-format @@ -3470,7 +3456,7 @@ msgstr "" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "معلومات التطبيق" #: actions/showapplication.php:263 msgid "Consumer key" @@ -3499,14 +3485,13 @@ msgid "" msgstr "" #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" +msgstr "أمتأكد من أنك تريد إعادة ضبط مفتاح المستهلك وكلمة سره؟" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "إشعارات %s المُفضلة" +msgstr "إشعارات %1$s المُفضلة، الصفحة %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3788,9 +3773,8 @@ msgid "Unknown language \"%s\"." msgstr "لغة غير معروفة \"%s\"." #: actions/siteadminpanel.php:165 -#, fuzzy msgid "Minimum text limit is 0 (unlimited)." -msgstr "حد النص الأدنى هو 140 حرفًا." +msgstr "حد النص الأدنى 0 (غير محدود)." #: actions/siteadminpanel.php:171 msgid "Dupe limit must be one or more seconds." @@ -3915,9 +3899,8 @@ msgstr "الرسائل القصيرة غير متوفرة." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "عنوان المراسلة الفورية" +msgstr "عنوان الرسائل القصيرة" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -3941,7 +3924,6 @@ msgstr "" #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" msgstr "أكّد" @@ -3954,13 +3936,12 @@ msgstr "رقم هاتف SMS" #. TRANS: SMS phone number input field instructions in SMS settings form. #: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" -msgstr "" +msgstr "رقم الهاتف بدون شرطات أو مسافات مع رمز المنطقة" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "التفضيلات" +msgstr "تفضيلات الرسائل القصيرة" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -3971,9 +3952,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "حُفِظت التفضيلات." +msgstr "حُفظت تفضيلات الرسائل القصيرة." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4009,9 +3989,8 @@ msgstr "إن رقم التأكيد هذا خاطئ." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "أُلغي التأكيد." +msgstr "أُلغي تأكيد الرسائل القصيرة." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. @@ -4021,9 +4000,8 @@ msgstr "هذا ليس رقم هاتفك." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "رقم هاتف SMS" +msgstr "تمت إزالة رقم هاتف الرسائل القصيرة." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4652,14 +4630,14 @@ msgstr "" msgid "Problem saving notice." msgstr "مشكلة أثناء حفظ الإشعار." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "مشكلة أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 3b6d78a7b6..12e952f3d6 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:07+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:10+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -2469,8 +2469,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr " مش نظام بيانات مدعوم." @@ -4647,14 +4647,14 @@ msgstr "" msgid "Problem saving notice." msgstr "مشكله أثناء حفظ الإشعار." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "مشكله أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index e38fe609c7..54f1fadec7 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:11+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:13+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -2565,8 +2565,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -4818,14 +4818,14 @@ msgstr "Забранено ви е да публикувате бележки в msgid "Problem saving notice." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Проблем при записване на бележката." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 3b72ee8c2c..5c3d4472e0 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:14+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:16+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -2460,8 +2460,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "" @@ -4617,13 +4617,13 @@ msgstr "" msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 55bbac1964..4fa73c71f3 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:18+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:20+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -2569,8 +2569,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -4866,14 +4866,14 @@ msgstr "Ha estat bandejat de publicar notificacions en aquest lloc." msgid "Problem saving notice." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Problema en guardar l'avís." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index b4efa94331..d97f792d16 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:21+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:23+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -2571,8 +2571,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "" @@ -4835,14 +4835,14 @@ msgstr "" msgid "Problem saving notice." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Problém při ukládání sdělení" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index f8a75b1a91..7214233761 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:26+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:26+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -93,7 +93,6 @@ msgstr "Speichern" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -#, fuzzy msgid "No such page." msgstr "Seite nicht vorhanden" @@ -251,6 +250,8 @@ msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" +"Du musst einen Parameter mit Namen 'device' übergeben. Mögliche Werte sind: " +"sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -454,9 +455,9 @@ msgid "Too many aliases! Maximum %d." msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d." #: actions/apigroupcreate.php:266 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"." -msgstr "Ungültiges Stichwort: „%s“" +msgstr "Ungültiges Alias: „%s“" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -472,7 +473,6 @@ msgstr "Alias kann nicht das gleiche wie der Spitznamen sein." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found." msgstr "Gruppe nicht gefunden!" @@ -853,7 +853,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "Nein" @@ -872,7 +871,6 @@ msgstr "Diesen Benutzer freigeben" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Ja" @@ -928,9 +926,9 @@ msgstr "Diesen Benutzer freigeben" #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 -#, fuzzy, php-format +#, php-format msgid "Post to %s" -msgstr "Versenden an " +msgstr "Versenden an %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -946,7 +944,7 @@ msgstr "Dieser Bestätigungscode ist nicht für dich!" #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. #: actions/confirmaddress.php:91 -#, fuzzy, php-format +#, php-format msgid "Unrecognized address type %s." msgstr "Nicht erkannter Adresstyp %s" @@ -1118,7 +1116,7 @@ msgid "Invalid logo URL." msgstr "Ungültige URL für das Logo" #: actions/designadminpanel.php:280 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s." msgstr "Theme nicht verfügbar: %s" @@ -1375,7 +1373,6 @@ msgstr "Aktuelle bestätigte E-Mail-Adresse." #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Entfernen" @@ -1394,7 +1391,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "Abbrechen" @@ -1409,7 +1405,6 @@ msgstr "E-Mail-Adresse, beispielsweise „Benutzername@example.org“" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Hinzufügen" @@ -1437,16 +1432,14 @@ msgstr "" #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "Neu" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "Einstellungen" +msgstr "E-Mail Einstellungen" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1487,9 +1480,8 @@ msgstr "MicroID für meine E-Mail-Adresse veröffentlichen." #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "Design-Einstellungen gespeichert." +msgstr "E-Mail Einstellungen gespeichert." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1545,15 +1537,13 @@ msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann." #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." -msgstr "Das ist die falsche IM-Adresse." +msgstr "Dies ist die falsche E-Mail Adresse" #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "Bestätigung abgebrochen." +msgstr "E-Mail Bestätigung abgebrochen." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1563,9 +1553,8 @@ msgstr "Dies ist nicht deine E-Mail-Adresse." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "Die Adresse wurde entfernt." +msgstr "Die E-Mail Adresse wurde entfernt." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1704,9 +1693,8 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "Service nutzt unbekannte OMB-Protokollversion." #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." -msgstr "Fehler beim Aktualisieren des entfernten Profils" +msgstr "Fehler beim Aktualisieren des entfernten Profils." #: actions/getfile.php:79 msgid "No such file." @@ -2029,9 +2017,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Einstellungen" +msgstr "IM Einstellungen" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2103,15 +2090,13 @@ msgstr "Das ist die falsche IM-Adresse." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "Konnte E-Mail-Bestätigung nicht löschen." +msgstr "Konnte die IM Bestätigung nicht löschen." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "Bestätigung abgebrochen." +msgstr "IM Bestätigung abgebrochen." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2121,9 +2106,8 @@ msgstr "Dies ist nicht deine JabberID." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "Die Adresse wurde entfernt." +msgstr "Die IM Adresse wurde entfernt." #: actions/inbox.php:59 #, php-format @@ -2146,7 +2130,7 @@ msgid "Invites have been disabled." msgstr "Einladungen wurden deaktiviert." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." msgstr "Du musst angemeldet sein, um andere Benutzer zu %s einzuladen" @@ -2388,9 +2372,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Konnte %1$s nicht zum Administrator der Gruppe %2$s machen" #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "Kein aktueller Status" +msgstr "Kein aktueller Status." #: actions/newapplication.php:52 msgid "New Application" @@ -2559,9 +2542,9 @@ msgid "You are not a user of that application." msgstr "Du bist kein Benutzer dieses Programms." #: actions/oauthconnectionssettings.php:186 -#, fuzzy, php-format +#, php-format msgid "Unable to revoke access for app: %s." -msgstr "Kann Zugang dieses Programm nicht entfernen: " +msgstr "Kann Zugang dieses Programm nicht entfernen: %s." #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." @@ -2574,7 +2557,6 @@ msgstr "" "Entwickler können die Registrierungseinstellungen ihrer Programme ändern " #: actions/oembed.php:79 actions/shownotice.php:100 -#, fuzzy msgid "Notice has no profile." msgstr "Nachricht hat kein Profil" @@ -2585,19 +2567,19 @@ msgstr "%1$s Status auf %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') #: actions/oembed.php:158 -#, fuzzy, php-format +#, php-format msgid "Content type %s not supported." -msgstr "Content-Typ " +msgstr "Content-Typ %s wird nicht untersützt." #. TRANS: Error message displaying attachments. %s is the site's base URL. #: actions/oembed.php:162 #, php-format msgid "Only %s URLs over plain HTTP please." -msgstr "" +msgstr "Bitte nur %s URLs über einfaches HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -2747,24 +2729,24 @@ msgid "Path and server settings for this StatusNet site." msgstr "Pfad- und Serverangaben für diese StatusNet Seite." #: actions/pathsadminpanel.php:157 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s." -msgstr "Theme-Verzeichnis nicht lesbar: %s" +msgstr "Theme-Verzeichnis nicht lesbar: %s." #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s" +msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s." #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." -msgstr "Hintergrund Verzeichnis ist nicht beschreibbar: %s" +msgstr "Hintergrund-Verzeichnis ist nicht beschreibbar: %s." #: actions/pathsadminpanel.php:177 -#, fuzzy, php-format +#, php-format msgid "Locales directory not readable: %s." -msgstr "Sprachverzeichnis nicht lesbar: %s" +msgstr "Sprachverzeichnis nicht lesbar: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2905,9 +2887,9 @@ msgid "People search" msgstr "Suche nach anderen Nutzern" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "Ungültiger Personen-Tag: %s" +msgstr "Ungültiger Personen-Tag: %s." #: actions/peopletag.php:142 #, php-format @@ -2915,9 +2897,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "Benutzer die sich selbst mit %1$s getagged haben - Seite %2$d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "Ungültiger Nachrichteninhalt" +msgstr "Ungültiger Nachrichteninhalt." #: actions/postnotice.php:101 #, php-format @@ -3066,9 +3047,9 @@ msgid "Settings saved." msgstr "Einstellungen gespeichert." #: actions/public.php:83 -#, fuzzy, php-format +#, php-format msgid "Beyond the page limit (%s)." -msgstr "Jenseits des Seitenlimits (%s)" +msgstr "Jenseits des Seitenlimits (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3666,11 +3647,11 @@ msgstr "Programminformation" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Anwender Schlüssel" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Anwender Geheimnis" #: actions/showapplication.php:273 msgid "Request token URL" @@ -3735,6 +3716,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s hat noch keine Nachricht zu den Favoriten hinzugefügt. Sende du doch " +"einfach eine interessante Nachricht, damit sich daran etwas ändert :)" #: actions/showfavorites.php:212 #, php-format @@ -3994,7 +3977,6 @@ msgid "Minimum text limit is 0 (unlimited)." msgstr "Minimale Textlänge ist 0 Zeichen (unbegrenzt)" #: actions/siteadminpanel.php:171 -#, fuzzy msgid "Dupe limit must be one or more seconds." msgstr "Duplikatlimit muss mehr als 1 Sekunde sein" @@ -4089,9 +4071,8 @@ msgid "Unable to save site notice." msgstr "Konnte Seitenbenachrichtigung nicht speichern" #: actions/sitenoticeadminpanel.php:113 -#, fuzzy msgid "Max length for the site-wide notice is 255 chars." -msgstr "Maximale Länge von Systembenachrichtigungen ist 255 Zeichen" +msgstr "Maximale Länge von Systembenachrichtigungen ist 255 Zeichen." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -4124,9 +4105,8 @@ msgstr "SMS ist nicht verfügbar." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "IM-Adresse" +msgstr "SMS Adresse" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -4150,7 +4130,6 @@ msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" msgstr "Bestätigen" @@ -4167,9 +4146,8 @@ msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Einstellungen" +msgstr "SMS Einstellungen" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4182,9 +4160,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "Einstellungen gesichert." +msgstr "SMS Einstellungen gesichert." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4223,9 +4200,8 @@ msgstr "Die Bestätigungsnummer ist falsch." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "Bestätigung abgebrochen." +msgstr "SMS Bestätigung abgebrochen." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. @@ -4235,9 +4211,8 @@ msgstr "Dies ist nicht deine Telefonnummer." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "SMS-Telefonnummer" +msgstr "SMS Telefonnummer wurde entfernt." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4282,23 +4257,23 @@ msgstr "" #: actions/snapshotadminpanel.php:133 msgid "Snapshot frequency must be a number." -msgstr "" +msgstr "Die Snapshot-Frequenz muss eine Zahl sein." #: actions/snapshotadminpanel.php:144 msgid "Invalid snapshot report URL." -msgstr "" +msgstr "Ungültige Snapshot-Berichts-URL." #: actions/snapshotadminpanel.php:200 msgid "Randomly during web hit" -msgstr "" +msgstr "Zufällig während Webseitenbesuchen" #: actions/snapshotadminpanel.php:201 msgid "In a scheduled job" -msgstr "" +msgstr "Als zeitlich geplanten Auftrag" #: actions/snapshotadminpanel.php:206 msgid "Data snapshots" -msgstr "" +msgstr "Daten-Snapshot" #: actions/snapshotadminpanel.php:208 msgid "When to send statistical data to status.net servers" @@ -4310,7 +4285,7 @@ msgstr "Frequenz" #: actions/snapshotadminpanel.php:218 msgid "Snapshots will be sent once every N web hits" -msgstr "" +msgstr "Snapshots werden all N Webseitenbesuche gesendet" #: actions/snapshotadminpanel.php:226 msgid "Report URL" @@ -4318,7 +4293,7 @@ msgstr "URL melden" #: actions/snapshotadminpanel.php:227 msgid "Snapshots will be sent to this URL" -msgstr "" +msgstr "An diese Adresse werden Snapshots gesendet" #: actions/snapshotadminpanel.php:248 msgid "Save snapshot settings" @@ -4524,7 +4499,6 @@ msgid "User is not silenced." msgstr "Der Benutzer ist nicht ruhig gestellt." #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile ID in request." msgstr "Keine Profil-ID in der Anfrage." @@ -4879,7 +4853,7 @@ msgstr "Konnte Nachricht nicht mit neuer URI versehen." #. TRANS: Server exception. %s are the error details. #: classes/Notice.php:176 -#, fuzzy, php-format +#, php-format msgid "Database error inserting hashtag: %s" msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" @@ -4915,13 +4889,13 @@ msgstr "" msgid "Problem saving notice." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problem bei Speichern der Nachricht." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5205,7 +5179,7 @@ msgstr "StatusNet-Software-Lizenz" #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. #: lib/action.php:817 -#, fuzzy, php-format +#, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." @@ -5263,7 +5237,7 @@ msgstr "" #: lib/action.php:871 #, php-format msgid "All %1$s content and data are available under the %2$s license." -msgstr "" +msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfügbar." #. TRANS: DT element for pagination (previous/next, etc.). #: lib/action.php:1182 @@ -5285,7 +5259,7 @@ msgstr "Vorher" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. #: lib/activity.php:121 msgid "Expecting a root feed element but got a whole XML document." -msgstr "" +msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten." #: lib/activityutils.php:208 msgid "Can't handle remote content yet." @@ -5472,13 +5446,11 @@ msgstr "Abbrechen" #. TRANS: Application access type #: lib/applicationlist.php:136 -#, fuzzy msgid "read-write" msgstr "Lese/Schreibzugriff" #. TRANS: Application access type #: lib/applicationlist.php:138 -#, fuzzy msgid "read-only" msgstr "Schreibgeschützt" @@ -5486,14 +5458,13 @@ msgstr "Schreibgeschützt" #: lib/applicationlist.php:144 #, php-format msgid "Approved %1$s - \"%2$s\" access." -msgstr "" +msgstr "Genehmigte %1$s - \"%2$s\" Zugriff." #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" -msgstr "Entfernen" +msgstr "Widerrufen" #. TRANS: DT element label in attachment list. #: lib/attachmentlist.php:88 @@ -5604,7 +5575,7 @@ msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen." @@ -5646,7 +5617,7 @@ msgstr "" #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "" "Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet." @@ -6232,9 +6203,11 @@ msgstr "SMS-Konfiguration" #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:457 -#, fuzzy, php-format +#, php-format msgid "%s: confirm you own this phone number with this code:" -msgstr "Warte auf die Bestätigung dieser Telefonnummer." +msgstr "" +"%s: bestätige mit folgendem Code, dass es sich um deine Telefonnummer " +"handelt:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:478 @@ -6356,6 +6329,9 @@ msgid "" "\n" "\t%s" msgstr "" +"Die komplette Unterhaltung kann hier gelesen werden:\n" +"\n" +"%s" #: lib/mail.php:651 #, php-format @@ -6390,6 +6366,29 @@ msgid "" "\n" "P.S. You can turn off these email notifications here: %8$s\n" msgstr "" +"%1$s (@%9$s) hat dir gerade eine Nachricht (eine '@-Antwort') auf %2$s " +"gesendet.\n" +"\n" +"Die Nachricht findest du hier:\n" +"\n" +"%3$s\n" +"\n" +"Sie lautet:\n" +"\n" +"%4$s\n" +"\n" +"%5$sHier kannst du auf die Nachricht antworten:\n" +"\n" +"%6$s\n" +"\n" +"Eine Liste aller @-Antworten an dich findest du hier:\n" +"\n" +"%7$s\n" +"\n" +"Hochachtungsvoll dein,\n" +"%2$s\n" +"\n" +"P.S. Diese E-Mail Benachrichtigung kannst du hier deaktivieren: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6717,9 +6716,8 @@ msgid "Popular" msgstr "Beliebte Beiträge" #: lib/redirectingaction.php:94 -#, fuzzy msgid "No return-to arguments." -msgstr "Kein id Argument." +msgstr "Kein Rückkehr Argument." #: lib/repeatform.php:107 msgid "Repeat this notice?" @@ -6825,12 +6823,12 @@ msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 msgid "People Tagcloud as self-tagged" -msgstr "" +msgstr "Personen-Tagwolke, wie man sich selbst markiert hat." #: lib/subscriberspeopletagcloudsection.php:48 #: lib/subscriptionspeopletagcloudsection.php:48 msgid "People Tagcloud as tagged" -msgstr "" +msgstr "Personen-Tag, wie markiert wurde" #: lib/tagcloudsection.php:56 msgid "None" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 8fc8ac6c41..31b4ea6607 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:29+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:31+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -2527,8 +2527,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "" @@ -4759,13 +4759,13 @@ msgstr "" msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 38feccec76..eeb1f41859 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:32+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:34+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -44,7 +44,6 @@ msgstr "Prohibit anonymous users (not logged in) from viewing site?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Private" @@ -81,7 +80,6 @@ msgstr "Save access settings" #: actions/accessadminpanel.php:203 actions/emailsettings.php:224 #: actions/imsettings.php:184 actions/smssettings.php:209 #: lib/applicationeditform.php:361 -#, fuzzy msgctxt "BUTTON" msgid "Save" msgstr "Save" @@ -89,9 +87,8 @@ msgstr "Save" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -#, fuzzy msgid "No such page." -msgstr "No such page" +msgstr "No such page." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -240,13 +237,12 @@ msgid "This method requires a POST." msgstr "This method requires a POST." #: actions/apiaccountupdatedeliverydevice.php:105 -#, fuzzy msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." #: actions/apiaccountupdatedeliverydevice.php:132 #, fuzzy @@ -446,9 +442,9 @@ msgid "Too many aliases! Maximum %d." msgstr "Too many aliases! Maximum %d." #: actions/apigroupcreate.php:266 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"." -msgstr "Invalid alias: \"%s\"" +msgstr "Invalid alias: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -464,9 +460,8 @@ msgstr "Alias can't be the same as nickname." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found." -msgstr "Group not found!" +msgstr "Group not found." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." @@ -498,9 +493,9 @@ msgstr "%s's groups" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s #: actions/apigrouplist.php:107 -#, fuzzy, php-format +#, php-format msgid "%1$s groups %2$s is a member of." -msgstr "Groups %s is a member of" +msgstr "%1$s groups %2$s is a member of." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. @@ -791,9 +786,8 @@ msgid "Crop" msgstr "Crop" #: actions/avatarsettings.php:305 -#, fuzzy msgid "No file uploaded." -msgstr "No profile specified." +msgstr "No file uploaded." #: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" @@ -841,7 +835,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "No" @@ -860,7 +853,6 @@ msgstr "Do not block this user" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Yes" @@ -916,9 +908,9 @@ msgstr "Unblock this user" #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 -#, fuzzy, php-format +#, php-format msgid "Post to %s" -msgstr "Post to " +msgstr "Post to %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -934,9 +926,9 @@ msgstr "That confirmation code is not for you!" #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. #: actions/confirmaddress.php:91 -#, fuzzy, php-format +#, php-format msgid "Unrecognized address type %s." -msgstr "Unrecognised address type %s" +msgstr "Unrecognized address type %s." #. TRANS: Client error for an already confirmed email/jabbel/sms address. #: actions/confirmaddress.php:96 @@ -1107,9 +1099,9 @@ msgid "Invalid logo URL." msgstr "nvalid logo URL." #: actions/designadminpanel.php:280 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s." -msgstr "Theme not available: %s" +msgstr "Theme not available: %s." #: actions/designadminpanel.php:376 msgid "Change logo" @@ -1363,7 +1355,6 @@ msgstr "Current confirmed e-mail address." #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Remove" @@ -1382,7 +1373,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "Cancel" @@ -1397,7 +1387,6 @@ msgstr "E-mail address, like \"UserName@example.org\"" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Add" @@ -1423,16 +1412,14 @@ msgstr "Make a new e-mail address for posting to - cancels the old one." #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "New" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "Preferences" +msgstr "Email preferences" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1471,9 +1458,8 @@ msgstr "Publish a MicroID for my e-mail address." #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "Design preferences saved." +msgstr "Email preferences saved." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1528,15 +1514,13 @@ msgstr "No pending confirmation to cancel." #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." -msgstr "That is the wrong IM address." +msgstr "That is the wrong email address." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "Confirmation cancelled." +msgstr "Email confirmation cancelled." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1546,9 +1530,8 @@ msgstr "That is not your e-mail address." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "The address was removed." +msgstr "The email address was removed." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1686,7 +1669,6 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "Remote service uses unknown version of OMB protocol." #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." msgstr "Error updating remote profile." @@ -1699,23 +1681,20 @@ msgid "Cannot read file." msgstr "Cannot read file." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Invalid token." +msgstr "Invalid role." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." msgstr "" #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "You cannot sandbox users on this site." +msgstr "You cannot grant user roles on this site." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "User is already silenced." +msgstr "User already has this role." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -2005,9 +1984,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Preferences" +msgstr "IM preferences" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2078,15 +2056,13 @@ msgstr "That is the wrong IM address." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "Couldn't delete e-mail confirmation." +msgstr "Couldn't delete IM confirmation." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "Confirmation cancelled." +msgstr "IM confirmation cancelled." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2096,9 +2072,8 @@ msgstr "That is not your Jabber ID." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "The address was removed." +msgstr "The IM address was removed." #: actions/inbox.php:59 #, php-format @@ -2119,9 +2094,9 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." -msgstr "You must be logged in to invite other users to use %s" +msgstr "You must be logged in to invite other users to use %s." #: actions/invite.php:72 #, php-format @@ -2189,7 +2164,6 @@ msgstr "Optionally add a personal message to the invitation." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Send" @@ -2357,9 +2331,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Can't make %1$s an admin for group %2$s." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "No current status" +msgstr "No current status." #: actions/newapplication.php:52 msgid "New Application" @@ -2536,9 +2509,8 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -#, fuzzy msgid "Notice has no profile." -msgstr "Notice has no profile" +msgstr "Notice has no profile." #: actions/oembed.php:86 actions/shownotice.php:175 #, php-format @@ -2547,9 +2519,9 @@ msgstr "%1$s's status on %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') #: actions/oembed.php:158 -#, fuzzy, php-format +#, php-format msgid "Content type %s not supported." -msgstr "content type " +msgstr "Content type %s not supported." #. TRANS: Error message displaying attachments. %s is the site's base URL. #: actions/oembed.php:162 @@ -2558,8 +2530,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -2708,24 +2680,24 @@ msgid "Path and server settings for this StatusNet site." msgstr "" #: actions/pathsadminpanel.php:157 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s." -msgstr "Theme directory not readable: %s" +msgstr "Theme directory not readable: %s." #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "Theme directory not readable: %s" +msgstr "Avatar directory not writable: %s." #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." -msgstr "Theme directory not readable: %s" +msgstr "Background directory not writable: %s." #: actions/pathsadminpanel.php:177 -#, fuzzy, php-format +#, php-format msgid "Locales directory not readable: %s." -msgstr "Theme directory not readable: %s" +msgstr "Locales directory not readable: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2865,9 +2837,9 @@ msgid "People search" msgstr "People Search" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "Not a valid people tag: %s" +msgstr "Not a valid people tag: %s." #: actions/peopletag.php:142 #, php-format @@ -2875,9 +2847,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "Users self-tagged with %1$s - page %2$d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "Invalid notice content" +msgstr "Invalid notice content." #: actions/postnotice.php:101 #, php-format @@ -3308,13 +3279,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Longer name, preferably your \"real\" name" #: actions/register.php:494 -#, fuzzy, php-format +#, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." #: actions/register.php:542 #, php-format @@ -3494,14 +3465,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Replies to %1$s on %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "You cannot silence users on this site." +msgstr "You cannot revoke user roles on this site." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "User without matching profile." +msgstr "User doesn't have this role." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3897,9 +3866,8 @@ msgid "User is already silenced." msgstr "User is already silenced." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Design settings for this StausNet site." +msgstr "Basic settings for this StatusNet site" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." @@ -3915,9 +3883,8 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -#, fuzzy msgid "Minimum text limit is 0 (unlimited)." -msgstr "Minimum text limit is 140 characters." +msgstr "Minimum text limit is 0 (unlimited)." #: actions/siteadminpanel.php:171 msgid "Dupe limit must be one or more seconds." @@ -3968,9 +3935,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "" #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Default site language" +msgstr "Default language" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3997,37 +3963,32 @@ msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Site notice" +msgstr "Site Notice" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "New message" +msgstr "Edit site-wide message" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Unable to save your design settings!" +msgstr "Unable to save site notice." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Site notice" +msgstr "Site notice text" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Site notice" +msgstr "Save site notice" #. TRANS: Title for SMS settings. #: actions/smssettings.php:59 @@ -4043,15 +4004,13 @@ msgstr "You can receive SMS messages through e-mail from %%site.name%%." #. TRANS: Message given in the SMS settings if SMS is not enabled on the site. #: actions/smssettings.php:97 -#, fuzzy msgid "SMS is not available." -msgstr "This page is not available in a " +msgstr "SMS is not available." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "IM address" +msgstr "SMS address" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -4075,7 +4034,6 @@ msgstr "Enter the code you received on your phone." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" msgstr "Confirm" @@ -4092,9 +4050,8 @@ msgstr "Phone number, no punctuation or spaces, with area code" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Preferences" +msgstr "SMS preferences" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4107,9 +4064,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "Preferences saved." +msgstr "SMS preferences saved." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4147,9 +4103,8 @@ msgstr "That is the wrong confirmation number." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "Confirmation cancelled." +msgstr "SMS confirmation cancelled." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. @@ -4159,9 +4114,8 @@ msgstr "That is not your phone number." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "SMS phone number" +msgstr "The SMS phone number was removed." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4196,9 +4150,8 @@ msgid "Snapshots" msgstr "" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Change site configuration" +msgstr "Manage snapshot configuration" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -4245,9 +4198,8 @@ msgid "Snapshots will be sent to this URL" msgstr "" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Save site settings" +msgstr "Save snapshot settings" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." @@ -4437,9 +4389,8 @@ msgid "User is not silenced." msgstr "User is not silenced." #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile ID in request." -msgstr "No profile id in request." +msgstr "No profile ID in request." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4454,7 +4405,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "User" @@ -4785,9 +4735,9 @@ msgstr "Could not update message with new URI." #. TRANS: Server exception. %s are the error details. #: classes/Notice.php:176 -#, fuzzy, php-format +#, php-format msgid "Database error inserting hashtag: %s" -msgstr "DB error inserting hashtag: %s" +msgstr "Database error inserting hashtag: %s" #: classes/Notice.php:245 msgid "Problem saving notice. Too long." @@ -4819,13 +4769,13 @@ msgstr "You are banned from posting notices on this site." msgid "Problem saving notice." msgstr "Problem saving notice." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problem saving group inbox." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4852,9 +4802,8 @@ msgid "Couldn't delete self-subscription." msgstr "Couldn't delete self-subscription." #: classes/Subscription.php:200 -#, fuzzy msgid "Couldn't delete subscription OMB token." -msgstr "Couldn't delete subscription." +msgstr "Couldn't delete subscription OMB token." #: classes/Subscription.php:211 msgid "Couldn't delete subscription." @@ -4934,28 +4883,24 @@ msgstr "Primary site navigation" #. TRANS: Tooltip for main menu option "Personal" #: lib/action.php:432 -#, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" -msgstr "Personal profile and friends timeline" +msgstr "ersonal profile and friends timeline" #. TRANS: Main menu option when logged in for access to personal profile and friends timeline #: lib/action.php:435 -#, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Personal" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:437 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Change your e-mail, avatar, password, profile" +msgstr "Change your email, avatar, password, profile" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:442 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Connect to services" @@ -4967,95 +4912,82 @@ msgstr "Connect" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:448 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Change site configuration" #. TRANS: Main menu option when logged in and site admin for access to site configuration #: lib/action.php:451 -#, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Admin" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:455 -#, fuzzy, php-format +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Invite friends and colleagues to join you on %s" #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users #: lib/action.php:458 -#, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Invite" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:464 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Logout from the site" #. TRANS: Main menu option when logged in to log out the current user #: lib/action.php:467 -#, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Logout" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:472 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Create an account" #. TRANS: Main menu option when not logged in to register a new account #: lib/action.php:475 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "Register" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:478 -#, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Login to the site" #: lib/action.php:481 -#, fuzzy msgctxt "MENU" msgid "Login" msgstr "Login" #. TRANS: Tooltip for main menu option "Help" #: lib/action.php:484 -#, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Help me!" #: lib/action.php:487 -#, fuzzy msgctxt "MENU" msgid "Help" msgstr "Help" #. TRANS: Tooltip for main menu option "Search" #: lib/action.php:490 -#, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Search for people or text" #: lib/action.php:493 -#, fuzzy msgctxt "MENU" msgid "Search" msgstr "Search" @@ -5127,7 +5059,7 @@ msgstr "StatusNet software licence" #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. #: lib/action.php:817 -#, fuzzy, php-format +#, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." @@ -5250,7 +5182,6 @@ msgstr "Basic site configuration" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:351 -#, fuzzy msgctxt "MENU" msgid "Site" msgstr "Site" @@ -5262,7 +5193,6 @@ msgstr "Design configuration" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:359 -#, fuzzy msgctxt "MENU" msgid "Design" msgstr "Design" @@ -5294,15 +5224,13 @@ msgstr "Sessions configuration" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:397 -#, fuzzy msgid "Edit site notice" -msgstr "Site notice" +msgstr "Edit site notice" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:405 -#, fuzzy msgid "Snapshots configuration" -msgstr "Paths configuration" +msgstr "Snapshots configuration" #. TRANS: Client error 401. #: lib/apiauth.php:95 @@ -5408,7 +5336,6 @@ msgstr "" #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" msgstr "Revoke" @@ -5474,9 +5401,9 @@ msgstr "Could not find a user with nickname %s" #. TRANS: Message given getting a non-existing user. #. TRANS: %s is the nickname of the user that could not be found. #: lib/command.php:147 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Could not find a user with nickname %s" +msgstr "Could not find a local user with nickname %s" #: lib/command.php:180 msgid "Sorry, this command is not yet implemented." @@ -5519,9 +5446,9 @@ msgstr "Could not join user %1$s to group %2$s." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Could not remove user %1$s to group %2$s." +msgstr "Could not remove user %1$s to group %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -5559,9 +5486,9 @@ msgstr "" #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" -msgstr "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "Message too long - maximum is %1$d characters, you sent %2$d" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -5612,9 +5539,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "Specify the name of the user to subscribe to" #: lib/command.php:628 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "You are not subscribed to that profile." +msgstr "Can't subscribe to OMB profiles by command." #: lib/command.php:634 #, php-format @@ -6090,9 +6016,9 @@ msgstr "SMS confirmation" #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:457 -#, fuzzy, php-format +#, php-format msgid "%s: confirm you own this phone number with this code:" -msgstr "Awaiting confirmation on this phone number." +msgstr "%s: confirm you own this phone number with this code:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:478 @@ -6544,9 +6470,9 @@ msgid "Repeat this notice" msgstr "Repeat this notice" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Block this user from this group" +msgstr "Revoke the \"%s\" role from this user" #: lib/router.php:704 msgid "No single user defined for single-user mode." @@ -6675,9 +6601,9 @@ msgid "Unsubscribe" msgstr "Unsubscribe" #: lib/usernoprofileexception.php:58 -#, fuzzy, php-format +#, php-format msgid "User %s (%d) has no profile record." -msgstr "User has no profile." +msgstr "User %s (%d) has no profile record." #: lib/userprofile.php:117 msgid "Edit Avatar" @@ -6712,15 +6638,13 @@ msgid "Moderate" msgstr "" #: lib/userprofile.php:364 -#, fuzzy msgid "User role" -msgstr "User profile" +msgstr "User role" #: lib/userprofile.php:366 -#, fuzzy msgctxt "role" msgid "Administrator" -msgstr "Admins" +msgstr "Administrator" #: lib/userprofile.php:367 msgctxt "role" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 39c2e95b80..40f1836062 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -4,6 +4,7 @@ # Author@translatewiki.net: Locos epraix # Author@translatewiki.net: McDutchie # Author@translatewiki.net: PerroVerd +# Author@translatewiki.net: Pertile # Author@translatewiki.net: Peter17 # Author@translatewiki.net: Translationista # -- @@ -13,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:36+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:37+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -2563,8 +2564,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Solamente %s URLs sobre HTTP simples por favor." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -4873,13 +4874,13 @@ msgstr "Tienes prohibido publicar avisos en este sitio." msgid "Problem saving notice." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Hubo un problema al guarda la bandeja de entrada del grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5564,9 +5565,9 @@ msgstr "No se pudo unir el usuario %s al grupo %s" #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s." +msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 300f8a602c..f3fa675693 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:42+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:44+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -2550,8 +2550,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست." @@ -4764,14 +4764,14 @@ msgstr "شما از فرستادن پست در این سایت مردود شدی msgid "Problem saving notice." msgstr "مشکل در ذخیره کردن آگهی." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "مشکل در ذخیره کردن آگهی." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 9020ccaeb7..7ca6b0c943 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:39+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:40+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -2618,8 +2618,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -4938,14 +4938,14 @@ msgstr "Päivityksesi tähän palveluun on estetty." msgid "Problem saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Ongelma päivityksen tallentamisessa." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 1d2bbcdaed..139fdc351f 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:46+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:47+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -1541,7 +1541,7 @@ msgstr "Cette adresse de messagerie électronique est erronée." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 msgid "Email confirmation cancelled." -msgstr "Courrier électronique de confirmation annulé." +msgstr "Confirmation de courrier électronique annulée." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -2584,8 +2584,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -4904,13 +4904,13 @@ msgstr "Il vous est interdit de poster des avis sur ce site." msgid "Problem saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5592,9 +5592,9 @@ msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s" #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s." +msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 7504570c15..2d6863b239 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:50+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:50+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -2647,8 +2647,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -4993,14 +4993,14 @@ msgstr "Tes restrinxido o envio de chíos neste sitio." msgid "Problem saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Aconteceu un erro ó gardar o chío." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index a63edfbb07..0a92d5ff13 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:53+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:49:53+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -2560,8 +2560,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Só %s enderezos URL sobre HTTP simple." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Non se soporta ese formato de datos." @@ -3509,6 +3509,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Pode conversar con outros usuarios, subscribirse a máis xente ou [unirse a " +"grupos](%%action.groups%%)." #: actions/replies.php:206 #, php-format @@ -3516,23 +3518,25 @@ msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"Pode probar a [facerlle un aceno a %1$s](../%2$s) ou [publicar algo dirixido " +"a el ou ela](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format msgid "Replies to %1$s on %2$s!" -msgstr "" +msgstr "Respostas a %1$s en %2$s!" #: actions/revokerole.php:75 msgid "You cannot revoke user roles on this site." -msgstr "" +msgstr "Non pode revogar os roles dos usuarios neste sitio." #: actions/revokerole.php:82 msgid "User doesn't have this role." -msgstr "" +msgstr "O usuario non ten este rol." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" -msgstr "" +msgstr "StatusNet" #: actions/sandbox.php:65 actions/unsandbox.php:65 msgid "You cannot sandbox users on this site." @@ -3546,144 +3550,150 @@ msgstr "" #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 #: lib/adminpanelaction.php:391 msgid "Sessions" -msgstr "" +msgstr "Sesións" #: actions/sessionsadminpanel.php:65 msgid "Session settings for this StatusNet site." -msgstr "" +msgstr "Configuración da sesión para este sitio StatusNet." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" -msgstr "" +msgstr "Manexar as sesións" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Se manexar as sesións nós mesmos." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" -msgstr "" +msgstr "Depuración da sesión" #: actions/sessionsadminpanel.php:183 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "Activar a saída de depuración para as sesións." #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 #: actions/useradminpanel.php:294 msgid "Save site settings" -msgstr "" +msgstr "Gardar a configuración do sitio" #: actions/showapplication.php:82 msgid "You must be logged in to view an application." -msgstr "" +msgstr "Debe estar identificado para ver unha aplicación." #: actions/showapplication.php:157 msgid "Application profile" -msgstr "" +msgstr "Perfil da aplicación" #. TRANS: Form input field label for application icon. #: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" -msgstr "" +msgstr "Icona" #. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 #: lib/applicationeditform.php:199 msgid "Name" -msgstr "" +msgstr "Nome" #. TRANS: Form input field label. #: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" -msgstr "" +msgstr "Organización" #. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" -msgstr "" +msgstr "Descrición" #: actions/showapplication.php:192 actions/showgroup.php:444 #: lib/profileaction.php:187 msgid "Statistics" -msgstr "" +msgstr "Estatísticas" #: actions/showapplication.php:203 #, php-format msgid "Created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "Creado por %1$s - acceso %2$s por defecto - %3$d usuarios" #: actions/showapplication.php:213 msgid "Application actions" -msgstr "" +msgstr "Accións da aplicación" #: actions/showapplication.php:236 msgid "Reset key & secret" -msgstr "" +msgstr "Restablecer o contrasinal ou a pregunta secreta" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Información da aplicación" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Clave do consumidor" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Pregunta secreta do consumidor" #: actions/showapplication.php:273 msgid "Request token URL" -msgstr "" +msgstr "Solicitar un URL de pase" #: actions/showapplication.php:278 msgid "Access token URL" -msgstr "" +msgstr "Acceder ao URL do pase" #: actions/showapplication.php:283 msgid "Authorize URL" -msgstr "" +msgstr "Autorizar o URL" #: actions/showapplication.php:288 msgid "" "Note: We support HMAC-SHA1 signatures. We do not support the plaintext " "signature method." msgstr "" +"Nota: sopórtanse as sinaturas HMAC-SHA1. Non se soporta o método de asinado " +"con texto sinxelo." #: actions/showapplication.php:309 msgid "Are you sure you want to reset your consumer key and secret?" msgstr "" +"Seguro que quere restablecer a súa clave e maila súa pregunta secreta de " +"consumidor?" #: actions/showfavorites.php:79 #, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "" +msgstr "Notas favoritas de %1$s, páxina %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." -msgstr "" +msgstr "Non se puideron obter as notas favoritas." #: actions/showfavorites.php:171 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "" +msgstr "Fonte de novas para os favoritos de %s (RSS 1.0)" #: actions/showfavorites.php:178 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "" +msgstr "Fonte de novas para os favoritos de %s (RSS 2.0)" #: actions/showfavorites.php:185 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "" +msgstr "Fonte de novas para os favoritos de %s (Atom)" #: actions/showfavorites.php:206 msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"Aínda non escolleu ningunha nota favorita. Prema no botón de favorita das " +"notas que lle gusten para marcalas para logo ou salientalas." #: actions/showfavorites.php:208 #, php-format @@ -3691,6 +3701,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s aínda non marcou ningunha nota como favorita. Publica algo interesante " +"que poida querer engadir aos seus favoritos :)" #: actions/showfavorites.php:212 #, php-format @@ -3699,80 +3711,83 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s aínda non marcou ningunha nota como favorita. Que lle parece [rexistrar " +"unha conta](%%%%action.register%%%%) e publicar algo interesante que puidese " +"querer engadir aos seus favoritos? :)" #: actions/showfavorites.php:243 msgid "This is a way to share what you like." -msgstr "" +msgstr "Isto é un modo de compartir o que che gusta." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" -msgstr "" +msgstr "Grupo %s" #: actions/showgroup.php:84 #, php-format msgid "%1$s group, page %2$d" -msgstr "" +msgstr "Grupo %1$s, páxina %2$d" #: actions/showgroup.php:227 msgid "Group profile" -msgstr "" +msgstr "Perfil do grupo" #: actions/showgroup.php:272 actions/tagother.php:118 #: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" -msgstr "" +msgstr "URL" #: actions/showgroup.php:283 actions/tagother.php:128 #: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" -msgstr "" +msgstr "Nota" #: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "Alias" #: actions/showgroup.php:302 msgid "Group actions" -msgstr "" +msgstr "Accións do grupo" #: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "" +msgstr "Fonte de novas nas notas do grupo %s (RSS 1.0)" #: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "" +msgstr "Fonte de novas nas notas do grupo %s (RSS 2.0)" #: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" -msgstr "" +msgstr "Fonte de novas nas notas do grupo %s (Atom)" #: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" -msgstr "" +msgstr "FOAF para o grupo %s" #: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" -msgstr "" +msgstr "Membros" #: actions/showgroup.php:398 lib/profileaction.php:117 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" -msgstr "" +msgstr "(Ningún)" #: actions/showgroup.php:404 msgid "All members" -msgstr "" +msgstr "Todos os membros" #: actions/showgroup.php:447 msgid "Created" -msgstr "" +msgstr "Creado" #: actions/showgroup.php:463 #, php-format @@ -3783,6 +3798,12 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [micro-" +"blogging](http://en.wikipedia.org/wiki/Micro-blogging) (en inglés) baseado " +"na ferramenta de software libre [StatusNet](http://status.net/). Os seus " +"membros compartes mensaxes curtas sobre as súas vidas e intereses. [Únase](%%" +"%%action.register%%%%) para pasar a formar parte deste grupo e de moitos " +"máis! ([Máis información](%%%%doc.help%%%%))" #: actions/showgroup.php:469 #, php-format @@ -3792,78 +3813,84 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" +"**%s** é un gupo de usuarios de %%%%site.name%%%%, un servizo de [micro-" +"blogging](http://en.wikipedia.org/wiki/Micro-blogging) (en inglés) baseado " +"na ferramenta de software libre [StatusNet](http://status.net/). Os seus " +"membros comparten mensaxes curtas sobre a súa vida e intereses. " #: actions/showgroup.php:497 msgid "Admins" -msgstr "" +msgstr "Administradores" #: actions/showmessage.php:81 msgid "No such message." -msgstr "" +msgstr "EsNon se atopou esa mensaxe." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." -msgstr "" +msgstr "Esta mensaxe só a poden ler o destinatario e mais o remitente." #: actions/showmessage.php:108 #, php-format msgid "Message to %1$s on %2$s" -msgstr "" +msgstr "Mensaxe a %1$s en %2$s" #: actions/showmessage.php:113 #, php-format msgid "Message from %1$s on %2$s" -msgstr "" +msgstr "Mensaxe de %1$s en %2$s" #: actions/shownotice.php:90 msgid "Notice deleted." -msgstr "" +msgstr "Borrouse a nota." #: actions/showstream.php:73 #, php-format msgid " tagged %s" -msgstr "" +msgstr "etiquetouse %s" #: actions/showstream.php:79 #, php-format msgid "%1$s, page %2$d" -msgstr "" +msgstr "%1$s, páxina %2$d" #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "" +msgstr "Fonte de novas notas para %1$s etiquetadas con %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "" +msgstr "Fonte de novas notas para %s (RSS 1.0)" #: actions/showstream.php:136 #, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "" +msgstr "Fonte de novas notas para %s (RSS 2.0)" #: actions/showstream.php:143 #, php-format msgid "Notice feed for %s (Atom)" -msgstr "" +msgstr "Fonte de novas notas para %s (Atom)" #: actions/showstream.php:148 #, php-format msgid "FOAF for %s" -msgstr "" +msgstr "FOAF para %s" #: actions/showstream.php:200 #, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "" +msgstr "Esta é a liña do tempo para %1$s pero %2$s aínda non publicou nada." #: actions/showstream.php:205 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"Viu algo interesante hoxe? Aínda non pblicou ningunha nota, este sería un bo " +"momento para comezar :)" #: actions/showstream.php:207 #, php-format @@ -3871,6 +3898,8 @@ msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" +"Pode probar a facerlle un aceno a %1$s ou [publicar algo dirixido a el ou " +"ela](%%%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:243 #, php-format @@ -3880,6 +3909,11 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [micro-blogging]" +"(http://en.wikipedia.org/wiki/Micro-blogging) (en inglés) baseado na " +"ferramenta de software libre [StatusNet](http://status.net/). [Únase](%%%%" +"action.register%%%%) para seguir as notas de **%s** e de moita máis xente! " +"([Máis información](%%%%doc.help%%%%))" #: actions/showstream.php:248 #, php-format @@ -3888,11 +3922,14 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" +"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [micro-blogging]" +"(http://en.wikipedia.org/wiki/Micro-blogging) (en inglés) baseado na " +"ferramenta de software libre [StatusNet](http://status.net/). " #: actions/showstream.php:305 #, php-format msgid "Repeat of %s" -msgstr "" +msgstr "Repeticións de %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." @@ -4072,7 +4109,6 @@ msgstr "" #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" msgstr "Confirmar" @@ -4781,13 +4817,13 @@ msgstr "" msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5342,10 +5378,9 @@ msgstr "" #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" -msgstr "Borrar" +msgstr "Revogar" #. TRANS: DT element label in attachment list. #: lib/attachmentlist.php:88 diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 05d4087815..31b14615a2 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:56+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:10+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -2579,8 +2579,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "" @@ -4838,14 +4838,14 @@ msgstr "" msgid "Problem saving notice." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "בעיה בשמירת ההודעה." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index dc063eec9d..9951ce1cd4 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:48:59+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:14+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -87,9 +87,8 @@ msgstr "Składować" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -#, fuzzy msgid "No such page." -msgstr "Strona njeeksistuje" +msgstr "Strona njeeksistuje." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -430,9 +429,9 @@ msgid "Too many aliases! Maximum %d." msgstr "Přewjele aliasow! Maksimum: %d." #: actions/apigroupcreate.php:266 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"." -msgstr "Njepłaćiwy alias: \"%s\"" +msgstr "Njepłaćiwy alias: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -448,9 +447,8 @@ msgstr "Alias njemóže samsny kaž přimjeno być." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found." -msgstr "Skupina njenamakana!" +msgstr "Skupina njenamakana." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." @@ -817,7 +815,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "Ně" @@ -836,7 +833,6 @@ msgstr "Tutoho wužiwarja njeblokować" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Haj" @@ -892,9 +888,9 @@ msgstr "" #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 -#, fuzzy, php-format +#, php-format msgid "Post to %s" -msgstr "skupiny na %s" +msgstr "Na %s pósłać" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -910,9 +906,9 @@ msgstr "Tutón wobkrućenski kod njeje za tebje!" #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. #: actions/confirmaddress.php:91 -#, fuzzy, php-format +#, php-format msgid "Unrecognized address type %s." -msgstr "Njespóznany adresowy typ %s" +msgstr "Njespóznaty adresowy typ %s." #. TRANS: Client error for an already confirmed email/jabbel/sms address. #: actions/confirmaddress.php:96 @@ -1076,9 +1072,9 @@ msgid "Invalid logo URL." msgstr "Njepłaćiwy logowy URL." #: actions/designadminpanel.php:280 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s." -msgstr "Šat njesteji k dispoziciji: %s" +msgstr "Šat njesteji k dispoziciji: %s." #: actions/designadminpanel.php:376 msgid "Change logo" @@ -1230,7 +1226,7 @@ msgstr "Wopisanje je trěbne." #: actions/editapplication.php:194 msgid "Source URL is too long." -msgstr "" +msgstr "Žórłowy URL je předołhi." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Source URL is not valid." @@ -1331,7 +1327,6 @@ msgstr "Aktualna wobkrućena e-mejlowa adresa." #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Wotstronić" @@ -1348,7 +1343,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "Přetorhnyć" @@ -1363,7 +1357,6 @@ msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@example.org\"" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Přidać" @@ -1389,16 +1382,14 @@ msgstr "" #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "Nowy" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "Nastajenja" +msgstr "E-mejlowe nastajenja" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1437,9 +1428,8 @@ msgstr "MicroID za moju e-mejlowu adresu publikować" #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "Designowe nastajenja składowane." +msgstr "E-mejlowe nastajenja składowane." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1492,15 +1482,13 @@ msgstr "" #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." -msgstr "to je wopačna IM-adresa." +msgstr "To je wopačna e-mejlowa adresa." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "Wobkrućenje přetorhnjene." +msgstr "E-mejlowe wobkrućenje přetorhnjene." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1510,9 +1498,8 @@ msgstr "To njeje twoja e-mejlowa adresa." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "Adresa bu wotstronjena." +msgstr "E-mejlowa adresa bu wotstronjena." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1645,9 +1632,8 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "" #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." -msgstr "Zmylk při zasunjenju zdaleneho profila" +msgstr "Zmylk při aktualizaciji zdaleneho profila." #: actions/getfile.php:79 msgid "No such file." @@ -1782,7 +1768,7 @@ msgstr "" #: actions/groupmembers.php:100 lib/groupnav.php:92 #, php-format msgid "%s group members" -msgstr "" +msgstr "%s skupinskich čłonow" #: actions/groupmembers.php:103 #, php-format @@ -1803,11 +1789,11 @@ msgstr "Blokować" #: actions/groupmembers.php:487 msgid "Make user an admin of the group" -msgstr "" +msgstr "Wužiwarja k administratorej skupiny činić" #: actions/groupmembers.php:519 msgid "Make Admin" -msgstr "" +msgstr "Za administratora pomjenować" #: actions/groupmembers.php:519 msgid "Make this user an admin" @@ -1888,7 +1874,7 @@ msgstr "" #: actions/groupunblock.php:95 msgid "User is not blocked from group." -msgstr "" +msgstr "Wužiwar njeje zablokowany za skupinu." #: actions/groupunblock.php:128 actions/unblock.php:86 msgid "Error removing the block." @@ -1944,9 +1930,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Nastajenja" +msgstr "IM-nastajenja" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2014,15 +1999,13 @@ msgstr "to je wopačna IM-adresa." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "Abonoment njeje so dał zničić." +msgstr "IM-wobkrućenje njeda so zhašeć." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "Wobkrućenje přetorhnjene." +msgstr "IM-wobkrućenje přetorhnjene." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2032,9 +2015,8 @@ msgstr "To njeje twój ID Jabber." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "Adresa bu wotstronjena." +msgstr "IM-adresa bu wotstronjena." #: actions/inbox.php:59 #, php-format @@ -2055,9 +2037,11 @@ msgid "Invites have been disabled." msgstr "Přeprošenja buchu znjemóžnjene." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." -msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał." +msgstr "" +"Dyrbiš přizjewjeny być, zo by druheho wužiwarja přeprosył, zo by wón %s " +"wužiwał." #: actions/invite.php:72 #, php-format @@ -2260,9 +2244,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Njeje móžno %1$S k administratorej w skupinje %2$s činić." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "Žadyn aktualny status" +msgstr "Žadyn aktualny status." #: actions/newapplication.php:52 msgid "New Application" @@ -2278,7 +2261,7 @@ msgstr "Wužij tutón formular, zo by nowu aplikaciju registrował." #: actions/newapplication.php:176 msgid "Source URL is required." -msgstr "" +msgstr "Žórłowy URL je trěbny." #: actions/newapplication.php:258 actions/newapplication.php:267 msgid "Could not create application." @@ -2368,7 +2351,7 @@ msgstr "" #: actions/noticesearchrss.php:96 #, php-format msgid "Updates with \"%s\"" -msgstr "" +msgstr "Aktualizacije z \"%s\"" #: actions/noticesearchrss.php:98 #, php-format @@ -2407,7 +2390,7 @@ msgstr "" #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" -msgstr "" +msgstr "Zwjazane aplikacije" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." @@ -2431,9 +2414,8 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -#, fuzzy msgid "Notice has no profile." -msgstr "Zdźělenka nima profil" +msgstr "Zdźělenka nima profil." #: actions/oembed.php:86 actions/shownotice.php:175 #, php-format @@ -2444,7 +2426,7 @@ msgstr "" #: actions/oembed.php:158 #, php-format msgid "Content type %s not supported." -msgstr "" +msgstr "Wobsahowy typ %s so njepodpěruje." #. TRANS: Error message displaying attachments. %s is the site's base URL. #: actions/oembed.php:162 @@ -2453,8 +2435,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -2583,11 +2565,11 @@ msgstr "Wopačne stare hesło" #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." -msgstr "" +msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy." #: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." -msgstr "" +msgstr "Nowe hesło njeda so składować." #: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." @@ -2603,19 +2585,19 @@ msgid "Path and server settings for this StatusNet site." msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet." #: actions/pathsadminpanel.php:157 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s." -msgstr "Šat njesteji k dispoziciji: %s" +msgstr "Šatowy zapis njeda so čitać: %s" #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "Awatarowy zapis" +msgstr "Do awataroweho zapisa njeda so pisać: %s." #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." -msgstr "Pozadkowy zapis" +msgstr "Do pozadkoweho zapisa njeda so pisać: %s." #: actions/pathsadminpanel.php:177 #, php-format @@ -2758,9 +2740,9 @@ msgid "People search" msgstr "Za ludźimi pytać" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "Njepłaćiwa e-mejlowa adresa." +msgstr "Njepłaćiwa wosobowa taflička: %s." #: actions/peopletag.php:142 #, php-format @@ -2768,9 +2750,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "Njepłaćiwy wobsah zdźělenki" +msgstr "Njepłaćiwy wobsah zdźělenki." #: actions/postnotice.php:101 #, php-format @@ -2898,7 +2879,7 @@ msgstr "Nastajenja městna njedachu so składować." #: actions/profilesettings.php:375 msgid "Couldn't save profile." -msgstr "" +msgstr "Profil njeda so składować." #: actions/profilesettings.php:383 msgid "Couldn't save tags." @@ -3051,6 +3032,7 @@ msgstr "" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." msgstr "" +"Twoje přimjeno na tutym serwerje abo twoje zregistrowana e-mejlowa adresa." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" @@ -3533,7 +3515,7 @@ msgstr "" #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" -msgstr "" +msgstr "skupina %s" #: actions/showgroup.php:84 #, php-format @@ -3872,9 +3854,8 @@ msgstr "SMS k dispoziciji njesteji." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "IM-adresa" +msgstr "SMS-adresa" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -3898,7 +3879,6 @@ msgstr "" #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" msgstr "Wobkrućić" @@ -3915,9 +3895,8 @@ msgstr "" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Nastajenja" +msgstr "SMS-nastajenja" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -3928,9 +3907,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "Nastajenja składowane." +msgstr "SMS-nastajenja składowane." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -3966,21 +3944,19 @@ msgstr "" #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "Wobkrućenje přetorhnjene." +msgstr "SMS-wobkrućenje přetorhnjene." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. #: actions/smssettings.php:448 msgid "That is not your phone number." -msgstr "" +msgstr "To twoje telefonowe čisło njeje." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "SMS telefonowe čisło" +msgstr "Telefonowe čisło za SMS bu wotstronjene." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4249,9 +4225,8 @@ msgid "User is not silenced." msgstr "" #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile ID in request." -msgstr "Žadyn profil z tym ID." +msgstr "Žadyn profilowy ID w naprašowanju." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4574,9 +4549,9 @@ msgstr "" #. TRANS: Server exception. %s are the error details. #: classes/Notice.php:176 -#, fuzzy, php-format +#, php-format msgid "Database error inserting hashtag: %s" -msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije." +msgstr "Zmylk datoweje banki při zasunjenju hašeje taflički: %s" #: classes/Notice.php:245 msgid "Problem saving notice. Too long." @@ -4605,13 +4580,13 @@ msgstr "" msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5116,7 +5091,7 @@ msgstr "" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:278 msgid "Browser" -msgstr "" +msgstr "Wobhladowak" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:295 @@ -5166,7 +5141,6 @@ msgstr "" #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" msgstr "Wotwołać" @@ -5277,9 +5251,9 @@ msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić." +msgstr "Njebě móžno, wužiwarja %1$s ze skupiny %2$s wotstronić" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -5582,7 +5556,7 @@ msgstr "FOAF" #: lib/feedlist.php:64 msgid "Export data" -msgstr "" +msgstr "Daty eksportować" #: lib/galleryaction.php:121 msgid "Filter tags" @@ -6359,7 +6333,7 @@ msgstr "" #: lib/subgroupnav.php:91 #, php-format msgid "People subscribed to %s" -msgstr "" +msgstr "Ludźo, kotřiž su %s abonowali" #: lib/subgroupnav.php:99 #, php-format diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index cda28819e8..7463e81786 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:04+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:19+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -85,9 +85,8 @@ msgstr "Salveguardar" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -#, fuzzy msgid "No such page." -msgstr "Pagina non existe" +msgstr "Pagina non existe." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -237,13 +236,12 @@ msgid "This method requires a POST." msgstr "Iste methodo require un POST." #: actions/apiaccountupdatedeliverydevice.php:105 -#, fuzzy msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" "Tu debe specificar un parametro nominate 'device' con un del valores: sms, " -"im, none" +"im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -441,9 +439,9 @@ msgid "Too many aliases! Maximum %d." msgstr "Troppo de aliases! Maximo: %d." #: actions/apigroupcreate.php:266 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"." -msgstr "Alias invalide: \"%s\"" +msgstr "Alias invalide: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -459,9 +457,8 @@ msgstr "Le alias non pote esser identic al pseudonymo." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found." -msgstr "Gruppo non trovate!" +msgstr "Gruppo non trovate." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." @@ -493,9 +490,9 @@ msgstr "Gruppos de %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s #: actions/apigrouplist.php:107 -#, fuzzy, php-format +#, php-format msgid "%1$s groups %2$s is a member of." -msgstr "Gruppos del quales %s es membro" +msgstr "Gruppos de %1$s del quales %2$s es membro." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. @@ -843,7 +840,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "No" @@ -862,7 +858,6 @@ msgstr "Non blocar iste usator" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Si" @@ -918,9 +913,9 @@ msgstr "Disblocar iste usator" #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 -#, fuzzy, php-format +#, php-format msgid "Post to %s" -msgstr "Publicar in " +msgstr "Publicar in %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -936,9 +931,9 @@ msgstr "Iste codice de confirmation non es pro te!" #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. #: actions/confirmaddress.php:91 -#, fuzzy, php-format +#, php-format msgid "Unrecognized address type %s." -msgstr "Typo de adresse %s non recognoscite" +msgstr "Le typo de adresse %s non es recognoscite." #. TRANS: Client error for an already confirmed email/jabbel/sms address. #: actions/confirmaddress.php:96 @@ -1109,9 +1104,9 @@ msgid "Invalid logo URL." msgstr "URL de logotypo invalide." #: actions/designadminpanel.php:280 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s." -msgstr "Thema non disponibile: %s" +msgstr "Thema non disponibile: %s." #: actions/designadminpanel.php:376 msgid "Change logo" @@ -1365,7 +1360,6 @@ msgstr "Adresse de e-mail actualmente confirmate." #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Remover" @@ -1384,7 +1378,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "Cancellar" @@ -1399,7 +1392,6 @@ msgstr "Le adresse de e-mail, como \"nomine@example.org\"" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Adder" @@ -1426,16 +1418,14 @@ msgstr "" #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "Nove" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "Preferentias" +msgstr "Preferentias de e-mail" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1474,9 +1464,8 @@ msgstr "Publicar un MicroID pro mi adresse de e-mail." #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "Preferentias de apparentia salveguardate." +msgstr "Preferentias de e-mail salveguardate." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1532,15 +1521,13 @@ msgstr "Nulle confirmation pendente a cancellar." #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." -msgstr "Iste adresse de messageria instantanee es erronee." +msgstr "Iste adresse de e-mail es erronee." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "Confirmation cancellate." +msgstr "Confirmation de e-mail cancellate." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1550,9 +1537,8 @@ msgstr "Isto non es tu adresse de e-mail." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "Le adresse ha essite removite." +msgstr "Le adresse de e-mail ha essite removite." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1690,9 +1676,8 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "Le servicio remote usa un version incognite del protocollo OMB." #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." -msgstr "Error in actualisar le profilo remote" +msgstr "Error durante le actualisation del profilo remote." #: actions/getfile.php:79 msgid "No such file." @@ -2012,9 +1997,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Preferentias" +msgstr "Preferentias de messageria instantanee" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2086,15 +2070,13 @@ msgstr "Iste adresse de messageria instantanee es erronee." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "Non poteva deler confirmation de e-mail." +msgstr "Non poteva deler confirmation de messageria instantanee." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "Confirmation cancellate." +msgstr "Confirmation de messageria instantanee cancellate." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2104,9 +2086,8 @@ msgstr "Isto non es tu ID de Jabber." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "Le adresse ha essite removite." +msgstr "Le adresse de messageria instantanee ha essite removite." #: actions/inbox.php:59 #, php-format @@ -2129,9 +2110,9 @@ msgid "Invites have been disabled." msgstr "Le invitationes ha essite disactivate." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." -msgstr "Tu debe aperir un session pro invitar altere usatores a usar %s" +msgstr "Tu debe aperir un session pro invitar altere usatores a usar %s." #: actions/invite.php:72 #, php-format @@ -2370,9 +2351,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Non pote facer %1$s administrator del gruppo %2$s." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "Nulle stato actual" +msgstr "Nulle stato actual." #: actions/newapplication.php:52 msgid "New Application" @@ -2539,9 +2519,9 @@ msgid "You are not a user of that application." msgstr "Tu non es usator de iste application." #: actions/oauthconnectionssettings.php:186 -#, fuzzy, php-format +#, php-format msgid "Unable to revoke access for app: %s." -msgstr "Impossibile revocar le accesso del application: " +msgstr "Impossibile revocar le accesso del application: %s." #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." @@ -2554,9 +2534,8 @@ msgstr "" "applicationes " #: actions/oembed.php:79 actions/shownotice.php:100 -#, fuzzy msgid "Notice has no profile." -msgstr "Le nota ha nulle profilo" +msgstr "Le nota ha nulle profilo." #: actions/oembed.php:86 actions/shownotice.php:175 #, php-format @@ -2565,19 +2544,19 @@ msgstr "Le stato de %1$s in %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') #: actions/oembed.php:158 -#, fuzzy, php-format +#, php-format msgid "Content type %s not supported." -msgstr "typo de contento " +msgstr "Le typo de contento %s non es supportate." #. TRANS: Error message displaying attachments. %s is the site's base URL. #: actions/oembed.php:162 #, php-format msgid "Only %s URLs over plain HTTP please." -msgstr "" +msgstr "Solmente le URLs %s es permittite super HTTP simple." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Formato de datos non supportate." @@ -2727,24 +2706,24 @@ msgid "Path and server settings for this StatusNet site." msgstr "Configuration de cammino e servitor pro iste sito StatusNet." #: actions/pathsadminpanel.php:157 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s." -msgstr "Directorio de thema non legibile: %s" +msgstr "Directorio de thema non legibile: %s." #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "Directorio de avatar non scriptibile: %s" +msgstr "Directorio de avatar non scriptibile: %s." #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." -msgstr "Directorio de fundo non scriptibile: %s" +msgstr "Directorio de fundo non scriptibile: %s." #: actions/pathsadminpanel.php:177 -#, fuzzy, php-format +#, php-format msgid "Locales directory not readable: %s." -msgstr "Directorio de localitates non scriptibile: %s" +msgstr "Directorio de localitates non scriptibile: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2884,9 +2863,9 @@ msgid "People search" msgstr "Recerca de personas" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "Etiquetta de personas invalide: %s" +msgstr "Etiquetta de personas invalide: %s." #: actions/peopletag.php:142 #, php-format @@ -2894,9 +2873,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usatores auto-etiquettate con %1$s - pagina %2$d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "Le contento del nota es invalide" +msgstr "Le contento del nota es invalide." #: actions/postnotice.php:101 #, php-format @@ -3043,9 +3021,9 @@ msgid "Settings saved." msgstr "Preferentias confirmate." #: actions/public.php:83 -#, fuzzy, php-format +#, php-format msgid "Beyond the page limit (%s)." -msgstr "Ultra le limite de pagina (%s)" +msgstr "Ultra le limite de pagina (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3305,7 +3283,6 @@ msgid "Invalid username or password." msgstr "Nomine de usator o contrasigno invalide." #: actions/register.php:343 -#, fuzzy msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3342,13 +3319,14 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"" #: actions/register.php:494 -#, fuzzy, php-format +#, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -" excepte iste datos private: contrasigno, adresse de e-mail, adresse de " -"messageria instantanee, numero de telephono." +"Mi texto e files es disponibile sub %s excepte iste datos private: " +"contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de " +"telephono." #: actions/register.php:542 #, php-format @@ -3965,9 +3943,8 @@ msgid "Minimum text limit is 0 (unlimited)." msgstr "Le limite minimal del texto es 0 (illimitate)." #: actions/siteadminpanel.php:171 -#, fuzzy msgid "Dupe limit must be one or more seconds." -msgstr "Le limite de duplicatos debe esser 1 o plus secundas." +msgstr "Le limite de duplicatos debe esser un o plus secundas." #: actions/siteadminpanel.php:221 msgid "General" @@ -4058,9 +4035,8 @@ msgid "Unable to save site notice." msgstr "Impossibile salveguardar le aviso del sito." #: actions/sitenoticeadminpanel.php:113 -#, fuzzy msgid "Max length for the site-wide notice is 255 chars." -msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres" +msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -4094,9 +4070,8 @@ msgstr "SMS non es disponibile." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "Adresse de messageria instantanee" +msgstr "Adresse SMS" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -4120,7 +4095,6 @@ msgstr "Entra le codice que tu ha recipite in tu telephono." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" msgstr "Confirmar" @@ -4137,9 +4111,8 @@ msgstr "Numero de telephono, sin punctuation o spatios, con indicativo" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Preferentias" +msgstr "Preferentias de SMS" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4152,9 +4125,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "Preferentias confirmate." +msgstr "Preferentias de SMS confirmate." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4192,9 +4164,8 @@ msgstr "Iste codice de confirmation es incorrecte." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "Confirmation cancellate." +msgstr "Confirmation de SMS cancellate." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. @@ -4204,9 +4175,8 @@ msgstr "Isto non es tu numero de telephono." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "Numero de telephono pro SMS" +msgstr "Le numero de telephono pro SMS ha essite removite." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4258,7 +4228,6 @@ msgid "Invalid snapshot report URL." msgstr "Le URL pro reportar instantaneos es invalide." #: actions/snapshotadminpanel.php:200 -#, fuzzy msgid "Randomly during web hit" msgstr "Aleatorimente durante un accesso web" @@ -4494,7 +4463,6 @@ msgid "User is not silenced." msgstr "Le usator non es silentiate." #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile ID in request." msgstr "Nulle ID de profilo in requesta." @@ -4846,7 +4814,7 @@ msgstr "Non poteva actualisar message con nove URI." #. TRANS: Server exception. %s are the error details. #: classes/Notice.php:176 -#, fuzzy, php-format +#, php-format msgid "Database error inserting hashtag: %s" msgstr "Error in base de datos durante insertion del marca (hashtag): %s" @@ -4881,13 +4849,13 @@ msgstr "Il te es prohibite publicar notas in iste sito." msgid "Problem saving notice." msgstr "Problema salveguardar nota." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problema salveguardar le cassa de entrata del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5170,13 +5138,13 @@ msgstr "Licentia del software StatusNet" #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. #: lib/action.php:817 -#, fuzzy, php-format +#, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** es un servicio de microblog offerite per [%%site.broughtby%" -"%](%%site.broughtbyurl%%). " +"%](%%site.broughtbyurl%%)." #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. #: lib/action.php:820 @@ -5225,7 +5193,7 @@ msgstr "" #: lib/action.php:871 #, php-format msgid "All %1$s content and data are available under the %2$s license." -msgstr "" +msgstr "Tote le contento e datos de %1$s es disponibile sub le licentia %2$s." #. TRANS: DT element for pagination (previous/next, etc.). #: lib/action.php:1182 @@ -5438,25 +5406,22 @@ msgstr "Cancellar" #. TRANS: Application access type #: lib/applicationlist.php:136 -#, fuzzy msgid "read-write" -msgstr "Lectura e scriptura" +msgstr "lectura-scriptura" #. TRANS: Application access type #: lib/applicationlist.php:138 -#, fuzzy msgid "read-only" -msgstr "Lectura solmente" +msgstr "lectura solmente" #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) #: lib/applicationlist.php:144 #, php-format msgid "Approved %1$s - \"%2$s\" access." -msgstr "" +msgstr "Accesso \"%2$s\" approbate le %1$s." #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" msgstr "Revocar" @@ -5570,9 +5535,9 @@ msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Non poteva remover le usator %1$s del gruppo %2$s." +msgstr "Non poteva remover le usator %1$s del gruppo %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -5612,9 +5577,9 @@ msgstr "" #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" -msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d." +msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -6196,9 +6161,9 @@ msgstr "Confirmation SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:457 -#, fuzzy, php-format +#, php-format msgid "%s: confirm you own this phone number with this code:" -msgstr "Iste numero de telephono attende confirmation." +msgstr "%s: confirma que tu possede iste numero de telephono con iste codice:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:478 @@ -6327,6 +6292,9 @@ msgid "" "\n" "\t%s" msgstr "" +"Le conversation complete pote esser legite hic:\n" +"\n" +"%s" #: lib/mail.php:651 #, php-format @@ -6360,6 +6328,28 @@ msgid "" "\n" "P.S. You can turn off these email notifications here: %8$s\n" msgstr "" +"%1$s (@%9$s) ha inviate un nota a tu attention (un '@-responsa') in %2$s.\n" +"\n" +"Le nota es hic:\n" +"\n" +"%3$s\n" +"\n" +"Illo dice:\n" +"\n" +"%4$s\n" +"\n" +"%5$sTu pote responder hic:\n" +"\n" +"%6$s\n" +"\n" +"Le lista de tote le @-responsas pro te es hic:\n" +"\n" +"%7$s\n" +"\n" +"Cordialmente,\n" +"%2$s\n" +"\n" +"P.S. Tu pote disactivar iste notificationes electronic hic: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 731a948685..ca7a1b2dbc 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:07+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:23+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -2599,8 +2599,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -4888,14 +4888,14 @@ msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu." msgid "Problem saving notice." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Vandamál komu upp við að vista babl." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index b3aa969ae5..efaf8956f3 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:10+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:26+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -841,7 +841,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "No" @@ -860,7 +859,6 @@ msgstr "Non bloccare questo utente" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Sì" @@ -1362,7 +1360,6 @@ msgstr "Indirizzo email attualmente confermato." #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Rimuovi" @@ -1396,7 +1393,6 @@ msgstr "Indirizzo email, del tipo \"nomeutente@example.org\"" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Aggiungi" @@ -1424,16 +1420,14 @@ msgstr "" #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "Nuovo" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "Preferenze" +msgstr "Preferenze dell'email" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1473,9 +1467,8 @@ msgstr "Pubblica un MicroID per il mio indirizzo email" #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "Preferenze dell'aspetto salvate." +msgstr "Preferenze dell'email salvate." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1531,15 +1524,13 @@ msgstr "Nessuna conferma da annullare." #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." -msgstr "Quello è l'indirizzo di messaggistica sbagliato." +msgstr "Quello è l'indirizzo email sbagliato." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "Conferma annullata." +msgstr "Conferma dell'email annullata." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1549,9 +1540,8 @@ msgstr "Quello non è il tuo indirizzo email." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "L'indirizzo è stato rimosso." +msgstr "L'indirizzo email è stato rimosso." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -2013,9 +2003,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Preferenze" +msgstr "Preferenze messaggistica" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2085,15 +2074,13 @@ msgstr "Quello è l'indirizzo di messaggistica sbagliato." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "Impossibile eliminare l'email di conferma." +msgstr "Impossibile eliminare la conferma della messaggistica." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "Conferma annullata." +msgstr "Conferma della messaggistica annullata." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2103,9 +2090,8 @@ msgstr "Quello non è il tuo ID di Jabber." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "L'indirizzo è stato rimosso." +msgstr "L'indirizzo di messaggistica è stato rimosso." #: actions/inbox.php:59 #, php-format @@ -2567,8 +2553,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Solo URL %s attraverso HTTP semplice." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -2598,7 +2584,7 @@ msgstr "Accorcia gli URL con" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "Servizio di autoriduzione da usare." +msgstr "Servizio di autoriduzione da usare" #: actions/othersettings.php:122 msgid "View profile designs" @@ -2606,7 +2592,7 @@ msgstr "Visualizza aspetto" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "Mostra o nasconde gli aspetti del profilo." +msgstr "Mostra o nasconde gli aspetti del profilo" #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." @@ -4081,9 +4067,8 @@ msgstr "Il servizio SMS non è disponibile." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "Indirizzo di messaggistica istantanea" +msgstr "Indirizzo SMS" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -4107,7 +4092,6 @@ msgstr "Inserisci il codice che hai ricevuto sul tuo telefono." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" msgstr "Conferma" @@ -4124,9 +4108,8 @@ msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Preferenze" +msgstr "Preferenze dell'SMS" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4139,9 +4122,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "Preferenze salvate." +msgstr "Preferenze dell'SMS salvate." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4180,9 +4162,8 @@ msgstr "Quello è il numero di conferma errato." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "Conferma annullata." +msgstr "Conferma dell'SMS annullata." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. @@ -4192,9 +4173,8 @@ msgstr "Quello non è il tuo numero di telefono." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "Numero di telefono per SMS" +msgstr "Il numero di telefono per SMS è stato rimosso." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4869,13 +4849,13 @@ msgstr "Ti è proibito inviare messaggi su questo sito." msgid "Problem saving notice." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problema nel salvare la casella della posta del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5556,9 +5536,9 @@ msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s." +msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -5598,9 +5578,9 @@ msgstr "" #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" -msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d." +msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -6354,6 +6334,29 @@ msgid "" "\n" "P.S. You can turn off these email notifications here: %8$s\n" msgstr "" +"%1$s (@%9$s) ti ha appena inviato un messaggio (una \"@-risposta\") su %2" +"$s.\n" +"\n" +"Il messaggio è qui:\n" +"\n" +"%3$s\n" +"\n" +"E dice:\n" +"\n" +"%4$s\n" +"\n" +"%5$sPuoi rispondere qui:\n" +"\n" +"%6$s\n" +"\n" +"L'elenco di tutte le tue @-risposte si trova qui:\n" +"\n" +"%7$s\n" +"\n" +"Cordiali saluti,\n" +"%2$s\n" +"\n" +"P.S: puoi disabilitare le notifiche via email qui: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index d70e8262de..1877ae3e9a 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:13+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:30+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -2572,8 +2572,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "サポートされていないデータ形式。" @@ -4880,13 +4880,13 @@ msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止さ msgid "Problem saving notice." msgstr "つぶやきを保存する際に問題が発生しました。" -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "グループ受信箱を保存する際に問題が発生しました。" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index cdd7d77a57..4642861fa6 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:16+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:37+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -85,7 +85,6 @@ msgstr "저장" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -#, fuzzy msgid "No such page." msgstr "해당하는 페이지 없음" @@ -995,9 +994,8 @@ msgid "There was a problem with your session token." msgstr "당신의 세션토큰관련 문제가 있습니다." #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 -#, fuzzy msgid "Delete application" -msgstr "그러한 통지는 없습니다." +msgstr "응용프로그램 삭제" #: actions/deleteapplication.php:149 msgid "" @@ -1654,9 +1652,8 @@ msgid "No notice." msgstr "새로운 통지" #: actions/file.php:42 -#, fuzzy msgid "No attachments." -msgstr "그러한 문서는 없습니다." +msgstr "첨부문서 없음" #: actions/file.php:51 #, fuzzy @@ -2571,8 +2568,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -4863,14 +4860,14 @@ msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었 msgid "Problem saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "통지를 저장하는데 문제가 발생했습니다." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 0d377eefaa..2aa24f5e83 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:19+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:40+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -2563,8 +2563,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Ве молиме користете само %s URL-адреси врз прост HTTP-код." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Ова не е поддржан формат на податотека." @@ -4870,13 +4870,13 @@ msgstr "Забрането Ви е да објавувате забелешки msgid "Problem saving notice." msgstr "Проблем во зачувувањето на белешката." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Проблем при зачувувањето на групното приемно сандаче." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5557,7 +5557,7 @@ msgstr "Не можев да го зачленам корисникот %1$s в #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" msgstr "Не можев да го отстранам корисникот %1$s од групата %2$s." diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 178ed2de86..12a97117f0 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:23+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:44+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -86,9 +86,8 @@ msgstr "Lagre" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -#, fuzzy msgid "No such page." -msgstr "Ingen slik side" +msgstr "Ingen slik side." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -238,11 +237,10 @@ msgid "This method requires a POST." msgstr "Denne metoden krever en POST." #: actions/apiaccountupdatedeliverydevice.php:105 -#, fuzzy msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." -msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none" +msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 #, fuzzy @@ -443,9 +441,9 @@ msgid "Too many aliases! Maximum %d." msgstr "For mange alias! Maksimum %d." #: actions/apigroupcreate.php:266 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"." -msgstr "Ugyldig alias: «%s»" +msgstr "Ugyldig alias: «%s»." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -461,9 +459,8 @@ msgstr "Alias kan ikke være det samme som kallenavn." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found." -msgstr "Gruppe ikke funnet!" +msgstr "Gruppe ikke funnet." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." @@ -765,7 +762,7 @@ msgstr "Avatarinnstillinger" #: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:202 actions/grouplogo.php:262 msgid "Original" -msgstr "Original" +msgstr "Opprinnelig" #: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:213 actions/grouplogo.php:274 @@ -835,7 +832,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "Nei" @@ -854,7 +850,6 @@ msgstr "Ikke blokker denne brukeren" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Ja" @@ -910,9 +905,9 @@ msgstr "Opphev blokkering av denne brukeren" #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 -#, fuzzy, php-format +#, php-format msgid "Post to %s" -msgstr "Post til " +msgstr "Post til %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -928,9 +923,9 @@ msgstr "Den bekreftelseskoden er ikke til deg." #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. #: actions/confirmaddress.php:91 -#, fuzzy, php-format +#, php-format msgid "Unrecognized address type %s." -msgstr "Ukjent adressetype %s" +msgstr "Ukjent adressetype %s." #. TRANS: Client error for an already confirmed email/jabbel/sms address. #: actions/confirmaddress.php:96 @@ -1090,20 +1085,20 @@ msgstr "Slett denne brukeren" #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" -msgstr "" +msgstr "Utseende" #: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." -msgstr "" +msgstr "Utseendeinnstillinger for dette StatusNet-nettstedet." #: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "Ugyldig logo-URL." #: actions/designadminpanel.php:280 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s." -msgstr "Tema ikke tilgjengelig: %s" +msgstr "Tema ikke tilgjengelig: %s." #: actions/designadminpanel.php:376 msgid "Change logo" @@ -1186,7 +1181,7 @@ msgstr "Bruk standard" #: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" -msgstr "" +msgstr "Gjenopprett standardutseende" #: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" @@ -1205,7 +1200,7 @@ msgstr "Lagre" #: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" -msgstr "" +msgstr "Lagre utseende" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" @@ -1356,7 +1351,6 @@ msgstr "Nåværende bekreftede e-postadresse" #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Fjern" @@ -1375,7 +1369,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "Avbryt" @@ -1390,7 +1383,6 @@ msgstr "E-postadresse («brukernavn@eksempel.org»)" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Legg til" @@ -1416,16 +1408,14 @@ msgstr "Angi en ny e-postadresse for å poste til; fjerner den gamle." #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "Ny" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "Innstillinger" +msgstr "E-postinnstillinger" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1464,9 +1454,8 @@ msgstr "Publiser en MicroID for min e-postadresse." #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "Innstillinger lagret." +msgstr "E-postinnstillinger lagret." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1521,15 +1510,13 @@ msgstr "Ingen ventende bekreftelse å avbryte." #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." -msgstr "Det er feil IM-adresse." +msgstr "Dette er feil e-postadresse." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "Bekreftelse avbrutt." +msgstr "E-postbekreftelse avbrutt." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1539,9 +1526,8 @@ msgstr "Det er ikke din e-postadresse." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "Adressen ble fjernet." +msgstr "E-postadressen ble fjernet." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1552,7 +1538,7 @@ msgstr "Ingen innkommende e-postadresse." #: actions/emailsettings.php:504 actions/emailsettings.php:528 #: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." -msgstr "" +msgstr "Kunne ikke oppdatere brukeroppføring." #. TRANS: Message given after successfully removing an incoming e-mail address. #: actions/emailsettings.php:508 actions/smssettings.php:581 @@ -1618,17 +1604,17 @@ msgstr "%s sine favorittnotiser" #: actions/favoritesrss.php:115 #, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "" +msgstr "Oppdateringer markert som favoritt av %1$s på %2$s!" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" -msgstr "" +msgstr "Profilerte brukere" #: actions/featured.php:71 #, php-format msgid "Featured users, page %d" -msgstr "" +msgstr "Profilerte brukere, side %d" #: actions/featured.php:99 #, php-format @@ -1653,19 +1639,19 @@ msgstr "Ingen opplastede vedlegg." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" -msgstr "" +msgstr "Forventet ikke denne responsen!" #: actions/finishremotesubscribe.php:80 msgid "User being listened to does not exist." -msgstr "" +msgstr "Brukeren som lyttes til finnes ikke." #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" -msgstr "" +msgstr "Du kan bruke det lokale abonnementet!" #: actions/finishremotesubscribe.php:99 msgid "That user has blocked you from subscribing." -msgstr "" +msgstr "Brukeren har blokkert deg fra å abonnere." #: actions/finishremotesubscribe.php:110 msgid "You are not authorized." @@ -1677,12 +1663,11 @@ msgstr "" #: actions/finishremotesubscribe.php:118 msgid "Remote service uses unknown version of OMB protocol." -msgstr "" +msgstr "Fjerntjeneste bruker ukjent versjon av OMB-protokollen." #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." -msgstr "Feil ved repetering av notis." +msgstr "Feil ved oppdatering av fjernprofil." #: actions/getfile.php:79 msgid "No such file." @@ -1727,7 +1712,7 @@ msgstr "Ingen gruppe oppgitt." #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "Bare en admin kan blokkere gruppemedlemmer." #: actions/groupblock.php:95 msgid "User is already blocked from group." @@ -1748,6 +1733,9 @@ msgid "" "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" +"Er du sikker på at du vil blokkere brukeren «%1$s» fra gruppen «%2$s»? De vil " +"bli fjernet fra gruppen, kan ikke poste og kan ikke abonnere på gruppen i " +"fremtiden." #. TRANS: Submit button title for 'No' when blocking a user from a group. #: actions/groupblock.php:182 @@ -1761,7 +1749,7 @@ msgstr "Blokker denne brukeren fra denne gruppen" #: actions/groupblock.php:206 msgid "Database error blocking user from group." -msgstr "" +msgstr "Databasefeil ved blokkering av bruker fra gruppe." #: actions/groupbyid.php:74 actions/userbyid.php:70 msgid "No ID." @@ -1769,27 +1757,28 @@ msgstr "Ingen ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." -msgstr "" +msgstr "Du må være logget inn for å redigere en gruppe." #: actions/groupdesignsettings.php:144 msgid "Group design" -msgstr "" +msgstr "Gruppeutseende" #: actions/groupdesignsettings.php:155 msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" +"Tilpass hvordan gruppen din ser ut med et bakgrunnsbilde og en fargepalett " +"av ditt valg." #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 -#, fuzzy msgid "Couldn't update your design." -msgstr "Klarte ikke å oppdatere bruker." +msgstr "Kunne ikke oppdatere utseende." #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231 msgid "Design preferences saved." -msgstr "" +msgstr "Utseende lagret." #: actions/grouplogo.php:142 actions/grouplogo.php:195 msgid "Group logo" @@ -1803,7 +1792,7 @@ msgstr "Du kan laste opp en logo for gruppen din. Maks filstørrelse er %s." #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." -msgstr "" +msgstr "Velg et kvadratisk område av bildet som skal bli logoen." #: actions/grouplogo.php:399 msgid "Logo updated." @@ -1924,10 +1913,12 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"Hvorfor ikke [registrere en konto](%%action.register%%) og [opprette gruppen]" +"(%%action.newgroup%%) selv!" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Bare en admin kan oppheve blokkering av gruppemedlemmer." #: actions/groupunblock.php:95 msgid "User is not blocked from group." @@ -1951,11 +1942,13 @@ msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" +"Du kan sende og motta notiser gjennom Jabber/GTalk [direktemeldinger](%%doc." +"im%%). Konfigurer adresse og innstillinger under." #. TRANS: Message given in the IM settings if XMPP is not enabled on the site. #: actions/imsettings.php:94 msgid "IM is not available." -msgstr "" +msgstr "Direktemeldinger ikke tilgjengelig." #. TRANS: Form legend for IM settings form. #. TRANS: Field label for IM address input in IM settings form. @@ -1986,27 +1979,28 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" +"Jabber- og GTalk-adresse, som «brukernavn@example.org». Husk å legge %s til " +"vennelisten din i direktemeldingsklienten din eller på GTalk." #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Innstillinger" +msgstr "Direktemeldingsinnstillinger" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." -msgstr "" +msgstr "Send meg notiser gjennom Jabber/GTalk." #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." -msgstr "" +msgstr "Post en notis når min Jabber/Gtalk-status endres." #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." -msgstr "" +msgstr "Send meg svar gjennom Jabber/GTalk fra personer jeg ikke abonnerer på." #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:179 @@ -2041,7 +2035,7 @@ msgstr "Det er allerede din Jabber ID." #. TRANS: Message given saving IM address that is already set for another user. #: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." -msgstr "" +msgstr "Jabber-ID tilhører allerede en annen bruker." #. TRANS: Message given saving valid IM address that is to be confirmed. #. TRANS: %s is the IM address set for the site. @@ -2061,15 +2055,13 @@ msgstr "Det er feil IM-adresse." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "Kunne ikke slette e-postbekreftelse." +msgstr "Kunne ikke slette direktemeldingsbekreftelse." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "Bekreftelse avbrutt." +msgstr "Direktemeldingsbekreftelse avbrutt." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2079,9 +2071,8 @@ msgstr "Det er ikke din Jabber ID." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "Adressen ble fjernet." +msgstr "Direktemeldingsadressen ble fjernet." #: actions/inbox.php:59 #, php-format @@ -2103,9 +2094,9 @@ msgid "Invites have been disabled." msgstr "Invitasjoner har blitt deaktivert." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." -msgstr "Du må være innlogget for å invitere andre brukere til å bruke %s" +msgstr "Du må være innlogget for å invitere andre brukere til å bruke %s." #: actions/invite.php:72 #, php-format @@ -2122,7 +2113,7 @@ msgstr "Inviter nye brukere" #: actions/invite.php:128 msgid "You are already subscribed to these users:" -msgstr "" +msgstr "Du abonnerer allerede på disse brukerne:" #. TRANS: Whois output. #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. @@ -2135,6 +2126,7 @@ msgstr "%1$s (%2$s)" msgid "" "These people are already users and you were automatically subscribed to them:" msgstr "" +"Disse personene er allerede brukere og du ble automatisk abonnent på dem:" #: actions/invite.php:144 msgid "Invitation(s) sent to the following people:" @@ -2145,11 +2137,15 @@ msgid "" "You will be notified when your invitees accept the invitation and register " "on the site. Thanks for growing the community!" msgstr "" +"Du vil bli varslet når dine inviterte aksepterer invitasjonen og registrerer " +"seg på nettstedet. Takk for at du hjelper oss å vokse!" #: actions/invite.php:162 msgid "" "Use this form to invite your friends and colleagues to use this service." msgstr "" +"Bruk dette skjemaet for å invitere dine venner og kollegaer til å bruke " +"denne tjenesten." #: actions/invite.php:187 msgid "Email addresses" @@ -2165,7 +2161,7 @@ msgstr "Personlig melding" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." -msgstr "" +msgstr "Om du vil kan du legge til en personlig melding i invitasjonen." #. TRANS: Send button for inviting friends #: actions/invite.php:198 @@ -2271,9 +2267,8 @@ msgid "Incorrect username or password." msgstr "Feil brukernavn eller passord" #: actions/login.php:132 actions/otp.php:120 -#, fuzzy msgid "Error setting user. You are probably not authorized." -msgstr "Ikke autorisert." +msgstr "Feil ved innstilling av bruker. Du er mest sannsynlig kke autorisert." #: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 msgid "Login" @@ -2301,6 +2296,8 @@ msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" +"Av sikkerhetsmessige årsaker, skriv inn brukernavn og passord på nytt før du " +"endrer innstillingene dine." #: actions/login.php:270 #, php-format @@ -2321,9 +2318,9 @@ msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%1$s er allerede en administrator for gruppen «%2$s»." #: actions/makeadmin.php:133 -#, fuzzy, php-format +#, php-format msgid "Can't get membership record for %1$s in group %2$s." -msgstr "Klarte ikke å oppdatere bruker." +msgstr "Kan ikke hente medlemsoppføring for %$1s i gruppen %2$s." #: actions/makeadmin.php:146 #, php-format @@ -2331,9 +2328,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Kan ikke gjøre %1$s til administrator for gruppen %2$s." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "Ingen nåværende status" +msgstr "Ingen nåværende status." #: actions/newapplication.php:52 msgid "New Application" @@ -2341,20 +2337,19 @@ msgstr "Nytt program" #: actions/newapplication.php:64 msgid "You must be logged in to register an application." -msgstr "" +msgstr "Du må være logget inn for å registrere et program." #: actions/newapplication.php:143 msgid "Use this form to register a new application." -msgstr "" +msgstr "Bruk dette skjemaet for å registrere et nytt program." #: actions/newapplication.php:176 msgid "Source URL is required." -msgstr "" +msgstr "Nettadresse til kilde kreves." #: actions/newapplication.php:258 actions/newapplication.php:267 -#, fuzzy msgid "Could not create application." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke opprette program." #: actions/newgroup.php:53 msgid "New group" @@ -2385,6 +2380,7 @@ msgstr "Ingen mottaker oppgitt." msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" +"Ikke send en melding til degselv; bare hvisk det stille til degselv istedet." #: actions/newmessage.php:181 msgid "Message sent" @@ -2413,6 +2409,8 @@ msgid "" "Search for notices on %%site.name%% by their contents. Separate search terms " "by spaces; they must be 3 characters or more." msgstr "" +"Søk i notiser på %%site.name%% etter deres innhold. Separer nøkkelord med " +"mellomrom; de må være minst 3 tegn lange." #: actions/noticesearch.php:78 msgid "Text search" @@ -2429,6 +2427,8 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" #: actions/noticesearch.php:124 #, php-format @@ -2436,6 +2436,9 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"Hvorfor ikke [registrere en konto](%%%%action.register%%%%) og vær den " +"første til å [poste om dette emnet](%%%%action.newnotice%%%%?status_textarea=" +"%s)!" #: actions/noticesearchrss.php:96 #, php-format @@ -2464,7 +2467,7 @@ msgstr "Knuff sendt!" #: actions/oauthappssettings.php:59 msgid "You must be logged in to list your applications." -msgstr "" +msgstr "Du må være logget inn for å liste opp programmene dine." #: actions/oauthappssettings.php:74 msgid "OAuth applications" @@ -2472,16 +2475,16 @@ msgstr "OAuth-program" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "Program du har registrert" #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "Du har ikke registrert noen program ennå." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" -msgstr "" +msgstr "Tilkoblede program" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." @@ -2492,9 +2495,9 @@ msgid "You are not a user of that application." msgstr "Du er ikke bruker av dette programmet." #: actions/oauthconnectionssettings.php:186 -#, fuzzy, php-format +#, php-format msgid "Unable to revoke access for app: %s." -msgstr "Kunne ikke tilbakekalle tilgang for programmet: " +msgstr "Kunne ikke tilbakekalle tilgang for programmet: %s." #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." @@ -2502,12 +2505,11 @@ msgstr "Du har ikke tillatt noen programmer å bruke din konto." #: actions/oauthconnectionssettings.php:211 msgid "Developers can edit the registration settings for their applications " -msgstr "" +msgstr "Utviklere kan redigere registreringsinnstillingene for sine program " #: actions/oembed.php:79 actions/shownotice.php:100 -#, fuzzy msgid "Notice has no profile." -msgstr "Brukeren har ingen profil." +msgstr "Notisen har ingen profil." #: actions/oembed.php:86 actions/shownotice.php:175 #, php-format @@ -2516,19 +2518,19 @@ msgstr "%1$s sin status på %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') #: actions/oembed.php:158 -#, fuzzy, php-format +#, php-format msgid "Content type %s not supported." -msgstr "innholdstype " +msgstr "Innholdstypen %s støttes ikke." #. TRANS: Error message displaying attachments. %s is the site's base URL. #: actions/oembed.php:162 #, php-format msgid "Only %s URLs over plain HTTP please." -msgstr "" +msgstr "Bare %s-nettadresser over vanlig HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Ikke et støttet dataformat." @@ -2546,7 +2548,7 @@ msgstr "Andre innstillinger" #: actions/othersettings.php:71 msgid "Manage various other options." -msgstr "" +msgstr "Håndter diverse andre alternativ." #: actions/othersettings.php:108 msgid " (free service)" @@ -2554,24 +2556,23 @@ msgstr " (gratis tjeneste)" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "Forkort nettadresser med" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "" +msgstr "Automatisk fortkortelsestjeneste å bruke." #: actions/othersettings.php:122 msgid "View profile designs" -msgstr "" +msgstr "Vis profilutseender" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "" +msgstr "Vis eller skjul profilutseender." #: actions/othersettings.php:153 -#, fuzzy msgid "URL shortening service is too long (max 50 chars)." -msgstr "Bioen er for lang (max 140 tegn)" +msgstr "Navnet på nettadresseforkortelsestjenesten er for lang (maks 50 tegn)." #: actions/otp.php:69 msgid "No user ID specified." @@ -2673,31 +2674,31 @@ msgstr "Passordet ble lagret" #. TRANS: Menu item for site administration #: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" -msgstr "" +msgstr "Stier" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." -msgstr "" +msgstr "Sti- og tjenerinnstillinger for dette StatusNet-nettstedet." #: actions/pathsadminpanel.php:157 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s." -msgstr "Tema ikke tilgjengelig: %s" +msgstr "Temamappe ikke lesbar: %s." #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "Avatarmappe" +msgstr "Avatarmappe ikke skrivbar: %s." #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." -msgstr "Bakgrunnsmappe" +msgstr "Bakgrunnsmappe ikke skrivbar: %s." #: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s." -msgstr "" +msgstr "Lokaliseringsmappe ikke lesbar: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2717,27 +2718,27 @@ msgstr "Vertsnavn for nettstedets tjener." #: actions/pathsadminpanel.php:242 msgid "Path" -msgstr "" +msgstr "Sti" #: actions/pathsadminpanel.php:242 msgid "Site path" -msgstr "" +msgstr "Nettstedssti" #: actions/pathsadminpanel.php:246 msgid "Path to locales" -msgstr "" +msgstr "Lokaliseringssti" #: actions/pathsadminpanel.php:246 msgid "Directory path to locales" -msgstr "" +msgstr "Lokaliseringsmappesti" #: actions/pathsadminpanel.php:250 msgid "Fancy URLs" -msgstr "" +msgstr "Pyntede nettadresser" #: actions/pathsadminpanel.php:252 msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" +msgstr "Bruk pyntede (mer lesbare og lettere å huske) nettadresser?" #: actions/pathsadminpanel.php:259 msgid "Theme" @@ -2821,7 +2822,7 @@ msgstr "Tjener SSL-forespørsler skal vises til" #: actions/pathsadminpanel.php:352 msgid "Save paths" -msgstr "" +msgstr "Lagre stier" #: actions/peoplesearch.php:52 #, php-format @@ -2837,24 +2838,23 @@ msgid "People search" msgstr "Personsøk" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "Ugyldig e-postadresse" +msgstr "Ikke en gyldig personmerkelapp: %s." #: actions/peopletag.php:142 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Mikroblogg av %s" +msgstr "Brukere som har merket seg selv med %1$s - side %2$d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "Ugyldig symbol." +msgstr "Ugyldig notisinnhold." #: actions/postnotice.php:101 #, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." -msgstr "" +msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2909,15 +2909,15 @@ msgstr "Om meg" #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" -msgstr "" +msgstr "Plassering" #: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "" +msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "Del min nåværende plassering når jeg poster notiser" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -2929,6 +2929,8 @@ msgstr "Tagger" msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" +"Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma " +"eller mellomrom" #: actions/profilesettings.php:151 msgid "Language" @@ -2966,27 +2968,25 @@ msgid "Language is too long (max 50 chars)." msgstr "Språk er for langt (maks 50 tegn)." #: actions/profilesettings.php:253 actions/tagother.php:178 -#, fuzzy, php-format +#, php-format msgid "Invalid tag: \"%s\"" -msgstr "Ugyldig hjemmeside '%s'" +msgstr "Ugyldig merkelapp: «%s»" #: actions/profilesettings.php:306 msgid "Couldn't update user for autosubscribe." -msgstr "" +msgstr "Kunne ikke oppdatere bruker for autoabonnering." #: actions/profilesettings.php:363 -#, fuzzy msgid "Couldn't save location prefs." -msgstr "Klarte ikke å lagre profil." +msgstr "Kunne ikke lagre plasseringsinnstillinger." #: actions/profilesettings.php:375 msgid "Couldn't save profile." msgstr "Klarte ikke å lagre profil." #: actions/profilesettings.php:383 -#, fuzzy msgid "Couldn't save tags." -msgstr "Klarte ikke å lagre profil." +msgstr "Kunne ikke lagre merkelapper." #. TRANS: Message after successful saving of administrative settings. #: actions/profilesettings.php:391 lib/adminpanelaction.php:141 @@ -2994,9 +2994,9 @@ msgid "Settings saved." msgstr "Innstillinger lagret." #: actions/public.php:83 -#, fuzzy, php-format +#, php-format msgid "Beyond the page limit (%s)." -msgstr "Over sidegrensen (%s)" +msgstr "Over sidegrensen (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3005,11 +3005,11 @@ msgstr "Kunne ikke hente offentlig strøm." #: actions/public.php:130 #, php-format msgid "Public timeline, page %d" -msgstr "" +msgstr "Offentlig tidslinje, side %d" #: actions/public.php:132 lib/publicgroupnav.php:79 msgid "Public timeline" -msgstr "" +msgstr "Offentlig tidslinje" #: actions/public.php:160 msgid "Public Stream Feed (RSS 1.0)" @@ -3029,16 +3029,20 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Dette er den offentlige tidslinjen for %%site.name%% men ingen har postet " +"noe ennå." #: actions/public.php:191 msgid "Be the first to post!" -msgstr "" +msgstr "Vær den første til å poste!" #: actions/public.php:195 #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" +"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første " +"til å poste!" #: actions/public.php:242 #, php-format @@ -3048,6 +3052,10 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Dette er %%site.name%%, en [mikroblogg](http://no.wikipedia.org/wiki/" +"Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]" +"(http://status.net). [Bli med nå](%%action.register%%) for å dele notiser om " +"degselv med venner, familie og kollegaer! ([Les mer](%%doc.help%%))" #: actions/public.php:247 #, php-format @@ -3056,15 +3064,18 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"Dette er %%site.name%%, en [mikroblogg](http://no.wikipedia.org/wiki/" +"Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]" +"(http://status.net)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" -msgstr "" +msgstr "Offentlig merkelappsky" #: actions/publictagcloud.php:63 #, php-format msgid "These are most popular recent tags on %s " -msgstr "" +msgstr "Dette er de siste mest populære merkelappene på %s " #: actions/publictagcloud.php:69 #, php-format @@ -3073,7 +3084,7 @@ msgstr "" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Vær den første til å poste en!" #: actions/publictagcloud.php:75 #, php-format @@ -3081,10 +3092,12 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første " +"til å poste en!" #: actions/publictagcloud.php:134 msgid "Tag cloud" -msgstr "" +msgstr "Merkelappsky" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -3092,15 +3105,15 @@ msgstr "Du er allerede logget inn!" #: actions/recoverpassword.php:62 msgid "No such recovery code." -msgstr "" +msgstr "Ingen slik gjenopprettingskode." #: actions/recoverpassword.php:66 msgid "Not a recovery code." -msgstr "" +msgstr "Ikke en gjenopprettingskode." #: actions/recoverpassword.php:73 msgid "Recovery code for unknown user." -msgstr "" +msgstr "Gjenopprettingskode for ukjent bruker." #: actions/recoverpassword.php:86 msgid "Error with confirmation code." @@ -3119,22 +3132,24 @@ msgid "" "If you have forgotten or lost your password, you can get a new one sent to " "the email address you have stored in your account." msgstr "" +"Om du har glemt eller mistet passordet ditt kan du få et nytt tilsendt på e-" +"postadressen du har lagret på kontoen din." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Du har blitt identifisert. Skriv inn et nytt passord nedenfor. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Passordgjenoppretting" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Kallenavn eller e-postadresse" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." -msgstr "" +msgstr "Ditt kallenavn på denne tjeneren eller din registrerte e-postadresse." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" @@ -3142,15 +3157,15 @@ msgstr "Gjenopprett" #: actions/recoverpassword.php:208 msgid "Reset password" -msgstr "" +msgstr "Tilbakestill passord" #: actions/recoverpassword.php:209 msgid "Recover password" -msgstr "" +msgstr "Gjenopprett passord" #: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" -msgstr "" +msgstr "Passordgjenoppretting forespurt" #: actions/recoverpassword.php:213 msgid "Unknown action" @@ -3166,19 +3181,19 @@ msgstr "Nullstill" #: actions/recoverpassword.php:252 msgid "Enter a nickname or email address." -msgstr "" +msgstr "Skriv inn et kallenavn eller en e-postadresse." #: actions/recoverpassword.php:282 msgid "No user with that email address or username." -msgstr "" +msgstr "Ingen bruker med den e-postadressen eller det kallenavnet." #: actions/recoverpassword.php:299 msgid "No registered email address for that user." -msgstr "" +msgstr "Ingen registrert e-postadresse for den brukeren." #: actions/recoverpassword.php:313 msgid "Error saving address confirmation." -msgstr "" +msgstr "Feil ved lagring av adressebekreftelse." #: actions/recoverpassword.php:338 msgid "" @@ -3190,7 +3205,7 @@ msgstr "" #: actions/recoverpassword.php:357 msgid "Unexpected password reset." -msgstr "" +msgstr "Uventet tilbakestilling av passord." #: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." @@ -3198,39 +3213,39 @@ msgstr "Passordet må bestå av 6 eller flere tegn." #: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." -msgstr "" +msgstr "Passord og bekreftelse samsvarer ikke." #: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." -msgstr "" +msgstr "Feil ved innstilling av bruker." #: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." -msgstr "" +msgstr "Nytt passord ble lagret. Du er nå logget inn." #: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." -msgstr "" +msgstr "Beklager, kun inviterte personer kan registrere seg." #: actions/register.php:92 msgid "Sorry, invalid invitation code." -msgstr "" +msgstr "Beklager, ugyldig invitasjonskode." #: actions/register.php:112 msgid "Registration successful" -msgstr "" +msgstr "Registrering vellykket" #: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" -msgstr "" +msgstr "Registrer" #: actions/register.php:135 msgid "Registration not allowed." -msgstr "" +msgstr "Registrering ikke tillatt." #: actions/register.php:198 msgid "You can't register if you don't agree to the license." -msgstr "" +msgstr "Du kan ikke registrere deg om du ikke godtar lisensvilkårene." #: actions/register.php:212 msgid "Email address already exists." @@ -3245,6 +3260,8 @@ msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" +"Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og " +"knytte deg til venner og kollegaer. " #: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -3267,20 +3284,20 @@ msgstr "E-post" #: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" -msgstr "" +msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting" #: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Lengre navn, helst ditt \"ekte\" navn" #: actions/register.php:494 -#, fuzzy, php-format +#, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -" utenom disse private dataene: passord, e-postadresse, lynmeldingsadresse " -"og telefonnummer." +"Mine tekster og filer er tilgjengelig under %s med unntak av disse private " +"dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer." #: actions/register.php:542 #, php-format @@ -3330,47 +3347,54 @@ msgid "" "register%%) a new account. If you already have an account on a [compatible " "microblogging site](%%doc.openmublog%%), enter your profile URL below." msgstr "" +"For å abonnere kan du [logge inn](%%action.login%%) eller [registrere](%%" +"action.register%%) en ny konto. Om du allerede har en konto på et " +"[kompatibelt mikrobloggingsnettsted](%%doc.openmublog%%), skriv inn " +"profilnettadressen din nedenfor." #: actions/remotesubscribe.php:112 msgid "Remote subscribe" -msgstr "" +msgstr "Fjernabonner" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "" +msgstr "Abonner på en fjernbruker" #: actions/remotesubscribe.php:129 msgid "User nickname" -msgstr "" +msgstr "Brukerens kallenavn" #: actions/remotesubscribe.php:130 msgid "Nickname of the user you want to follow" -msgstr "" +msgstr "Kallenavn på brukeren du vil følge" #: actions/remotesubscribe.php:133 msgid "Profile URL" -msgstr "" +msgstr "Profilnettadresse" #: actions/remotesubscribe.php:134 msgid "URL of your profile on another compatible microblogging service" msgstr "" +"Nettadresse til profilen din på en annen kompatibel mikrobloggingstjeneste" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:406 msgid "Subscribe" -msgstr "" +msgstr "Abonner" #: actions/remotesubscribe.php:159 msgid "Invalid profile URL (bad format)" -msgstr "" +msgstr "Ugyldig profilnettadresse (dårlig format)" #: actions/remotesubscribe.php:168 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "" +"Ikke en gyldig profilnettadresse (inget YADIS-dokument eller ugyldig XRDS " +"definert)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "Det er en lokal profil! Logg inn for å abonnere." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." @@ -3378,21 +3402,19 @@ msgstr "" #: actions/repeat.php:57 msgid "Only logged-in users can repeat notices." -msgstr "" +msgstr "Bare innloggede brukere kan repetere notiser." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "Nytt nick" +msgstr "Ingen notis spesifisert." #: actions/repeat.php:76 msgid "You can't repeat your own notice." -msgstr "" +msgstr "Du kan ikke gjenta din egen notis." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Du er allerede logget inn!" +msgstr "Du har allerede gjentatt den notisen." #: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" @@ -3429,11 +3451,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Svarstrøm for %s (Atom)" #: actions/replies.php:199 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." -msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda." +msgstr "" +"Dette er tidslinjen som viser svar til %1$s men %2$s har ikke mottat en " +"notis for hans oppmerksomhet ennå." #: actions/replies.php:204 #, php-format @@ -3441,16 +3465,17 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Du kan engasjere andre brukere i en samtale, abonnere på flere personer " +"eller [bli med i grupper](%%action.groups%%)." #: actions/replies.php:206 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Du kan prøve å [knuffe %s](../%s) fra dennes profil eller [post noe for å få " -"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%" -"s)." +"Du kan prøve å [knuffe %1$s](../%2$s) eller [post noe for å få hans eller " +"hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -3458,68 +3483,63 @@ msgid "Replies to %1$s on %2$s!" msgstr "Svar til %1$s på %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Du er allerede logget inn!" +msgstr "Du kan ikke trekke tilbake brukerroller på dette nettstedet." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Brukeren har ingen profil." +msgstr "Brukeren har ikke denne rollen." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" msgstr "StatusNet" #: actions/sandbox.php:65 actions/unsandbox.php:65 -#, fuzzy msgid "You cannot sandbox users on this site." -msgstr "Du er allerede logget inn!" +msgstr "Du kan ikke flytte brukere til sandkassen på dette nettstedet." #: actions/sandbox.php:72 -#, fuzzy msgid "User is already sandboxed." -msgstr "Du er allerede logget inn!" +msgstr "Brukeren er allerede i sandkassen." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 #: lib/adminpanelaction.php:391 msgid "Sessions" -msgstr "" +msgstr "Økter" #: actions/sessionsadminpanel.php:65 msgid "Session settings for this StatusNet site." -msgstr "" +msgstr "Øktinnstillinger for dette StatusNet-nettstedet." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" -msgstr "" +msgstr "Håndter økter" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Hvorvidt økter skal håndteres av oss selv." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" -msgstr "" +msgstr "Øktfeilsøking" #: actions/sessionsadminpanel.php:183 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "Slå på feilsøkingsutdata for økter." #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 #: actions/useradminpanel.php:294 -#, fuzzy msgid "Save site settings" -msgstr "Innstillinger for IM" +msgstr "Lagre nettstedsinnstillinger" #: actions/showapplication.php:82 msgid "You must be logged in to view an application." -msgstr "" +msgstr "Du må være innlogget for å se et program." #: actions/showapplication.php:157 msgid "Application profile" -msgstr "" +msgstr "Programprofil" #. TRANS: Form input field label for application icon. #: actions/showapplication.php:159 lib/applicationeditform.php:182 @@ -3555,23 +3575,23 @@ msgstr "Opprettet av %1$s - %2$s standardtilgang - %3$d brukere" #: actions/showapplication.php:213 msgid "Application actions" -msgstr "" +msgstr "Programhandlinger" #: actions/showapplication.php:236 msgid "Reset key & secret" -msgstr "" +msgstr "Tilbakestill nøkkel & hemmelighet" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Programinformasjon" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Forbrukernøkkel" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Forbrukerhemmelighet" #: actions/showapplication.php:273 msgid "Request token URL" @@ -3590,11 +3610,13 @@ msgid "" "Note: We support HMAC-SHA1 signatures. We do not support the plaintext " "signature method." msgstr "" +"Merk: Vi støtter HMAC-SHA1-signaturer. Vi støtter ikke metoden for " +"klartekstsignatur." #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "Er du sikker på at du vil slette denne notisen?" +msgstr "" +"Er du sikker på at du vil tilbakestille din forbrukernøkkel og -hemmelighet?" #: actions/showfavorites.php:79 #, php-format @@ -3625,6 +3647,8 @@ msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"Du har ikke valgt en favorittnotis ennå. Klikk på favorittknappen på notiser " +"du liker for å bokmerke dem for senere eller for å kaste et søkelys på dem." #: actions/showfavorites.php:208 #, php-format @@ -3632,6 +3656,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s har ikke lagt til noen notiser til sine favoritter ennå. Post noe " +"interessant som de vil legge til sine favoritter :)" #: actions/showfavorites.php:212 #, php-format @@ -3640,10 +3666,13 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s har ikke lagt noen notiser til sine favoritter ennå. Hvorfor ikke " +"[registrere en konto](%%%%action.register%%%%) og post noe interessant som " +"de vil legge til sine favoritter :)" #: actions/showfavorites.php:243 msgid "This is a way to share what you like." -msgstr "" +msgstr "Dette er en måte å dele det du liker." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -3667,7 +3696,7 @@ msgstr "Nettadresse" #: actions/showgroup.php:283 actions/tagother.php:128 #: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" -msgstr "" +msgstr "Merk" #: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" @@ -3693,9 +3722,9 @@ msgid "Notice feed for %s group (Atom)" msgstr "Notismating for %s gruppe (Atom)" #: actions/showgroup.php:355 -#, fuzzy, php-format +#, php-format msgid "FOAF for %s group" -msgstr "Klarte ikke å lagre profil." +msgstr "FOAF for gruppen %s" #: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" @@ -3754,7 +3783,7 @@ msgstr "Ingen slik melding." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." -msgstr "" +msgstr "Kun senderen og mottakeren kan lese denne meldingen." #: actions/showmessage.php:108 #, php-format @@ -3771,9 +3800,9 @@ msgid "Notice deleted." msgstr "Notis slettet." #: actions/showstream.php:73 -#, fuzzy, php-format +#, php-format msgid " tagged %s" -msgstr "Tagger" +msgstr " merket %s" #: actions/showstream.php:79 #, php-format @@ -3801,30 +3830,31 @@ msgid "Notice feed for %s (Atom)" msgstr "Notismating for %s (Atom)" #: actions/showstream.php:148 -#, fuzzy, php-format +#, php-format msgid "FOAF for %s" -msgstr "Feed for taggen %s" +msgstr "FOAF for %s" #: actions/showstream.php:200 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda." +msgstr "Dette er tidslinjen for %1$s men %2$s har ikke postet noe ennå." #: actions/showstream.php:205 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"Sett noe interessant nylig? Du har ikke postet noen notiser ennå, så hvorfor " +"ikke begynne nå? :)" #: actions/showstream.php:207 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"Du kan prøve å [knuffe %s](../%s) fra dennes profil eller [post noe for å få " -"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%" -"s)." +"Du kan prøve å knuffe %1$s eller [poste noe for å få hans eller hennes " +"oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:243 #, php-format @@ -3858,20 +3888,19 @@ msgstr "Repetisjon av %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." -msgstr "" +msgstr "Du kan ikke bringe brukere til taushet på dette nettstedet." #: actions/silence.php:72 -#, fuzzy msgid "User is already silenced." -msgstr "Du er allerede logget inn!" +msgstr "Bruker er allerede brakt til taushet." #: actions/siteadminpanel.php:69 msgid "Basic settings for this StatusNet site" -msgstr "" +msgstr "Grunninnstillinger for dette StatusNet-nettstedet" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." -msgstr "" +msgstr "Nettstedsnavnet må være minst ett tegn langt." #: actions/siteadminpanel.php:141 msgid "You must have a valid contact email address." @@ -3884,7 +3913,7 @@ msgstr "Ukjent språk «%s»." #: actions/siteadminpanel.php:165 msgid "Minimum text limit is 0 (unlimited)." -msgstr "" +msgstr "Minste tekstgrense er 0 (ubegrenset)." #: actions/siteadminpanel.php:171 msgid "Dupe limit must be one or more seconds." @@ -3900,7 +3929,7 @@ msgstr "Nettstedsnavn" #: actions/siteadminpanel.php:225 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "Navnet på nettstedet ditt, for eksempel «Foretaksnavn mikroblogg»" #: actions/siteadminpanel.php:229 msgid "Brought by" @@ -4056,9 +4085,8 @@ msgstr "" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Innstillinger" +msgstr "SMS-innstillinger" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4322,17 +4350,17 @@ msgstr "Mikroblogg av %s" #: actions/tag.php:87 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" +msgstr "Notismating for merkelapp %s (RSS 1.0)" #: actions/tag.php:93 #, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "" +msgstr "Notismating for merkelapp %s (RSS 2.0)" #: actions/tag.php:99 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Feed for taggen %s" +msgstr "Notismating for merkelapp %s (Atom)" #: actions/tagother.php:39 msgid "No ID argument." @@ -4369,9 +4397,8 @@ msgid "" msgstr "" #: actions/tagother.php:200 -#, fuzzy msgid "Could not save tags." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke lagre merkelapper." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." @@ -4591,9 +4618,9 @@ msgstr "Bon appétit." #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. #: actions/usergroups.php:66 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "Alle abonnementer" +msgstr "%1$s grupper, side %2$d" #: actions/usergroups.php:132 msgid "Search for more groups" @@ -4722,11 +4749,11 @@ msgstr "" #: classes/Message.php:61 msgid "Could not insert message." -msgstr "" +msgstr "Kunne ikke sette inn melding." #: classes/Message.php:71 msgid "Could not update message with new URI." -msgstr "" +msgstr "Kunne ikke oppdatere melding med ny nettadresse." #. TRANS: Server exception. %s are the error details. #: classes/Notice.php:176 @@ -4761,13 +4788,13 @@ msgstr "" msgid "Problem saving notice." msgstr "Problem ved lagring av notis." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problem ved lagring av gruppeinnboks." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4890,10 +4917,9 @@ msgstr "Personlig" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:437 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Endre passordet ditt" +msgstr "Endre e-posten, avateren, passordet og profilen din" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:442 @@ -4923,7 +4949,7 @@ msgstr "Administrator" #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "" +msgstr "Inviter venner og kollegaer til å bli med deg på %s" #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users #: lib/action.php:458 @@ -4992,17 +5018,17 @@ msgstr "Søk" #. TRANS: Menu item for site administration #: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" -msgstr "" +msgstr "Nettstedsnotis" #. TRANS: DT element for local views block. String is hidden in default CSS. #: lib/action.php:582 msgid "Local views" -msgstr "" +msgstr "Lokale visninger" #. TRANS: DT element for page notice. String is hidden in default CSS. #: lib/action.php:649 msgid "Page notice" -msgstr "" +msgstr "Sidenotis" #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. #: lib/action.php:752 @@ -5055,13 +5081,13 @@ msgstr "Programvarelisens for StatusNet" #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. #: lib/action.php:817 -#, fuzzy, php-format +#, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." msgstr "" -"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site." -"broughtbyurl%%). " +"**%%site.name%%** er en mikrobloggingtjeneste brakt til deg av [%%site." +"broughtby%%](%%site.broughtbyurl%%)." #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. #: lib/action.php:820 @@ -5186,10 +5212,9 @@ msgstr "" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:359 -#, fuzzy msgctxt "MENU" msgid "Design" -msgstr "Personlig" +msgstr "Utseende" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:365 @@ -5316,15 +5341,13 @@ msgstr "Avbryt" #. TRANS: Application access type #: lib/applicationlist.php:136 -#, fuzzy msgid "read-write" -msgstr "Les og skriv" +msgstr "les og skriv" #. TRANS: Application access type #: lib/applicationlist.php:138 -#, fuzzy msgid "read-only" -msgstr "Skrivebeskyttet" +msgstr "skrivebeskyttet" #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) #: lib/applicationlist.php:144 @@ -5334,7 +5357,6 @@ msgstr "" #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" msgstr "Tilbakekall" @@ -5372,15 +5394,15 @@ msgstr "Endring av passord er ikke tillatt" #: lib/channel.php:157 lib/channel.php:177 msgid "Command results" -msgstr "" +msgstr "Kommandoresultat" #: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" -msgstr "" +msgstr "Kommando fullført" #: lib/channel.php:240 msgid "Command failed" -msgstr "" +msgstr "Kommando feilet" #: lib/command.php:83 lib/command.php:105 msgid "Notice with that id does not exist" @@ -5400,13 +5422,13 @@ msgstr "Fant ingen bruker med kallenavn %s" #. TRANS: Message given getting a non-existing user. #. TRANS: %s is the nickname of the user that could not be found. #: lib/command.php:147 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Fant ingen bruker med kallenavn %s" +msgstr "Fant ingen lokal bruker med kallenavn %s" #: lib/command.php:180 msgid "Sorry, this command is not yet implemented." -msgstr "" +msgstr "Beklager, denne kommandoen er ikke implementert ennå." #: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" @@ -5448,9 +5470,9 @@ msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s." +msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -5488,9 +5510,9 @@ msgstr "" #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" -msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d." +msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -5505,11 +5527,11 @@ msgstr "Feil ved sending av direktemelding." #: lib/command.php:514 msgid "Cannot repeat your own notice" -msgstr "Kan ikke repetere din egen notis" +msgstr "Kan ikke gjenta din egen notis" #: lib/command.php:519 msgid "Already repeated that notice" -msgstr "Allerede repetert den notisen" +msgstr "Allerede gjentatt den notisen" #. TRANS: Message given having repeated a notice from another user. #. TRANS: %s is the name of the user for which the notice was repeated. @@ -6035,9 +6057,9 @@ msgstr "SMS-bekreftelse" #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:457 -#, fuzzy, php-format +#, php-format msgid "%s: confirm you own this phone number with this code:" -msgstr "Venter på bekreftelse for dette telefonnummeret." +msgstr "%s: bekreft telefonnummeret ditt med denne koden:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:478 @@ -6198,6 +6220,29 @@ msgid "" "\n" "P.S. You can turn off these email notifications here: %8$s\n" msgstr "" +"%1$s (@%9$s) sendte deg akkurat varsel for din oppmerksomhet (et '@-svar') " +"på %2$s.\n" +"\n" +"Notisen er her:\n" +"\n" +"%3$s\n" +"\n" +"Det lyder:\n" +"\n" +"%4$s\n" +"\n" +"%5$sDu kan svare her:\n" +"\n" +"%6$s\n" +"\n" +"Listen over alle @-svar til deg finner du her:\n" +"\n" +"%7$s\n" +"\n" +"Vennlig hilsen,\n" +"%2$s\n" +"\n" +"P.S. Du kan slå av disse e-postvarslene her: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 41318c9852..153746057d 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:31+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:50+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -2584,8 +2584,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Alleen URL's voor %s via normale HTTP alstublieft." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -4909,7 +4909,7 @@ msgstr "" msgid "Problem saving notice." msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" "Er is een probleem opgetreden bij het opslaan van het Postvak IN van de " @@ -4917,7 +4917,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5600,7 +5600,7 @@ msgstr "" #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen." diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 2df7238a6c..10e542c135 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:27+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:47+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -1199,9 +1199,8 @@ msgid "Change colours" msgstr "Endra passordet ditt" #: actions/designadminpanel.php:513 lib/designsettings.php:191 -#, fuzzy msgid "Content" -msgstr "Kopla til" +msgstr "Innhald" #: actions/designadminpanel.php:526 lib/designsettings.php:204 #, fuzzy @@ -2622,8 +2621,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -4928,14 +4927,14 @@ msgstr "Du kan ikkje lengre legge inn notisar på denne sida." msgid "Problem saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Eit problem oppstod ved lagring av notis." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5923,9 +5922,8 @@ msgid "Database error" msgstr "" #: lib/designsettings.php:105 -#, fuzzy msgid "Upload file" -msgstr "Last opp" +msgstr "Last opp fil" #: lib/designsettings.php:109 #, fuzzy diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 4aeae1113e..f7f8b888d1 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:35+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:53+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -2543,8 +2543,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -4842,13 +4842,13 @@ msgstr "Zabroniono ci wysyłania wpisów na tej witrynie." msgid "Problem saving notice." msgstr "Problem podczas zapisywania wpisu." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5530,9 +5530,9 @@ msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s." +msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 8318da1ba5..49d412e15c 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:38+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:56+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -2604,8 +2604,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -4937,14 +4937,14 @@ msgstr "Está proibido de publicar notas neste site." msgid "Problem saving notice." msgstr "Problema na gravação da nota." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Problema na gravação da nota." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index b506f7f297..07d963c6ec 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:42+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:50:59+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -2592,8 +2592,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Não é um formato de dados suportado." @@ -4905,13 +4905,13 @@ msgstr "Você está proibido de publicar mensagens neste site." msgid "Problem saving notice." msgstr "Problema no salvamento da mensagem." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problema no salvamento das mensagens recebidas do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 87e7ea8fb2..de3ce4c215 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:46+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:51:03+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -2564,8 +2564,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Только %s URL в простом HTTP, пожалуйста." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -3705,7 +3705,7 @@ msgstr "" #: actions/showfavorites.php:243 msgid "This is a way to share what you like." -msgstr "Это способ разделить то, что вам нравится." +msgstr "Это способ поделиться тем, что вам нравится." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -4860,13 +4860,13 @@ msgstr "Вам запрещено поститься на этом сайте ( msgid "Problem saving notice." msgstr "Проблемы с сохранением записи." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Проблемы с сохранением входящих сообщений группы." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5546,9 +5546,9 @@ msgstr "Не удаётся присоединить пользователя %1 #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Не удаётся удалить пользователя %1$s из группы %2$s." +msgstr "Не удаётся удалить пользователя %1$s из группы %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 12fa2d986f..6a69f9cd7f 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2423,8 +2423,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "" @@ -4566,13 +4566,13 @@ msgstr "" msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 1e6065dc53..079094dd7e 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:49+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:51:06+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -2542,8 +2542,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Endast %s-webbadresser över vanlig HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -4837,13 +4837,13 @@ msgstr "Du är utestängd från att posta notiser på denna webbplats." msgid "Problem saving notice." msgstr "Problem med att spara notis." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problem med att spara gruppinkorg." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5519,9 +5519,9 @@ msgstr "Kunde inte ansluta användare %1$s till grupp %2$s." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Kunde inte ta bort användare %1$s från grupp %2$s." +msgstr "Kunde inte ta bort användare %1$s från grupp %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index b591d2fc01..593ee2a898 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:52+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:51:12+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -187,7 +187,7 @@ msgstr "మీరు మరియు మీ స్నేహితులు" #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" -msgstr "" +msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 @@ -827,7 +827,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "కాదు" @@ -1347,7 +1346,6 @@ msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిల #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "తొలగించు" @@ -1366,7 +1364,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "రద్దుచేయి" @@ -1381,7 +1378,6 @@ msgstr "ఈమెయిల్ చిరునామా, \"username@example.org\" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "చేర్చు" @@ -1908,7 +1904,7 @@ msgstr "" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "నిర్వాహకులు మాత్రమే గుంపు సభ్యులపై నిరోధాన్ని ఎత్తివేయగలరు." #: actions/groupunblock.php:95 msgid "User is not blocked from group." @@ -2384,6 +2380,7 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ్రాసే మొదటివారు మీరే అవ్వండి!" #: actions/noticesearch.php:124 #, php-format @@ -2482,8 +2479,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "" @@ -3514,7 +3511,7 @@ msgstr "గణాంకాలు" #: actions/showapplication.php:203 #, php-format msgid "Created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "సృష్టించినది %1$s - అప్రమేయ అందుబాటు %2$s - %3$d వాడుకరులు" #: actions/showapplication.php:213 msgid "Application actions" @@ -4701,14 +4698,14 @@ msgstr "ఈ సైటులో నోటీసులు రాయడం ను msgid "Problem saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5269,13 +5266,11 @@ msgstr "రద్దుచేయి" #. TRANS: Application access type #: lib/applicationlist.php:136 -#, fuzzy msgid "read-write" msgstr "చదవడం-వ్రాయడం" #. TRANS: Application access type #: lib/applicationlist.php:138 -#, fuzzy msgid "read-only" msgstr "చదవడం-మాత్రమే" @@ -5687,7 +5682,7 @@ msgstr "అటువంటి సందేశమేమీ లేదు." #: lib/favorform.php:140 msgid "Favor" -msgstr "" +msgstr "ఇష్టపడు" #: lib/feed.php:85 msgid "RSS 1.0" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 3fe578e086..36d0195b4e 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:55+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:51:16+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -2583,8 +2583,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "" @@ -4841,14 +4841,14 @@ msgstr "" msgid "Problem saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Durum mesajını kaydederken hata oluştu." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index de2f4e803b..bb0c0f6a92 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:49:58+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:51:20+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -2552,8 +2552,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "URL-адреса %s лише в простому HTTP, будь ласка." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -4845,13 +4845,13 @@ msgstr "Вам заборонено надсилати дописи до цьо msgid "Problem saving notice." msgstr "Проблема при збереженні допису." -#: classes/Notice.php:965 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Проблема при збереженні вхідних дописів для групи." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5529,9 +5529,9 @@ msgstr "Не вдалось долучити користувача %1$s до г #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Не вдалось видалити користувача %1$s з групи %2$s." +msgstr "Не вдалось видалити користувача %1$s з групи %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 9f6fd0b166..e7cc45573e 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:50:02+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:51:23+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -2673,8 +2673,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -4995,14 +4995,14 @@ msgstr "" msgid "Problem saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Có lỗi xảy ra khi lưu tin nhắn." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index cd34a34998..f9ced76ead 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:50:08+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:51:26+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -43,7 +43,7 @@ msgstr "注册" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" +msgstr "要禁止匿名用户（未登录）浏览网站吗？" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 @@ -55,7 +55,7 @@ msgstr "隐私" #. TRANS: Checkbox instructions for admin setting "Invite only" #: actions/accessadminpanel.php:174 msgid "Make registration invitation only." -msgstr "" +msgstr "只允许邀请注册。" #. TRANS: Checkbox label for configuring site as invite only. #: actions/accessadminpanel.php:176 @@ -66,13 +66,13 @@ msgstr "邀请" #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations) #: actions/accessadminpanel.php:183 msgid "Disable new registrations." -msgstr "" +msgstr "禁止新用户注册" #. TRANS: Checkbox label for disabling new user registrations. #: actions/accessadminpanel.php:185 #, fuzzy msgid "Closed" -msgstr "阻止" +msgstr "已关闭" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 @@ -125,9 +125,9 @@ msgstr "没有这个用户。" #. TRANS: Page title. %1$s is user nickname, %2$d is page number #: actions/all.php:86 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "%s 及好友" +msgstr "%1$s 和好友，第%2$d页" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname @@ -188,9 +188,8 @@ msgstr "" #. TRANS: H1 text #: actions/all.php:178 -#, fuzzy msgid "You and friends" -msgstr "%s 及好友" +msgstr "你和好友" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. @@ -1038,6 +1037,8 @@ msgid "" "about the application from the database, including all existing user " "connections." msgstr "" +"你确定要删除这个组件吗？这将从数据库中清除有关这个组件的所有数据，包括所有的" +"用户联系。" #. TRANS: Submit button title for 'No' when deleting an application. #: actions/deleteapplication.php:158 @@ -2624,8 +2625,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -4923,14 +4924,14 @@ msgstr "在这个网站你被禁止发布消息。" msgid "Problem saving notice." msgstr "保存通告时出错。" -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "保存通告时出错。" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -6783,7 +6784,7 @@ msgstr "无标题章节" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "更多..." #: lib/silenceform.php:67 #, fuzzy @@ -6892,7 +6893,7 @@ msgstr "个人设置" #: lib/userprofile.php:264 msgid "Edit" -msgstr "" +msgstr "编辑" #: lib/userprofile.php:287 #, fuzzy diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 5d8a1c3810..619f258a95 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-12 21:47+0000\n" -"PO-Revision-Date: 2010-04-12 21:50:12+0000\n" +"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"PO-Revision-Date: 2010-04-18 19:51:31+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -2533,8 +2533,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069 -#: lib/apiaction.php:1098 lib/apiaction.php:1215 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 +#: lib/apiaction.php:1099 lib/apiaction.php:1216 msgid "Not a supported data format." msgstr "" @@ -4749,14 +4749,14 @@ msgstr "" msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:965 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "儲存使用者發生錯誤" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1513 +#: classes/Notice.php:1515 #, php-format msgid "RT @%1$s %2$s" msgstr "" From e547a2f54c2a2184d55c57c7712d4d50621f5fc2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 19 Apr 2010 18:45:50 +0200 Subject: [PATCH 005/730] Fix ticket #2289: registration links were showing in top nav bar, login page message when site set to invite-only or closed registration, when the 'register' action can't be used. --- actions/login.php | 10 +++++++--- lib/action.php | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/actions/login.php b/actions/login.php index 8ea3c800b7..dc6352368a 100644 --- a/actions/login.php +++ b/actions/login.php @@ -267,9 +267,13 @@ class LoginAction extends Action 'user name and password ' . 'before changing your settings.'); } else { - return _('Login with your username and password. ' . - 'Don\'t have a username yet? ' . - '[Register](%%action.register%%) a new account.'); + $prompt = _('Login with your username and password.'); + if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) { + $prompt .= ' '; + $prompt .= _('Don\'t have a username yet? ' . + '[Register](%%action.register%%) a new account.'); + } + return $prompt; } } diff --git a/lib/action.php b/lib/action.php index 0fc3a0dc43..c4d9fd5cbf 100644 --- a/lib/action.php +++ b/lib/action.php @@ -464,7 +464,7 @@ class Action extends HTMLOutputter // lawsuit _m('MENU', 'Logout'), $tooltip, false, 'nav_logout'); } else { - if (!common_config('site', 'closed')) { + if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) { // TRANS: Tooltip for main menu option "Register" $tooltip = _m('TOOLTIP', 'Create an account'); // TRANS: Main menu option when not logged in to register a new account From e7c112ccd61d2503413716029dcb257994188594 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 19 Apr 2010 19:17:47 +0200 Subject: [PATCH 006/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/af/LC_MESSAGES/statusnet.po | 14 +- locale/ar/LC_MESSAGES/statusnet.po | 14 +- locale/arz/LC_MESSAGES/statusnet.po | 14 +- locale/bg/LC_MESSAGES/statusnet.po | 73 +-- locale/br/LC_MESSAGES/statusnet.po | 41 +- locale/ca/LC_MESSAGES/statusnet.po | 40 +- locale/cs/LC_MESSAGES/statusnet.po | 14 +- locale/de/LC_MESSAGES/statusnet.po | 16 +- locale/el/LC_MESSAGES/statusnet.po | 14 +- locale/en_GB/LC_MESSAGES/statusnet.po | 16 +- locale/es/LC_MESSAGES/statusnet.po | 16 +- locale/fa/LC_MESSAGES/statusnet.po | 16 +- locale/fi/LC_MESSAGES/statusnet.po | 14 +- locale/fr/LC_MESSAGES/statusnet.po | 16 +- locale/ga/LC_MESSAGES/statusnet.po | 14 +- locale/gl/LC_MESSAGES/statusnet.po | 227 ++++---- locale/he/LC_MESSAGES/statusnet.po | 14 +- locale/hsb/LC_MESSAGES/statusnet.po | 14 +- locale/ia/LC_MESSAGES/statusnet.po | 16 +- locale/is/LC_MESSAGES/statusnet.po | 14 +- locale/it/LC_MESSAGES/statusnet.po | 16 +- locale/ja/LC_MESSAGES/statusnet.po | 16 +- locale/ko/LC_MESSAGES/statusnet.po | 14 +- locale/mk/LC_MESSAGES/statusnet.po | 16 +- locale/nb/LC_MESSAGES/statusnet.po | 16 +- locale/nl/LC_MESSAGES/statusnet.po | 16 +- locale/nn/LC_MESSAGES/statusnet.po | 14 +- locale/pl/LC_MESSAGES/statusnet.po | 16 +- locale/pt/LC_MESSAGES/statusnet.po | 730 +++++++++++--------------- locale/pt_BR/LC_MESSAGES/statusnet.po | 16 +- locale/ru/LC_MESSAGES/statusnet.po | 16 +- locale/statusnet.pot | 9 +- locale/sv/LC_MESSAGES/statusnet.po | 16 +- locale/te/LC_MESSAGES/statusnet.po | 85 ++- locale/tr/LC_MESSAGES/statusnet.po | 14 +- locale/uk/LC_MESSAGES/statusnet.po | 16 +- locale/vi/LC_MESSAGES/statusnet.po | 16 +- locale/zh_CN/LC_MESSAGES/statusnet.po | 14 +- locale/zh_TW/LC_MESSAGES/statusnet.po | 14 +- 39 files changed, 870 insertions(+), 817 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index a9c8d84a48..9ff8d646dd 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:04+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:11:49+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -2236,10 +2236,14 @@ msgid "" msgstr "" #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Verkeerde gebruikersnaam of wagwoord." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 57b2094d0a..21d95a2241 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:07+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:11:52+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -2228,10 +2228,14 @@ msgstr "" "لأسباب أمنية، من فضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "لُج باسم مستخدم وكلمة سر" + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 12e952f3d6..7f5f7b8ab3 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:10+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:11:55+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -2249,10 +2249,14 @@ msgid "" msgstr "" #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "اسم المستخدم أو كلمه السر غير صحيحان." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 54f1fadec7..6fc613032c 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:13+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:11:58+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -455,7 +455,6 @@ msgstr "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found." msgstr "Групата не е открита." @@ -830,7 +829,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "Не" @@ -849,7 +847,6 @@ msgstr "Да не се блокира този потребител" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Да" @@ -973,20 +970,17 @@ msgid "Notices" msgstr "Бележки" #: actions/deleteapplication.php:63 -#, fuzzy msgid "You must be logged in to delete an application." -msgstr "За да редактирате група, трябва да сте влезли." +msgstr "За да изтриете приложение, трябва да сте влезли." #: actions/deleteapplication.php:71 -#, fuzzy msgid "Application not found." -msgstr "Бележката няма профил" +msgstr "Приложението не е открито." #: actions/deleteapplication.php:78 actions/editapplication.php:77 #: actions/showapplication.php:94 -#, fuzzy msgid "You are not the owner of this application." -msgstr "Не членувате в тази група." +msgstr "Не сте собственик на това приложение." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 @@ -995,9 +989,8 @@ msgid "There was a problem with your session token." msgstr "Имаше проблем със сесията ви в сайта." #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 -#, fuzzy msgid "Delete application" -msgstr "Няма такава бележка." +msgstr "Изтриване на приложението" #: actions/deleteapplication.php:149 msgid "" @@ -1008,15 +1001,13 @@ msgstr "" #. TRANS: Submit button title for 'No' when deleting an application. #: actions/deleteapplication.php:158 -#, fuzzy msgid "Do not delete this application" -msgstr "Да не се изтрива бележката" +msgstr "Да не се изтрива приложението" #. TRANS: Submit button title for 'Yes' when deleting an application. #: actions/deleteapplication.php:164 -#, fuzzy msgid "Delete this application" -msgstr "Изтриване на бележката" +msgstr "Изтриване на това приложение" #. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 @@ -1362,7 +1353,6 @@ msgstr "Текущ потвърден адрес на е-поща." #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Премахване" @@ -1396,7 +1386,6 @@ msgstr "Адрес на е-поща, като \"UserName@example.org\"" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Добавяне" @@ -2334,10 +2323,14 @@ msgstr "" "при промяна на настройките." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Вход с име и парола" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Влезте с име и парола. Нямате такива? [Регистрирайте](%%action.register%%) " "нова сметка или опитайте с [OpenID](%%action.openidlogin%%). " @@ -2588,7 +2581,7 @@ msgstr "Управление на различни други настройки #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr " (безплатна услуга)" #: actions/othersettings.php:116 msgid "Shorten URLs with" @@ -3556,14 +3549,12 @@ msgid "Save site settings" msgstr "Запазване настройките на сайта" #: actions/showapplication.php:82 -#, fuzzy msgid "You must be logged in to view an application." -msgstr "За напуснете група, трябва да сте влезли." +msgstr "За прегледате приложение, трябва да сте влезли." #: actions/showapplication.php:157 -#, fuzzy msgid "Application profile" -msgstr "Бележката няма профил" +msgstr "Профил на приложението" #. TRANS: Form input field label for application icon. #: actions/showapplication.php:159 lib/applicationeditform.php:182 @@ -4277,9 +4268,9 @@ msgid "%s subscribers" msgstr "%s абоната" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "Абонаменти на %s, страница %d" +msgstr "Абонати на %1$s, страница %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -4314,9 +4305,9 @@ msgid "%s subscriptions" msgstr "Абонаменти на %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "Абонаменти на %s, страница %d" +msgstr "Абонаменти на %1$s, страница %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -4952,14 +4943,12 @@ msgstr "Лично" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:437 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Промяна на поща, аватар, парола, профил" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:442 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Свързване към услуги" @@ -4971,7 +4960,6 @@ msgstr "Свързване" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:448 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Промяна настройките на сайта" @@ -4985,7 +4973,7 @@ msgstr "Настройки" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:455 -#, fuzzy, php-format +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Поканете приятели и колеги да се присъединят към вас в %s" @@ -5011,14 +4999,12 @@ msgstr "Изход" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:472 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Създаване на нова сметка" #. TRANS: Main menu option when not logged in to register a new account #: lib/action.php:475 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "Регистриране" @@ -5049,7 +5035,6 @@ msgstr "Помощ" #. TRANS: Tooltip for main menu option "Search" #: lib/action.php:490 -#, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Търсене за хора или бележки" @@ -6355,14 +6340,12 @@ msgid "Attach a file" msgstr "Прикрепяне на файл" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "Грешка при запазване етикетите." +msgstr "Споделяне на местоположението ми" #: lib/noticeform.php:215 -#, fuzzy msgid "Do not share my location" -msgstr "Грешка при запазване етикетите." +msgstr "Без споделяне на местоположението ми" #: lib/noticeform.php:216 msgid "" @@ -6557,9 +6540,8 @@ msgid "No return-to arguments." msgstr "Липсват аргументи return-to." #: lib/repeatform.php:107 -#, fuzzy msgid "Repeat this notice?" -msgstr "Повтаряне на тази бележка" +msgstr "Да се повтори ли тази бележка?" #: lib/repeatform.php:132 msgid "Yes" @@ -6602,9 +6584,8 @@ msgid "Search" msgstr "Търсене" #: lib/searchaction.php:162 -#, fuzzy msgid "Search help" -msgstr "Търсене" +msgstr "Помощ за търсенето" #: lib/searchgroupnav.php:80 msgid "People" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 5c3d4472e0..8362298aca 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:16+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:01+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -816,10 +816,9 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" -msgstr "Ket" +msgstr "Nann" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. @@ -835,7 +834,6 @@ msgstr "Arabat stankañ an implijer-mañ" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Ya" @@ -1330,7 +1328,6 @@ msgstr "Chomlec'h postel gwiriekaet er mare-mañ." #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Dilemel" @@ -1347,7 +1344,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "Nullañ" @@ -1362,7 +1358,6 @@ msgstr "Chomlec'h postel, evel \"AnvImplijer@example.org\"" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Ouzhpennañ" @@ -1388,16 +1383,14 @@ msgstr "" #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "Nevez" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "Penndibaboù" +msgstr "Penndibaboù ar posteloù" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1491,7 +1484,6 @@ msgstr "" #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." msgstr "N'eo ket mat ar chomlec'h postelerezh prim." @@ -1943,9 +1935,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Penndibaboù" +msgstr "Penndibaboù ar bostelerezh prim" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2239,10 +2230,14 @@ msgstr "" "tremen a-benn enrollañ ho penndibaboù." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Anv implijer pe ger-tremen direizh." + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Kevreit gant ho anv implijer hag ho ker tremen. N'o peus ket a anv implijer " "evit c'hoazh ? [Krouit](%%action.register%%) ur gont nevez." @@ -3908,7 +3903,6 @@ msgstr "" #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" msgstr "Kadarnaat" @@ -3925,9 +3919,8 @@ msgstr "" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Penndibaboù" +msgstr "Penndibaboù an SMSoù" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -5163,15 +5156,13 @@ msgstr "Nullañ" #. TRANS: Application access type #: lib/applicationlist.php:136 -#, fuzzy msgid "read-write" -msgstr "Lenn-skrivañ" +msgstr "lenn-skrivañ" #. TRANS: Application access type #: lib/applicationlist.php:138 -#, fuzzy msgid "read-only" -msgstr "Lenn hepken" +msgstr "lenn hepken" #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) #: lib/applicationlist.php:144 diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 4fa73c71f3..5191bd3d09 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:20+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:05+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -839,7 +839,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "No" @@ -858,7 +857,6 @@ msgstr "No bloquis l'usuari" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Sí" @@ -892,14 +890,13 @@ msgid "%s blocked profiles" msgstr "%s perfils blocats" #: actions/blockedfromgroup.php:100 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s perfils blocats, pàgina %d" +msgstr "%1$s perfils blocats, pàgina %2$d" #: actions/blockedfromgroup.php:115 -#, fuzzy msgid "A list of the users blocked from joining this group." -msgstr "La llista dels usuaris d'aquest grup." +msgstr "Una llista d'usuaris que han estat blocats d'afegir-se a aquest grup." #: actions/blockedfromgroup.php:288 msgid "Unblock user from group" @@ -982,9 +979,8 @@ msgid "Notices" msgstr "Avisos" #: actions/deleteapplication.php:63 -#, fuzzy msgid "You must be logged in to delete an application." -msgstr "Heu d'iniciar una sessió per editar un grup." +msgstr "Heu d'haver iniciat una sessió per a suprimir una aplicació." #: actions/deleteapplication.php:71 msgid "Application not found." @@ -1011,12 +1007,14 @@ msgid "" "about the application from the database, including all existing user " "connections." msgstr "" +"Esteu segur que voler suprimir l'aplicació? Això netejarà totes les dades de " +"l'aplicació de la base de dades, incloent-hi totes les connexions d'usuari " +"existents." #. TRANS: Submit button title for 'No' when deleting an application. #: actions/deleteapplication.php:158 -#, fuzzy msgid "Do not delete this application" -msgstr "No es pot esborrar la notificació." +msgstr "No suprimeixis l'aplicació" #. TRANS: Submit button title for 'Yes' when deleting an application. #: actions/deleteapplication.php:164 @@ -2339,10 +2337,14 @@ msgstr "" "contrasenya abans de canviar la teva configuració." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Accedir amb el nom d'usuari i contrasenya" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Inicia una sessió amb el teu nom d'usuari i la teva contrasenya. Encara no " "tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova " @@ -2514,20 +2516,20 @@ msgstr "Aplicacions OAuth" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "Aplicacions que heu registrat" #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "No teniu cap aplicació registrada encara." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" -msgstr "" +msgstr "Aplicacions connectades" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." -msgstr "" +msgstr "Heu permès les aplicacions següents accedir al vostre compte." #: actions/oauthconnectionssettings.php:175 msgid "You are not a user of that application." diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index d97f792d16..07ede1212c 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:23+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:08+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65249); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -2343,10 +2343,14 @@ msgid "" msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Neplatné jméno nebo heslo" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste zaregistrován? " "[Registrovat](%%action.register%%) nový účet, nebo vyzkoušejte [OpenID](%%" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 7214233761..d1ebc64457 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:26+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:11+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -2344,10 +2344,14 @@ msgstr "" "ein, bevor die Änderungen an deinen Einstellungen übernommen werden." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Mit Nutzernamen und Passwort anmelden" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? " "[Registriere](%%action.register%%) ein neues Konto." diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 31b4ea6607..c903d03dfa 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:31+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:14+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -2303,10 +2303,14 @@ msgstr "" "σας, πριν αλλάξετε τις ρυθμίσεις σας." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Σύνδεση με όνομα χρήστη και κωδικό" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Συνδεθείτε με το όνομα χρήστη και τον κωδικό σας. Δεν έχετε όνομα χρήστη " "ακόμα; Κάντε [εγγραφή](%%action.register%%) για ένα νέο λογαριασμό ή " diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index eeb1f41859..c02f7988d9 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:34+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:17+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -2303,10 +2303,14 @@ msgstr "" "changing your settings." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Login with a username and password" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 40f1836062..2a38c8cda7 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:37+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:21+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -2332,10 +2332,14 @@ msgstr "" "contraseña antes de cambiar tu configuración." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Ingresar con un nombre de usuario y contraseña." + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Inicia sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea](%%" "action.register%%) una cuenta." diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index f3fa675693..9c6903353c 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:44+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:27+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -2314,10 +2314,14 @@ msgstr "" "دوباره وارد نمایید." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "وارد شدن با یک نام کاربری و کلمه ی عبور" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "با نام‌کاربری و گذزواژه‌ی خود وارد شوید. نام‌کاربری ندارید؟ یک نام‌کاربری [ثبت ]" "(%%action.register%%) کنید." diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 7ca6b0c943..171b0c43a3 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:40+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:24+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -2382,10 +2382,14 @@ msgstr "" "asetuksiesi muuttamista." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Kirjaud sisään käyttäjätunnuksella ja salasanalla. Ei vielä " "käyttäjätunnusta? [Rekisteröi](%%action.register%%) käyttäjätunnus tai " diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 139fdc351f..d4f3ffdfb1 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:47+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:30+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -2348,10 +2348,14 @@ msgstr "" "votre mot de passe afin d’enregistrer vos préférences." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Ouvrez une session avec un identifiant et un mot de passe" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Ouvrez une session avec votre identifiant et votre mot de passe. Vous n’avez " "pas encore d’identifiant ? [Créez-vous](%%action.register%%) un nouveau " diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 2d6863b239..405e5ba545 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:50+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:33+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -2412,10 +2412,14 @@ msgstr "" "contrasinal antes de cambiar as túas preferenzas." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Accede co teu nome de usuario e contrasinal." + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Accede co teu nome de usuario e contrasinal. ¿Non tes un todavía?? [Rexistra]" "(%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index 0a92d5ff13..15d9641eac 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:49:53+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:36+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -2330,10 +2330,14 @@ msgstr "" "contrasinal antes de cambiar a súa configuración." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Nome de usuario ou contrasinal incorrectos." + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Identifíquese co seu nome de usuario e contrasinal. Aínda non ten un nome de " "usuario? [Rexistre](%%action.register%%) unha conta nova." @@ -3089,10 +3093,10 @@ msgid "" "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" "Isto é %%site.name%%, un servizo de [microblogging](http://en.wikipedia.org/" -"wiki/Microblogging) baseado na ferramenta de software libre [StatusNet]" -"(http://status.net/). [Únase agora](%%action.register%%) para compartir " -"notas persoais cos amigos, a familia e os compañeiros! ([Ler máis](%%doc.help" -"%%))" +"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre " +"[StatusNet](http://status.net/). [Únase agora](%%action.register%%) para " +"compartir notas persoais cos amigos, a familia e os compañeiros! ([Máis " +"información](%%doc.help%%))" #: actions/public.php:247 #, php-format @@ -3102,8 +3106,8 @@ msgid "" "tool." msgstr "" "Isto é %%site.name%%, un servizo de [microblogging](http://en.wikipedia.org/" -"wiki/Microblogging) baseado na ferramenta de software libre [StatusNet]" -"(http://status.net/)." +"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre " +"[StatusNet](http://status.net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" @@ -3540,11 +3544,11 @@ msgstr "StatusNet" #: actions/sandbox.php:65 actions/unsandbox.php:65 msgid "You cannot sandbox users on this site." -msgstr "" +msgstr "Non pode illar usuarios neste sitio." #: actions/sandbox.php:72 msgid "User is already sandboxed." -msgstr "" +msgstr "O usuario xa está illado." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 @@ -3562,7 +3566,7 @@ msgstr "Manexar as sesións" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "Se manexar as sesións nós mesmos." +msgstr "Manexar ou non as sesións nós mesmos." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" @@ -3675,25 +3679,25 @@ msgstr "Non se puideron obter as notas favoritas." #: actions/showfavorites.php:171 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Fonte de novas para os favoritos de %s (RSS 1.0)" +msgstr "Fonte de novas dos favoritos de %s (RSS 1.0)" #: actions/showfavorites.php:178 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Fonte de novas para os favoritos de %s (RSS 2.0)" +msgstr "Fonte de novas dos favoritos de %s (RSS 2.0)" #: actions/showfavorites.php:185 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Fonte de novas para os favoritos de %s (Atom)" +msgstr "Fonte de novas dos favoritos de %s (Atom)" #: actions/showfavorites.php:206 msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" -"Aínda non escolleu ningunha nota favorita. Prema no botón de favorita das " -"notas que lle gusten para marcalas para logo ou salientalas." +"Aínda non escolleu ningunha nota favorita. Prema no botón de nota favorita " +"naquelas notas que lle gusten para marcalas para logo ou para salientalas." #: actions/showfavorites.php:208 #, php-format @@ -3701,7 +3705,7 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" -"%s aínda non marcou ningunha nota como favorita. Publica algo interesante " +"%s aínda non marcou ningunha nota como favorita. Publique algo interesante " "que poida querer engadir aos seus favoritos :)" #: actions/showfavorites.php:212 @@ -3711,13 +3715,13 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" -"%s aínda non marcou ningunha nota como favorita. Que lle parece [rexistrar " -"unha conta](%%%%action.register%%%%) e publicar algo interesante que puidese " +"%s aínda non marcou ningunha nota como favorita. Por que non [rexistrar unha " +"conta](%%%%action.register%%%%) e publicar algo interesante que puidese " "querer engadir aos seus favoritos? :)" #: actions/showfavorites.php:243 msgid "This is a way to share what you like." -msgstr "Isto é un modo de compartir o que che gusta." +msgstr "Isto é un modo de compartir o que lle gusta." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -3745,7 +3749,7 @@ msgstr "Nota" #: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" -msgstr "Alias" +msgstr "Pseudónimos" #: actions/showgroup.php:302 msgid "Group actions" @@ -3754,22 +3758,22 @@ msgstr "Accións do grupo" #: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Fonte de novas nas notas do grupo %s (RSS 1.0)" +msgstr "Fonte de novas das notas do grupo %s (RSS 1.0)" #: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Fonte de novas nas notas do grupo %s (RSS 2.0)" +msgstr "Fonte de novas das notas do grupo %s (RSS 2.0)" #: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Fonte de novas nas notas do grupo %s (Atom)" +msgstr "Fonte de novas das notas do grupo %s (Atom)" #: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" -msgstr "FOAF para o grupo %s" +msgstr "Amigo dun amigo para o grupo %s" #: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" @@ -3798,12 +3802,12 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [micro-" -"blogging](http://en.wikipedia.org/wiki/Micro-blogging) (en inglés) baseado " -"na ferramenta de software libre [StatusNet](http://status.net/). Os seus " -"membros compartes mensaxes curtas sobre as súas vidas e intereses. [Únase](%%" -"%%action.register%%%%) para pasar a formar parte deste grupo e de moitos " -"máis! ([Máis información](%%%%doc.help%%%%))" +"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de " +"[microblogging](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " +"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os " +"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. " +"[Únase agora](%%%%action.register%%%%) para pasar a formar parte deste grupo " +"e de moitos máis! ([Máis información](%%%%doc.help%%%%))" #: actions/showgroup.php:469 #, php-format @@ -3813,10 +3817,10 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" -"**%s** é un gupo de usuarios de %%%%site.name%%%%, un servizo de [micro-" -"blogging](http://en.wikipedia.org/wiki/Micro-blogging) (en inglés) baseado " -"na ferramenta de software libre [StatusNet](http://status.net/). Os seus " -"membros comparten mensaxes curtas sobre a súa vida e intereses. " +"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de " +"[microblogging](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " +"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os " +"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. " #: actions/showgroup.php:497 msgid "Admins" @@ -3824,7 +3828,7 @@ msgstr "Administradores" #: actions/showmessage.php:81 msgid "No such message." -msgstr "EsNon se atopou esa mensaxe." +msgstr "Non se atopou esa mensaxe." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." @@ -3847,7 +3851,7 @@ msgstr "Borrouse a nota." #: actions/showstream.php:73 #, php-format msgid " tagged %s" -msgstr "etiquetouse %s" +msgstr " etiquetouse %s" #: actions/showstream.php:79 #, php-format @@ -3857,27 +3861,27 @@ msgstr "%1$s, páxina %2$d" #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Fonte de novas notas para %1$s etiquetadas con %2$s (RSS 1.0)" +msgstr "Fonte de novas das notas para %1$s etiquetadas con %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "Fonte de novas notas para %s (RSS 1.0)" +msgstr "Fonte de novas das notas para %s (RSS 1.0)" #: actions/showstream.php:136 #, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "Fonte de novas notas para %s (RSS 2.0)" +msgstr "Fonte de novas das notas para %s (RSS 2.0)" #: actions/showstream.php:143 #, php-format msgid "Notice feed for %s (Atom)" -msgstr "Fonte de novas notas para %s (Atom)" +msgstr "Fonte de novas das notas para %s (Atom)" #: actions/showstream.php:148 #, php-format msgid "FOAF for %s" -msgstr "FOAF para %s" +msgstr "Amigo dun amigo para %s" #: actions/showstream.php:200 #, php-format @@ -3889,8 +3893,8 @@ msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" -"Viu algo interesante hoxe? Aínda non pblicou ningunha nota, este sería un bo " -"momento para comezar :)" +"Viu algo interesante hoxe? Aínda non publicou ningunha nota, este sería un " +"bo momento para comezar :)" #: actions/showstream.php:207 #, php-format @@ -3909,11 +3913,11 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [micro-blogging]" -"(http://en.wikipedia.org/wiki/Micro-blogging) (en inglés) baseado na " -"ferramenta de software libre [StatusNet](http://status.net/). [Únase](%%%%" -"action.register%%%%) para seguir as notas de **%s** e de moita máis xente! " -"([Máis información](%%%%doc.help%%%%))" +"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogging]" +"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na " +"ferramenta de software libre [StatusNet](http://status.net/). [Únase agora](%" +"%%%action.register%%%%) para seguir as notas de **%s** e de moita máis " +"xente! ([Máis información](%%%%doc.help%%%%))" #: actions/showstream.php:248 #, php-format @@ -3922,8 +3926,8 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" -"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [micro-blogging]" -"(http://en.wikipedia.org/wiki/Micro-blogging) (en inglés) baseado na " +"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogging]" +"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na " "ferramenta de software libre [StatusNet](http://status.net/). " #: actions/showstream.php:305 @@ -3933,179 +3937,184 @@ msgstr "Repeticións de %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." -msgstr "" +msgstr "Non pode silenciar usuarios neste sitio." #: actions/silence.php:72 msgid "User is already silenced." -msgstr "" +msgstr "O usuario xa está silenciado." #: actions/siteadminpanel.php:69 msgid "Basic settings for this StatusNet site" -msgstr "" +msgstr "Configuración básica para este sitio StatusNet" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." -msgstr "" +msgstr "O nome do sitio non pode quedar baleiro." #: actions/siteadminpanel.php:141 msgid "You must have a valid contact email address." -msgstr "" +msgstr "Ten que ter un enderezo de correo electrónico de contacto correcto." #: actions/siteadminpanel.php:159 #, php-format msgid "Unknown language \"%s\"." -msgstr "" +msgstr "Non se coñece a lingua \"%s\"." #: actions/siteadminpanel.php:165 msgid "Minimum text limit is 0 (unlimited)." -msgstr "" +msgstr "O límite mínimo de texto é 0 (ilimitado)." #: actions/siteadminpanel.php:171 msgid "Dupe limit must be one or more seconds." -msgstr "" +msgstr "O tempo límite de repetición debe ser de 1 ou máis segundos." #: actions/siteadminpanel.php:221 msgid "General" -msgstr "" +msgstr "Xeral" #: actions/siteadminpanel.php:224 msgid "Site name" -msgstr "" +msgstr "Nome do sitio" #: actions/siteadminpanel.php:225 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" +"O nome do seu sitio, como por exemplo \"O microblogue da miña empresa\"" #: actions/siteadminpanel.php:229 msgid "Brought by" -msgstr "" +msgstr "Publicado por" #: actions/siteadminpanel.php:230 msgid "Text used for credits link in footer of each page" -msgstr "" +msgstr "Texto utilizado para a ligazón aos créditos ao pé de cada páxina" #: actions/siteadminpanel.php:234 msgid "Brought by URL" -msgstr "" +msgstr "URL do publicador" #: actions/siteadminpanel.php:235 msgid "URL used for credits link in footer of each page" -msgstr "" +msgstr "URL utilizado para a ligazón aos créditos ao pé de cada páxina" #: actions/siteadminpanel.php:239 msgid "Contact email address for your site" -msgstr "" +msgstr "Enderezo de correo electrónico de contacto para o seu sitio" #: actions/siteadminpanel.php:245 msgid "Local" -msgstr "" +msgstr "Local" #: actions/siteadminpanel.php:256 msgid "Default timezone" -msgstr "" +msgstr "Fuso horario por defecto" #: actions/siteadminpanel.php:257 msgid "Default timezone for the site; usually UTC." -msgstr "" +msgstr "Fuso horario por defecto para este sitio. Adoita poñerse o UTC." #: actions/siteadminpanel.php:262 msgid "Default language" -msgstr "" +msgstr "Lingua por defecto" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Lingua do sitio para cando a detección automática a partir do navegador non " +"sexa posible" #: actions/siteadminpanel.php:271 msgid "Limits" -msgstr "" +msgstr "Límites" #: actions/siteadminpanel.php:274 msgid "Text limit" -msgstr "" +msgstr "Límite de texto" #: actions/siteadminpanel.php:274 msgid "Maximum number of characters for notices." -msgstr "" +msgstr "Número máximo de caracteres para as notas." #: actions/siteadminpanel.php:278 msgid "Dupe limit" -msgstr "" +msgstr "Tempo límite de repetición" #: actions/siteadminpanel.php:278 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" +"Tempo (en segundos) que teñen que agardar os usuarios para publicar unha " +"nota de novo." #: actions/sitenoticeadminpanel.php:56 msgid "Site Notice" -msgstr "" +msgstr "Nota do sitio" #: actions/sitenoticeadminpanel.php:67 msgid "Edit site-wide message" -msgstr "" +msgstr "Editar a mensaxe global do sitio" #: actions/sitenoticeadminpanel.php:103 msgid "Unable to save site notice." -msgstr "" +msgstr "Non se puido gardar a nota do sitio." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars." -msgstr "" +msgstr "O tamaño máximo da nota global do sitio é de 255 caracteres." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" -msgstr "" +msgstr "Texto da nota do sitio" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" +"Texto da nota global do sitio (255 caracteres como máximo, pode conter HTML)" #: actions/sitenoticeadminpanel.php:198 msgid "Save site notice" -msgstr "" +msgstr "Gardar a nota do sitio" #. TRANS: Title for SMS settings. #: actions/smssettings.php:59 msgid "SMS settings" -msgstr "" +msgstr "Configuración dos SMS" #. TRANS: SMS settings page instructions. #. TRANS: %%site.name%% is the name of the site. #: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." -msgstr "" +msgstr "Pode recibir mensaxes SMS de %%site.name%% por correo electrónico." #. TRANS: Message given in the SMS settings if SMS is not enabled on the site. #: actions/smssettings.php:97 msgid "SMS is not available." -msgstr "" +msgstr "Os SMS non están dispoñibles." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "Enderezo de mensaxería instantánea" +msgstr "Enderezo dos SMS" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." -msgstr "" +msgstr "Número de teléfono cos SMS activados confirmado actualmente." #. TRANS: Form guide in IM settings form. #: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." -msgstr "" +msgstr "Agardando pola confirmación do número de teléfono." #. TRANS: Field label for SMS address input in SMS settings form. #: actions/smssettings.php:142 msgid "Confirmation code" -msgstr "" +msgstr "Código de confirmación" #. TRANS: Form field instructions in SMS settings form. #: actions/smssettings.php:144 msgid "Enter the code you received on your phone." -msgstr "" +msgstr "Introduza o código que recibiu no teléfono." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 @@ -4116,18 +4125,19 @@ msgstr "Confirmar" #. TRANS: Field label for SMS phone number input in SMS settings form. #: actions/smssettings.php:153 msgid "SMS phone number" -msgstr "" +msgstr "Número de teléfono para os SMS" #. TRANS: SMS phone number input field instructions in SMS settings form. #: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" +"Número de teléfono, sen signos de puntuación nin espazos en branco, co " +"código da zona" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Preferencias" +msgstr "Preferencias dos SMS" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4135,32 +4145,33 @@ msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" +"Enviádeme notas por SMS. Comprendo que isto podería supoñerme uns custos " +"exorbitantes na factura da miña compañía." #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "Gardáronse as preferencias." +msgstr "Gardáronse as preferencias dos SMS." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 msgid "No phone number." -msgstr "" +msgstr "Non hai ningún número de teléfono." #. TRANS: Message given saving SMS phone number without having selected a carrier. #: actions/smssettings.php:344 msgid "No carrier selected." -msgstr "" +msgstr "Non se escolleu unha compañía." #. TRANS: Message given saving SMS phone number that is already set. #: actions/smssettings.php:352 msgid "That is already your phone number." -msgstr "" +msgstr "Ese xa é o seu número de teléfono." #. TRANS: Message given saving SMS phone number that is already set for another user. #: actions/smssettings.php:356 msgid "That phone number already belongs to another user." -msgstr "" +msgstr "Ese número de teléfono xa pertence a outro usuario." #. TRANS: Message given saving valid SMS phone number that is to be confirmed. #: actions/smssettings.php:384 @@ -4168,29 +4179,29 @@ msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" +"Enviouse un código de confirmación ao número de teléfono que engadiu. " +"Comprobe no seu teléfono o código e as instrucións para utilizalo." #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. #: actions/smssettings.php:413 msgid "That is the wrong confirmation number." -msgstr "" +msgstr "Ese número de confirmación é incorrecto." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "Cancelouse a confirmación." +msgstr "Cancelouse a confirmación para os SMS." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. #: actions/smssettings.php:448 msgid "That is not your phone number." -msgstr "" +msgstr "Ese número de teléfono non é seu." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "Borrouse o enderezo." +msgstr "Borrouse o número de teléfono para os SMS." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 31b14615a2..a755933c93 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:10+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:40+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -2351,10 +2351,14 @@ msgid "" msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "שם המשתמש או הסיסמה לא חוקיים" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "היכנס בעזרת שם המשתמש והסיסמה שלך. עדיין אין לך שם משתמש? [הרשם](%%action." "register%%) לחשבון " diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 9951ce1cd4..adc15a7a61 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:14+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:44+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -2218,10 +2218,14 @@ msgid "" msgstr "" #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom" + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 7463e81786..cce9d66f28 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:19+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:47+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -2323,10 +2323,14 @@ msgstr "" "contrasigno ante de cambiar tu configurationes." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Aperir session con nomine de usator e contrasigno" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Aperi un session con tu nomine de usator e contrasigno. Non ha ancora un " "nomine de usator? [Crea](%%action.register%%) un nove conto." diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index ca7a1b2dbc..434ca44fa8 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:23+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:50+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -2364,10 +2364,14 @@ msgstr "" "lykilorð áður en þú breytir stillingunum þínum." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Skráðu þig inn með notendanafni og lykilorði" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Skráðu þig inn með notendanafninu þínu og lykilorði. Ertu ekki með " "notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu [OpenID](%%" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index efaf8956f3..3dd83d9ac7 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:26+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:53+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -2323,10 +2323,14 @@ msgstr "" "la tua password prima di modificare le impostazioni." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Accedi con nome utente e password" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Accedi col tuo nome utente e password. Non hai ancora un nome utente? [Crea]" "(%%action.register%%) un nuovo account." diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 1877ae3e9a..0b1a865961 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:30+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:56+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -2341,10 +2341,14 @@ msgstr "" "て下さい。" #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "ユーザ名とパスワードでログイン" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "ユーザ名とパスワードで、ログインしてください。 まだユーザ名を持っていません" "か? 新しいアカウントを [登録](%%action.register%%)。" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 4642861fa6..2696240ad7 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:37+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:12:59+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -2335,10 +2335,14 @@ msgstr "" "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "사용자 이름과 비밀번호로 로그인" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "귀하의 계정과 비밀 번호로 로그인 하세요. 계정이 아직 없으세요? [가입](%%" "action.register%%) 새 계정을 생성 또는 [OpenID](%%action.openidlogin%%)를 사" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 2aa24f5e83..db7c2f3aae 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:40+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:02+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -2332,10 +2332,14 @@ msgstr "" "име и лозинка пред да ги смените Вашите нагодувања." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Најава со корисничко име и лозинка" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Најавете се со Вашето корисничко име и лозинка. Сè уште немате корисничко " "име? [Регистрирајте](%%action.register%%) нова сметка." diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 12a97117f0..dfffd8082f 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:44+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:05+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -2300,10 +2300,14 @@ msgstr "" "endrer innstillingene dine." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Logg inn med brukernavn og passord" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Logg inn med ditt brukernavn og passord. Har du ikke et brukernavn ennå? " "[Opprett](%%action.register%%) en ny konto." diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 153746057d..f039ae0be7 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:50+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:11+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -2349,10 +2349,14 @@ msgstr "" "invoeren alvorens u uw instellingen kunt wijzigen." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Aanmelden met gebruikersnaam en wachtwoord" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Meld u aan met uw gebruikersnaam en wachtwoord. Hebt u nog geen " "gebruikersnaam? [Registreer een nieuwe gebruiker](%%action.register%%)." diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 10e542c135..ca232927da 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:47+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:08+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -2385,10 +2385,14 @@ msgstr "" "tryggleiksomsyn)." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Log inn med brukarnamn og passord." + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Logg inn med brukarnamn og passord. Har du ikkje brukarnamn endå? [Opprett](%" "%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index f7f8b888d1..d4bff1164a 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:53+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:14+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -2315,10 +2315,14 @@ msgstr "" "zmienianiem ustawień." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? " "[Zarejestruj](%%action.register%%) nowe konto." diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 49d412e15c..78d38fa580 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:56+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:17+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -28,15 +28,13 @@ msgstr "Acesso" #. TRANS: Page notice #: actions/accessadminpanel.php:67 -#, fuzzy msgid "Site access settings" -msgstr "Gravar configurações do site" +msgstr "Configurações de acesso ao site" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 -#, fuzzy msgid "Registration" -msgstr "Registar" +msgstr "Registo" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -45,7 +43,6 @@ msgstr "Proibir utilizadores anónimos (sem sessão iniciada) de ver o site?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Privado" @@ -72,9 +69,8 @@ msgstr "Fechado" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "Gravar configurações do site" +msgstr "Gravar configurações de acesso" #. TRANS: Button label to save e-mail preferences. #. TRANS: Button label to save IM preferences. @@ -83,7 +79,6 @@ msgstr "Gravar configurações do site" #: actions/accessadminpanel.php:203 actions/emailsettings.php:224 #: actions/imsettings.php:184 actions/smssettings.php:209 #: lib/applicationeditform.php:361 -#, fuzzy msgctxt "BUTTON" msgid "Save" msgstr "Gravar" @@ -91,9 +86,8 @@ msgstr "Gravar" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -#, fuzzy msgid "No such page." -msgstr "Página não encontrada." +msgstr "Página não foi encontrada." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -117,13 +111,13 @@ msgstr "Página não encontrada." #: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 #: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." -msgstr "Utilizador não encontrado." +msgstr "Utilizador não foi encontrado." #. TRANS: Page title. %1$s is user nickname, %2$d is page number #: actions/all.php:86 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "Perfis bloqueados de %1$s, página %2$d" +msgstr "%1$s e amigos, página %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname @@ -242,12 +236,11 @@ msgid "This method requires a POST." msgstr "Este método requer um POST." #: actions/apiaccountupdatedeliverydevice.php:105 -#, fuzzy msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" -"Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none" +"Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -444,30 +437,29 @@ msgstr "Localidade demasiado longa (máx. 255 caracteres)." #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "Demasiados sinónimos (máx. %d)." +msgstr "Demasiados nomes alternativos! Máx. %d." #: actions/apigroupcreate.php:266 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"." -msgstr "Sinónimo inválido: \"%s\"" +msgstr "Nome alternativo inválido: \"%s\"" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "Sinónimo \"%s\" já em uso. Tente outro." +msgstr "Nome alternativo \"%s\" já em uso. Tente outro." #: actions/apigroupcreate.php:288 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "Os sinónimos não podem ser iguais ao nome do utilizador." +msgstr "Um nome alternativo não pode ser igual ao nome do utilizador." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found." -msgstr "Grupo não foi encontrado!" +msgstr "Grupo não foi encontrado." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." @@ -499,9 +491,9 @@ msgstr "Grupos de %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s #: actions/apigrouplist.php:107 -#, fuzzy, php-format +#, php-format msgid "%1$s groups %2$s is a member of." -msgstr "Grupos de que %s é membro" +msgstr "Grupos de %1$s de que %2$s é membro." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. @@ -517,12 +509,11 @@ msgstr "Grupos em %s" #: actions/apioauthauthorize.php:101 msgid "No oauth_token parameter provided." -msgstr "" +msgstr "Não foi fornecido o parâmetro oauth_token." #: actions/apioauthauthorize.php:106 -#, fuzzy msgid "Invalid token." -msgstr "Tamanho inválido." +msgstr "Chave inválida." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 @@ -543,31 +534,28 @@ msgid "There was a problem with your session token. Try again, please." msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente." #: actions/apioauthauthorize.php:135 -#, fuzzy msgid "Invalid nickname / password!" -msgstr "Nome de utilizador ou senha inválidos." +msgstr "Alcunha ou senha inválidos!" #: actions/apioauthauthorize.php:159 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "Erro ao configurar utilizador." +msgstr "Erro na base de dados ao apagar o utilizador da aplicação OAuth." #: actions/apioauthauthorize.php:185 -#, fuzzy msgid "Database error inserting OAuth application user." -msgstr "Erro na base de dados ao inserir a marca: %s" +msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth." #: actions/apioauthauthorize.php:214 #, php-format msgid "" "The request token %s has been authorized. Please exchange it for an access " "token." -msgstr "" +msgstr "A chave de pedido %s foi autorizada. Troque-a por uma chave de acesso." #: actions/apioauthauthorize.php:227 #, php-format msgid "The request token %s has been denied and revoked." -msgstr "" +msgstr "A chave de pedido %s foi negada e retirada." #. TRANS: Message given submitting a form with an unknown action in e-mail settings. #. TRANS: Message given submitting a form with an unknown action in IM settings. @@ -583,11 +571,11 @@ msgstr "Envio inesperado de formulário." #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" -msgstr "" +msgstr "Uma aplicação pretende ligar-se à sua conta" #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" -msgstr "" +msgstr "Permitir ou negar acesso" #: actions/apioauthauthorize.php:292 #, php-format @@ -596,6 +584,9 @@ msgid "" "the ability to %3$s your %4$s account data. You should only " "give access to your %4$s account to third parties you trust." msgstr "" +"A aplicação %1$s por %2$s solicita " +"permissão para %3$s os dados da sua conta %4$s. Só deve " +"permitir acesso à sua conta %4$s a terceiros da sua confiança." #. TRANS: Main menu option when logged in for access to user settings #: actions/apioauthauthorize.php:310 lib/action.php:440 @@ -617,18 +608,16 @@ msgid "Password" msgstr "Senha" #: actions/apioauthauthorize.php:328 -#, fuzzy msgid "Deny" -msgstr "Estilo" +msgstr "Negar" #: actions/apioauthauthorize.php:334 -#, fuzzy msgid "Allow" -msgstr "Todas" +msgstr "Permitir" #: actions/apioauthauthorize.php:351 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "Permitir ou negar acesso à informação da sua conta." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." @@ -641,7 +630,7 @@ msgstr "Não pode apagar o estado de outro utilizador." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 #: actions/deletenotice.php:52 actions/shownotice.php:92 msgid "No such notice." -msgstr "Nota não encontrada." +msgstr "Nota não foi encontrada." #: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." @@ -730,14 +719,14 @@ msgstr "Actualizações categorizadas com %1$s em %2$s!" #: actions/attachment.php:73 msgid "No such attachment." -msgstr "Anexo não encontrado." +msgstr "Anexo não foi encontrado." #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84 #: actions/grouplogo.php:86 actions/groupmembers.php:76 #: actions/grouprss.php:91 actions/showgroup.php:121 msgid "No nickname." -msgstr "Nenhuma utilizador." +msgstr "Alcunha não definida." #: actions/avatarbynickname.php:64 msgid "No size." @@ -793,9 +782,8 @@ msgid "Crop" msgstr "Cortar" #: actions/avatarsettings.php:305 -#, fuzzy msgid "No file uploaded." -msgstr "Não foi especificado um perfil." +msgstr "Não foi carregado nenhum ficheiro." #: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" @@ -843,7 +831,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "Não" @@ -862,7 +849,6 @@ msgstr "Não bloquear este utilizador" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Sim" @@ -918,9 +904,9 @@ msgstr "Desbloquear este utilizador" #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 -#, fuzzy, php-format +#, php-format msgid "Post to %s" -msgstr "Publicar em " +msgstr "Publicar em %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -936,9 +922,9 @@ msgstr "Esse código de confirmação não é para si!" #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. #: actions/confirmaddress.php:91 -#, fuzzy, php-format +#, php-format msgid "Unrecognized address type %s." -msgstr "Tipo do endereço %s não reconhecido" +msgstr "Tipo do endereço %s não reconhecido." #. TRANS: Client error for an already confirmed email/jabbel/sms address. #: actions/confirmaddress.php:96 @@ -967,9 +953,8 @@ msgid "Couldn't delete email confirmation." msgstr "Não foi possível apagar a confirmação do endereço electrónico." #: actions/confirmaddress.php:146 -#, fuzzy msgid "Confirm address" -msgstr "Confirmar Endereço" +msgstr "Confirmar endereço" #: actions/confirmaddress.php:161 #, php-format @@ -986,20 +971,17 @@ msgid "Notices" msgstr "Notas" #: actions/deleteapplication.php:63 -#, fuzzy msgid "You must be logged in to delete an application." -msgstr "Precisa de iniciar sessão para editar um grupo." +msgstr "Tem de iniciar uma sessão para eliminar uma aplicação." #: actions/deleteapplication.php:71 -#, fuzzy msgid "Application not found." -msgstr "Nota não tem perfil" +msgstr "Aplicação não foi encontrada." #: actions/deleteapplication.php:78 actions/editapplication.php:77 #: actions/showapplication.php:94 -#, fuzzy msgid "You are not the owner of this application." -msgstr "Não é membro deste grupo." +msgstr "Não é o proprietário desta aplicação." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 @@ -1008,31 +990,28 @@ msgid "There was a problem with your session token." msgstr "Ocorreu um problema com a sua sessão." #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 -#, fuzzy msgid "Delete application" -msgstr "Nota não encontrada." +msgstr "Apagar aplicação" #: actions/deleteapplication.php:149 -#, fuzzy msgid "" "Are you sure you want to delete this application? This will clear all data " "about the application from the database, including all existing user " "connections." msgstr "" -"Tem a certeza de que quer apagar este utilizador? Todos os dados do " -"utilizador serão eliminados da base de dados, sem haver cópias." +"Tem a certeza de que quer apagar esta aplicação? Todos os dados da aplicação " +"serão eliminados da base de dados, incluindo todas as ligações de " +"utilizadores em existência." #. TRANS: Submit button title for 'No' when deleting an application. #: actions/deleteapplication.php:158 -#, fuzzy msgid "Do not delete this application" -msgstr "Não apagar esta nota" +msgstr "Não apagar esta aplicação" #. TRANS: Submit button title for 'Yes' when deleting an application. #: actions/deleteapplication.php:164 -#, fuzzy msgid "Delete this application" -msgstr "Apagar esta nota" +msgstr "Apagar esta aplicação" #. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 @@ -1116,9 +1095,9 @@ msgid "Invalid logo URL." msgstr "URL do logotipo inválida." #: actions/designadminpanel.php:280 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s." -msgstr "Tema não está disponível: %s" +msgstr "Tema não está disponível: %s." #: actions/designadminpanel.php:376 msgid "Change logo" @@ -1232,86 +1211,74 @@ msgid "Add to favorites" msgstr "Adicionar às favoritas" #: actions/doc.php:158 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Documento não encontrado." +msgstr "Documento \"%s\" não foi encontrado" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" -msgstr "Outras opções" +msgstr "Editar Aplicação" #: actions/editapplication.php:66 -#, fuzzy msgid "You must be logged in to edit an application." -msgstr "Precisa de iniciar sessão para editar um grupo." +msgstr "Tem de iniciar uma sessão para editar uma aplicação." #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166 #: actions/showapplication.php:87 -#, fuzzy msgid "No such application." -msgstr "Nota não encontrada." +msgstr "Aplicação não foi encontrada." #: actions/editapplication.php:161 -#, fuzzy msgid "Use this form to edit your application." -msgstr "Use este formulário para editar o grupo." +msgstr "Use este formulário para editar a sua aplicação." #: actions/editapplication.php:177 actions/newapplication.php:159 -#, fuzzy msgid "Name is required." -msgstr "Repita a senha acima. Obrigatório." +msgstr "Nome é obrigatório." #: actions/editapplication.php:180 actions/newapplication.php:165 -#, fuzzy msgid "Name is too long (max 255 chars)." -msgstr "Nome completo demasiado longo (máx. 255 caracteres)." +msgstr "Nome é demasiado longo (máx. 255 caracteres)." #: actions/editapplication.php:183 actions/newapplication.php:162 -#, fuzzy msgid "Name already in use. Try another one." -msgstr "Utilizador já é usado. Tente outro." +msgstr "Nome já é usado. Tente outro." #: actions/editapplication.php:186 actions/newapplication.php:168 -#, fuzzy msgid "Description is required." -msgstr "Descrição" +msgstr "Descrição é obrigatória." #: actions/editapplication.php:194 msgid "Source URL is too long." -msgstr "" +msgstr "URL de origem é demasiado longa." #: actions/editapplication.php:200 actions/newapplication.php:185 -#, fuzzy msgid "Source URL is not valid." -msgstr "A URL ‘%s’ do avatar é inválida." +msgstr "A URL de origem é inválida." #: actions/editapplication.php:203 actions/newapplication.php:188 msgid "Organization is required." -msgstr "" +msgstr "Organização é obrigatória." #: actions/editapplication.php:206 actions/newapplication.php:191 -#, fuzzy msgid "Organization is too long (max 255 chars)." -msgstr "Localidade demasiado longa (máx. 255 caracteres)." +msgstr "Organização é demasiado longa (máx. 255 caracteres)." #: actions/editapplication.php:209 actions/newapplication.php:194 msgid "Organization homepage is required." -msgstr "" +msgstr "Página da organização é obrigatória." #: actions/editapplication.php:218 actions/newapplication.php:206 msgid "Callback is too long." -msgstr "" +msgstr "Callback é demasiado longo." #: actions/editapplication.php:225 actions/newapplication.php:215 -#, fuzzy msgid "Callback URL is not valid." -msgstr "A URL ‘%s’ do avatar é inválida." +msgstr "A URL de callback é inválida." #: actions/editapplication.php:258 -#, fuzzy msgid "Could not update application." -msgstr "Não foi possível actualizar o grupo." +msgstr "Não foi possível actualizar a aplicação." #: actions/editgroup.php:56 #, php-format @@ -1339,7 +1306,7 @@ msgstr "descrição é demasiada extensa (máx. %d caracteres)." #: actions/editgroup.php:228 actions/newgroup.php:168 #, php-format msgid "Invalid alias: \"%s\"" -msgstr "Sinónimo inválido: \"%s\"" +msgstr "Nome alternativo inválido: \"%s\"" #: actions/editgroup.php:258 msgid "Could not update group." @@ -1347,7 +1314,7 @@ msgstr "Não foi possível actualizar o grupo." #: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." -msgstr "Não foi possível criar sinónimos." +msgstr "Não foi possível criar os nomes alternativos." #: actions/editgroup.php:280 msgid "Options saved." @@ -1384,7 +1351,6 @@ msgstr "Endereço de correio já confirmado." #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Remover" @@ -1403,7 +1369,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "Cancelar" @@ -1419,7 +1384,6 @@ msgstr "" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Adicionar" @@ -1445,16 +1409,14 @@ msgstr "Crie um endereço electrónico novo para publicações; cancela o antigo #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "Novo" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "Preferências" +msgstr "Preferências de correio electrónico" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1478,7 +1440,7 @@ msgstr "" #: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -"Enviem-me notificação electrónica quando me enviarem uma \"@-resposta\"." +"Enviem-me notificação electrónica quando me enviarem uma \"resposta-@\"." #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:205 @@ -1497,9 +1459,8 @@ msgstr "Publicar uma MicroID para o meu endereço electrónico." #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "Preferências de estilo foram gravadas." +msgstr "Preferências de correio electrónico foram gravadas." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1555,15 +1516,13 @@ msgstr "Nenhuma confirmação pendente para cancelar." #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." -msgstr "Esse endereço de mensagens instantâneas está errado." +msgstr "Esse endereço de correio electrónico está errado." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "Confirmação cancelada." +msgstr "Confirmação de correio electrónico cancelada." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1573,9 +1532,8 @@ msgstr "Esse não é o seu endereço electrónico." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "O endereço foi removido." +msgstr "O endereço de correio electrónico foi removido." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1713,9 +1671,8 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "Serviço remoto usa uma versão desconhecida do protocolo OMB." #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." -msgstr "Erro ao actualizar o perfil remoto" +msgstr "Erro ao actualizar o perfil remoto." #: actions/getfile.php:79 msgid "No such file." @@ -1726,23 +1683,20 @@ msgid "Cannot read file." msgstr "Não foi possível ler o ficheiro." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Tamanho inválido." +msgstr "Função inválida." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Esta função está reservada e não pode ser activada." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Não pode impedir notas públicas neste site." +msgstr "Não pode atribuir funções aos utilizadores neste site." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "O utilizador já está silenciado." +msgstr "O utilizador já tem esta função." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1808,7 +1762,7 @@ msgstr "Sem ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." -msgstr "Precisa de iniciar sessão para editar um grupo." +msgstr "Tem de iniciar uma sessão para editar um grupo." #: actions/groupdesignsettings.php:144 msgid "Group design" @@ -2039,9 +1993,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Preferências" +msgstr "Preferências de MI" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2111,15 +2064,13 @@ msgstr "Esse endereço de mensagens instantâneas está errado." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "Não foi possível apagar a confirmação do endereço electrónico." +msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "Confirmação cancelada." +msgstr "Confirmação do mensageiro instantâneo cancelada." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2129,14 +2080,13 @@ msgstr "Esse não é o seu Jabber ID." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "O endereço foi removido." +msgstr "O endereço do mensageiro instantâneo foi removido." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Caixa de entrada de %s" +msgstr "Caixa de entrada de %s - página %2$d" #: actions/inbox.php:62 #, php-format @@ -2154,11 +2104,11 @@ msgid "Invites have been disabled." msgstr "Convites foram desabilitados." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." msgstr "" -"Precisa de iniciar uma sessão para convidar outros utilizadores a usarem o " -"site %s." +"Tem de iniciar uma sessão para convidar outros utilizadores a usarem o site %" +"s." #: actions/invite.php:72 #, php-format @@ -2226,7 +2176,6 @@ msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite" #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Enviar" @@ -2296,12 +2245,11 @@ msgstr "" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." -msgstr "Precisa de iniciar uma sessão para se juntar a um grupo." +msgstr "Tem de iniciar uma sessão para se juntar a um grupo." #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Nenhuma utilizador." +msgstr "Nenhuma alcunha ou utilizador." #. TRANS: Message given having added a user to a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. @@ -2312,7 +2260,7 @@ msgstr "%1$s juntou-se ao grupo %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." -msgstr "Precisa de iniciar uma sessão para deixar um grupo." +msgstr "Tem de iniciar uma sessão para deixar um grupo." #: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." @@ -2368,10 +2316,14 @@ msgstr "" "senha antes de alterar as configurações." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Iniciar sessão com um nome de utilizador e senha" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Entrar com o seu nome de utilizador e senha. Ainda não está registado? " "[Registe](%%action.register%%) uma conta." @@ -2396,33 +2348,28 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Não é possível tornar %1$s administrador do grupo %2$s." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "Sem estado actual" +msgstr "Sem estado actual." #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" -msgstr "Nota não encontrada." +msgstr "Aplicação Nova" #: actions/newapplication.php:64 -#, fuzzy msgid "You must be logged in to register an application." -msgstr "Tem de iniciar uma sessão para criar o grupo." +msgstr "Tem de iniciar uma sessão para registar uma aplicação." #: actions/newapplication.php:143 -#, fuzzy msgid "Use this form to register a new application." -msgstr "Use este formulário para criar um grupo novo." +msgstr "Use este formulário para registar uma nova aplicação." #: actions/newapplication.php:176 msgid "Source URL is required." -msgstr "" +msgstr "É necessária a URL de origem." #: actions/newapplication.php:258 actions/newapplication.php:267 -#, fuzzy msgid "Could not create application." -msgstr "Não foi possível criar sinónimos." +msgstr "Não foi possível criar a aplicação." #: actions/newgroup.php:53 msgid "New group" @@ -2537,54 +2484,51 @@ msgid "Nudge sent!" msgstr "Toque enviado!" #: actions/oauthappssettings.php:59 -#, fuzzy msgid "You must be logged in to list your applications." -msgstr "Precisa de iniciar sessão para editar um grupo." +msgstr "Tem de iniciar uma sessão para listar as suas aplicações." #: actions/oauthappssettings.php:74 -#, fuzzy msgid "OAuth applications" -msgstr "Outras opções" +msgstr "Aplicações OAuth" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "Aplicações que registou" #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "Ainda não registou nenhuma aplicação." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" -msgstr "" +msgstr "Aplicações ligadas" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." -msgstr "" +msgstr "Permitiu que as seguintes aplicações acedam à sua conta." #: actions/oauthconnectionssettings.php:175 -#, fuzzy msgid "You are not a user of that application." -msgstr "Não é um membro desse grupo." +msgstr "Não é utilizador dessa aplicação." #: actions/oauthconnectionssettings.php:186 #, php-format msgid "Unable to revoke access for app: %s." -msgstr "" +msgstr "Não foi possível retirar acesso da aplicação: %s" #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "Não permitiu que nenhuma aplicação use a sua conta." #: actions/oauthconnectionssettings.php:211 msgid "Developers can edit the registration settings for their applications " msgstr "" +"Programadores podem editar as configurações de inscrição das suas aplicações " #: actions/oembed.php:79 actions/shownotice.php:100 -#, fuzzy msgid "Notice has no profile." -msgstr "Nota não tem perfil" +msgstr "Nota não tem perfil." #: actions/oembed.php:86 actions/shownotice.php:175 #, php-format @@ -2593,15 +2537,15 @@ msgstr "Estado de %1$s em %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') #: actions/oembed.php:158 -#, fuzzy, php-format +#, php-format msgid "Content type %s not supported." -msgstr "tipo de conteúdo " +msgstr "O tipo de conteúdo %s não é suportado." #. TRANS: Error message displaying attachments. %s is the site's base URL. #: actions/oembed.php:162 #, php-format msgid "Only %s URLs over plain HTTP please." -msgstr "" +msgstr "Só URLs %s sobre HTTP simples, por favor." #. TRANS: Client error on an API request with an unsupported data format. #: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 @@ -2618,9 +2562,8 @@ msgid "Notice Search" msgstr "Pesquisa de Notas" #: actions/othersettings.php:60 -#, fuzzy msgid "Other settings" -msgstr "Outras Configurações" +msgstr "Outras configurações" #: actions/othersettings.php:71 msgid "Manage various other options." @@ -2651,34 +2594,29 @@ msgid "URL shortening service is too long (max 50 chars)." msgstr "Serviço de encurtamento de URLs demasiado extenso (máx. 50 caracteres)" #: actions/otp.php:69 -#, fuzzy msgid "No user ID specified." -msgstr "Não foi especificado um grupo." +msgstr "Não foi especificado um ID de utilizador." #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "Nota não foi especificada." +msgstr "Chave de entrada não foi especificada." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "O pedido não tem a identificação do perfil." +msgstr "Chave de entrada não foi pedida." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "Chave inválida ou expirada." +msgstr "Chave de entrada especificada é inválida." #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "Iniciar sessão no site" +msgstr "Chave de entrada expirou." #: actions/outbox.php:58 -#, fuzzy, php-format +#, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "Caixa de saída de %s" +msgstr "Caixa de saída de %s - página %2$d" #: actions/outbox.php:61 #, php-format @@ -2761,24 +2699,24 @@ msgid "Path and server settings for this StatusNet site." msgstr "Configurações de localização e servidor deste site StatusNet." #: actions/pathsadminpanel.php:157 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s." -msgstr "Sem acesso de leitura do directório do tema: %s" +msgstr "Sem acesso de leitura do directório do tema: %s." #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "Sem acesso de escrita no directório do avatar: %s" +msgstr "Sem acesso de escrita no directório do avatar: %s." #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." -msgstr "Sem acesso de escrita no directório do fundo: %s" +msgstr "Sem acesso de escrita no directório do fundo: %s." #: actions/pathsadminpanel.php:177 -#, fuzzy, php-format +#, php-format msgid "Locales directory not readable: %s." -msgstr "Sem acesso de leitura ao directório de idiomas: %s" +msgstr "Sem acesso de leitura ao directório de idiomas: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2919,9 +2857,9 @@ msgid "People search" msgstr "Pesquisa de pessoas" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "Categoria de pessoas inválida: %s" +msgstr "Categoria de pessoas inválida: %s." #: actions/peopletag.php:142 #, php-format @@ -2929,9 +2867,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "Utilizadores auto-categorizados com %1$s - página %2$d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "Conteúdo da nota é inválido" +msgstr "Conteúdo da nota é inválido." #: actions/postnotice.php:101 #, php-format @@ -3076,9 +3013,9 @@ msgid "Settings saved." msgstr "Configurações gravadas." #: actions/public.php:83 -#, fuzzy, php-format +#, php-format msgid "Beyond the page limit (%s)." -msgstr "Além do limite de página (%s)" +msgstr "Além do limite de página (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3187,7 +3124,7 @@ msgstr "Já tem uma sessão iniciada!" #: actions/recoverpassword.php:62 msgid "No such recovery code." -msgstr "Esse código de recuperação não existe." +msgstr "Código de recuperação não foi encontrado." #: actions/recoverpassword.php:66 msgid "Not a recovery code." @@ -3342,7 +3279,6 @@ msgid "Invalid username or password." msgstr "Nome de utilizador ou senha inválidos." #: actions/register.php:343 -#, fuzzy msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3378,13 +3314,14 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\"" #: actions/register.php:494 -#, fuzzy, php-format +#, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -" excepto estes dados privados: senha, endereço de correio electrónico, " -"endereço de mensageiro instantâneo, número de telefone." +"Os meus textos e ficheiros são disponibilizados nos termos da %s excepto " +"estes dados privados: senha, endereço de correio electrónico, endereço de " +"mensageiro instantâneo, número de telefone." #: actions/register.php:542 #, php-format @@ -3517,9 +3454,9 @@ msgid "Replies to %s" msgstr "Respostas a %s" #: actions/replies.php:128 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "Respostas a %1$s em %2$s!" +msgstr "Respostas a %1$s, página %2$d" #: actions/replies.php:145 #, php-format @@ -3569,14 +3506,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Respostas a %1$s em %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Não pode silenciar utilizadores neste site." +msgstr "Não pode retirar funções aos utilizadores neste site." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Utilizador sem perfil correspondente." +msgstr "O utilizador não tem esta função." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3597,9 +3532,8 @@ msgid "Sessions" msgstr "Sessões" #: actions/sessionsadminpanel.php:65 -#, fuzzy msgid "Session settings for this StatusNet site." -msgstr "Configurações do estilo deste site StatusNet." +msgstr "Configurações da sessão para este site StatusNet." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" @@ -3623,19 +3557,17 @@ msgid "Save site settings" msgstr "Gravar configurações do site" #: actions/showapplication.php:82 -#, fuzzy msgid "You must be logged in to view an application." -msgstr "Precisa de iniciar uma sessão para deixar um grupo." +msgstr "Tem de iniciar uma sessão para ver uma aplicação." #: actions/showapplication.php:157 -#, fuzzy msgid "Application profile" -msgstr "Nota não tem perfil" +msgstr "Perfil da aplicação" #. TRANS: Form input field label for application icon. #: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" -msgstr "" +msgstr "Ícone" #. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 @@ -3645,9 +3577,8 @@ msgstr "Nome" #. TRANS: Form input field label. #: actions/showapplication.php:178 lib/applicationeditform.php:235 -#, fuzzy msgid "Organization" -msgstr "Paginação" +msgstr "Organização" #. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 @@ -3663,56 +3594,57 @@ msgstr "Estatísticas" #: actions/showapplication.php:203 #, php-format msgid "Created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "Criado por %1$s - acesso por omissão %2$s - %3$d utilizadores" #: actions/showapplication.php:213 msgid "Application actions" -msgstr "" +msgstr "Operações da aplicação" #: actions/showapplication.php:236 msgid "Reset key & secret" -msgstr "" +msgstr "Reiniciar chave e segredo" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Informação da aplicação" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Chave do consumidor" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Segredo do consumidor" #: actions/showapplication.php:273 msgid "Request token URL" -msgstr "" +msgstr "URL da chave de pedido" #: actions/showapplication.php:278 msgid "Access token URL" -msgstr "" +msgstr "URL da chave de acesso" #: actions/showapplication.php:283 -#, fuzzy msgid "Authorize URL" -msgstr "Autor" +msgstr "Autorizar URL" #: actions/showapplication.php:288 msgid "" "Note: We support HMAC-SHA1 signatures. We do not support the plaintext " "signature method." msgstr "" +"Nota: Assinaturas HMAC-SHA1 são suportadas. O método de assinatura com texto " +"simples não é suportado." #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "Tem a certeza de que quer apagar esta nota?" +msgstr "" +"Tem a certeza de que quer reiniciar a sua chave e segredo de consumidor?" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "Notas favoritas de %s" +msgstr "Notas favoritas de %1$s, página %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3772,9 +3704,9 @@ msgid "%s group" msgstr "Grupo %s" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "Membros do grupo %1$s, página %2$d" +msgstr "Grupo %1$s, página %2$d" #: actions/showgroup.php:227 msgid "Group profile" @@ -3792,7 +3724,7 @@ msgstr "Anotação" #: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" -msgstr "Sinónimos" +msgstr "Nomes alternativos" #: actions/showgroup.php:302 msgid "Group actions" @@ -3897,9 +3829,9 @@ msgid " tagged %s" msgstr " categorizou %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "Perfis bloqueados de %1$s, página %2$d" +msgstr "%1$s, página %2$d" #: actions/showstream.php:122 #, php-format @@ -3987,9 +3919,8 @@ msgid "User is already silenced." msgstr "O utilizador já está silenciado." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Configurações básicas para este site StatusNet." +msgstr "Configurações básicas para este site StatusNet" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." @@ -4005,14 +3936,12 @@ msgid "Unknown language \"%s\"." msgstr "Língua desconhecida \"%s\"." #: actions/siteadminpanel.php:165 -#, fuzzy msgid "Minimum text limit is 0 (unlimited)." -msgstr "O valor mínimo de limite para o texto é 140 caracteres." +msgstr "O limite mínimo para o texto é 0 (sem limite)." #: actions/siteadminpanel.php:171 -#, fuzzy msgid "Dupe limit must be one or more seconds." -msgstr "O limite de duplicados tem de ser 1 ou mais segundos." +msgstr "O limite de duplicados tem de ser um ou mais segundos." #: actions/siteadminpanel.php:221 msgid "General" @@ -4059,13 +3988,14 @@ msgid "Default timezone for the site; usually UTC." msgstr "Fuso horário por omissão, para o site; normalmente, UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" msgstr "Idioma do site, por omissão" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Idioma do site quando a sua detecção na configuração do browser não é " +"possível" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -4090,37 +4020,32 @@ msgstr "" "mesma coisa outra vez." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Aviso do site" +msgstr "Aviso do Site" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Mensagem nova" +msgstr "Editar mensagem do site" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Não foi possível gravar as configurações do estilo." +msgstr "Não foi possível gravar o aviso do site." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars." -msgstr "" +msgstr "Tamanho máximo do aviso do site é 255 caracteres." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Aviso do site" +msgstr "Texto do aviso do site" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "Texto do aviso do site (máx. 255 caracteres; pode usar HTML)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Aviso do site" +msgstr "Gravar aviso do site" #. TRANS: Title for SMS settings. #: actions/smssettings.php:59 @@ -4141,9 +4066,8 @@ msgstr "SMS não está disponível." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "Endereço IM" +msgstr "Endereço SMS" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -4167,10 +4091,9 @@ msgstr "Introduza o código que recebeu no seu telefone." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" -msgstr "Confirmação" +msgstr "Confirmar" #. TRANS: Field label for SMS phone number input in SMS settings form. #: actions/smssettings.php:153 @@ -4184,9 +4107,8 @@ msgstr "Número de telefone, sem pontuação ou espaços, com código de área" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Preferências" +msgstr "Preferências de SMS" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4199,9 +4121,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "Preferências gravadas." +msgstr "Preferências de SMS gravadas." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4240,9 +4161,8 @@ msgstr "Esse número de confirmação está errado." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "Confirmação cancelada." +msgstr "Confirmação de SMS cancelada." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. @@ -4252,9 +4172,8 @@ msgstr "Esse número de telefone não é o seu." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "Número de telefone para SMS" +msgstr "Número de telefone para SMS foi removido." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4290,9 +4209,8 @@ msgid "Snapshots" msgstr "Instantâneos" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Alterar a configuração do site" +msgstr "Alterar a configuração do instantâneo" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -4307,7 +4225,6 @@ msgid "Invalid snapshot report URL." msgstr "URL para onde enviar instantâneos é inválida" #: actions/snapshotadminpanel.php:200 -#, fuzzy msgid "Randomly during web hit" msgstr "Aleatoriamente, durante o acesso pela internet" @@ -4340,9 +4257,8 @@ msgid "Snapshots will be sent to this URL" msgstr "Instantâneos serão enviados para esta URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Gravar configurações do site" +msgstr "Gravar configurações do instantâneo" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." @@ -4354,17 +4270,15 @@ msgstr "Não foi possível gravar a subscrição." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "Esta operação só aceita pedidos POST." #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "Ficheiro não foi encontrado." +msgstr "Perfil não foi encontrado." #: actions/subscribe.php:117 -#, fuzzy msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "Não subscreveu esse perfil." +msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4460,9 +4374,9 @@ msgid "SMS" msgstr "SMS" #: actions/tag.php:69 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "Utilizadores auto-categorizados com %1$s - página %2$d" +msgstr "Notas categorizadas com %1$s, página %2$d" #: actions/tag.php:87 #, php-format @@ -4526,7 +4440,7 @@ msgstr "" #: actions/tagrss.php:35 msgid "No such tag." -msgstr "Categoria não existe." +msgstr "Categoria não foi encontrada." #: actions/twitapitrends.php:85 msgid "API method under construction." @@ -4545,7 +4459,6 @@ msgid "User is not silenced." msgstr "Utilizador não está silenciado." #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile ID in request." msgstr "O pedido não tem a identificação do perfil." @@ -4563,7 +4476,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Utilizador" @@ -4751,9 +4663,9 @@ msgstr "Disfrute do seu cachorro-quente!" #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. #: actions/usergroups.php:66 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "Membros do grupo %1$s, página %2$d" +msgstr "Grupos de %1$s, página %2$d" #: actions/usergroups.php:132 msgid "Search for more groups" @@ -4864,24 +4776,20 @@ msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Um ficheiro desta dimensão excederia a sua quota mensal de %d bytes." #: classes/Group_member.php:41 -#, fuzzy msgid "Group join failed." -msgstr "Perfil do grupo" +msgstr "Entrada no grupo falhou." #: classes/Group_member.php:53 -#, fuzzy msgid "Not part of group." -msgstr "Não foi possível actualizar o grupo." +msgstr "Não faz parte do grupo." #: classes/Group_member.php:60 -#, fuzzy msgid "Group leave failed." -msgstr "Perfil do grupo" +msgstr "Saída do grupo falhou." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "Não foi possível actualizar o grupo." +msgstr "Não foi possível actualizar o grupo local." #: classes/Login_token.php:76 #, php-format @@ -4902,7 +4810,7 @@ msgstr "Não foi possível actualizar a mensagem com a nova URI." #. TRANS: Server exception. %s are the error details. #: classes/Notice.php:176 -#, fuzzy, php-format +#, php-format msgid "Database error inserting hashtag: %s" msgstr "Erro na base de dados ao inserir a marca: %s" @@ -4938,9 +4846,8 @@ msgid "Problem saving notice." msgstr "Problema na gravação da nota." #: classes/Notice.php:967 -#, fuzzy msgid "Problem saving group inbox." -msgstr "Problema na gravação da nota." +msgstr "Problema na gravação da caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. @@ -4970,9 +4877,8 @@ msgid "Couldn't delete self-subscription." msgstr "Não foi possível apagar a auto-subscrição." #: classes/Subscription.php:200 -#, fuzzy msgid "Couldn't delete subscription OMB token." -msgstr "Não foi possível apagar a subscrição." +msgstr "Não foi possível apagar a chave de subscrição OMB." #: classes/Subscription.php:211 msgid "Couldn't delete subscription." @@ -4988,18 +4894,16 @@ msgid "Could not create group." msgstr "Não foi possível criar o grupo." #: classes/User_group.php:489 -#, fuzzy msgid "Could not set group URI." -msgstr "Não foi possível configurar membros do grupo." +msgstr "Não foi possível configurar a URI do grupo." #: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Não foi possível configurar membros do grupo." #: classes/User_group.php:524 -#, fuzzy msgid "Could not save local group info." -msgstr "Não foi possível gravar a subscrição." +msgstr "Não foi possível gravar a informação do grupo local." #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:109 @@ -5038,9 +4942,9 @@ msgstr "Outras" #. TRANS: Page title. %1$s is the title, %2$s is the site name. #: lib/action.php:145 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s - %2$s" #. TRANS: Page title for a page without a title set. #: lib/action.php:161 @@ -5054,28 +4958,24 @@ msgstr "Navegação primária deste site" #. TRANS: Tooltip for main menu option "Personal" #: lib/action.php:432 -#, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e notas dos amigos" #. TRANS: Main menu option when logged in for access to personal profile and friends timeline #: lib/action.php:435 -#, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Pessoal" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:437 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Altere o seu endereço electrónico, avatar, senha, perfil" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:442 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Ligar aos serviços" @@ -5087,95 +4987,82 @@ msgstr "Ligar" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:448 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Alterar a configuração do site" #. TRANS: Main menu option when logged in and site admin for access to site configuration #: lib/action.php:451 -#, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Gestor" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:455 -#, fuzzy, php-format +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Convidar amigos e colegas para se juntarem a si em %s" #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users #: lib/action.php:458 -#, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Convidar" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:464 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Terminar esta sessão" #. TRANS: Main menu option when logged in to log out the current user #: lib/action.php:467 -#, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Sair" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:472 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Criar uma conta" #. TRANS: Main menu option when not logged in to register a new account #: lib/action.php:475 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "Registar" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:478 -#, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Iniciar uma sessão" #: lib/action.php:481 -#, fuzzy msgctxt "MENU" msgid "Login" msgstr "Entrar" #. TRANS: Tooltip for main menu option "Help" #: lib/action.php:484 -#, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Ajudem-me!" #: lib/action.php:487 -#, fuzzy msgctxt "MENU" msgid "Help" msgstr "Ajuda" #. TRANS: Tooltip for main menu option "Search" #: lib/action.php:490 -#, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Procurar pessoas ou pesquisar texto" #: lib/action.php:493 -#, fuzzy msgctxt "MENU" msgid "Search" msgstr "Pesquisa" @@ -5247,13 +5134,13 @@ msgstr "Licença de software do StatusNet" #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. #: lib/action.php:817 -#, fuzzy, php-format +#, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. #: lib/action.php:820 @@ -5283,7 +5170,7 @@ msgstr "Licença de conteúdos do site" #: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "O conteúdo e dados do site %1$s são privados e confidenciais." #. TRANS: Content license displayed when license is set to 'allrightsreserved'. #. TRANS: %1$s is the copyright owner. @@ -5291,17 +5178,23 @@ msgstr "" #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" +"Direitos de autor sobre o conteúdo e dados, detidos por %1$s. Todos os " +"direitos reservados." #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. #: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. " +"Todos os direitos reservados." #. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. #: lib/action.php:871 #, php-format msgid "All %1$s content and data are available under the %2$s license." msgstr "" +"Todo o conteúdo e dados do site %1$s são disponibilizados nos termos da " +"licença %2$s." #. TRANS: DT element for pagination (previous/next, etc.). #: lib/action.php:1182 @@ -5324,18 +5217,20 @@ msgstr "Anteriores" #: lib/activity.php:121 msgid "Expecting a root feed element but got a whole XML document." msgstr "" +"Era esperado um elemento raiz da fonte, mas foi recebido um documento XML " +"inteiro." #: lib/activityutils.php:208 msgid "Can't handle remote content yet." -msgstr "" +msgstr "Ainda não é possível processar conteúdos remotos." #: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." -msgstr "" +msgstr "Ainda não é possível processar conteúdo XML embutido." #: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." -msgstr "" +msgstr "Ainda não é possível processar conteúdo Base64 embutido." #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 @@ -5370,7 +5265,6 @@ msgstr "Configuração básica do site" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:351 -#, fuzzy msgctxt "MENU" msgid "Site" msgstr "Site" @@ -5382,16 +5276,14 @@ msgstr "Configuração do estilo" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:359 -#, fuzzy msgctxt "MENU" msgid "Design" msgstr "Estilo" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:365 -#, fuzzy msgid "User configuration" -msgstr "Configuração das localizações" +msgstr "Configuração do utilizador" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 @@ -5400,9 +5292,8 @@ msgstr "Utilizador" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:373 -#, fuzzy msgid "Access configuration" -msgstr "Configuração do estilo" +msgstr "Configuração de acesso" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:381 @@ -5411,106 +5302,99 @@ msgstr "Configuração das localizações" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:389 -#, fuzzy msgid "Sessions configuration" -msgstr "Configuração do estilo" +msgstr "Configuração das sessões" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:397 -#, fuzzy msgid "Edit site notice" -msgstr "Aviso do site" +msgstr "Editar aviso do site" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:405 -#, fuzzy msgid "Snapshots configuration" -msgstr "Configuração das localizações" +msgstr "Configuração dos instântaneos" #. TRANS: Client error 401. #: lib/apiauth.php:95 msgid "API resource requires read-write access, but you only have read access." -msgstr "" +msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura." #. TRANS: Form legend. #: lib/applicationeditform.php:137 msgid "Edit application" -msgstr "" +msgstr "Editar aplicação" #. TRANS: Form guide. #: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Ícone para esta aplicação" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:209 -#, fuzzy, php-format +#, php-format msgid "Describe your application in %d characters" -msgstr "Descreva o grupo ou o assunto em %d caracteres" +msgstr "Descreva a sua aplicação em %d caracteres" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:213 -#, fuzzy msgid "Describe your application" -msgstr "Descreva o grupo ou assunto" +msgstr "Descreva a sua aplicação" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:224 -#, fuzzy msgid "URL of the homepage of this application" -msgstr "URL da página ou do blogue, deste grupo ou assunto" +msgstr "URL da página desta aplicação" #. TRANS: Form input field label. #: lib/applicationeditform.php:226 -#, fuzzy msgid "Source URL" -msgstr "Código" +msgstr "URL de origem" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:233 msgid "Organization responsible for this application" -msgstr "" +msgstr "Organização responsável por esta aplicação" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:242 -#, fuzzy msgid "URL for the homepage of the organization" -msgstr "URL da página ou do blogue, deste grupo ou assunto" +msgstr "URL da página desta organização" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" -msgstr "" +msgstr "URL para onde reencaminhar após autenticação" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:278 msgid "Browser" -msgstr "" +msgstr "Browser" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:295 msgid "Desktop" -msgstr "" +msgstr "Desktop" #. TRANS: Form guide. #: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Tipo da aplicação, browser ou desktop" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:320 msgid "Read-only" -msgstr "" +msgstr "Leitura" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:339 msgid "Read-write" -msgstr "" +msgstr "Leitura e escrita" #. TRANS: Form guide. #: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" -msgstr "" +msgstr "Acesso por omissão para esta aplicação: leitura ou leitura e escrita" #. TRANS: Submit button title #: lib/applicationeditform.php:359 @@ -5520,25 +5404,24 @@ msgstr "Cancelar" #. TRANS: Application access type #: lib/applicationlist.php:136 msgid "read-write" -msgstr "" +msgstr "leitura e escrita" #. TRANS: Application access type #: lib/applicationlist.php:138 msgid "read-only" -msgstr "" +msgstr "leitura" #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) #: lib/applicationlist.php:144 #, php-format msgid "Approved %1$s - \"%2$s\" access." -msgstr "" +msgstr "Aprovado a %1$s - acesso \"%2$s\"." #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" -msgstr "Remover" +msgstr "Retirar" #. TRANS: DT element label in attachment list. #: lib/attachmentlist.php:88 @@ -5601,9 +5484,9 @@ msgstr "Não foi encontrado um utilizador com a alcunha %s" #. TRANS: Message given getting a non-existing user. #. TRANS: %s is the nickname of the user that could not be found. #: lib/command.php:147 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Não foi encontrado um utilizador com a alcunha %s" +msgstr "Não foi encontrado um utilizador local com a alcunha %s" #: lib/command.php:180 msgid "Sorry, this command is not yet implemented." @@ -5649,9 +5532,9 @@ msgstr "Não foi possível juntar o utilizador %1$s ao grupo %2$s" #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Não foi possível remover %1$s do grupo %2$s." +msgstr "Não foi possível remover %1$s do grupo %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -5685,13 +5568,15 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s é um perfil remoto; só pode enviar mensagens directas a utilizadores no " +"mesmo servidor." #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" -msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d." +msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -5742,9 +5627,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "Introduza o nome do utilizador para subscrever" #: lib/command.php:628 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Não subscreveu esse perfil." +msgstr "Não pode subscrever perfis OMB por comando." #: lib/command.php:634 #, php-format @@ -5792,9 +5676,9 @@ msgstr "" "s" #: lib/command.php:761 -#, fuzzy, php-format +#, php-format msgid "Unsubscribed %s" -msgstr "Deixou de subscrever %s" +msgstr "Deixou de subscrever %s" #: lib/command.php:778 msgid "You are not subscribed to anyone." @@ -5827,7 +5711,6 @@ msgstr[0] "Está no grupo:" msgstr[1] "Está nos grupos:" #: lib/command.php:838 -#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5880,6 +5763,7 @@ msgstr "" "d - mensagem directa para o utilizador\n" "get - receber última nota do utilizador\n" "whois - receber perfil do utilizador\n" +"lose - obrigar o utilizador a deixar de subscrevê-lo\n" "fav - adicionar última nota do utilizador às favoritas\n" "fav # - adicionar nota com esta identificação às favoritas\n" "repeat # - repetir uma nota com uma certa identificação\n" @@ -5935,13 +5819,12 @@ msgid "Updates by SMS" msgstr "Actualizações por SMS" #: lib/connectsettingsaction.php:120 -#, fuzzy msgid "Connections" -msgstr "Ligar" +msgstr "Ligações" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "Aplicações ligadas autorizadas" #: lib/dberroraction.php:60 msgid "Database error" @@ -6021,7 +5904,7 @@ msgstr "Prosseguir" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Atribuir a este utilizador a função \"%s\"" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -6140,9 +6023,9 @@ msgid "[%s]" msgstr "[%s]" #: lib/jabber.php:567 -#, fuzzy, php-format +#, php-format msgid "Unknown inbox source %d." -msgstr "Língua desconhecida \"%s\"." +msgstr "Origem da caixa de entrada desconhecida \"%s\"." #: lib/joinform.php:114 msgid "Join" @@ -6275,9 +6158,9 @@ msgstr "Confirmação SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:457 -#, fuzzy, php-format +#, php-format msgid "%s: confirm you own this phone number with this code:" -msgstr "A aguardar confirmação deste número de telefone." +msgstr "%s: confirme que este número de telefone é seu com este código:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:478 @@ -6405,6 +6288,9 @@ msgid "" "\n" "\t%s" msgstr "" +"O diálogo completo pode ser lido aqui:\n" +"\n" +"\t%s" #: lib/mail.php:651 #, php-format @@ -6438,6 +6324,29 @@ msgid "" "\n" "P.S. You can turn off these email notifications here: %8$s\n" msgstr "" +"%1$s (@%9$s) acaba de enviar uma nota à sua atenção (uma 'resposta-@') em %2" +"$s.\n" +"\n" +"A nota está aqui:\n" +"\n" +"\t%3$s\n" +"\n" +"Diz:\n" +"\n" +"\t%4$s\n" +"\n" +"%5$sPode responder aqui:\n" +"\n" +"\t%6$s\n" +"\n" +"A lista de todas as respostas-@ aqui:\n" +"\n" +"%7$s\n" +"\n" +"Atenciosamente,\n" +"%2$s\n" +"\n" +"P.S. Pode desligar estas notificações electrónicas aqui: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6546,7 +6455,6 @@ msgid "Available characters" msgstr "Caracteres disponíveis" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Enviar" @@ -6573,15 +6481,16 @@ msgid "Share my location" msgstr "Partilhar a minha localização." #: lib/noticeform.php:215 -#, fuzzy msgid "Do not share my location" -msgstr "Não partilhar a minha localização." +msgstr "Não partilhar a minha localização" #: lib/noticeform.php:216 msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"A obtenção da sua geolocalização está a demorar mais do que o esperado; " +"tente novamente mais tarde" #. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 @@ -6732,7 +6641,7 @@ msgstr "Membro desde" #. TRANS: Average count of posts made per day since account registration #: lib/profileaction.php:235 msgid "Daily average" -msgstr "" +msgstr "Média diária" #: lib/profileaction.php:264 msgid "All groups" @@ -6779,13 +6688,13 @@ msgid "Repeat this notice" msgstr "Repetir esta nota" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Bloquear acesso deste utilizador a este grupo" +msgstr "Retirar a função \"%s\" a este utilizador" #: lib/router.php:704 msgid "No single user defined for single-user mode." -msgstr "" +msgstr "Nenhum utilizador único definido para o modo de utilizador único." #: lib/sandboxform.php:67 msgid "Sandbox" @@ -6910,9 +6819,9 @@ msgid "Unsubscribe" msgstr "Abandonar" #: lib/usernoprofileexception.php:58 -#, fuzzy, php-format +#, php-format msgid "User %s (%d) has no profile record." -msgstr "Utilizador não tem perfil." +msgstr "Utilizador %s (%d) não tem perfil." #: lib/userprofile.php:117 msgid "Edit Avatar" @@ -6924,7 +6833,7 @@ msgstr "Acções do utilizador" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "A apagar o utilizador..." #: lib/userprofile.php:263 msgid "Edit profile settings" @@ -6947,21 +6856,18 @@ msgid "Moderate" msgstr "Moderar" #: lib/userprofile.php:364 -#, fuzzy msgid "User role" -msgstr "Perfil" +msgstr "Função" #: lib/userprofile.php:366 -#, fuzzy msgctxt "role" msgid "Administrator" -msgstr "Gestores" +msgstr "Gestor" #: lib/userprofile.php:367 -#, fuzzy msgctxt "role" msgid "Moderator" -msgstr "Moderar" +msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1054 diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 07d963c6ec..b75e6f1c48 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:50:59+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:20+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -2356,10 +2356,14 @@ msgstr "" "senha antes de alterar suas configurações." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Autentique-se com um nome de usuário e uma senha" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Digite seu nome de usuário e senha. Ainda não possui um usuário? [Registre](%" "%action.register%%) uma nova conta." diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index de3ce4c215..43013529c3 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:51:03+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:23+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -2336,10 +2336,14 @@ msgstr "" "изменять Ваши установки." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Войти с вашим ником и паролем." + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Вход с вашим логином и паролем. Нет аккаунта? [Зарегистрируйте](%%action." "register%%) новый аккаунт." diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 6a69f9cd7f..4fcc7d463d 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2206,10 +2206,13 @@ msgid "" msgstr "" #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "" + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 079094dd7e..7f6d7cdae4 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:51:06+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:26+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -2312,10 +2312,14 @@ msgstr "" "igen innan du ändrar dina inställningar." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Logga in med ett användarnamn och lösenord" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? " "[Registrera](%%action.register%%) ett nytt konto." diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 593ee2a898..7991adafad 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:51:12+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:29+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -335,7 +335,7 @@ msgstr "మీ స్నేహితులు కాని వాడుకరు #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." -msgstr "" +msgstr "ఆ IDతో ఏ నోటీసూ కనబడలేదు." #: actions/apifavoritecreate.php:119 msgid "This status is already a favorite." @@ -778,9 +778,8 @@ msgid "Crop" msgstr "కత్తిరించు" #: actions/avatarsettings.php:305 -#, fuzzy msgid "No file uploaded." -msgstr "పాక్షిక ఎగుమతి." +msgstr "ఏ దస్త్రమూ ఎక్కింపబడలేదు." #: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" @@ -2039,9 +2038,8 @@ msgstr "ఈమెయిల్ నిర్ధారణని తొలగిం #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "నిర్ధారణ రద్దయింది." +msgstr "IM నిర్ధారణ రద్దయింది." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2051,9 +2049,8 @@ msgstr "ఇది మీ Jabber ID కాదు" #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "ఆ చిరునామాని తొలగించాం." +msgstr "ఆ IM చిరునామాని తొలగించాం." #: actions/inbox.php:59 #, php-format @@ -2181,6 +2178,29 @@ msgid "" "\n" "Sincerely, %2$s\n" msgstr "" +"%2$s (%3$s) లో వారితో చేరమని %1$s మిమ్మల్ని ఆహ్వానించారు.\n" +"\n" +"%2$s అనేది మీకు తెలిసిన మరియు మీకు ఆసక్తి ఉన్న వ్యక్తులతో ఎప్పటికప్పుడు పరిచయంలో ఉండేదుకు " +"వీలుకల్పించే ఒక సూక్ష్మ-బ్లాగింగు సేవ.\n" +"\n" +"మీరు కూడా మీ గురించి, మీ ఆలోచనల గురించి లేదా మీ జీవితం గురించిన విశేషాలను మీకు తెలిసిన వారితో " +"పంచుకోవచ్చు. అలానే ఇది మీలాంటి ఆసక్తులు కలిగిన కొత్త వ్యక్తులని కలుసుకునేందుకు గొప్ప ప్రదేశం.\n" +"\n" +"%1$s అన్నారు:\n" +"\n" +"%4$s\n" +"\n" +"%2$sలో %1$s యొక్క ప్రొఫైలుని మీరు ఇక్కడ చూడవచ్చు:\n" +"\n" +"%5$s\n" +"\n" +"మీరు దీన్ని ప్రయత్నించి చూడాలనుకుంటే, ఈ ఆహ్వానాన్ని అంగీకరించడానికి ఈ క్రింద లంకెపై నొక్కండి.\n" +"\n" +"%6$s\n" +"\n" +"కాదనుకుంటే, ఈ సందేశాన్ని పట్టించుకోకండి. మీ ఓపిక మరియు సమయానికి ధన్యవాదాలు.\n" +"\n" +"వినమ్రతతో, %2$s\n" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." @@ -2253,10 +2273,14 @@ msgstr "" "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి. మీకు ఇంకా వాడుకరిపేరు లేదా? కొత్త ఖాతాని [నమోదుచేసుకోండి]" "(%%action.register%%)." @@ -3473,9 +3497,8 @@ msgid "Save site settings" msgstr "సైటు అమరికలను భద్రపరచు" #: actions/showapplication.php:82 -#, fuzzy msgid "You must be logged in to view an application." -msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి." +msgstr "ఉపకరణాలని చూడడానికి మీరు తప్పనిసరిగా ప్రవేశించి ఉండాలి." #: actions/showapplication.php:157 msgid "Application profile" @@ -4369,7 +4392,7 @@ msgstr "" #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." -msgstr "" +msgstr "చెల్లని స్వాగత పాఠ్యం. గరిష్ఠ పొడవు 255 అక్షరాలు." #: actions/useradminpanel.php:165 #, php-format @@ -4706,9 +4729,9 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. #: classes/Notice.php:1515 -#, fuzzy, php-format +#, php-format msgid "RT @%1$s %2$s" -msgstr "%1$s (%2$s)" +msgstr "RT @%1$s %2$s" #: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." @@ -5618,13 +5641,12 @@ msgid "" msgstr "" #: lib/common.php:135 -#, fuzzy msgid "No configuration file found. " -msgstr "నిర్ధారణ సంకేతం లేదు." +msgstr "స్వరూపణపు దస్త్రమేమీ కనబడలేదు. " #: lib/common.php:136 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "స్వరూపణపు దస్త్రాల కొరకు ఈ ప్రదేశాలతో చూసాం: " #: lib/common.php:138 msgid "You may wish to run the installer to fix this." @@ -5739,9 +5761,8 @@ msgid "URL of the homepage or blog of the group or topic" msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి" +msgstr "గుంపుని లేదా విషయాన్ని వివరించండి" #: lib/groupeditform.php:170 #, php-format @@ -5763,9 +5784,8 @@ msgid "Group" msgstr "గుంపు" #: lib/groupnav.php:101 -#, fuzzy msgid "Blocked" -msgstr "అటువంటి వాడుకరి లేరు." +msgstr "నిరోధించారు" #: lib/groupnav.php:102 #, php-format @@ -6006,6 +6026,17 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) మీరేం చేస్తున్నారో అని విస్మయం చెందుతున్నారు మరియు ఏవైనా విశేషాలని వ్రాయమని మిమ్మల్ని " +"ఆహ్వానిస్తున్నారు.\n" +"\n" +"కాబట్టి మిమ్మల్ని విననివ్వండి :)\n" +"\n" +"%3$s\n" +"\n" +"ఈ ఈమెయిలుకే స్పందించకండి; ఇది వారికి వెళ్ళదు.\n" +"\n" +"శుభాశీస్సులతో,\n" +"%4$s\n" #. TRANS: Subject for direct-message notification email #: lib/mail.php:530 @@ -6636,9 +6667,9 @@ msgid "Unsubscribe" msgstr "చందామాను" #: lib/usernoprofileexception.php:58 -#, fuzzy, php-format +#, php-format msgid "User %s (%d) has no profile record." -msgstr "వాడుకరికి ప్రొఫైలు లేదు." +msgstr "వాడుకరి %s (%d) కి ప్రొఫైలు లేదు." #: lib/userprofile.php:117 msgid "Edit Avatar" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 36d0195b4e..ead5aaa6eb 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:51:16+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:33+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -2355,10 +2355,14 @@ msgstr "" "ve parolanızı tekrar giriniz." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Geçersiz kullanıcı adı veya parola." + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok mu? Ne " "duruyorsunuz, hemen bir [yeni hesap oluşturun](%%action.register%%) ya da " diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index bb0c0f6a92..a1fd4155cb 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:51:20+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:36+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -2322,10 +2322,14 @@ msgstr "" "змінювати налаштування." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Увійти використовуючи ім’я та пароль" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Увійти викристовуючи ім’я та пароль. Ще не маєте імені користувача? " "[Зареєструвати](%%action.register%%) новий акаунт." diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index e7cc45573e..8fcdfa3cc2 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:51:23+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:39+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -2436,10 +2436,14 @@ msgstr "" "đổi trong điều chỉnh." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Sai tên đăng nhập hoặc mật khẩu." + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. Nếu bạn chưa có tài " "khoản, [hãy đăng ký](%%action.register%%) tài khoản mới, hoặc thử đăng nhập " diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index f9ced76ead..0deb9e2463 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:51:26+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:42+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -2394,10 +2394,14 @@ msgid "" msgstr "由于安全原因，修改设置前需要输入用户名和密码。" #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "输入用户名和密码以登录。" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "请使用你的帐号和密码登入。没有帐号？[注册](%%action.register%%) 一个新帐号, " "或使用 [OpenID](%%action.openidlogin%%). " diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 619f258a95..f9f1ec6357 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 19:48+0000\n" -"PO-Revision-Date: 2010-04-18 19:51:31+0000\n" +"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"PO-Revision-Date: 2010-04-19 17:13:48+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65251); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -2311,10 +2311,14 @@ msgid "" msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更改設定。" #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "使用者名稱或密碼無效" + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 From acea53404461dba0789b4e661862329097c26e11 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 19 Apr 2010 19:45:01 +0200 Subject: [PATCH 007/730] Disable the send-notice form at the top of the page OStatus subscription confirmation page to work around bugs in Cloudy theme. This is really just a hack for the broken CSS in the Cloudy theme, I think; copying from other non-notice-navigation pages that do this as well. There will be plenty of others also broken. --- avatar/.gitignore | 0 plugins/OStatus/actions/ostatussub.php | 14 ++++++++++++++ 2 files changed, 14 insertions(+) mode change 100644 => 100755 avatar/.gitignore diff --git a/avatar/.gitignore b/avatar/.gitignore old mode 100644 new mode 100755 diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php index 994af6e95c..28714514f5 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -446,4 +446,18 @@ class OStatusSubAction extends Action { return common_local_url('ostatussub'); } + + /** + * Disable the send-notice form at the top of the page. + * This is really just a hack for the broken CSS in the Cloudy theme, + * I think; copying from other non-notice-navigation pages that do this + * as well. There will be plenty of others also broken. + * + * @fixme fix the cloudy theme + * @fixme do this in a more general way + */ + function showNoticeForm() { + // nop + } + } From 32918bb7c18c6c098a16e88d169099c6ce371dfe Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 19 Apr 2010 20:57:12 +0200 Subject: [PATCH 008/730] Test for and use mysqli in installer, since that's what we use later, rather than mysql. --- lib/installer.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/installer.php b/lib/installer.php index d0e46f95c8..589a19a66e 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -51,7 +51,7 @@ abstract class Installer public static $dbModules = array( 'mysql' => array( 'name' => 'MySQL', - 'check_module' => 'mysql', // mysqli? + 'check_module' => 'mysqli', 'installer' => 'mysql_db_installer', ), 'pgsql' => array( @@ -341,7 +341,6 @@ abstract class Installer * @param string $password * @return mixed array of database connection params on success, false on failure * - * @fixme be consistent about using mysqli vs mysql! * @fixme escape things in the connection string in case we have a funny pass etc */ function Mysql_Db_installer($host, $database, $username, $password) @@ -349,14 +348,13 @@ abstract class Installer $this->updateStatus("Starting installation..."); $this->updateStatus("Checking database..."); - $conn = mysql_connect($host, $username, $password); - if (!$conn) { + $conn = mysqli_init(); + if (!$conn->real_connect($host, $username, $password)) { $this->updateStatus("Can't connect to server '$host' as '$username'.", true); return false; } $this->updateStatus("Changing to database..."); - $res = mysql_select_db($database, $conn); - if (!$res) { + if (!$conn->select_db($database)) { $this->updateStatus("Can't change to database.", true); return false; } @@ -438,9 +436,9 @@ abstract class Installer // FIXME: use PEAR::DB or PDO instead of our own switch switch ($type) { case 'mysqli': - $res = mysql_query($stmt, $conn); + $res = $conn->query($stmt); if ($res === false) { - $error = mysql_error(); + $error = $conn->error(); } break; case 'pgsql': From 0e1be7e01b00a9ad5201845b96f9f5634ab10236 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 20 Apr 2010 10:44:14 +0200 Subject: [PATCH 009/730] Ticket #2291: fix typo in SMS doc --- doc-src/sms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc-src/sms b/doc-src/sms index 1a3064318f..6cdccc6e97 100644 --- a/doc-src/sms +++ b/doc-src/sms @@ -1,4 +1,4 @@ -You can post messages to %%site.name%% using a many kinds of cell +You can post messages to %%site.name%% using many kinds of cell phones that support SMS messaging. This site does not support SMS directly; rather, it uses your carrier's email gateway to send and receive messages. From c48caa85e12063c2df9913957dbd11af6b5e3ea6 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 20 Apr 2010 12:06:54 +0200 Subject: [PATCH 010/730] Fix email notifications for @-replies that come via OStatus. * Moved notification sending from Notice::saveReplies to distrib queue handler, so it'll pull from the reply set we've saved regardless of how we got it. * Set up gettext infrastructure for command-line scripts; gets localization mail notifications etc working from background queues. * Adjusted locale switching: common_switch_locale() works at runtime for bg scripts, forces a message catalog update --- classes/Notice.php | 44 +++++++++++++++++++++++++++---------- lib/distribqueuehandler.php | 17 ++++++++++---- lib/mail.php | 4 ++-- lib/util.php | 31 +++++++++++++++++++++++++- scripts/commandline.inc | 4 ++++ 5 files changed, 81 insertions(+), 19 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index a8147e4c4d..4cf12fc6f9 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -959,8 +959,7 @@ class Notice extends Memcached_DataObject * messages, we won't deliver to any remote targets as that's the * source service's responsibility. * - * @fixme Unlike saveReplies() there's no mail notification here. - * Move that to distrib queue handler? + * Mail notifications etc will be handled later. * * @param array of unique identifier URIs for recipients */ @@ -999,8 +998,7 @@ class Notice extends Memcached_DataObject * and save reply records indicating that this message needs to be * delivered to those users. * - * Side effect: local recipients get e-mail notifications here. - * @fixme move mail notifications to distrib? + * Mail notifications to local profiles will be sent later. * * @return array of integer profile IDs */ @@ -1060,17 +1058,14 @@ class Notice extends Memcached_DataObject $recipientIds = array_keys($replied); - foreach ($recipientIds as $recipientId) { - $user = User::staticGet('id', $recipientId); - if (!empty($user)) { - self::blow('reply:stream:%d', $reply->profile_id); - mail_notify_attn($user, $this); - } - } - return $recipientIds; } + /** + * Pull the complete list of @-reply targets for this notice. + * + * @return array of integer profile ids + */ function getReplies() { // XXX: cache me @@ -1093,6 +1088,31 @@ class Notice extends Memcached_DataObject return $ids; } + /** + * Send e-mail notifications to local @-reply targets. + * + * Replies must already have been saved; this is expected to be run + * from the distrib queue handler. + */ + function sendReplyNotifications() + { + // Don't send reply notifications for repeats + + if (!empty($this->repeat_of)) { + return array(); + } + + $recipientIds = $this->getReplies(); + + foreach ($recipientIds as $recipientId) { + $user = User::staticGet('id', $recipientId); + if (!empty($user)) { + self::blow('reply:stream:%d', $recipientId); + mail_notify_attn($user, $this); + } + } + } + /** * Pull list of groups this notice needs to be delivered to, * as previously recorded by saveGroups() or saveKnownGroups(). diff --git a/lib/distribqueuehandler.php b/lib/distribqueuehandler.php index d2be7a92c7..8f4b72d5c3 100644 --- a/lib/distribqueuehandler.php +++ b/lib/distribqueuehandler.php @@ -49,25 +49,34 @@ class DistribQueueHandler } /** - * Here's the meat of your queue handler -- you're handed a Notice - * object, which you may do as you will with. + * Handle distribution of a notice after we've saved it: + * @li add to local recipient inboxes + * @li send email notifications to local @-reply targets + * @li run final EndNoticeSave plugin events + * @li put any remaining post-processing into the queues * * If this function indicates failure, a warning will be logged * and the item is placed back in the queue to be re-run. * + * @fixme addToInboxes is known to fail sometimes with large recipient sets + * * @param Notice $notice * @return boolean true on success, false on failure */ function handle($notice) { - // XXX: do we need to change this for remote users? - try { $notice->addToInboxes(); } catch (Exception $e) { $this->logit($notice, $e); } + try { + $notice->sendReplyNotifications(); + } catch (Exception $e) { + $this->logit($notice, $e); + } + try { Event::handle('EndNoticeSave', array($notice)); // Enqueue for other handlers diff --git a/lib/mail.php b/lib/mail.php index 807b6a3633..d73603694d 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -620,7 +620,7 @@ function mail_notify_attn($user, $notice) $bestname = $sender->getBestName(); - common_init_locale($user->language); + common_switch_locale($user->language); if ($notice->conversation != $notice->id) { $conversationEmailText = "The full conversation can be read here:\n\n". @@ -662,7 +662,7 @@ function mail_notify_attn($user, $notice) $headers = _mail_prepare_headers('mention', $user->nickname, $sender->nickname); - common_init_locale(); + common_switch_locale(); mail_to_user($user, $subject, $body, $headers); } diff --git a/lib/util.php b/lib/util.php index e37df63484..58d54cda34 100644 --- a/lib/util.php +++ b/lib/util.php @@ -41,11 +41,13 @@ function common_init_locale($language=null) } putenv('LANGUAGE='.$language); putenv('LANG='.$language); - return setlocale(LC_ALL, $language . ".utf8", + $ok = setlocale(LC_ALL, $language . ".utf8", $language . ".UTF8", $language . ".utf-8", $language . ".UTF-8", $language); + + return $ok; } function common_init_language() @@ -89,6 +91,14 @@ function common_init_language() $locale_set = common_init_locale($language); } + common_init_gettext(); +} + +/** + * @access private + */ +function common_init_gettext() +{ setlocale(LC_CTYPE, 'C'); // So we do not have to make people install the gettext locales $path = common_config('site','locale_path'); @@ -97,6 +107,25 @@ function common_init_language() textdomain("statusnet"); } +/** + * Switch locale during runtime, and poke gettext until it cries uncle. + * Otherwise, sometimes it doesn't actually switch away from the old language. + * + * @param string $language code for locale ('en', 'fr', 'pt_BR' etc) + */ +function common_switch_locale($language=null) +{ + common_init_locale($language); + + setlocale(LC_CTYPE, 'C'); + // So we do not have to make people install the gettext locales + $path = common_config('site','locale_path'); + bindtextdomain("statusnet", $path); + bind_textdomain_codeset("statusnet", "UTF-8"); + textdomain("statusnet"); +} + + function common_timezone() { if (common_logged_in()) { diff --git a/scripts/commandline.inc b/scripts/commandline.inc index 9029bb19db..a475e11d01 100644 --- a/scripts/commandline.inc +++ b/scripts/commandline.inc @@ -123,6 +123,10 @@ require_once INSTALLDIR . '/lib/common.php'; set_error_handler('common_error_handler'); +// Set up the language infrastructure so we can localize anything that +// needs to be sent out to users, such as mail notifications. +common_init_language(); + function _make_matches($opt, $alt) { $matches = array(); From 98f0d970da98e5b6de18972d033320a191152eb4 Mon Sep 17 00:00:00 2001 From: Zachary Copley Date: Tue, 20 Apr 2010 15:01:23 -0700 Subject: [PATCH 011/730] Update release notes and version number for 0.9.2 --- README | 53 ++++++++++++++++++++++++-------------------------- lib/common.php | 2 +- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/README b/README index c687cb240a..98ebe15066 100644 --- a/README +++ b/README @@ -2,8 +2,8 @@ README ------ -StatusNet 0.9.1 ("Everybody Hurts") -28 Mar 2010 +StatusNet 0.9.2 ("King of Birds") +21 Apr 2010 This is the README file for StatusNet, the Open Source microblogging platform. It includes installation instructions, descriptions of @@ -77,7 +77,7 @@ for additional terms. New this version ================ -This is a minor bug and feature release since version 0.9.0 released 4 +This is a minor bug and feature release since version 0.9.1 released 28 March 2010. Because of fixes to OStatus bugs, it is highly recommended that all @@ -85,26 +85,23 @@ public sites upgrade to the new version immediately. Notable changes this version: -- Twitter bridge truncates and links back to original for long - notices. -- Changed "Home" link in main menu to "Personal". -- A new memcached plugin (using pecl/memcached versus pecl/memcache) -- Opt-in subscription to update@status.net -- Script to run commands on behalf of a user. -- Better Web UI for long notices. -- A plugin to open external links in their own window or tab -- Fixes to Salmon protocol for compatibility with other systems. -- Updates to latest ActivityStreams definition. -- Twitpic-compatible API for image upload. -- Background deletion of user accounts. -- Better support for HTTP basic authentication with CGI/FastCGI -- Better discovery on OStatus -- Support for PuSH-enabled RSS 2.0 feeds -- OpenID-only mode -- OpenID blacklist/whitelist -- OStatus unit tests +- Fixed email notifications for @-replies that come in via OStatus +- OStatus related Fixes to the cloudy theme +- Pass geo locations over Twitter bridge (will only be used if enabled on the Twitter side) +- scripts/showplugins.php - script to dump the list of activated plugins and their settings +- scripts/fixup_blocks.php - script to finds any stray subscriptions in violation of blocks, and removes them +- Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future) +- Default 2-second timeout on Geonames web service lookups +- Improved localization for plugins +- New anti-spam measures: added nofollow rels to group members list, subscribers list +- Shared cache key option for Geonames plugin (lets multi-instance sites share their cached geoname lookups) +- Stability fixes to the TwitterStatusFetcher +- If user allows location sharing but turned off browser location use profile location +- Improved group listing via the API +- Improved FOAF output +- Several other bugfixes -A full changelog is available at http://status.net/wiki/StatusNet_0.9.1. +A full changelog is available at http://status.net/wiki/StatusNet_0.9.2. Prerequisites ============= @@ -216,9 +213,9 @@ especially if you've previously installed PHP/MySQL packages. 1. Unpack the tarball you downloaded on your Web server. Usually a command like this will work: - tar zxf statusnet-0.9.1.tar.gz + tar zxf statusnet-0.9.2.tar.gz - ...which will make a statusnet-0.9.1 subdirectory in your current + ...which will make a statusnet-0.9.2 subdirectory in your current directory. (If you don't have shell access on your Web server, you may have to unpack the tarball on your local computer and FTP the files to the server.) @@ -226,7 +223,7 @@ especially if you've previously installed PHP/MySQL packages. 2. Move the tarball to a directory of your choosing in your Web root directory. Usually something like this will work: - mv statusnet-0.9.1 /var/www/statusnet + mv statusnet-0.9.2 /var/www/statusnet This will make your StatusNet instance available in the statusnet path of your server, like "http://example.net/statusnet". "microblog" or @@ -641,7 +638,7 @@ with this situation. If you've been using StatusNet 0.7, 0.6, 0.5 or lower, or if you've been tracking the "git" version of the software, you will probably want to upgrade and keep your existing data. There is no automated -upgrade procedure in StatusNet 0.9.1. Try these step-by-step +upgrade procedure in StatusNet 0.9.2. Try these step-by-step instructions; read to the end first before trying them. 0. Download StatusNet and set up all the prerequisites as if you were @@ -662,7 +659,7 @@ instructions; read to the end first before trying them. 5. Once all writing processes to your site are turned off, make a final backup of the Web directory and database. 6. Move your StatusNet directory to a backup spot, like "statusnet.bak". -7. Unpack your StatusNet 0.9.1 tarball and move it to "statusnet" or +7. Unpack your StatusNet 0.9.2 tarball and move it to "statusnet" or wherever your code used to be. 8. Copy the config.php file and avatar directory from your old directory to your new directory. @@ -1499,7 +1496,7 @@ repository (see below), and you get a compilation error ("unexpected T_STRING") in the browser, check to see that you don't have any conflicts in your code. -If you upgraded to StatusNet 0.9.1 without reading the "Notice +If you upgraded to StatusNet 0.9.2 without reading the "Notice inboxes" section above, and all your users' 'Personal' tabs are empty, read the "Notice inboxes" section above. diff --git a/lib/common.php b/lib/common.php index 8d2e6b420b..b29719b75c 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.1'); +define('STATUSNET_VERSION', '0.9.2'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Everybody Hurts'); From 1d94b08efcda56fa5efdef19721bcef21410177a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 21 Apr 2010 16:24:15 +0200 Subject: [PATCH 012/730] Revert "Update release notes and version number for 0.9.2" This reverts commit 98f0d970da98e5b6de18972d033320a191152eb4. Per xopher we're not yet ready to push 0.9.2 theme directories live; we also haven't merged down various things from testing that need to be in the release such as installer fixes. --- README | 53 ++++++++++++++++++++++++++------------------------ lib/common.php | 2 +- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/README b/README index 98ebe15066..c687cb240a 100644 --- a/README +++ b/README @@ -2,8 +2,8 @@ README ------ -StatusNet 0.9.2 ("King of Birds") -21 Apr 2010 +StatusNet 0.9.1 ("Everybody Hurts") +28 Mar 2010 This is the README file for StatusNet, the Open Source microblogging platform. It includes installation instructions, descriptions of @@ -77,7 +77,7 @@ for additional terms. New this version ================ -This is a minor bug and feature release since version 0.9.1 released 28 +This is a minor bug and feature release since version 0.9.0 released 4 March 2010. Because of fixes to OStatus bugs, it is highly recommended that all @@ -85,23 +85,26 @@ public sites upgrade to the new version immediately. Notable changes this version: -- Fixed email notifications for @-replies that come in via OStatus -- OStatus related Fixes to the cloudy theme -- Pass geo locations over Twitter bridge (will only be used if enabled on the Twitter side) -- scripts/showplugins.php - script to dump the list of activated plugins and their settings -- scripts/fixup_blocks.php - script to finds any stray subscriptions in violation of blocks, and removes them -- Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future) -- Default 2-second timeout on Geonames web service lookups -- Improved localization for plugins -- New anti-spam measures: added nofollow rels to group members list, subscribers list -- Shared cache key option for Geonames plugin (lets multi-instance sites share their cached geoname lookups) -- Stability fixes to the TwitterStatusFetcher -- If user allows location sharing but turned off browser location use profile location -- Improved group listing via the API -- Improved FOAF output -- Several other bugfixes +- Twitter bridge truncates and links back to original for long + notices. +- Changed "Home" link in main menu to "Personal". +- A new memcached plugin (using pecl/memcached versus pecl/memcache) +- Opt-in subscription to update@status.net +- Script to run commands on behalf of a user. +- Better Web UI for long notices. +- A plugin to open external links in their own window or tab +- Fixes to Salmon protocol for compatibility with other systems. +- Updates to latest ActivityStreams definition. +- Twitpic-compatible API for image upload. +- Background deletion of user accounts. +- Better support for HTTP basic authentication with CGI/FastCGI +- Better discovery on OStatus +- Support for PuSH-enabled RSS 2.0 feeds +- OpenID-only mode +- OpenID blacklist/whitelist +- OStatus unit tests -A full changelog is available at http://status.net/wiki/StatusNet_0.9.2. +A full changelog is available at http://status.net/wiki/StatusNet_0.9.1. Prerequisites ============= @@ -213,9 +216,9 @@ especially if you've previously installed PHP/MySQL packages. 1. Unpack the tarball you downloaded on your Web server. Usually a command like this will work: - tar zxf statusnet-0.9.2.tar.gz + tar zxf statusnet-0.9.1.tar.gz - ...which will make a statusnet-0.9.2 subdirectory in your current + ...which will make a statusnet-0.9.1 subdirectory in your current directory. (If you don't have shell access on your Web server, you may have to unpack the tarball on your local computer and FTP the files to the server.) @@ -223,7 +226,7 @@ especially if you've previously installed PHP/MySQL packages. 2. Move the tarball to a directory of your choosing in your Web root directory. Usually something like this will work: - mv statusnet-0.9.2 /var/www/statusnet + mv statusnet-0.9.1 /var/www/statusnet This will make your StatusNet instance available in the statusnet path of your server, like "http://example.net/statusnet". "microblog" or @@ -638,7 +641,7 @@ with this situation. If you've been using StatusNet 0.7, 0.6, 0.5 or lower, or if you've been tracking the "git" version of the software, you will probably want to upgrade and keep your existing data. There is no automated -upgrade procedure in StatusNet 0.9.2. Try these step-by-step +upgrade procedure in StatusNet 0.9.1. Try these step-by-step instructions; read to the end first before trying them. 0. Download StatusNet and set up all the prerequisites as if you were @@ -659,7 +662,7 @@ instructions; read to the end first before trying them. 5. Once all writing processes to your site are turned off, make a final backup of the Web directory and database. 6. Move your StatusNet directory to a backup spot, like "statusnet.bak". -7. Unpack your StatusNet 0.9.2 tarball and move it to "statusnet" or +7. Unpack your StatusNet 0.9.1 tarball and move it to "statusnet" or wherever your code used to be. 8. Copy the config.php file and avatar directory from your old directory to your new directory. @@ -1496,7 +1499,7 @@ repository (see below), and you get a compilation error ("unexpected T_STRING") in the browser, check to see that you don't have any conflicts in your code. -If you upgraded to StatusNet 0.9.2 without reading the "Notice +If you upgraded to StatusNet 0.9.1 without reading the "Notice inboxes" section above, and all your users' 'Personal' tabs are empty, read the "Notice inboxes" section above. diff --git a/lib/common.php b/lib/common.php index b29719b75c..8d2e6b420b 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.2'); +define('STATUSNET_VERSION', '0.9.1'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Everybody Hurts'); From 61e7d898dc24b06afbda963ee78a907a3863e82d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 21 Apr 2010 20:20:43 +0200 Subject: [PATCH 013/730] docgen.php no longer depends on having a working installation; uses Console_GetOpt directly and regexes the STATUSNET_VERSION from common.php --- scripts/docgen.php | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/scripts/docgen.php b/scripts/docgen.php index 78bbe37d8a..ac0a5c83dc 100755 --- a/scripts/docgen.php +++ b/scripts/docgen.php @@ -17,10 +17,30 @@ Options: ENDOFHELP; define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -require_once INSTALLDIR.'/scripts/commandline.inc'; +set_include_path(INSTALLDIR . DIRECTORY_SEPARATOR . 'extlib' . PATH_SEPARATOR . get_include_path()); $pattern = "*.php *.inc"; $exclude = 'config.php */extlib/* */local/* */plugins/* */scripts/*'; +$plugin = false; + +require_once 'Console/Getopt.php'; +$parser = new Console_Getopt(); +$result = $parser->getopt($_SERVER['argv'], $shortoptions, $longoptions); +if (PEAR::isError($result)) { + print $result->getMessage() . "\n"; + exit(1); +} +list($options, $args) = $result; + +foreach ($options as $option) { + $arg = $option[0]; + if ($arg == '--plugin') { + $plugin = $options[1]; + } else if ($arg == 'h' || $arg == '--help') { + print $helptext; + exit(0); + } +} if (isset($args[0])) { $outdir = $args[0]; @@ -33,8 +53,7 @@ if (isset($args[0])) { exit(1); } -if (have_option('p', 'plugin')) { - $plugin = get_option_value('plugin'); +if ($plugin) { $exclude = "*/extlib/*"; $indir = INSTALLDIR . "/plugins/" . $plugin; if (!is_dir($indir)) { @@ -51,8 +70,19 @@ if (have_option('p', 'plugin')) { $indir = INSTALLDIR; } +function getVersion() +{ + // define('STATUSNET_VERSION', '0.9.1'); + $source = file_get_contents(INSTALLDIR . '/lib/common.php'); + if (preg_match('/^\s*define\s*\(\s*[\'"]STATUSNET_VERSION[\'"]\s*,\s*[\'"](.*)[\'"]\s*\)\s*;/m', $source, $matches)) { + return $matches[1]; + } + return 'unknown'; +} + + $replacements = array( - '%%version%%' => STATUSNET_VERSION, + '%%version%%' => getVersion(), '%%indir%%' => $indir, '%%pattern%%' => $pattern, '%%outdir%%' => $outdir, From c78a10b476bb6d84e4056038fea1b8185d20ef46 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 21 Apr 2010 17:14:25 -0400 Subject: [PATCH 014/730] add 'always' parameter to common_shorten_links --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index 81920eb447..e0669a1d56 100644 --- a/lib/util.php +++ b/lib/util.php @@ -855,10 +855,10 @@ function common_linkify($url) { return XMLStringer::estring('a', $attrs, $url); } -function common_shorten_links($text) +function common_shorten_links($text, $always = false) { $maxLength = Notice::maxContent(); - if ($maxLength == 0 || mb_strlen($text) <= $maxLength) return $text; + if (!$always && ($maxLength == 0 || mb_strlen($text) <= $maxLength)) return $text; return common_replace_urls_callback($text, array('File_redirection', 'makeShort')); } From 65796ba03ba4cd0470a1e9790d2234c8b42d6cba Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 21 Apr 2010 17:14:54 -0400 Subject: [PATCH 015/730] add ClientSideShortenPlugin see plugins/ClientSideShorten/README --- .../ClientSideShortenPlugin.php | 78 +++++++++++++++++++ plugins/ClientSideShorten/README | 6 ++ plugins/ClientSideShorten/shorten.js | 46 +++++++++++ plugins/ClientSideShorten/shorten.php | 68 ++++++++++++++++ 4 files changed, 198 insertions(+) create mode 100644 plugins/ClientSideShorten/ClientSideShortenPlugin.php create mode 100644 plugins/ClientSideShorten/README create mode 100644 plugins/ClientSideShorten/shorten.js create mode 100644 plugins/ClientSideShorten/shorten.php diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php new file mode 100644 index 0000000000..21763d5b7e --- /dev/null +++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php @@ -0,0 +1,78 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once(INSTALLDIR.'/plugins/ClientSideShorten/shorten.php'); + +class ClientSideShortenPlugin extends Plugin +{ + function __construct() + { + parent::__construct(); + } + + function onAutoload($cls) + { + switch ($cls) + { + case 'ShortenAction': + require_once(INSTALLDIR.'/plugins/ClientSideShorten/shorten.php'); + return false; + } + } + + function onEndShowScripts($action){ + if (common_logged_in()) { + $action->script('plugins/ClientSideShorten/shorten.js'); + } + } + + function onRouterInitialized($m) + { + if (common_logged_in()) { + $m->connect('plugins/ClientSideShorten/shorten', array('action'=>'shorten')); + } + } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Shorten', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:ClientSideShorten', + 'rawdescription' => + _m('ClientSideShorten causes the web interface\'s notice form to automatically shorten urls as they entered, and before the notice is submitted.')); + return true; + } + +} + diff --git a/plugins/ClientSideShorten/README b/plugins/ClientSideShorten/README new file mode 100644 index 0000000000..e6524c9c7d --- /dev/null +++ b/plugins/ClientSideShorten/README @@ -0,0 +1,6 @@ +ClientSideShorten causes the web interface's notice form to automatically shorten urls as they entered, and before the notice is submitted. + +Installation +============ +Add "addPlugin('ClientSideShorten');" to the bottom of your config.php +That's it! diff --git a/plugins/ClientSideShorten/shorten.js b/plugins/ClientSideShorten/shorten.js new file mode 100644 index 0000000000..8e07217563 --- /dev/null +++ b/plugins/ClientSideShorten/shorten.js @@ -0,0 +1,46 @@ +// smart(x) from Paul Irish +// http://paulirish.com/2009/throttled-smartresize-jquery-event-handler/ + +(function($,sr){ + + // debouncing function from John Hann + // http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/ + var debounce = function (func, threshold, execAsap) { + var timeout; + + return function debounced () { + var obj = this, args = arguments; + function delayed () { + if (!execAsap) + func.apply(obj, args); + timeout = null; + }; + + if (timeout) + clearTimeout(timeout); + else if (execAsap) + func.apply(obj, args); + + timeout = setTimeout(delayed, threshold || 100); + }; + } + jQuery.fn[sr] = function(fn){ return fn ? this.bind('keypress', debounce(fn, 1000)) : this.trigger(sr); }; + +})(jQuery,'smartkeypress'); + +$(document).ready(function(){ + $('#notice_data-text').smartkeypress(function(e){ + var original = $('#notice_data-text').val(); + $.ajax({ + url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten', + data: { text: $('#notice_data-text').val() }, + dataType: 'text', + success: function(data) { + if(original == $('#notice_data-text').val()) { + $('#notice_data-text').val(data); + $('#notice_data-text').keyup(); + } + } + }); + }); +}); diff --git a/plugins/ClientSideShorten/shorten.php b/plugins/ClientSideShorten/shorten.php new file mode 100644 index 0000000000..4905c62c21 --- /dev/null +++ b/plugins/ClientSideShorten/shorten.php @@ -0,0 +1,68 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Shorten all URLs in a string + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ShortenAction extends Action +{ + private $text; + + function prepare($args) + { + parent::prepare($args); + $this->groups=array(); + $this->users=array(); + $this->text = $this->arg('text'); + if(is_null($this->text)){ + throw new ClientException(_m('\'text\' argument must be specified.')); + } + return true; + } + + function handle($args) + { + parent::handle($args); + header('Content-Type: text/plain'); + $shortened_text = common_shorten_links($this->text, true); + print $shortened_text; + } +} + From e28214bfe91b23fe5e463d6e56152218f0769910 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 21 Apr 2010 18:11:29 -0700 Subject: [PATCH 016/730] fix reference error in RSSCloud plugin --- plugins/RSSCloud/RSSCloudPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php index 9f444c8bba..661c32141f 100644 --- a/plugins/RSSCloud/RSSCloudPlugin.php +++ b/plugins/RSSCloud/RSSCloudPlugin.php @@ -100,12 +100,12 @@ class RSSCloudPlugin extends Plugin * * Hook for RouterInitialized event. * - * @param Mapper &$m URL parser and mapper + * @param Mapper $m URL parser and mapper * * @return boolean hook return */ - function onRouterInitialized(&$m) + function onRouterInitialized($m) { $m->connect('/main/rsscloud/request_notify', array('action' => 'RSSCloudRequestNotify')); From a129c455a2e102c4276a95694a8fb0ece830232b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 21 Apr 2010 18:19:16 -0700 Subject: [PATCH 017/730] Fix exceptions with bad gravatar URLs --- plugins/OStatus/classes/Ostatus_profile.php | 30 ++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index e3b3daa2c5..5d3f37cd07 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -1001,7 +1001,7 @@ class Ostatus_profile extends Memcached_DataObject return; } if (!common_valid_http_url($url)) { - throw new ServerException(_m("Invalid avatar URL %s"), $url); + throw new ServerException(sprintf(_m("Invalid avatar URL %s"), $url)); } if ($this->isGroup()) { @@ -1303,15 +1303,23 @@ class Ostatus_profile extends Memcached_DataObject $ok = $oprofile->insert(); - if ($ok) { - $avatar = self::getActivityObjectAvatar($object, $hints); - if ($avatar) { - $oprofile->updateAvatar($avatar); - } - return $oprofile; - } else { + if (!$ok) { throw new ServerException("Can't save OStatus profile"); } + + $avatar = self::getActivityObjectAvatar($object, $hints); + + if ($avatar) { + try { + $oprofile->updateAvatar($avatar); + } catch (Exception $ex) { + // Profile is saved, but Avatar is messed up. We're + // just going to continue. + common_log(LOG_WARNING, "Exception saving OStatus profile avatar: ". $ex->getMessage()); + } + } + + return $oprofile; } /** @@ -1330,7 +1338,11 @@ class Ostatus_profile extends Memcached_DataObject } $avatar = self::getActivityObjectAvatar($object, $hints); if ($avatar) { - $this->updateAvatar($avatar); + try { + $this->updateAvatar($avatar); + } catch (Exception $ex) { + common_log(LOG_WARNING, "Exception saving OStatus profile avatar: " . $ex->getMessage()); + } } } From fd9d520aeb52f7f3a3fe7c242fbe16078de1bc6e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 22 Apr 2010 06:14:40 +0200 Subject: [PATCH 018/730] OStatus: CLI script to force a renewal on the given PuSH subscription. May help when we get out of sync with the hub. php plugins/OStatus/scripts/resub-feed.php -smysite http://example.com/some/atom/feed --- plugins/OStatus/scripts/resub-feed.php | 74 ++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 plugins/OStatus/scripts/resub-feed.php diff --git a/plugins/OStatus/scripts/resub-feed.php b/plugins/OStatus/scripts/resub-feed.php new file mode 100644 index 0000000000..121d12109a --- /dev/null +++ b/plugins/OStatus/scripts/resub-feed.php @@ -0,0 +1,74 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..')); + +$helptext = <<huburi with new subscription for $sub->uri\n"; +$ok = $sub->subscribe(); + +if ($ok) { + print "ok\n"; +} else { + print "Could not confirm.\n"; +} + +$sub2 = FeedSub::staticGet('topic', $feedurl); + +print "\n"; +print "New state:\n"; +showSub($sub2); + +function showSub($sub) +{ + print " Subscription state: $sub->sub_state\n"; + print " Verify token: $sub->verify_token\n"; + print " Signature secret: $sub->secret\n"; + print " Sub start date: $sub->sub_start\n"; + print " Record created: $sub->created\n"; + print " Record modified: $sub->modified\n"; +} From beaecb18d5b92b913473dfffd545dc436f50cf66 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 22 Apr 2010 08:49:33 -0700 Subject: [PATCH 019/730] Add statusnet: prefix for API to JSON and XML output I added the statusnet: prefix to the xml output. This prefix should be declared on the root element of all relevant XML output. I also added two StatusNet-specific fields: * statusnet:html - rendered HTML. Clients shouldn't have to guess at the correct HTML rendering for notices, especially since some of the links depend on context. * statusnet:profile_url - profile URL for a user. You can't count on a user being a local user in a distributed microblogging world. So, this shows the explicit profile_url. --- actions/apidirectmessage.php | 3 ++- actions/apiusershow.php | 2 +- lib/apiaction.php | 42 +++++++++++++++++++++++++++--------- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php index 53da9e0c68..7a0f46274c 100644 --- a/actions/apidirectmessage.php +++ b/actions/apidirectmessage.php @@ -232,7 +232,8 @@ class ApiDirectMessageAction extends ApiAuthAction function showXmlDirectMessages() { $this->initDocument('xml'); - $this->elementStart('direct-messages', array('type' => 'array')); + $this->elementStart('direct-messages', array('type' => 'array', + 'xmlns:statusnet' => 'http://status.net/schema/api/1/')); foreach ($this->messages as $m) { $dm_array = $this->directMessageArray($m); diff --git a/actions/apiusershow.php b/actions/apiusershow.php index 6c8fad49ba..28993102c0 100644 --- a/actions/apiusershow.php +++ b/actions/apiusershow.php @@ -113,7 +113,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction if ($this->format == 'xml') { $this->initDocument('xml'); - $this->showTwitterXmlUser($twitter_user); + $this->showTwitterXmlUser($twitter_user, 'user', true); $this->endDocument('xml'); } elseif ($this->format == 'json') { $this->initDocument('json'); diff --git a/lib/apiaction.php b/lib/apiaction.php index 59dc47c23b..6ee0a94d94 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -223,6 +223,10 @@ class ApiAction extends Action } } + // StatusNet-specific + + $twitter_user['statusnet:profile_url'] = $profile->profileurl; + return $twitter_user; } @@ -308,6 +312,10 @@ class ApiAction extends Action $twitter_status['user'] = $twitter_user; } + // StatusNet-specific + + $twitter_status['statusnet:html'] = $notice->rendered; + return $twitter_status; } @@ -475,9 +483,13 @@ class ApiAction extends Action } } - function showTwitterXmlStatus($twitter_status, $tag='status') + function showTwitterXmlStatus($twitter_status, $tag='status', $namespaces=false) { - $this->elementStart($tag); + $attrs = array(); + if ($namespaces) { + $attrs['xmlns:statusnet'] = 'http://status.net/schema/api/1/'; + } + $this->elementStart($tag, $attrs); foreach($twitter_status as $element => $value) { switch ($element) { case 'user': @@ -511,9 +523,13 @@ class ApiAction extends Action $this->elementEnd('group'); } - function showTwitterXmlUser($twitter_user, $role='user') + function showTwitterXmlUser($twitter_user, $role='user', $namespaces=false) { - $this->elementStart($role); + $attrs = array(); + if ($namespaces) { + $attrs['xmlns:statusnet'] = 'http://status.net/schema/api/1/'; + } + $this->elementStart($role, $attrs); foreach($twitter_user as $element => $value) { if ($element == 'status') { $this->showTwitterXmlStatus($twitter_user['status']); @@ -595,7 +611,7 @@ class ApiAction extends Action { $this->initDocument('xml'); $twitter_status = $this->twitterStatusArray($notice); - $this->showTwitterXmlStatus($twitter_status); + $this->showTwitterXmlStatus($twitter_status, 'status', true); $this->endDocument('xml'); } @@ -611,7 +627,8 @@ class ApiAction extends Action { $this->initDocument('xml'); - $this->elementStart('statuses', array('type' => 'array')); + $this->elementStart('statuses', array('type' => 'array', + 'xmlns:statusnet' => 'http://status.net/schema/api/1/')); if (is_array($notice)) { foreach ($notice as $n) { @@ -778,9 +795,13 @@ class ApiAction extends Action $this->elementEnd('entry'); } - function showXmlDirectMessage($dm) + function showXmlDirectMessage($dm, $namespaces=false) { - $this->elementStart('direct_message'); + $attrs = array(); + if ($namespaces) { + $attrs['xmlns:statusnet'] = 'http://status.net/schema/api/1/'; + } + $this->elementStart('direct_message', $attrs); foreach($dm as $element => $value) { switch ($element) { case 'sender': @@ -857,7 +878,7 @@ class ApiAction extends Action { $this->initDocument('xml'); $dmsg = $this->directMessageArray($message); - $this->showXmlDirectMessage($dmsg); + $this->showXmlDirectMessage($dmsg, true); $this->endDocument('xml'); } @@ -974,7 +995,8 @@ class ApiAction extends Action { $this->initDocument('xml'); - $this->elementStart('users', array('type' => 'array')); + $this->elementStart('users', array('type' => 'array', + 'xmlns:statusnet' => 'http://status.net/schema/api/1/')); if (is_array($user)) { foreach ($user as $u) { From 1b561065b0ff8d7082d8da49750a4bc99a4830e2 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 30 Mar 2010 18:52:21 -0700 Subject: [PATCH 020/730] Some initial Doxygen-based documentation for the API --- actions/apistatusesupdate.php | 91 ++ actions/apitimelinefriends.php | 97 +- lib/apiaction.php | 60 ++ lib/apiauth.php | 18 + scripts/apidocs.config | 1551 ++++++++++++++++++++++++++++++++ 5 files changed, 1816 insertions(+), 1 deletion(-) create mode 100644 scripts/apidocs.config diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index d4ef6b550d..5f3a447c23 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -33,6 +33,97 @@ * @link http://status.net/ */ +/* External API usage documentation. Please update when you change how this method works. */ + +/*! @page statusesupdate statuses/update + + @section Description + Updates the authenticating user's status. Requires the status parameter specified below. + Request must be a POST. + + @par URL pattern + /api/statuses/update.:format + + @par Formats (:format) + xml, json + + @par HTTP Method(s) + POST + + @par Requires Authentication + Yes + + @param status (Required) The URL-encoded text of the status update. + @param source (Optional) The source of the status. + @param in_reply_to_status_id (Optional) The ID of an existing status that the update is in reply to. + @param lat (Optional) The latitude the status refers to. + @param long (Optional) The longitude the status refers to. + @param media (Optional) a media upload, such as an image or movie file. + + @sa @ref authentication + @sa @ref apiroot + + @subsection usagenotes Usage notes + + @li The URL pattern is relative to the @ref apiroot. + @li If the @e source parameter is not supplied the source of the status will default to 'api'. + @li The XML response uses GeoRSS + to encode the latitude and longitude (see example response below ). + @li Data uploaded via the @e media parameter should be multipart/form-data encoded. + + @subsection exampleusage Example usage + + @verbatim + curl -u username:password http://example.com/api/statuses/update.xml -d status='Howdy!' -d lat='30.468' -d long='-94.743' + @endverbatim + + @subsection exampleresponse Example response + + @verbatim + + + Howdy! + false + Tue Mar 30 23:28:05 +0000 2010 + + api + 26668724 + + + + 30.468 -94.743 + + false + + 25803 + Jed Sanders + jedsanders + Hoop and Holler, Texas + I like to think of myself as America's Favorite. + http://avatar.example.com/25803-48-20080924200604.png + http://jedsanders.net + false + 5 + + + + + + 2 + Wed Sep 24 20:04:00 +0000 2008 + 0 + 0 + UTC + + false + 70 + true + true + + + @endverbatim +*/ + if (!defined('STATUSNET')) { exit(1); } diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index 7f80f252e7..3c25c049e9 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -28,11 +28,106 @@ * @author Mike Cochrane * @author Robin Millette * @author Zach Copley - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ +/* External API usage documentation. Please update when you change how this method works. */ + +/*! @page friendstimeline statuses/friends_timeline + + @section Description + Returns the 20 most recent statuses posted by the authenticating + user and that user's friends. This is the equivalent of "You and + friends" page in the web interface. + + @par URL patterns + @li /api/statuses/friends_timeline.:format + @li /api/statuses/friends_timeline/:id.:format + + @par Formats (:format) + xml, json, rss, atom + + @par ID (:id) + username, user id + + @par HTTP Method(s) + GET + + @par Requires Authentication + Sometimes (see: @ref authentication) + + @param user_id (Optional) Specifies a user by ID + @param screen_name (Optional) Specifies a user by screename (nickname) + @param since_id (Optional) Returns only statuses with an ID greater + than (that is, more recent than) the specified ID. + @param max_id (Optional) Returns only statuses with an ID less than + (that is, older than) or equal to the specified ID. + @param count (Optional) Specifies the number of statuses to retrieve. + @param page (Optional) Specifies the page of results to retrieve. + + @sa @ref authentication + @sa @ref apiroot + + @subsection usagenotes Usage notes + @li The URL pattern is relative to the @ref apiroot. + @li The XML response uses GeoRSS + to encode the latitude and longitude (see example response below ). + + @subsection exampleusage Example usage + + @verbatim + curl http://identi.ca/api/statuses/friends_timeline/evan.xml?count=1&page=2 + @endverbatim + + @subsection exampleresponse Example response + + @verbatim + + + + back from the !yul !drupal meet with Evolving Web folk, @anarcat, @webchick and others, and an interesting refresher on SQL indexing + false + Wed Mar 31 01:33:02 +0000 2010 + + <a href="http://code.google.com/p/microblog-purple/">mbpidgin</a> + 26674201 + + + + false + + 246 + Mark + lambic + Montreal, Canada + Geek + http://avatar.identi.ca/246-48-20080702141545.png + http://lambic.co.uk + false + 73 + #F0F2F5 + + #002E6E + #CEE1E9 + + 58 + Wed Jul 02 14:12:15 +0000 2008 + 2 + -14400 + US/Eastern + + false + 933 + false + false + + + + @endverbatim +*/ + if (!defined('STATUSNET')) { exit(1); } diff --git a/lib/apiaction.php b/lib/apiaction.php index d5580abd3a..f206f1d5c4 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -32,6 +32,66 @@ * @link http://status.net/ */ +/* External API usage documentation. Please update when you change how the API works. */ + +/*! @mainpage StatusNet REST API + + @section Introduction + + Some explanatory text about the API would be nice. + + @section API Methods + + @subsection timelinesmethods_sec Timeline Methods + + @li @ref friendstimeline + + @subsection statusmethods_sec Status Methods + + @li @ref statusesupdate + + @subsection usermethods_sec User Methods + + @subsection directmessagemethods_sec Direct Message Methods + + @subsection friendshipmethods_sec Friendship Methods + + @subsection socialgraphmethods_sec Social Graph Methods + + @subsection accountmethods_sec Account Methods + + @subsection favoritesmethods_sec Favorites Methods + + @subsection blockmethods_sec Block Methods + + @subsection oauthmethods_sec OAuth Methods + + @subsection helpmethods_sec Help Methods + + @subsection groupmethods_sec Group Methods + + @page apiroot API Root + + The URLs for methods referred to in this API documentation are + relative to the StatusNet API root. The API root is determined by the + site's @b server and @b path variables, which are generally specified + in config.php. For example: + + @code + $config['site']['server'] = 'example.org'; + $config['site']['path'] = 'statusnet' + @endcode + + The pattern for a site's API root is: @c protocol://server/path/api E.g: + + @c http://example.org/statusnet/api + + The @b path can be empty. In that case the API root would simply be: + + @c http://example.org/api + +*/ + if (!defined('STATUSNET')) { exit(1); } diff --git a/lib/apiauth.php b/lib/apiauth.php index d6ad7e0211..8c39988889 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -34,6 +34,24 @@ * @link http://status.net/ */ +/* External API usage documentation. Please update when you change how this method works. */ + +/*! @page authentication Authentication + + StatusNet supports HTTP Basic Authentication and OAuth for API calls. + + @warning Currently, users who have created accounts without setting a + password via OpenID, Facebook Connect, etc., cannot use the API until + they set a password with their account settings panel. + + @section HTTP Basic Auth + + + + @section OAuth + +*/ + if (!defined('STATUSNET')) { exit(1); } diff --git a/scripts/apidocs.config b/scripts/apidocs.config new file mode 100644 index 0000000000..fdbe35ba19 --- /dev/null +++ b/scripts/apidocs.config @@ -0,0 +1,1551 @@ +# Doxyfile 1.6.2 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "StatusNet REST API" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = ../apidocs + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = NO + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = NO + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = NO + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = NO + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = NO + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = NO + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = NO + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = NO + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= NO + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = NO + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = NO + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = NO + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = ../actions ../lib + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = api*.php + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = *Action Api* if* + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = NO + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = NO + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES From 809e597841d1337b641784eee21d5e9b5dc297e1 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 22 Apr 2010 17:57:57 -0400 Subject: [PATCH 021/730] Only shorten after the user presses space, or following a paste operation --- plugins/ClientSideShorten/shorten.js | 75 ++++++++++++++++------------ 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/plugins/ClientSideShorten/shorten.js b/plugins/ClientSideShorten/shorten.js index 8e07217563..b3a6146339 100644 --- a/plugins/ClientSideShorten/shorten.js +++ b/plugins/ClientSideShorten/shorten.js @@ -1,46 +1,59 @@ -// smart(x) from Paul Irish -// http://paulirish.com/2009/throttled-smartresize-jquery-event-handler/ +//wrap everything in a self-executing anonymous function to avoid conflicts +(function(){ -(function($,sr){ + // smart(x) from Paul Irish + // http://paulirish.com/2009/throttled-smartresize-jquery-event-handler/ - // debouncing function from John Hann - // http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/ - var debounce = function (func, threshold, execAsap) { - var timeout; + (function($,sr){ - return function debounced () { - var obj = this, args = arguments; - function delayed () { - if (!execAsap) + // debouncing function from John Hann + // http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/ + var debounce = function (func, threshold, execAsap) { + var timeout; + + return function debounced () { + var obj = this, args = arguments; + function delayed () { + if (!execAsap) + func.apply(obj, args); + timeout = null; + }; + + if (timeout) + clearTimeout(timeout); + else if (execAsap) func.apply(obj, args); - timeout = null; + + timeout = setTimeout(delayed, threshold || 100); }; + } + jQuery.fn[sr] = function(fn){ return fn ? this.bind('keypress', debounce(fn, 1000)) : this.trigger(sr); }; - if (timeout) - clearTimeout(timeout); - else if (execAsap) - func.apply(obj, args); + })(jQuery,'smartkeypress'); - timeout = setTimeout(delayed, threshold || 100); - }; - } - jQuery.fn[sr] = function(fn){ return fn ? this.bind('keypress', debounce(fn, 1000)) : this.trigger(sr); }; + $(document).ready(function(){ + $noticeDataText = $('#'+SN.C.S.NoticeDataText); + $noticeDataText.smartkeypress(function(e){ + if(e.charCode == '32') { + shorten(); + } + }); + $noticeDataText.bind('paste', shorten); + }); -})(jQuery,'smartkeypress'); - -$(document).ready(function(){ - $('#notice_data-text').smartkeypress(function(e){ - var original = $('#notice_data-text').val(); + function shorten() + { + $noticeDataText = $('#'+SN.C.S.NoticeDataText); + var original = $noticeDataText.val(); $.ajax({ url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten', - data: { text: $('#notice_data-text').val() }, + data: { text: $noticeDataText.val() }, dataType: 'text', success: function(data) { - if(original == $('#notice_data-text').val()) { - $('#notice_data-text').val(data); - $('#notice_data-text').keyup(); + if(original == $noticeDataText.val()) { + $noticeDataText.val(data).keyup(); } } }); - }); -}); + } +})(); From f91e99285196a3ef6d4f570e4839f7a4d87d5890 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 22 Apr 2010 18:03:05 -0400 Subject: [PATCH 022/730] use onAutoload instead of always requiring --- plugins/Autocomplete/AutocompletePlugin.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php index d586631a4a..b2b18bf275 100644 --- a/plugins/Autocomplete/AutocompletePlugin.php +++ b/plugins/Autocomplete/AutocompletePlugin.php @@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once(INSTALLDIR.'/plugins/Autocomplete/autocomplete.php'); - class AutocompletePlugin extends Plugin { function __construct() @@ -40,6 +38,16 @@ class AutocompletePlugin extends Plugin parent::__construct(); } + function onAutoload($cls) + { + switch ($cls) + { + case 'AutocompleteAction': + require_once(INSTALLDIR.'/plugins/Autocomplete/autocomplete.php'); + return false; + } + } + function onEndShowScripts($action){ if (common_logged_in()) { $action->script('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.pack.js'); From f852a1931b352ede261ec4597abdbb63683cc9a8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 16 Apr 2010 17:54:43 -0700 Subject: [PATCH 023/730] Add docs for public_timeline --- actions/apitimelinepublic.php | 89 +++++++++++++++++++++++++++++++++++ lib/apiaction.php | 1 + 2 files changed, 90 insertions(+) diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php index 9034614253..30f9f4cda6 100644 --- a/actions/apitimelinepublic.php +++ b/actions/apitimelinepublic.php @@ -55,6 +55,95 @@ require_once INSTALLDIR . '/lib/apiprivateauth.php'; * @link http://status.net/ */ +/* External API usage documentation. Please update when you change how this method works. */ + +/*! @page publictimeline statuses/public_timeline + + @section Description + Returns the 20 most recent notices from users throughout the system who have + uploaded their own avatars. Depending on configuration, it may or may not + not include notices from automatic posting services. + + @par URL patterns + @li /api/statuses/public_timeline.:format + + @par Formats (:format) + xml, json, rss, atom + + @par HTTP Method(s) + GET + + @par Requires Authentication + No + + @param since_id (Optional) Returns only statuses with an ID greater + than (that is, more recent than) the specified ID. + @param max_id (Optional) Returns only statuses with an ID less than + (that is, older than) or equal to the specified ID. + @param count (Optional) Specifies the number of statuses to retrieve. + @param page (Optional) Specifies the page of results to retrieve. + + @sa @ref apiroot + + @subsection usagenotes Usage notes + @li The URL pattern is relative to the @ref apiroot. + @li The XML response uses GeoRSS + to encode the latitude and longitude (see example response below ). + + @subsection exampleusage Example usage + + @verbatim + curl http://identi.ca/api/statuses/friends_timeline/evan.xml?count=1&page=2 + @endverbatim + + @subsection exampleresponse Example response + + @verbatim + + + + @skwashd oh, commbank reenabled me super quick both times. but disconcerting when you don't expect it though + false + Sat Apr 17 00:49:12 +0000 2010 + 28838393 + xmpp + 28838456 + 39303 + skwashd + + false + + 44517 + joshua may + notjosh + + + http://avatar.identi.ca/44517-48-20090321004106.jpeg + + false + 17 + + + + + + 20 + Sat Mar 21 00:40:25 +0000 2009 + 0 + 0 + UTC + + false + 100 + false + false + + + [....] + +@endverbatim +*/ + class ApiTimelinePublicAction extends ApiPrivateAuthAction { diff --git a/lib/apiaction.php b/lib/apiaction.php index f206f1d5c4..a3c34a91bf 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -44,6 +44,7 @@ @subsection timelinesmethods_sec Timeline Methods + @li @ref publictimeline @li @ref friendstimeline @subsection statusmethods_sec Status Methods From 7bdea95ccbf31cf9c9191a93c44dedb22f1fd3df Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 23 Apr 2010 06:55:46 -0700 Subject: [PATCH 024/730] Fix to make blowing of replies stream cache more consistent when receiving replies. (Was being done at mail notify time instead of at save time for local replies; now moved to reply save time internally so it can't get forgotten) --- classes/Notice.php | 4 +--- classes/Reply.php | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 4cf12fc6f9..c4a3168881 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -985,8 +985,6 @@ class Notice extends Memcached_DataObject $reply->profile_id = $user->id; $id = $reply->insert(); - - self::blow('reply:stream:%d', $user->id); } } @@ -1052,6 +1050,7 @@ class Notice extends Memcached_DataObject throw new ServerException("Couldn't save reply for {$this->id}, {$mentioned->id}"); } else { $replied[$mentioned->id] = 1; + self::blow('reply:stream:%d', $mentioned->id); } } } @@ -1107,7 +1106,6 @@ class Notice extends Memcached_DataObject foreach ($recipientIds as $recipientId) { $user = User::staticGet('id', $recipientId); if (!empty($user)) { - self::blow('reply:stream:%d', $recipientId); mail_notify_attn($user, $this); } } diff --git a/classes/Reply.php b/classes/Reply.php index 659e04c925..dc6296bda3 100644 --- a/classes/Reply.php +++ b/classes/Reply.php @@ -22,6 +22,20 @@ class Reply extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + /** + * Wrapper for record insertion to update related caches + */ + function insert() + { + $result = parent::insert(); + + if ($result) { + self::blow('reply:stream:%d', $this->profile_id); + } + + return $result; + } + function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0) { $ids = Notice::stream(array('Reply', '_streamDirect'), From 67b8b1334fc53fb06f1a751e534533e30b7cfd01 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 23 Apr 2010 07:10:36 -0700 Subject: [PATCH 025/730] Fix keys / keyTypes for Blacklist plugin - was spewing notices for undefined array indexes when saving blacklist entries from admin panel --- plugins/Blacklist/Homepage_blacklist.php | 4 ++-- plugins/Blacklist/Nickname_blacklist.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/Blacklist/Homepage_blacklist.php b/plugins/Blacklist/Homepage_blacklist.php index 32080667e1..ec89ee4bd8 100644 --- a/plugins/Blacklist/Homepage_blacklist.php +++ b/plugins/Blacklist/Homepage_blacklist.php @@ -94,7 +94,7 @@ class Homepage_blacklist extends Memcached_DataObject function keys() { - return array('pattern' => 'K'); + return array_keys($this->keyTypes()); } /** @@ -108,7 +108,7 @@ class Homepage_blacklist extends Memcached_DataObject function keyTypes() { - return $this->keys(); + return array('pattern' => 'K'); } /** diff --git a/plugins/Blacklist/Nickname_blacklist.php b/plugins/Blacklist/Nickname_blacklist.php index 9810631444..e8545292d1 100644 --- a/plugins/Blacklist/Nickname_blacklist.php +++ b/plugins/Blacklist/Nickname_blacklist.php @@ -88,7 +88,7 @@ class Nickname_blacklist extends Memcached_DataObject function keys() { - return array('pattern' => 'K'); + return array_keys($this->keyTypes()); } /** @@ -99,7 +99,7 @@ class Nickname_blacklist extends Memcached_DataObject function keyTypes() { - return $this->keys(); + return array('pattern' => 'K'); } /** From 390a2a8624b71be7d598b945452fc6e0000f3df5 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 23 Apr 2010 07:17:52 -0700 Subject: [PATCH 026/730] Fix for Blacklist plugin: was saving an empty entry if blacklist was empty, which would match *all* possible nickname registrations, preventing all registration on mozilla.status.net. Now saving only non-empty lines, and only matching non-empty lines so we don't fail if we still have a bogus entry. --- plugins/Blacklist/BlacklistPlugin.php | 4 ++-- plugins/Blacklist/blacklistadminpanel.php | 29 +++++++++++------------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index adc4d9d7e2..63bffe2c6f 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -262,7 +262,7 @@ class BlacklistPlugin extends Plugin $patterns = $this->_getUrlPatterns(); foreach ($patterns as $pattern) { - if (preg_match("/$pattern/", $url)) { + if ($pattern != '' && preg_match("/$pattern/", $url)) { return false; } } @@ -285,7 +285,7 @@ class BlacklistPlugin extends Plugin $patterns = $this->_getNicknamePatterns(); foreach ($patterns as $pattern) { - if (preg_match("/$pattern/", $nickname)) { + if ($pattern != '' && preg_match("/$pattern/", $nickname)) { return false; } } diff --git a/plugins/Blacklist/blacklistadminpanel.php b/plugins/Blacklist/blacklistadminpanel.php index b996aba8dc..23c503cd82 100644 --- a/plugins/Blacklist/blacklistadminpanel.php +++ b/plugins/Blacklist/blacklistadminpanel.php @@ -88,28 +88,27 @@ class BlacklistadminpanelAction extends AdminPanelAction function saveSettings() { - $nickPatterns = array(); - - $rawNickPatterns = explode("\n", $this->trimmed('blacklist-nicknames')); - - foreach ($rawNickPatterns as $raw) { - $nickPatterns[] = trim($raw); - } - + $nickPatterns = $this->splitPatterns($this->trimmed('blacklist-nicknames')); Nickname_blacklist::saveNew($nickPatterns); - $rawUrlPatterns = explode("\n", $this->trimmed('blacklist-urls')); - $urlPatterns = array(); - - foreach ($rawUrlPatterns as $raw) { - $urlPatterns[] = trim($raw); - } - + $urlPatterns = $this->splitPatterns($this->trimmed('url-nicknames')); Homepage_blacklist::saveNew($urlPatterns); return; } + protected function splitPatterns($text) + { + $patterns = array(); + foreach (explode("\n", $text) as $raw) { + $trimmed = trim($raw); + if ($trimmed != '') { + $patterns[] = $trimmed; + } + } + return $patterns; + } + /** * Validate the values * From 0f975f42159ce714b59b5d7ca958f3f5ee1b226b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 23 Apr 2010 08:24:53 -0700 Subject: [PATCH 027/730] Fix to regression in last commit; wrong field name for homepage blacklist --- plugins/Blacklist/blacklistadminpanel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Blacklist/blacklistadminpanel.php b/plugins/Blacklist/blacklistadminpanel.php index 23c503cd82..4289dec1ba 100644 --- a/plugins/Blacklist/blacklistadminpanel.php +++ b/plugins/Blacklist/blacklistadminpanel.php @@ -91,7 +91,7 @@ class BlacklistadminpanelAction extends AdminPanelAction $nickPatterns = $this->splitPatterns($this->trimmed('blacklist-nicknames')); Nickname_blacklist::saveNew($nickPatterns); - $urlPatterns = $this->splitPatterns($this->trimmed('url-nicknames')); + $urlPatterns = $this->splitPatterns($this->trimmed('blacklist-urls')); Homepage_blacklist::saveNew($urlPatterns); return; From 1de8877cad94e1f9252b1f6ccdea57ff3339c367 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 23 Apr 2010 12:13:46 -0400 Subject: [PATCH 028/730] Shorten text after paste operation Abort ajax shorten request if the user pastes/pushes another key --- plugins/ClientSideShorten/shorten.js | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/plugins/ClientSideShorten/shorten.js b/plugins/ClientSideShorten/shorten.js index b3a6146339..0db78eceaf 100644 --- a/plugins/ClientSideShorten/shorten.js +++ b/plugins/ClientSideShorten/shorten.js @@ -31,21 +31,11 @@ })(jQuery,'smartkeypress'); - $(document).ready(function(){ - $noticeDataText = $('#'+SN.C.S.NoticeDataText); - $noticeDataText.smartkeypress(function(e){ - if(e.charCode == '32') { - shorten(); - } - }); - $noticeDataText.bind('paste', shorten); - }); - function shorten() { $noticeDataText = $('#'+SN.C.S.NoticeDataText); var original = $noticeDataText.val(); - $.ajax({ + shortenAjax = $.ajax({ url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten', data: { text: $noticeDataText.val() }, dataType: 'text', @@ -56,4 +46,19 @@ } }); } + + $(document).ready(function(){ + $noticeDataText = $('#'+SN.C.S.NoticeDataText); + $noticeDataText.smartkeypress(function(e){ + if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort(); + if(e.charCode == '32') { + shorten(); + } + }); + $noticeDataText.bind('paste', function() { + if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort(); + setTimeout(shorten,1); + }); + }); + })(); From 4beaba9fb013ab32be0e07fe4d25a622c95b8a06 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 23 Apr 2010 11:28:50 -0700 Subject: [PATCH 029/730] Ticket #93: pretty up the auto-submit for OpenID logins a bit. * throwing in our spinner * cleanup of texts * "If this doesn't go through click the button" instead of just a mystery button * slightly faster submission: immediate at end of page rather than waiting for jQuery to confirm document setup completion --- plugins/OpenID/openid.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 1524389177..4ec336e1c3 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -299,11 +299,21 @@ class AutosubmitAction extends Action function title() { - return _m('OpenID Auto-Submit'); + return _m('OpenID Login Submission'); } function showContent() { + $this->raw('

'); + // @fixme this would be better using standard CSS class, but the present theme's a bit scary. + $this->element('img', array('src' => Theme::path('images/icons/icon_processing.gif', 'base'), + // for some reason the base CSS sets s as block display?! + 'style' => 'display: inline')); + $this->text(_m('Requesting authorization from your login provider...')); + $this->raw('

'); + $this->raw('

'); + $this->text(_m('If you are not redirected to your login provider in a few seconds, try pushing the button below.')); + $this->raw('

'); $this->raw($this->form_html); } @@ -311,8 +321,6 @@ class AutosubmitAction extends Action { parent::showScripts(); $this->element('script', null, - '$(document).ready(function() { ' . - ' $(\'#'. $this->form_id .'\').submit(); '. - '});'); + 'document.getElementById(\'' . $this->form_id . '\').submit();'); } } From 9c8052e755e5ad4c8120ace9acdd75ee910e2ab7 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 23 Apr 2010 12:54:31 -0700 Subject: [PATCH 030/730] Rerun feed discovery and update the feed, salmon, and hub for the given OStatus remote profile. Restarts subscription fresh as well. update-profile.php -sexample.com http://example.com/path/to/profile/url --- plugins/OStatus/scripts/update-profile.php | 147 +++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 plugins/OStatus/scripts/update-profile.php diff --git a/plugins/OStatus/scripts/update-profile.php b/plugins/OStatus/scripts/update-profile.php new file mode 100644 index 0000000000..d06de4f903 --- /dev/null +++ b/plugins/OStatus/scripts/update-profile.php @@ -0,0 +1,147 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..')); + +$helptext = <<uri\n"; +showProfile($oprofile); + +print "\n"; +print "Re-running feed discovery for profile URL $oprofile->uri\n"; +// @fixme will bork where the URI isn't the profile URL for now +$discover = new FeedDiscovery(); +$feedurl = $discover->discoverFromURL($oprofile->uri); +$huburi = $discover->getAtomLink('hub'); +$salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES); + +print " Feed URL: $feedurl\n"; +print " Hub URL: $huburi\n"; +print " Salmon URL: $salmonuri\n"; + +if ($feedurl != $oprofile->feeduri || $salmonuri != $oprofile->salmonuri) { + print "\n"; + print "Updating...\n"; + // @fixme update keys :P + #$orig = clone($oprofile); + #$oprofile->feeduri = $feedurl; + #$oprofile->salmonuri = $salmonuri; + #$ok = $oprofile->update($orig); + $ok = $oprofile->query('UPDATE ostatus_profile SET ' . + 'feeduri=\'' . $oprofile->escape($feedurl) . '\',' . + 'salmonuri=\'' . $oprofile->escape($salmonuri) . '\' ' . + 'WHERE uri=\'' . $oprofile->escape($uri) . '\''); + + if (!$ok) { + print "Failed to update profile record...\n"; + exit(1); + } + + $oprofile->decache(); +} else { + print "\n"; + print "Ok, ostatus_profile record unchanged.\n\n"; +} + +$sub = FeedSub::ensureFeed($feedurl); + +if ($huburi != $sub->huburi) { + print "\n"; + print "Updating hub record for feed; was $sub->huburi\n"; + $orig = clone($sub); + $sub->huburi = $huburi; + $ok = $sub->update($orig); + + if (!$ok) { + print "Failed to update sub record...\n"; + exit(1); + } +} else { + print "\n"; + print "Feed record ok, not changing.\n\n"; +} + +print "\n"; +print "Pinging hub $sub->huburi with new subscription for $sub->uri\n"; +$ok = $sub->subscribe(); + +if ($ok) { + print "ok\n"; +} else { + print "Could not confirm.\n"; +} + +$o2 = Ostatus_profile::staticGet('uri', $uri); + +print "\n"; +print "New profile state:\n"; +showProfile($o2); + +print "\n"; +print "New feed state:\n"; +$sub2 = FeedSub::ensureFeed($feedurl); +showSub($sub2); + +function showProfile($oprofile) +{ + print " Feed URL: $oprofile->feeduri\n"; + print " Salmon URL: $oprofile->salmonuri\n"; + print " Avatar URL: $oprofile->avatar\n"; + print " Profile ID: $oprofile->profile_id\n"; + print " Group ID: $oprofile->group_id\n"; + print " Record created: $oprofile->created\n"; + print " Record modified: $oprofile->modified\n"; +} + +function showSub($sub) +{ + print " Subscription state: $sub->sub_state\n"; + print " Verify token: $sub->verify_token\n"; + print " Signature secret: $sub->secret\n"; + print " Sub start date: $sub->sub_start\n"; + print " Record created: $sub->created\n"; + print " Record modified: $sub->modified\n"; +} From 8fd0059bf69ed16ed4efad7b8e16dc2afda32e18 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 23 Apr 2010 15:40:48 -0700 Subject: [PATCH 031/730] Test cases and fixes for Atom and RSS content decoding. Fix extraction of Atom and ; we were failing to escape plaintext source data to HTML, and doing an extraneous double-deescape on HTML source resulting in breakage of notices containing text that looks like HTML. Only was working correctly previously. Fixes for RSS2 content processing: we were failing to load at all due to using wrong element name, and were applying an extraneous de-escape for rather than the escaping that is required to turn plaintext into HTML. (Per spec, must be plaintext.) --- lib/activity.php | 14 +++++-- lib/activityutils.php | 12 +++++- tests/ActivityParseTests.php | 77 ++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 5 deletions(-) diff --git a/lib/activity.php b/lib/activity.php index 5d6230c6df..27f09ab4d4 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -83,6 +83,7 @@ class Activity const CREATOR = 'creator'; const CONTENTNS = 'http://purl.org/rss/1.0/modules/content/'; + const ENCODED = 'encoded'; public $actor; // an ActivityObject public $verb; // a string (the URL) @@ -268,14 +269,21 @@ class Activity $this->title = ActivityUtils::childContent($item, ActivityObject::TITLE, self::RSS); - $contentEl = ActivityUtils::child($item, ActivityUtils::CONTENT, self::CONTENTNS); + $contentEl = ActivityUtils::child($item, self::ENCODED, self::CONTENTNS); if (!empty($contentEl)) { - $this->content = htmlspecialchars_decode($contentEl->textContent, ENT_QUOTES); + // XML node's text content is HTML; no further processing needed. + $this->content = $contentEl->textContent; } else { $descriptionEl = ActivityUtils::child($item, self::DESCRIPTION, self::RSS); if (!empty($descriptionEl)) { - $this->content = htmlspecialchars_decode($descriptionEl->textContent, ENT_QUOTES); + // Per spec, must be plaintext. + // In practice, often there's HTML... but these days good + // feeds are using which is explicitly + // real HTML. + // We'll treat this following spec, and do HTML escaping + // to convert from plaintext to HTML. + $this->content = htmlspecialchars($descriptionEl->textContent); } } diff --git a/lib/activityutils.php b/lib/activityutils.php index a7e99fb11e..401fd7fc28 100644 --- a/lib/activityutils.php +++ b/lib/activityutils.php @@ -213,11 +213,19 @@ class ActivityUtils // slavishly following http://atompub.org/rfc4287.html#rfc.section.4.1.3.3 if (empty($type) || $type == 'text') { - return $el->textContent; + // We have plaintext saved as the XML text content. + // Since we want HTML, we need to escape any special chars. + return htmlspecialchars($el->textContent); } else if ($type == 'html') { + // We have HTML saved as the XML text content. + // No additional processing required once we've got it. $text = $el->textContent; - return htmlspecialchars_decode($text, ENT_QUOTES); + return $text; } else if ($type == 'xhtml') { + // Per spec, the contains a single + // HTML
with XHTML namespace on it as a child node. + // We need to pull all of that
's child nodes and + // serialize them back to an (X)HTML source fragment. $divEl = ActivityUtils::child($el, 'div', 'http://www.w3.org/1999/xhtml'); if (empty($divEl)) { return null; diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php index 4563da9146..378478d741 100644 --- a/tests/ActivityParseTests.php +++ b/tests/ActivityParseTests.php @@ -32,6 +32,18 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase $this->assertEquals('tag:versioncentral.example.org,2009:/change/1643245', $act->objects[0]->id); } + public function testExample2() + { + global $_example2; + $dom = DOMDocument::loadXML($_example2); + $act = new Activity($dom->documentElement); + + $this->assertFalse(empty($act)); + // Did we handle correctly with a typical payload? + $this->assertEquals("

Geraldine posted a Photo on PhotoPanic

\n " . + "", trim($act->content)); + } + public function testExample3() { global $_example3; @@ -305,6 +317,71 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase } + public function testAtomContent() + { + $tests = array(array("Some regular plain text.", + "Some regular plain text."), + array("<b>this is not HTML</b>", + "<b>this is not HTML</b>"), + array("Some regular plain HTML.", + "Some regular plain HTML."), + array("<b>this is too HTML</b>", + "this is too HTML"), + array("&lt;b&gt;but this is not HTML!&lt;/b&gt;", + "<b>but this is not HTML!</b>"), + array("
Some regular plain XHTML.
", + "Some regular plain XHTML."), + array("
This is some XHTML!
", + "This is some XHTML!"), + array("
<b>This is not some XHTML!</b>
", + "<b>This is not some XHTML!</b>"), + array("
&lt;b&gt;This is not some XHTML either!&lt;/b&gt;
", + "&lt;b&gt;This is not some XHTML either!&lt;/b&gt;")); + foreach ($tests as $data) { + list($source, $output) = $data; + $xml = "" . + "http://example.com/fakeid" . + "Test" . + "Atom content tests" . + $source . + ""; + $dom = DOMDocument::loadXML($xml); + $act = new Activity($dom->documentElement); + + $this->assertFalse(empty($act)); + $this->assertEquals($output, trim($act->content)); + } + } + + public function testRssContent() + { + $tests = array(array("Some regular plain HTML.", + "Some regular plain HTML."), + array("Some <b>exciting bold HTML</b>", + "Some exciting bold HTML"), + array("Some &lt;b&gt;escaped non-HTML.&lt;/b&gt;", + "Some <b>escaped non-HTML.</b>"), + array("Some plain text.", + "Some plain text."), + array("Some <b>non-HTML text</b>", + "Some <b>non-HTML text</b>"), + array("Some &lt;b&gt;double-escaped text&lt;/b&gt;", + "Some &lt;b&gt;double-escaped text&lt;/b&gt;")); + foreach ($tests as $data) { + list($source, $output) = $data; + $xml = "" . + "http://example.com/fakeid" . + "RSS content tests" . + $source . + ""; + $dom = DOMDocument::loadXML($xml); + $act = new Activity($dom->documentElement); + + $this->assertFalse(empty($act)); + $this->assertEquals($output, trim($act->content)); + } + } + } $_example1 = << Date: Sat, 24 Apr 2010 16:25:40 +0200 Subject: [PATCH 032/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/af/LC_MESSAGES/statusnet.po | 60 +-- locale/ar/LC_MESSAGES/statusnet.po | 60 +-- locale/arz/LC_MESSAGES/statusnet.po | 60 +-- locale/bg/LC_MESSAGES/statusnet.po | 60 +-- locale/br/LC_MESSAGES/statusnet.po | 381 +++++++------- locale/ca/LC_MESSAGES/statusnet.po | 141 +++-- locale/cs/LC_MESSAGES/statusnet.po | 60 +-- locale/de/LC_MESSAGES/statusnet.po | 69 ++- locale/el/LC_MESSAGES/statusnet.po | 60 +-- locale/en_GB/LC_MESSAGES/statusnet.po | 60 +-- locale/es/LC_MESSAGES/statusnet.po | 69 ++- locale/fa/LC_MESSAGES/statusnet.po | 60 +-- locale/fi/LC_MESSAGES/statusnet.po | 60 +-- locale/fr/LC_MESSAGES/statusnet.po | 73 ++- locale/ga/LC_MESSAGES/statusnet.po | 60 +-- locale/gl/LC_MESSAGES/statusnet.po | 713 +++++++++++++++----------- locale/he/LC_MESSAGES/statusnet.po | 60 +-- locale/hsb/LC_MESSAGES/statusnet.po | 63 ++- locale/ia/LC_MESSAGES/statusnet.po | 68 ++- locale/is/LC_MESSAGES/statusnet.po | 60 +-- locale/it/LC_MESSAGES/statusnet.po | 60 +-- locale/ja/LC_MESSAGES/statusnet.po | 60 +-- locale/ko/LC_MESSAGES/statusnet.po | 60 +-- locale/mk/LC_MESSAGES/statusnet.po | 68 ++- locale/nb/LC_MESSAGES/statusnet.po | 120 ++--- locale/nl/LC_MESSAGES/statusnet.po | 69 ++- locale/nn/LC_MESSAGES/statusnet.po | 60 +-- locale/pl/LC_MESSAGES/statusnet.po | 69 ++- locale/pt/LC_MESSAGES/statusnet.po | 70 ++- locale/pt_BR/LC_MESSAGES/statusnet.po | 60 +-- locale/ru/LC_MESSAGES/statusnet.po | 69 ++- locale/statusnet.pot | 56 +- locale/sv/LC_MESSAGES/statusnet.po | 69 ++- locale/te/LC_MESSAGES/statusnet.po | 98 ++-- locale/tr/LC_MESSAGES/statusnet.po | 60 +-- locale/uk/LC_MESSAGES/statusnet.po | 69 ++- locale/vi/LC_MESSAGES/statusnet.po | 60 +-- locale/zh_CN/LC_MESSAGES/statusnet.po | 60 +-- locale/zh_TW/LC_MESSAGES/statusnet.po | 60 +-- 39 files changed, 1833 insertions(+), 1761 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index 9ff8d646dd..b8b48f1084 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:11:49+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:16:38+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -98,8 +98,8 @@ msgstr "Hierdie bladsy bestaan nie" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -123,7 +123,7 @@ msgstr "%1$s en vriende, bladsy %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -185,7 +185,7 @@ msgstr "U en vriende" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -207,9 +207,9 @@ msgstr "Opdaterings van %1$s en vriende op %2$s." #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -226,7 +226,7 @@ msgstr "Die API-funksie is nie gevind nie." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Hierdie metode benodig 'n POST." @@ -256,7 +256,7 @@ msgstr "Kon nie die profiel stoor nie." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -643,17 +643,17 @@ msgstr "Die status is verwyder." msgid "No status with that ID found." msgstr "Geen status met die ID gevind nie." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Nie gevind nie." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -682,12 +682,12 @@ msgstr "" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2459,8 +2459,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -4616,7 +4616,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5068,7 +5068,7 @@ msgid "Snapshots configuration" msgstr "" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6472,56 +6472,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "'n paar sekondes gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "ongeveer 'n minuut gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minute gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "ongeveer 'n uur gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "ongeveer een dag gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dae gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "ongeveer een maand gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maande gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "ongeveer een jaar gelede" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 21d95a2241..c5dd909e20 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:11:52+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:16:41+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -99,8 +99,8 @@ msgstr "لا صفحة كهذه." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -124,7 +124,7 @@ msgstr "%1$s والأصدقاء, الصفحة %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -184,7 +184,7 @@ msgstr "أنت والأصدقاء" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -206,9 +206,9 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -225,7 +225,7 @@ msgstr "لم يتم العثور على وسيلة API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقة POST." @@ -255,7 +255,7 @@ msgstr "لم يمكن حفظ الملف." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -637,17 +637,17 @@ msgstr "حُذِفت الحالة." msgid "No status with that ID found." msgstr "لا حالة وُجدت بهذه الهوية." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "لم يوجد." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -676,12 +676,12 @@ msgstr "" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "مسار %s الزمني العام" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2453,8 +2453,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -4641,7 +4641,7 @@ msgstr "مشكلة أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" @@ -5103,7 +5103,7 @@ msgid "Snapshots configuration" msgstr "ضبط المسارات" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6579,56 +6579,56 @@ msgid "Moderator" msgstr "مراقب" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "قبل يوم تقريبا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "قبل شهر تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "قبل سنة تقريبًا" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 7f5f7b8ab3..a09ec71751 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:11:55+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:16:44+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -106,8 +106,8 @@ msgstr "لا صفحه كهذه" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -131,7 +131,7 @@ msgstr "%1$s و الصحاب, صفحه %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -191,7 +191,7 @@ msgstr "أنت والأصدقاء" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -213,9 +213,9 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -232,7 +232,7 @@ msgstr "الـ API method مش موجوده." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقه POST." @@ -262,7 +262,7 @@ msgstr "لم يمكن حفظ الملف." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -645,17 +645,17 @@ msgstr "حُذِفت الحاله." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "لم يوجد." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -684,12 +684,12 @@ msgstr "" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "مسار %s الزمنى العام" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2473,8 +2473,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr " مش نظام بيانات مدعوم." @@ -4658,7 +4658,7 @@ msgstr "مشكله أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" @@ -5142,7 +5142,7 @@ msgid "Snapshots configuration" msgstr "ضبط المسارات" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6560,56 +6560,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "قبل يوم تقريبا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "قبل شهر تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "قبل سنه تقريبًا" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 6fc613032c..3c4fc0a8eb 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:11:58+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:16:47+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -100,8 +100,8 @@ msgstr "Няма такака страница." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -125,7 +125,7 @@ msgstr "%1$s и приятели, страница %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -185,7 +185,7 @@ msgstr "Вие и приятелите" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -207,9 +207,9 @@ msgstr "Бележки от %1$s и приятели в %2$s." #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -226,7 +226,7 @@ msgstr "Не е открит методът в API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Този метод изисква заявка POST." @@ -256,7 +256,7 @@ msgstr "Грешка при запазване на профила." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -646,17 +646,17 @@ msgstr "Бележката е изтрита." msgid "No status with that ID found." msgstr "Не е открита бележка с такъв идентификатор." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Твърде дълга бележка. Трябва да е най-много 140 знака." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Не е открито." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -685,12 +685,12 @@ msgstr "%1$s / Реплики на %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s реплики на съобщения от %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Общ поток на %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2558,8 +2558,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -4816,7 +4816,7 @@ msgstr "Проблем при записване на бележката." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5298,7 +5298,7 @@ msgid "Snapshots configuration" msgstr "Настройка на пътищата" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6739,56 +6739,56 @@ msgid "Moderator" msgstr "Модератор" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "преди няколко секунди" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "преди около минута" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "преди около час" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "преди около %d часа" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "преди около ден" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "преди около месец" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "преди около %d месеца" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "преди около година" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 8362298aca..18092074c1 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:01+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:17:22+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -98,8 +98,8 @@ msgstr "N'eus ket eus ar bajenn-se." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -123,7 +123,7 @@ msgstr "%1$s hag e vignoned, pajenn %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -183,7 +183,7 @@ msgstr "C'hwi hag o mignoned" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -205,9 +205,9 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -224,7 +224,7 @@ msgstr "N'eo ket bet kavet an hentenn API !" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Ezhomm en deus an argerzh-mañ eus ur POST." @@ -254,7 +254,7 @@ msgstr "Diposubl eo enrollañ ar profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -482,9 +482,9 @@ msgstr "Strollad %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s #: actions/apigrouplist.php:107 -#, fuzzy, php-format +#, php-format msgid "%1$s groups %2$s is a member of." -msgstr "Ezel eo %s eus ar strolladoù" +msgstr "Strolladoù %1s m'eo ezel %2s." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. @@ -636,17 +636,17 @@ msgstr "Statud diverket." msgid "No status with that ID found." msgstr "N'eo ket bet kavet a statud evit an ID-mañ" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "N'eo ket bet kavet." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -675,12 +675,12 @@ msgstr "%1$s / Hizivadennoù a veneg %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Oberezhioù publik %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s statud an holl !" @@ -890,9 +890,9 @@ msgstr "Distankañ an implijer-mañ" #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 -#, fuzzy, php-format +#, php-format msgid "Post to %s" -msgstr "Postañ war " +msgstr "Postañ war %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -908,9 +908,9 @@ msgstr "N'eo ket ar c'hod-se evidoc'h !" #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. #: actions/confirmaddress.php:91 -#, fuzzy, php-format +#, php-format msgid "Unrecognized address type %s." -msgstr "N'eo ket bet anavezet seurt ar chomlec'h %s" +msgstr "Doare chomlec'h dianav %s." #. TRANS: Client error for an already confirmed email/jabbel/sms address. #: actions/confirmaddress.php:96 @@ -1074,9 +1074,9 @@ msgid "Invalid logo URL." msgstr "URL fall evit al logo." #: actions/designadminpanel.php:280 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s." -msgstr "N'eus ket tu kaout an dodenn : %s" +msgstr "N'eus ket eus ar gaoz-se : %s." #: actions/designadminpanel.php:376 msgid "Change logo" @@ -1429,9 +1429,8 @@ msgstr "Embann ur MicroID evit ma chomlec'h postel." #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "Enrollet eo bet an arventennoù design." +msgstr "Enrollet eo bet an arventennoù postel." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1465,7 +1464,7 @@ msgstr "" #: actions/emailsettings.php:391 actions/imsettings.php:348 #: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." -msgstr "" +msgstr "Dibosupl eo ensoc'hañ ar c'hod gwiriekaat." #. TRANS: Message given saving valid e-mail address that is to be confirmed. #: actions/emailsettings.php:398 @@ -1489,9 +1488,8 @@ msgstr "N'eo ket mat ar chomlec'h postelerezh prim." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "Nullet eo bet ar gadarnadenn." +msgstr "Nullet eo bet kadarnadenn ar postel." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1501,9 +1499,8 @@ msgstr "N'eo ket ho postel." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "Dilamet eo bet ar chomlec'h." +msgstr "Dilamet eo bet ar chomlec'h postel." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1514,7 +1511,7 @@ msgstr "Chomlec'h postel ebet o tont." #: actions/emailsettings.php:504 actions/emailsettings.php:528 #: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." -msgstr "" +msgstr "Dibosupl eo hizivaat doser an implijer." #. TRANS: Message given after successfully removing an incoming e-mail address. #: actions/emailsettings.php:508 actions/smssettings.php:581 @@ -2010,9 +2007,8 @@ msgstr "Diposubl eo dilemel ar postel kadarnadur." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "Nullet eo bet ar gadarnadenn." +msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2045,9 +2041,9 @@ msgid "Invites have been disabled." msgstr "Diweredekaat eo bet ar bedadennoù." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." -msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad." +msgstr "Rankout a reoc'h bezañ luget evit pediñ implijerien all e %s." #: actions/invite.php:72 #, php-format @@ -2230,17 +2226,16 @@ msgstr "" "tremen a-benn enrollañ ho penndibaboù." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Anv implijer pe ger-tremen direizh." +msgstr "Kevreit gant ho anv implijer hag ho ker-tremen." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Kevreit gant ho anv implijer hag ho ker tremen. N'o peus ket a anv implijer " -"evit c'hoazh ? [Krouit](%%action.register%%) ur gont nevez." +"N'o peus ket a anv implijer evit c'hoazh ? [Krouit](%%action.register%%) ur " +"gont nevez." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2455,8 +2450,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -2760,9 +2755,9 @@ msgid "People search" msgstr "Klask tud" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "N'eo ket reizh ar merk-se : %s" +msgstr "N'eo ket reizh ar merk-se : %s." #: actions/peopletag.php:142 #, php-format @@ -2770,9 +2765,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "Implijerien bet merket drezo o unan gant %1$s - pajenn %2$d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "Danvez direizh an ali" +msgstr "Danvez direizh an ali." #: actions/postnotice.php:101 #, php-format @@ -2819,7 +2813,7 @@ msgstr "" #: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" -msgstr "" +msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h" #: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" @@ -2838,7 +2832,7 @@ msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\"" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "Rannañ va lec'hiadur pa bostan un ali." #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -2896,7 +2890,7 @@ msgstr "" #: actions/profilesettings.php:363 msgid "Couldn't save location prefs." -msgstr "" +msgstr "Dibosupl eo enrollañ an dibaboù lec'hiadur." #: actions/profilesettings.php:375 msgid "Couldn't save profile." @@ -2914,7 +2908,7 @@ msgstr "Enrollet eo bet an arventennoù." #: actions/public.php:83 #, php-format msgid "Beyond the page limit (%s)." -msgstr "" +msgstr "Dreist da bevennoù ar bajenn (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2931,15 +2925,15 @@ msgstr "" #: actions/public.php:160 msgid "Public Stream Feed (RSS 1.0)" -msgstr "" +msgstr "Neudenn gwazh foran (RSS 1.0)" #: actions/public.php:164 msgid "Public Stream Feed (RSS 2.0)" -msgstr "" +msgstr "Neudenn gwazh foran (RSS 2.0)" #: actions/public.php:168 msgid "Public Stream Feed (Atom)" -msgstr "" +msgstr "Neudenn gwazh foran (Atom)" #: actions/public.php:188 #, php-format @@ -2982,7 +2976,7 @@ msgstr "" #: actions/publictagcloud.php:63 #, php-format msgid "These are most popular recent tags on %s " -msgstr "" +msgstr "Ar merkoù ziwezhañ evit ar re vrudetañ war %s " #: actions/publictagcloud.php:69 #, php-format @@ -2991,7 +2985,7 @@ msgstr "" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Bezit an hini gentañ oc'h embann unan !" #: actions/publictagcloud.php:75 #, php-format @@ -3018,15 +3012,15 @@ msgstr "N'eo ket ur c'hod adtapout an dra-mañ." #: actions/recoverpassword.php:73 msgid "Recovery code for unknown user." -msgstr "" +msgstr "Kod adtapout evit un implijer dizanv." #: actions/recoverpassword.php:86 msgid "Error with confirmation code." -msgstr "" +msgstr "Ur fazi 'zo bet gant ar c'hod kadarnaat." #: actions/recoverpassword.php:97 msgid "This confirmation code is too old. Please start again." -msgstr "" +msgstr "Re gozh eo ar c'hod gwiriañ. Adkrogit mar plij." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." @@ -3048,7 +3042,7 @@ msgstr "Adtapout ar ger-tremen" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Lesanv pe chomlec'h postel" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -3088,15 +3082,15 @@ msgstr "Lakait ul lesanv pe ur chomlec'h postel." #: actions/recoverpassword.php:282 msgid "No user with that email address or username." -msgstr "" +msgstr "N'eus bet kavet implijer ebet gant ar postel-se pe an anv-se." #: actions/recoverpassword.php:299 msgid "No registered email address for that user." -msgstr "" +msgstr "Chomlec'h postel enrollet ebet evit an implijer-mañ." #: actions/recoverpassword.php:313 msgid "Error saving address confirmation." -msgstr "" +msgstr "Ur fazi 'zo bet pa voe enrollet kod kadarnaat ar postel." #: actions/recoverpassword.php:338 msgid "" @@ -3110,23 +3104,25 @@ msgstr "" #: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." -msgstr "" +msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ." #: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." -msgstr "" +msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur." #: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." -msgstr "" +msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer." #: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." -msgstr "" +msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ." #: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" +"Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em " +"enskrivañ." #: actions/register.php:92 msgid "Sorry, invalid invitation code." @@ -3134,7 +3130,7 @@ msgstr "Digarezit, kod pedadenn direizh." #: actions/register.php:112 msgid "Registration successful" -msgstr "" +msgstr "Krouet eo bet ar gont." #: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" @@ -3142,11 +3138,13 @@ msgstr "Krouiñ ur gont" #: actions/register.php:135 msgid "Registration not allowed." -msgstr "" +msgstr "N'eo ket aotreet krouiñ kontoù." #: actions/register.php:198 msgid "You can't register if you don't agree to the license." msgstr "" +"Rankout a reoc'h bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur " +"gont." #: actions/register.php:212 msgid "Email address already exists." @@ -3154,7 +3152,7 @@ msgstr "Implijet eo dija ar chomlec'h postel-se." #: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." -msgstr "" +msgstr "Anv implijer pe ger-tremen direizh." #: actions/register.php:343 msgid "" @@ -3230,11 +3228,11 @@ msgstr "" #: actions/remotesubscribe.php:112 msgid "Remote subscribe" -msgstr "" +msgstr "Koumanant eus a-bell" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "" +msgstr "Koumanantiñ d'un implijer pell" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -3259,7 +3257,7 @@ msgstr "En em enskrivañ" #: actions/remotesubscribe.php:159 msgid "Invalid profile URL (bad format)" -msgstr "" +msgstr "URL direizh evit ar profil (furmad fall)" #: actions/remotesubscribe.php:168 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." @@ -3271,11 +3269,11 @@ msgstr "" #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." -msgstr "" +msgstr "Dibosupl eo kaout ur jedaouer reked." #: actions/repeat.php:57 msgid "Only logged-in users can repeat notices." -msgstr "" +msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù." #: actions/repeat.php:64 actions/repeat.php:71 msgid "No notice specified." @@ -3399,7 +3397,7 @@ msgstr "" #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 #: actions/useradminpanel.php:294 msgid "Save site settings" -msgstr "" +msgstr "Enrollañ arventennoù al lec'hienn" #: actions/showapplication.php:82 msgid "You must be logged in to view an application." @@ -3495,12 +3493,12 @@ msgstr "" #: actions/showfavorites.php:171 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "" +msgstr "Gwazh evit mignoned %s (RSS 1.0)" #: actions/showfavorites.php:178 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "" +msgstr "Gwazh evit mignoned %s (RSS 2.0)" #: actions/showfavorites.php:185 #, php-format @@ -3567,17 +3565,17 @@ msgstr "Obererezh ar strollad" #: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "" +msgstr "Neudenn alioù ar strollad %s (RSS 1.0)" #: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "" +msgstr "Neudenn alioù ar strollad %s (RSS 2.0)" #: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" -msgstr "" +msgstr "Neudenn alioù ar strollad %s (Atom)" #: actions/showgroup.php:355 #, php-format @@ -3662,17 +3660,17 @@ msgstr "%1$s, pajenn %2$d" #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "" +msgstr "Neudenn an alioù evit %1$s merket %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "" +msgstr "Neudenn an alioù evit %s (RSS 1.0)" #: actions/showstream.php:136 #, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "" +msgstr "Neudenn an alioù evit %s (RSS 2.0)" #: actions/showstream.php:143 #, php-format @@ -3751,7 +3749,7 @@ msgstr "Yezh \"%s\" dizanv." #: actions/siteadminpanel.php:165 msgid "Minimum text limit is 0 (unlimited)." -msgstr "" +msgstr "Ar vevenn izelañ evit an destenn a zo 0 arouezenn (anvevenn)." #: actions/siteadminpanel.php:171 msgid "Dupe limit must be one or more seconds." @@ -3767,7 +3765,7 @@ msgstr "Anv al lec'hienn" #: actions/siteadminpanel.php:225 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "Anv ho lec'hienn, evel \"Microblog ho embregerezh\"" #: actions/siteadminpanel.php:229 msgid "Brought by" @@ -3787,7 +3785,7 @@ msgstr "" #: actions/siteadminpanel.php:239 msgid "Contact email address for your site" -msgstr "" +msgstr "Chomlec'h postel daremprediñ ho lec'hienn" #: actions/siteadminpanel.php:245 msgid "Local" @@ -3834,9 +3832,8 @@ msgid "Site Notice" msgstr "Ali al lec'hienn" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Kemennadenn nevez" +msgstr "Kemmañ ur gemennadenn hag a zo diwar-benn al lec'hienn a-bezh" #: actions/sitenoticeadminpanel.php:103 msgid "Unable to save site notice." @@ -3853,6 +3850,8 @@ msgstr "Testenn ali al lec'hienn" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" +"Testenn an ali diwar-benn al lec'hienn a-bezh (255 arouezenn d'ar muiañ ; " +"HTML gweredekaet)" #: actions/sitenoticeadminpanel.php:198 msgid "Save site notice" @@ -3869,6 +3868,8 @@ msgstr "Arventennoù SMS" #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" +"Gellout a reoc'h resevout kemmadennoù SMS dre postel o tont eus %%site.name%" +"%." #. TRANS: Message given in the SMS settings if SMS is not enabled on the site. #: actions/smssettings.php:97 @@ -3877,19 +3878,18 @@ msgstr "Dizimplijadus eo an SMS." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "Chomlec'h postelerezh prim" +msgstr "Chomlec'h SMS" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." -msgstr "" +msgstr "Niverenn pellgomz bet gwiriekaet evit resevout SMSoù." #. TRANS: Form guide in IM settings form. #: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." -msgstr "" +msgstr "Niverenn pellgomz o c'hortoz bezañ kadarnaet." #. TRANS: Field label for SMS address input in SMS settings form. #: actions/smssettings.php:142 @@ -3899,7 +3899,7 @@ msgstr "Kod kadarnaat" #. TRANS: Form field instructions in SMS settings form. #: actions/smssettings.php:144 msgid "Enter the code you received on your phone." -msgstr "" +msgstr "Lakait ar c'hod o peus resevet war ho pellgomzer hezoug." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 @@ -3931,9 +3931,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "Penndibaboù enrollet" +msgstr "Penndibaboù an SMSoù enrollet." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -3969,9 +3968,8 @@ msgstr "Direizh eo ar c'hod gwiriekaat-mañ." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "Nullet eo bet ar gadarnadenn." +msgstr "Nullet eo bet ar gadarnadenn SMS." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. @@ -3981,14 +3979,13 @@ msgstr "n'eo ket ho niverenn pellgomz." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "Niverenn bellgomz evit an SMS" +msgstr "Dilamet eo bet an niverenn bellgomz evit an SMSoù." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 msgid "Mobile carrier" -msgstr "" +msgstr "Pourvezer pellgomzerezh hezoug" #. TRANS: Default option for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:516 @@ -4057,7 +4054,7 @@ msgstr "" #: actions/snapshotadminpanel.php:226 msgid "Report URL" -msgstr "" +msgstr "URL an danevell" #: actions/snapshotadminpanel.php:227 msgid "Snapshots will be sent to this URL" @@ -4133,16 +4130,16 @@ msgstr "" #: actions/subscriptions.php:52 #, php-format msgid "%s subscriptions" -msgstr "" +msgstr "Koumanantoù %s" #: actions/subscriptions.php:54 #, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "" +msgstr "Koumanantoù %1$s, pajenn %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "Heuliañ a reoc'h alioù an dud-se." #: actions/subscriptions.php:69 #, php-format @@ -4175,26 +4172,26 @@ msgstr "SMS" #: actions/tag.php:69 #, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "" +msgstr "Alioù merket gant %1$s, pajenn %2$d" #: actions/tag.php:87 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" +msgstr "Gwazh an alioù evit ar merk %s (RSS 1.0)" #: actions/tag.php:93 #, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "" +msgstr "Gwazh an alioù evit ar merk %s (RSS 2.0)" #: actions/tag.php:99 #, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "" +msgstr "Gwazh an alioù evit ar merk %s (Atom)" #: actions/tagother.php:39 msgid "No ID argument." -msgstr "" +msgstr "Arguzenn ID ebet." #: actions/tagother.php:65 #, php-format @@ -4219,6 +4216,8 @@ msgid "" "Tags for this user (letters, numbers, -, ., and _), comma- or space- " "separated" msgstr "" +"Merkoù evit an implijer-mañ (lizherennoù, sifroù, -, ., ha _), dispartiet " +"gant virgulennoù pe gant esaouennoù" #: actions/tagother.php:193 msgid "" @@ -4254,9 +4253,8 @@ msgid "User is not silenced." msgstr "" #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile ID in request." -msgstr "N'eus profil id ebet er reked." +msgstr "N'eus profil ID ebet er reked." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4398,27 +4396,27 @@ msgstr "" #: actions/userauthorization.php:303 #, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "" +msgstr "N'eo ket bet kavet amañ URI ar selaouer \"%s\"." #: actions/userauthorization.php:308 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "Re hir eo an URI \"%s\" ez oc'h koumanantet dezhi." #: actions/userauthorization.php:314 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "An URI \"%s\" ez oc'h koumanantet dezhi a zo un implijer lec'hel." #: actions/userauthorization.php:329 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "URI ar profil \"%s\" a zo evit un implijer lec'hel." #: actions/userauthorization.php:345 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "N'eo ket reizh URL an avatar \"%s\"." #: actions/userauthorization.php:350 #, php-format @@ -4428,11 +4426,11 @@ msgstr "Dibosupl eo lenn URL an avatar \"%s\"." #: actions/userauthorization.php:355 #, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "" +msgstr "Seurt skeudenn direizh evit URL an avatar \"%s\"." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" -msgstr "" +msgstr "Design ar profil" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" @@ -4608,22 +4606,22 @@ msgstr "" #: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." -msgstr "" +msgstr "Ur gudenn 'zo bet pa veze enrollet an ali." #: classes/Notice.php:967 msgid "Problem saving group inbox." -msgstr "" +msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" #: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." -msgstr "" +msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ." #: classes/Subscription.php:78 msgid "Already subscribed!" @@ -4648,7 +4646,7 @@ msgstr "Diposubl eo dilemel ar postel kadarnadur." #: classes/Subscription.php:211 msgid "Couldn't delete subscription." -msgstr "" +msgstr "Dibosupl eo paouez gant ar c'houmanant." #: classes/User.php:363 #, php-format @@ -4661,20 +4659,20 @@ msgstr "Dibosupl eo krouiñ ar strollad." #: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "" +msgstr "Dibosupl eo termeniñ URI ar strollad." #: classes/User_group.php:510 msgid "Could not set group membership." -msgstr "" +msgstr "Dibosupl eo en em enskrivañ d'ar strollad." #: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "" +msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel." #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:109 msgid "Change your profile settings" -msgstr "" +msgstr "Kemmañ arventennoù ho profil" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:116 @@ -4689,12 +4687,12 @@ msgstr "Cheñch ar ger-tremen" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:130 msgid "Change email handling" -msgstr "" +msgstr "Kemmañ tretadur ar posteloù" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:137 msgid "Design your profile" -msgstr "" +msgstr "Krouit ho profil" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:144 @@ -4755,7 +4753,7 @@ msgstr "Kevreañ" #: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "" +msgstr "Kemmañ arventennoù al lec'hienn" #. TRANS: Main menu option when logged in and site admin for access to site configuration #: lib/action.php:451 @@ -4768,7 +4766,7 @@ msgstr "Merañ" #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "" +msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s" #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users #: lib/action.php:458 @@ -4924,7 +4922,7 @@ msgstr "" #. TRANS: DT element for StatusNet site content license. #: lib/action.php:840 msgid "Site content license" -msgstr "" +msgstr "Aotre-implijout diwar-benn danvez al lec'hienn" #. TRANS: Content license displayed when license is set to 'private'. #. TRANS: %1$s is the site name. @@ -4993,28 +4991,28 @@ msgstr "" #. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." -msgstr "" +msgstr "N'eo ket aotreet kemmañ ar panell-se" #. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." -msgstr "" +msgstr "N'eo ket bet emplementet showForm()." #. TRANS: Client error message #: lib/adminpanelaction.php:259 msgid "saveSettings() not implemented." -msgstr "" +msgstr "N'eo ket bet emplementet saveSettings()." #. TRANS: Client error message thrown if design settings could not be deleted in #. TRANS: the admin panel Design. #: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." -msgstr "" +msgstr "Dibosupl eo dilemel an arventennoù krouiñ." #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:349 msgid "Basic site configuration" -msgstr "" +msgstr "Arventennoù diazez al lec'hienn" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:351 @@ -5025,7 +5023,7 @@ msgstr "Lec'hienn" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:357 msgid "Design configuration" -msgstr "" +msgstr "Kefluniadur ar c'hrouiñ" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:359 @@ -5036,7 +5034,7 @@ msgstr "Design" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:365 msgid "User configuration" -msgstr "" +msgstr "Kefluniadur an implijer" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 @@ -5046,17 +5044,17 @@ msgstr "Implijer" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:373 msgid "Access configuration" -msgstr "" +msgstr "Kefluniadur ar moned" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:381 msgid "Paths configuration" -msgstr "" +msgstr "Kefluniadur an hentoù" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:389 msgid "Sessions configuration" -msgstr "" +msgstr "Kefluniadur an dalc'hoù" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:397 @@ -5066,10 +5064,10 @@ msgstr "Kemmañ ali al lec'hienn" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "" +msgstr "Kefluniadur ar primoù" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5081,23 +5079,23 @@ msgstr "Kemmañ an arload" #. TRANS: Form guide. #: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Arlun evit ar poellad-mañ" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" -msgstr "" +msgstr "Diskrivit ho poellad gant %d arouezenn" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:213 msgid "Describe your application" -msgstr "" +msgstr "Deskrivit ho poellad" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" -msgstr "" +msgstr "URL pajenn degemer ar poellad-mañ" #. TRANS: Form input field label. #: lib/applicationeditform.php:226 @@ -5107,17 +5105,17 @@ msgstr "Mammenn URL" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:233 msgid "Organization responsible for this application" -msgstr "" +msgstr "An aozadur e karg eus ar poellad-mañ" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" -msgstr "" +msgstr "URL pajenn degemer an aozadur-se" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" -msgstr "" +msgstr "URL davet pehini e o ret adkas goude bezañ kevreet" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:278 @@ -5132,7 +5130,7 @@ msgstr "Burev" #. TRANS: Form guide. #: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Seurt ar poellad, merdeer pe burev" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:320 @@ -5168,7 +5166,7 @@ msgstr "lenn hepken" #: lib/applicationlist.php:144 #, php-format msgid "Approved %1$s - \"%2$s\" access." -msgstr "" +msgstr "Aprouet d'an %1$s - moned \"%2$s\"." #. TRANS: Button label #: lib/applicationlist.php:159 @@ -5202,53 +5200,54 @@ msgstr "" #: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 msgid "Password changing failed" -msgstr "" +msgstr "N'eo ket aet betek penn kemmañ ar ger-tremen" #: lib/authenticationplugin.php:235 msgid "Password changing is not allowed" -msgstr "" +msgstr "N'eo ket aotreet kemmañ ar ger-tremen" #: lib/channel.php:157 lib/channel.php:177 msgid "Command results" -msgstr "" +msgstr "Disoc'hoù an urzhiad" #: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" -msgstr "" +msgstr "Urzhiad bet klokaet" #: lib/channel.php:240 msgid "Command failed" -msgstr "" +msgstr "C'hwitet en deus an urzhiad" #: lib/command.php:83 lib/command.php:105 msgid "Notice with that id does not exist" -msgstr "" +msgstr "N'eus ali ebet gant an id-mañ." #: lib/command.php:99 lib/command.php:596 msgid "User has no last notice" -msgstr "" +msgstr "N'eus ali nevez evit an implijer-mañ" #. TRANS: Message given requesting a profile for a non-existing user. #. TRANS: %s is the nickname of the user for which the profile could not be found. #: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" -msgstr "" +msgstr "Dibosupl eo kavout un implijer gant al lesanv %s" #. TRANS: Message given getting a non-existing user. #. TRANS: %s is the nickname of the user that could not be found. #: lib/command.php:147 #, php-format msgid "Could not find a local user with nickname %s" -msgstr "" +msgstr "Dibosupl eo kavout un implijer lec'hel gant al lesanv %s" #: lib/command.php:180 msgid "Sorry, this command is not yet implemented." -msgstr "" +msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh." #: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" +"N'eus tamm talvoudegezh ebet ober ur blinkadenn deoc'h c'hwi oc'h unan !" #. TRANS: Message given having nudged another user. #. TRANS: %s is the nickname of the user that was nudged. @@ -5264,14 +5263,17 @@ msgid "" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Koumanatoù : %1$s\n" +"Tud koumanantet : %2$s\n" +"kemennadennoù : %3$s" #: lib/command.php:302 msgid "Notice marked as fave." -msgstr "" +msgstr "Ali bet ouzhpennet d'ar pennroll." #: lib/command.php:323 msgid "You are already a member of that group" -msgstr "" +msgstr "Ezel oc'h eus ar strollad-mañ dija." #. TRANS: Message given having failed to add a user to a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. @@ -5283,9 +5285,9 @@ msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %2$s." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s." +msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -5323,11 +5325,11 @@ msgstr "" #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "" "Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d " -"arouezenn o peus lakaet." +"arouezenn o peus lakaet" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -5338,15 +5340,15 @@ msgstr "Kaset eo bet ar gemennadenn war eeun da %s." #: lib/command.php:494 msgid "Error sending direct message." -msgstr "" +msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn." #: lib/command.php:514 msgid "Cannot repeat your own notice" -msgstr "" +msgstr "Ne c'helloc'h ket adkemer ho ali" #: lib/command.php:519 msgid "Already repeated that notice" -msgstr "" +msgstr "Ali bet adkemeret dija" #. TRANS: Message given having repeated a notice from another user. #. TRANS: %s is the name of the user for which the notice was repeated. @@ -5401,7 +5403,7 @@ msgstr "" #: lib/command.php:685 msgid "Notification off." -msgstr "" +msgstr "Kemennoù diweredekaet." #: lib/command.php:687 msgid "Can't turn off notification." @@ -5409,7 +5411,7 @@ msgstr "" #: lib/command.php:708 msgid "Notification on." -msgstr "" +msgstr "Kemennoù gweredekaet" #: lib/command.php:710 msgid "Can't turn on notification." @@ -5417,7 +5419,7 @@ msgstr "" #: lib/command.php:723 msgid "Login command is disabled" -msgstr "" +msgstr "Diweredekaet eo an urzhiad evit digeriñ un dalc'h" #: lib/command.php:734 #, php-format @@ -5453,7 +5455,7 @@ msgstr[1] "These people are subscribed to you:" #: lib/command.php:822 msgid "You are not a member of any groups." -msgstr "" +msgstr "N'oc'h ezel eus strollad ebet." #: lib/command.php:824 #, fuzzy @@ -5834,7 +5836,7 @@ msgstr "Statud %s" #. TRANS: Subject line for SMS-by-email address confirmation message #: lib/mail.php:454 msgid "SMS confirmation" -msgstr "" +msgstr "Kadarnadur SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:457 @@ -6460,9 +6462,8 @@ msgid "Moderate" msgstr "Habaskaat" #: lib/userprofile.php:364 -#, fuzzy msgid "User role" -msgstr "Strolladoù implijerien" +msgstr "Rol an implijer" #: lib/userprofile.php:366 msgctxt "role" @@ -6475,56 +6476,56 @@ msgid "Moderator" msgstr "Habasker" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "un nebeud eilennoù zo" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "1 vunutenn zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "%d munutenn zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "1 eurvezh zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "%d eurvezh zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "1 devezh zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "%d devezh zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "miz zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "%d miz zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "bloaz zo well-wazh" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 5191bd3d09..a63f9aa02c 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:05+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:17:31+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -30,9 +30,8 @@ msgstr "Accés" #. TRANS: Page notice #: actions/accessadminpanel.php:67 -#, fuzzy msgid "Site access settings" -msgstr "Desa els paràmetres del lloc" +msgstr "Paràmetres d'accés al lloc" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 @@ -74,9 +73,8 @@ msgstr "Tancat" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "Desa els paràmetres del lloc" +msgstr "Desa els paràmetres d'accés" #. TRANS: Button label to save e-mail preferences. #. TRANS: Button label to save IM preferences. @@ -104,8 +102,8 @@ msgstr "No existeix la pàgina." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -121,15 +119,15 @@ msgstr "No existeix aquest usuari." #. TRANS: Page title. %1$s is user nickname, %2$d is page number #: actions/all.php:86 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "%s perfils blocats, pàgina %d" +msgstr "%1$s i amics, pàgina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -191,7 +189,7 @@ msgstr "Un mateix i amics" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -213,13 +211,12 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 -#, fuzzy msgid "API method not found." msgstr "No s'ha trobat el mètode API!" @@ -233,7 +230,7 @@ msgstr "No s'ha trobat el mètode API!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Aquest mètode requereix POST." @@ -265,7 +262,7 @@ msgstr "No s'ha pogut guardar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -655,17 +652,17 @@ msgstr "S'ha suprimit l'estat." msgid "No status with that ID found." msgstr "No s'ha trobat cap estatus amb la ID trobada." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Massa llarg. La longitud màxima és de %d caràcters." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "No s'ha trobat." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -694,12 +691,12 @@ msgstr "%1$s / Notificacions contestant a %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s línia temporal pública" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s notificacions de tots!" @@ -1425,16 +1422,14 @@ msgstr "Posar un nou correu electrònic per publicar; cancel·lar l'antic." #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "Nou" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "Preferències" +msgstr "Preferències del correu electrònic" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1456,9 +1451,8 @@ msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat." #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:199 -#, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat." +msgstr "Envia'm un correu electrònic quan algú m'enviï una resposta amb @." #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:205 @@ -1624,9 +1618,9 @@ msgid "%s's favorite notices" msgstr "%s's notes favorites" #: actions/favoritesrss.php:115 -#, fuzzy, php-format +#, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "Actualitzacions de %1$s a %2$s!" +msgstr "Actualitzacions preferides per %1$s a %2$s!" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 @@ -1708,23 +1702,21 @@ msgstr "Rol no vàlid." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Aquest rol està reservat i no pot definir-se." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "No pots enviar un missatge a aquest usuari." +msgstr "No podeu establir rols d'usuari en aquest lloc." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "L'usuari ja està silenciat." +msgstr "L'usuari ja té aquest rol." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 #: lib/profileformaction.php:70 msgid "No profile specified." -msgstr "No s'ha especificat perfil." +msgstr "No s'ha especificat cap perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 @@ -2302,9 +2294,10 @@ msgid "Incorrect username or password." msgstr "Nom d'usuari o contrasenya incorrectes." #: actions/login.php:132 actions/otp.php:120 -#, fuzzy msgid "Error setting user. You are probably not authorized." -msgstr "No autoritzat." +msgstr "" +"S'ha produït un error en definir l'usuari. Probablement no hi esteu " +"autoritzat." #: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 msgid "Login" @@ -2571,8 +2564,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -2781,11 +2774,11 @@ msgstr "" #: actions/pathsadminpanel.php:250 msgid "Fancy URLs" -msgstr "" +msgstr "URL atractius" #: actions/pathsadminpanel.php:252 msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" +msgstr "Voleu fer servir URL atractius (més fàcils de llegir i de recordar)?" #: actions/pathsadminpanel.php:259 msgid "Theme" @@ -2857,16 +2850,15 @@ msgstr "Utilitza l'SSL" #: actions/pathsadminpanel.php:330 msgid "When to use SSL" -msgstr "" +msgstr "Quan utilitzar l'SSL" #: actions/pathsadminpanel.php:335 -#, fuzzy msgid "SSL server" msgstr "Servidor SSL" #: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" -msgstr "" +msgstr "Servidor on dirigir les sol·licituds SSL" #: actions/pathsadminpanel.php:352 #, fuzzy @@ -3659,9 +3651,8 @@ msgid "Access token URL" msgstr "" #: actions/showapplication.php:283 -#, fuzzy msgid "Authorize URL" -msgstr "Autoria" +msgstr "Autoritza l'URL" #: actions/showapplication.php:288 msgid "" @@ -3943,13 +3934,13 @@ msgid "You must have a valid contact email address." msgstr "Heu de tenir una adreça electrònica de contacte vàlida" #: actions/siteadminpanel.php:159 -#, fuzzy, php-format +#, php-format msgid "Unknown language \"%s\"." -msgstr "Llengua desconeguda «%s»" +msgstr "Llengua desconeguda «%s»." #: actions/siteadminpanel.php:165 msgid "Minimum text limit is 0 (unlimited)." -msgstr "" +msgstr "El límit de text mínim és 0 (sense cap límit)." #: actions/siteadminpanel.php:171 msgid "Dupe limit must be one or more seconds." @@ -4000,13 +3991,14 @@ msgid "Default timezone for the site; usually UTC." msgstr "Fus horari per defecte del lloc; normalment UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Llengua per defecte del lloc" +msgstr "Llengua per defecte" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Llengua del lloc quan la detecció automàtica des de la configuració del " +"navegador no està disponible" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -4018,7 +4010,7 @@ msgstr "Límits del text" #: actions/siteadminpanel.php:274 msgid "Maximum number of characters for notices." -msgstr "" +msgstr "Nombre màxim de caràcters dels avisos." #: actions/siteadminpanel.php:278 msgid "Dupe limit" @@ -4031,7 +4023,6 @@ msgstr "" "de nou." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" msgstr "Avís del lloc" @@ -4875,7 +4866,7 @@ msgstr "Problema en guardar l'avís." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5366,7 +5357,7 @@ msgid "Snapshots configuration" msgstr "Configuració dels camins" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6576,7 +6567,7 @@ msgstr "Membre des de" #. TRANS: Average count of posts made per day since account registration #: lib/profileaction.php:235 msgid "Daily average" -msgstr "" +msgstr "Mitjana diària" #: lib/profileaction.php:264 msgid "All groups" @@ -6773,7 +6764,7 @@ msgstr "Accions de l'usuari" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "S'està suprimint l'usuari..." #: lib/userprofile.php:263 msgid "Edit profile settings" @@ -6796,73 +6787,70 @@ msgid "Moderate" msgstr "Modera" #: lib/userprofile.php:364 -#, fuzzy msgid "User role" -msgstr "Perfil de l'usuari" +msgstr "Rol de l'usuari" #: lib/userprofile.php:366 -#, fuzzy msgctxt "role" msgid "Administrator" -msgstr "Administradors" +msgstr "Administrador" #: lib/userprofile.php:367 -#, fuzzy msgctxt "role" msgid "Moderator" -msgstr "Modera" +msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "fa pocs segons" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "fa un minut" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "fa una hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "fa un dia" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "fa %d dies" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "fa un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "fa un any" @@ -6877,6 +6865,7 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals." #: lib/xmppmanager.php:403 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." -msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" +msgstr "" +"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d." diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 07ede1212c..f941ed775f 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:08+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:17:38+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -106,8 +106,8 @@ msgstr "Žádné takové oznámení." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -131,7 +131,7 @@ msgstr "%s a přátelé" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -192,7 +192,7 @@ msgstr "%s a přátelé" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -214,9 +214,9 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -234,7 +234,7 @@ msgstr "Potvrzující kód nebyl nalezen" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" @@ -266,7 +266,7 @@ msgstr "Nelze uložit profil" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -664,18 +664,18 @@ msgstr "Obrázek nahrán" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "Žádný požadavek nebyl nalezen!" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -705,12 +705,12 @@ msgstr "%1 statusů na %2" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2575,8 +2575,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -4846,7 +4846,7 @@ msgstr "Problém při ukládání sdělení" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5341,7 +5341,7 @@ msgid "Snapshots configuration" msgstr "Potvrzení emailové adresy" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6805,56 +6805,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "před pár sekundami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "asi před minutou" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "asi před %d minutami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "asi před hodinou" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "asi před %d hodinami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "asi přede dnem" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "před %d dny" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "asi před měsícem" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "asi před %d mesíci" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "asi před rokem" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index d1ebc64457..cb48bf4907 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:11+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:17:41+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -105,8 +105,8 @@ msgstr "Seite nicht vorhanden" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -130,7 +130,7 @@ msgstr "%1$s und Freunde, Seite% 2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -200,7 +200,7 @@ msgstr "Du und Freunde" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -222,9 +222,9 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -241,7 +241,7 @@ msgstr "API-Methode nicht gefunden." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Diese Methode benötigt ein POST." @@ -273,7 +273,7 @@ msgstr "Konnte Profil nicht speichern." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -665,18 +665,18 @@ msgstr "Status gelöscht." msgid "No status with that ID found." msgstr "Keine Nachricht mit dieser ID gefunden." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Nicht gefunden." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -707,12 +707,12 @@ msgstr "%1$s / Aktualisierungen erwähnen %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s öffentliche Zeitleiste" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s Nachrichten von allen!" @@ -2344,17 +2344,16 @@ msgstr "" "ein, bevor die Änderungen an deinen Einstellungen übernommen werden." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Mit Nutzernamen und Passwort anmelden" +msgstr "Mit Nutzernamen und Passwort anmelden." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? " -"[Registriere](%%action.register%%) ein neues Konto." +"Du hast noch keinen Nutzernamen? [Registriere](%%action.register%%) ein " +"neues Konto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2582,8 +2581,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Bitte nur %s URLs über einfaches HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -4899,7 +4898,7 @@ msgstr "Problem bei Speichern der Nachricht." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5361,7 +5360,7 @@ msgid "Snapshots configuration" msgstr "Snapshot Konfiguration" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte." @@ -6918,56 +6917,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "vor einer Minute" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "vor einer Stunde" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "vor einem Tag" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "vor einem Monat" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "vor einem Jahr" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index c903d03dfa..08061b15ea 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:14+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:17:45+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -101,8 +101,8 @@ msgstr "Δεν υπάρχει τέτοια σελίδα" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -126,7 +126,7 @@ msgstr "%1$s και φίλοι, σελίδα 2%$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -190,7 +190,7 @@ msgstr "Εσείς και οι φίλοι σας" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -212,9 +212,9 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -232,7 +232,7 @@ msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" @@ -264,7 +264,7 @@ msgstr "Απέτυχε η αποθήκευση του προφίλ." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -655,17 +655,17 @@ msgstr "Η κατάσταση διεγράφη." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -694,12 +694,12 @@ msgstr "" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2531,8 +2531,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -4769,7 +4769,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5251,7 +5251,7 @@ msgid "Snapshots configuration" msgstr "Επιβεβαίωση διεύθυνσης email" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6676,56 +6676,56 @@ msgid "Moderator" msgstr "Συντονιστής" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index c02f7988d9..1429e2439b 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:17+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:17:49+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -99,8 +99,8 @@ msgstr "No such page." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -124,7 +124,7 @@ msgstr "%1$s and friends, page %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -191,7 +191,7 @@ msgstr "You and friends" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -213,9 +213,9 @@ msgstr "Updates from %1$s and friends on %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -232,7 +232,7 @@ msgstr "API method not found." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "This method requires a POST." @@ -266,7 +266,7 @@ msgstr "Couldn't save profile." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -652,17 +652,17 @@ msgstr "Status deleted." msgid "No status with that ID found." msgstr "No status with that ID found." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "That's too long. Max notice size is %d chars." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Not found." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Max notice size is %d chars, including attachment URL." @@ -691,12 +691,12 @@ msgstr "%1$s / Updates mentioning %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s updates that reply to updates from %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s public timeline" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s updates from everyone!" @@ -2534,8 +2534,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -4779,7 +4779,7 @@ msgstr "Problem saving group inbox." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5237,7 +5237,7 @@ msgid "Snapshots configuration" msgstr "Snapshots configuration" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6656,56 +6656,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "a few seconds ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "about a minute ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "about an hour ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "about a day ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "about %d days ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "about a month ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "about %d months ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "about a year ago" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 2a38c8cda7..e0071a8a3c 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:21+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:17:59+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -103,8 +103,8 @@ msgstr "No existe tal página." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -128,7 +128,7 @@ msgstr "%1$s y sus amistades, página %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -196,7 +196,7 @@ msgstr "Tú y tus amistades" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -218,9 +218,9 @@ msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -237,7 +237,7 @@ msgstr "Método de API no encontrado." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Este método requiere un POST." @@ -269,7 +269,7 @@ msgstr "No se pudo guardar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -660,17 +660,17 @@ msgstr "Status borrado." msgid "No status with that ID found." msgstr "No hay estado para ese ID" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "La entrada es muy larga. El tamaño máximo es de %d caracteres." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "No encontrado." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -701,12 +701,12 @@ msgstr "%1$s / Actualizaciones que mencionan %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "línea temporal pública de %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "¡Actualizaciones de todos en %s!" @@ -2332,17 +2332,16 @@ msgstr "" "contraseña antes de cambiar tu configuración." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Ingresar con un nombre de usuario y contraseña." +msgstr "Ingresar con tu nombre de usuario y contraseña." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Inicia sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea](%%" -"action.register%%) una cuenta." +"Aún no tienes nombre de usuario? [Registrar](%%action.register%%) una nueva " +"cuenta." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2568,8 +2567,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Solamente %s URLs sobre HTTP simples por favor." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -4884,7 +4883,7 @@ msgstr "Hubo un problema al guarda la bandeja de entrada del grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5349,7 +5348,7 @@ msgid "Snapshots configuration" msgstr "Configuración de instantáneas" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API requiere acceso de lectura y escritura, pero sólo tienes acceso de " @@ -6913,56 +6912,56 @@ msgid "Moderator" msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "hace unos segundos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "hace un minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "hace una hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "hace un día" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "hace %d días" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "hace un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "hace %d meses" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "hace un año" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 9c6903353c..1532ea9432 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:27+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:18:10+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -102,8 +102,8 @@ msgstr "چنین صفحه‌ای وجود ندارد" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -127,7 +127,7 @@ msgstr "%s کاربران مسدود شده، صفحه‌ی %d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -193,7 +193,7 @@ msgstr "شما و دوستان" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -215,9 +215,9 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -234,7 +234,7 @@ msgstr "رابط مورد نظر پیدا نشد." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "برای استفاده از این روش باید اطلاعات را به صورت پست بفرستید" @@ -265,7 +265,7 @@ msgstr "نمی‌توان شناس‌نامه را ذخیره کرد." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -650,17 +650,17 @@ msgstr "وضعیت حذف شد." msgid "No status with that ID found." msgstr "هیچ وضعیتی با آن شناسه یافت نشد." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "خیلی طولانی است. حداکثر طول مجاز پیام %d حرف است." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "یافت نشد." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "حداکثر طول پیام %d حرف است که شامل ضمیمه نیز می‌باشد" @@ -689,12 +689,12 @@ msgstr "%$1s / به روز رسانی های شامل %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s خط‌زمانی عمومی" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s به روز رسانی های عموم" @@ -2554,8 +2554,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست." @@ -4775,7 +4775,7 @@ msgstr "مشکل در ذخیره کردن آگهی." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5254,7 +5254,7 @@ msgid "Snapshots configuration" msgstr "پیکره بندی اصلی سایت" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6677,56 +6677,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "چند ثانیه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "حدود یک دقیقه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "حدود %d دقیقه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "حدود یک ساعت پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "حدود %d ساعت پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "حدود یک روز پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "حدود %d روز پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "حدود یک ماه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "حدود %d ماه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "حدود یک سال پیش" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 171b0c43a3..d9c89e0088 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:24+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:18:04+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -108,8 +108,8 @@ msgstr "Sivua ei ole." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -133,7 +133,7 @@ msgstr "%s ja kaverit, sivu %d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -199,7 +199,7 @@ msgstr "Sinä ja kaverit" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -221,9 +221,9 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -241,7 +241,7 @@ msgstr "API-metodia ei löytynyt!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Tämä metodi edellyttää POST sanoman." @@ -273,7 +273,7 @@ msgstr "Ei voitu tallentaa profiilia." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -674,17 +674,17 @@ msgstr "Päivitys poistettu." msgid "No status with that ID found." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Ei löytynyt." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." @@ -714,12 +714,12 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" "%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s julkinen aikajana" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s päivitykset kaikilta!" @@ -2622,8 +2622,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -4949,7 +4949,7 @@ msgstr "Ongelma päivityksen tallentamisessa." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5447,7 +5447,7 @@ msgid "Snapshots configuration" msgstr "SMS vahvistus" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6920,56 +6920,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "muutama sekunti sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "noin minuutti sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "noin tunti sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "noin päivä sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "noin kuukausi sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "noin vuosi sitten" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index d4f3ffdfb1..6f1fcbc604 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -7,6 +7,7 @@ # Author@translatewiki.net: Julien C # Author@translatewiki.net: McDutchie # Author@translatewiki.net: Peter17 +# Author@translatewiki.net: Y-M D # -- # This file is distributed under the same license as the StatusNet package. # @@ -14,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:30+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:18:18+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -103,8 +104,8 @@ msgstr "Page non trouvée." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -128,7 +129,7 @@ msgstr "%1$s et ses amis, page %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -197,7 +198,7 @@ msgstr "Vous et vos amis" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -219,9 +220,9 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -238,7 +239,7 @@ msgstr "Méthode API non trouvée !" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Ce processus requiert un POST." @@ -270,7 +271,7 @@ msgstr "Impossible d’enregistrer le profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -667,17 +668,17 @@ msgstr "Statut supprimé." msgid "No status with that ID found." msgstr "Aucun statut trouvé avec cet identifiant." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Non trouvé." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -708,12 +709,12 @@ msgstr "%1$s / Mises à jour mentionnant %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Activité publique %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s statuts de tout le monde !" @@ -2348,18 +2349,16 @@ msgstr "" "votre mot de passe afin d’enregistrer vos préférences." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Ouvrez une session avec un identifiant et un mot de passe" +msgstr "Ouvrez une session avec un identifiant et un mot de passe." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Ouvrez une session avec votre identifiant et votre mot de passe. Vous n’avez " -"pas encore d’identifiant ? [Créez-vous](%%action.register%%) un nouveau " -"compte." +"Vous n’avez pas encore d’identifiant ? [Créez-vous](%%action.register%%) un " +"nouveau compte." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2588,8 +2587,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -4914,14 +4913,14 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" #: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." -msgstr "Il vous avez été interdit de vous abonner." +msgstr "Il vous a été interdit de vous abonner." #: classes/Subscription.php:78 msgid "Already subscribed!" @@ -5376,7 +5375,7 @@ msgid "Snapshots configuration" msgstr "Configuration des instantanés" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "La ressource de l’API a besoin de l’accès en lecture et en écriture, mais " @@ -6946,56 +6945,56 @@ msgid "Moderator" msgstr "Modérateur" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "il y a quelques secondes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "il y a 1 minute" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "il y a 1 heure" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "il y a 1 jour" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "il y a 1 mois" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "il y a environ 1 an" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 405e5ba545..7c677f89fb 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:33+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:18:22+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -107,8 +107,8 @@ msgstr "Non existe a etiqueta." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -132,7 +132,7 @@ msgstr "%s e amigos" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -193,7 +193,7 @@ msgstr "%s e amigos" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -215,9 +215,9 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -235,7 +235,7 @@ msgstr "Método da API non atopado" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Este método require un POST." @@ -267,7 +267,7 @@ msgstr "Non se puido gardar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -669,18 +669,18 @@ msgstr "Avatar actualizado." msgid "No status with that ID found." msgstr "Non existe ningún estado con esa ID atopada." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Non atopado" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -710,12 +710,12 @@ msgstr "%1$s / Chíos que respostan a %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Liña de tempo pública de %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s chíos de calquera!" @@ -2651,8 +2651,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -5004,7 +5004,7 @@ msgstr "Aconteceu un erro ó gardar o chío." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5506,7 +5506,7 @@ msgid "Snapshots configuration" msgstr "Confirmación de SMS" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -7087,56 +7087,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "fai uns segundos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "fai un minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "fai unha hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "fai un día" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "fai %d días" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "fai un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "fai %d meses" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "fai un ano" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index 15d9641eac..01110eaff0 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:36+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:18:29+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -98,8 +98,8 @@ msgstr "Esa páxina non existe." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -123,7 +123,7 @@ msgstr "%1$s e amigos, páxina %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -191,7 +191,7 @@ msgstr "Vostede e mailos seus amigos" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -213,9 +213,9 @@ msgstr "Actualizacións de %1$s e amigos en %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -232,7 +232,7 @@ msgstr "Non se atopou o método da API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Este método require un POST." @@ -264,7 +264,7 @@ msgstr "Non se puido gardar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -656,17 +656,17 @@ msgstr "Borrouse o estado." msgid "No status with that ID found." msgstr "Non se atopou ningún estado con esa ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Iso é longo de máis. A nota non pode exceder os %d caracteres." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Non se atopou." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -697,12 +697,12 @@ msgstr "%1$s / Actualizacións que mencionan %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Liña do tempo pública de %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s actualizacións de todos!" @@ -2330,17 +2330,16 @@ msgstr "" "contrasinal antes de cambiar a súa configuración." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Nome de usuario ou contrasinal incorrectos." +msgstr "Identifíquese co seu nome de usuario e contrasinal." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Identifíquese co seu nome de usuario e contrasinal. Aínda non ten un nome de " -"usuario? [Rexistre](%%action.register%%) unha conta nova." +"Aínda non ten un nome de usuario? [Rexistre](%%action.register%%) unha conta " +"nova." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2564,8 +2563,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Só %s enderezos URL sobre HTTP simple." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Non se soporta ese formato de datos." @@ -4206,12 +4205,12 @@ msgstr "Borrouse o número de teléfono para os SMS." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 msgid "Mobile carrier" -msgstr "" +msgstr "Compañía" #. TRANS: Default option for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:516 msgid "Select a carrier" -msgstr "" +msgstr "Escolla unha compañía" #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. #. TRANS: %s is an administrative contact's e-mail address. @@ -4221,123 +4220,128 @@ msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" +"Compañía de telecomunicacións coa que contratou o seu móbil. Se sabe " +"dalgunha compañía que permita SMS sobre correo electrónico pero non aparece " +"nesta lista, envíenos un correo electrónico para notificárnolo a %s." #. TRANS: Message given saving SMS phone number confirmation code without having provided one. #: actions/smssettings.php:548 msgid "No code entered" -msgstr "" +msgstr "Non se introduciu ningún código" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 #: lib/adminpanelaction.php:407 msgid "Snapshots" -msgstr "" +msgstr "Instantáneas" #: actions/snapshotadminpanel.php:65 msgid "Manage snapshot configuration" -msgstr "" +msgstr "Xestione a configuración das instantáneas" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." -msgstr "" +msgstr "Valor de execución da instantánea incorrecto." #: actions/snapshotadminpanel.php:133 msgid "Snapshot frequency must be a number." -msgstr "" +msgstr "A frecuencia das instantáneas debe ser un número." #: actions/snapshotadminpanel.php:144 msgid "Invalid snapshot report URL." -msgstr "" +msgstr "URL de envío das instantáneas incorrecto." #: actions/snapshotadminpanel.php:200 msgid "Randomly during web hit" -msgstr "" +msgstr "Ao chou durante o acceso á rede" #: actions/snapshotadminpanel.php:201 msgid "In a scheduled job" -msgstr "" +msgstr "Nun proceso programado" #: actions/snapshotadminpanel.php:206 msgid "Data snapshots" -msgstr "" +msgstr "Instantáneas de datos" #: actions/snapshotadminpanel.php:208 msgid "When to send statistical data to status.net servers" -msgstr "" +msgstr "Cando enviar información estatística aos servidores status.net" #: actions/snapshotadminpanel.php:217 msgid "Frequency" -msgstr "" +msgstr "Frecuencia" #: actions/snapshotadminpanel.php:218 msgid "Snapshots will be sent once every N web hits" -msgstr "" +msgstr "As instantáneas enviaranse unha vez cada N accesos á rede" #: actions/snapshotadminpanel.php:226 msgid "Report URL" -msgstr "" +msgstr "URL de envío" #: actions/snapshotadminpanel.php:227 msgid "Snapshots will be sent to this URL" -msgstr "" +msgstr "As instantáneas enviaranse a este URL" #: actions/snapshotadminpanel.php:248 msgid "Save snapshot settings" -msgstr "" +msgstr "Gardar a configuración das instantáneas" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." -msgstr "" +msgstr "Non está subscrito a ese perfil." #: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." -msgstr "" +msgstr "Non se puido gardar a subscrición." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "Esta acción só permite solicitudes POST." #: actions/subscribe.php:107 msgid "No such profile." -msgstr "" +msgstr "Non existe ese perfil." #: actions/subscribe.php:117 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "" +msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción." #: actions/subscribe.php:145 msgid "Subscribed" -msgstr "" +msgstr "Subscrito" #: actions/subscribers.php:50 #, php-format msgid "%s subscribers" -msgstr "" +msgstr "%s subscritores" #: actions/subscribers.php:52 #, php-format msgid "%1$s subscribers, page %2$d" -msgstr "" +msgstr "%1$s subscritores, páxina %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." -msgstr "" +msgstr "Estas son as persoas que seguen as súas notas." #: actions/subscribers.php:67 #, php-format msgid "These are the people who listen to %s's notices." -msgstr "" +msgstr "Estas son as persoas que están seguindo as notas de %s." #: actions/subscribers.php:108 msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" msgstr "" +"Non ten subscritores. Probe a subscribirse a xente que coñeza e pode que lle " +"devolvan o favor" #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" -msgstr "" +msgstr "%s non ten subscritores. Quere ser o primeiro?" #: actions/subscribers.php:114 #, php-format @@ -4345,25 +4349,27 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%s non ten subscritores. Por que non [rexistrar unha conta](%%%%action." +"register%%%%) e ser o primeiro?" #: actions/subscriptions.php:52 #, php-format msgid "%s subscriptions" -msgstr "" +msgstr "%s subscricións" #: actions/subscriptions.php:54 #, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "" +msgstr "%1$s subscricións, páxina %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "Estas son as persoas cuxas notas segue." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "Estas son as persoas cuxas notas segue %s." #: actions/subscriptions.php:126 #, php-format @@ -4374,188 +4380,200 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"Agora mesmo non está a seguir as notas de ninguén, probe a subscribirse a " +"xente que coñeza. Intente [buscar xente](%%action.peoplesearch%%), buscar " +"xente en grupos que lle interesen e nos nosos [usuarios destacados](%%action." +"featured%%). Se é [usuario do Twitter](%%action.twittersettings%%), pode " +"subscribirse automaticamente á xente que segue alí." #: actions/subscriptions.php:128 actions/subscriptions.php:132 #, php-format msgid "%s is not listening to anyone." -msgstr "" +msgstr "%s non está seguindo a ninguén." #: actions/subscriptions.php:208 msgid "Jabber" -msgstr "" +msgstr "Jabber" #: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" -msgstr "" +msgstr "SMS" #: actions/tag.php:69 #, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "" +msgstr "Notas etiquetadas con %1$s, páxina %2$d" #: actions/tag.php:87 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" +msgstr "Fonte de novas das notas para a etiqueta %s (RSS 1.0)" #: actions/tag.php:93 #, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "" +msgstr "Fonte de novas das notas para a etiqueta %s (RSS 2.0)" #: actions/tag.php:99 #, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "" +msgstr "Fonte de novas das notas para a etiqueta %s (Atom)" #: actions/tagother.php:39 msgid "No ID argument." -msgstr "" +msgstr "Sen argumento ID." #: actions/tagother.php:65 #, php-format msgid "Tag %s" -msgstr "" +msgstr "Etiqueta %s" #: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" -msgstr "" +msgstr "Perfil do usuario" #: actions/tagother.php:81 actions/userauthorization.php:132 #: lib/userprofile.php:103 msgid "Photo" -msgstr "" +msgstr "Fotografía" #: actions/tagother.php:141 msgid "Tag user" -msgstr "" +msgstr "Etiquetar ao usuario" #: actions/tagother.php:151 msgid "" "Tags for this user (letters, numbers, -, ., and _), comma- or space- " "separated" msgstr "" +"Etiquetas para este usuario (letras, números, -, ., e _), separadas por " +"comas ou espazos en branco" #: actions/tagother.php:193 msgid "" "You can only tag people you are subscribed to or who are subscribed to you." msgstr "" +"Só pode etiquetar a xente á que estea subscrito ou que estean subscritos a " +"vostede." #: actions/tagother.php:200 msgid "Could not save tags." -msgstr "" +msgstr "Non se puideron gardar as etiquetas." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" +"Utilice este formulario para engadir etiquetas aos seus subscritores ou " +"subscricións." #: actions/tagrss.php:35 msgid "No such tag." -msgstr "" +msgstr "Esa etiqueta non existe." #: actions/twitapitrends.php:85 msgid "API method under construction." -msgstr "" +msgstr "Método API en desenvolvemento." #: actions/unblock.php:59 msgid "You haven't blocked that user." -msgstr "" +msgstr "Non bloqueou a ese usuario." #: actions/unsandbox.php:72 msgid "User is not sandboxed." -msgstr "" +msgstr "O usuario non está illado." #: actions/unsilence.php:72 msgid "User is not silenced." -msgstr "" +msgstr "O usuario non está silenciado." #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile ID in request." -msgstr "Non se solicitou ningún pase." +msgstr "Á solicitude fáltalle o ID do perfil." #: actions/unsubscribe.php:98 msgid "Unsubscribed" -msgstr "" +msgstr "Cancelouse a subscrición" #: actions/updateprofile.php:64 actions/userauthorization.php:337 #, php-format msgid "" "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"A licenza \"%1$s\" das transmisións da persoa seguida non é compatible coa " +"licenza deste sitio: \"%2$s\"." #. TRANS: User admin panel title #: actions/useradminpanel.php:59 msgctxt "TITLE" msgid "User" -msgstr "" +msgstr "Usuario" #: actions/useradminpanel.php:70 msgid "User settings for this StatusNet site." -msgstr "" +msgstr "Preferencias de usuario para este sitio StatusNet." #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." -msgstr "" +msgstr "Límite da biografía incorrecto. Debe ser numérico." #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." -msgstr "" +msgstr "Texto de benvida incorrecto. A extensión máxima é de 255 caracteres." #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "" +msgstr "Subscrición por defecto incorrecta. \"%1$s\" non é un usuario." #. TRANS: Link description in user account settings menu. #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" -msgstr "" +msgstr "Perfil" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "Límite da biografía" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "Extensión máxima da biografía dun perfil en caracteres." #: actions/useradminpanel.php:231 msgid "New users" -msgstr "" +msgstr "Novos usuarios" #: actions/useradminpanel.php:235 msgid "New user welcome" -msgstr "" +msgstr "Nova benvida para os usuarios" #: actions/useradminpanel.php:236 msgid "Welcome text for new users (Max 255 chars)." -msgstr "" +msgstr "Texto de benvida para os novos usuarios (255 caracteres como máximo)." #: actions/useradminpanel.php:241 msgid "Default subscription" -msgstr "" +msgstr "Subscrición por defecto" #: actions/useradminpanel.php:242 msgid "Automatically subscribe new users to this user." -msgstr "" +msgstr "Subscribir automaticamente aos novos usuarios a este usuario." #: actions/useradminpanel.php:251 msgid "Invitations" -msgstr "" +msgstr "Invitacións" #: actions/useradminpanel.php:256 msgid "Invitations enabled" -msgstr "" +msgstr "Activáronse as invitacións" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "Se se permite aos usuarios invitar a novos usuarios." #: actions/userauthorization.php:105 msgid "Authorize subscription" -msgstr "" +msgstr "Autorizar a subscrición" #: actions/userauthorization.php:110 msgid "" @@ -4563,35 +4581,38 @@ msgid "" "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " "click “Reject”." msgstr "" +"Verifique estes detalles para asegurar que quere subscribirse ás notas deste " +"usuario. Se non acaba de pedir subscribirse ás notas de alguén, prema en " +"«Rexeitar»." #: actions/userauthorization.php:196 actions/version.php:165 msgid "License" -msgstr "" +msgstr "Licenza" #: actions/userauthorization.php:217 msgid "Accept" -msgstr "" +msgstr "Aceptar" #: actions/userauthorization.php:218 lib/subscribeform.php:115 #: lib/subscribeform.php:139 msgid "Subscribe to this user" -msgstr "" +msgstr "Subscribirse a este usuario" #: actions/userauthorization.php:219 msgid "Reject" -msgstr "" +msgstr "Rexeitar" #: actions/userauthorization.php:220 msgid "Reject this subscription" -msgstr "" +msgstr "Rexeitar esta subscrición" #: actions/userauthorization.php:232 msgid "No authorization request!" -msgstr "" +msgstr "Non se solicitou a autorización!" #: actions/userauthorization.php:254 msgid "Subscription authorized" -msgstr "" +msgstr "Autorizouse a subscrición" #: actions/userauthorization.php:256 msgid "" @@ -4599,10 +4620,13 @@ msgid "" "with the site’s instructions for details on how to authorize the " "subscription. Your subscription token is:" msgstr "" +"Autorizouse a subscrición, pero non se devolveu ningún URL. Bote unha ollada " +"ás instrucións do sitio para saber máis sobre como autorizar a subscrición. " +"O pase da súa subscrición é:" #: actions/userauthorization.php:266 msgid "Subscription rejected" -msgstr "" +msgstr "Rexeitouse a subscrición" #: actions/userauthorization.php:268 msgid "" @@ -4610,75 +4634,80 @@ msgid "" "with the site’s instructions for details on how to fully reject the " "subscription." msgstr "" +"Rexeitouse a subscrición, pero non se devolveu ningún URL. Bote unha ollada " +"ás instrucións do sitio para obter máis información sobre como rexeitar " +"completamente a subscrición." #: actions/userauthorization.php:303 #, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "" +msgstr "Non se atopou o URI do seguidor, «%s», aquí." #: actions/userauthorization.php:308 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "O URI do seguido, «%s», é longa de máis." #: actions/userauthorization.php:314 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "O URI do seguido, «%s», é dun usuario local." #: actions/userauthorization.php:329 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "O URL de perfil «%s» pertence a un usuario local." #: actions/userauthorization.php:345 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "O URL do avatar, «%s», é incorrecto." #: actions/userauthorization.php:350 #, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "" +msgstr "Non se puido ler o URL do avatar, «%s»." #: actions/userauthorization.php:355 #, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "" +msgstr "O tipo de imaxe do URL do avatar, «%s», é incorrecto." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" -msgstr "" +msgstr "Deseño do perfil" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"Personalice a aparencia do seu perfil cunha imaxe de fondo e unha paleta de " +"cores escollida por vostede." #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" -msgstr "" +msgstr "Bo proveito!" #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. #: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" -msgstr "" +msgstr "%1$s grupos, páxina %2$d" #: actions/usergroups.php:132 msgid "Search for more groups" -msgstr "" +msgstr "Buscar máis grupos" #: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." -msgstr "" +msgstr "%s non pertence a ningún grupo." #: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." -msgstr "" +msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse a el." #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom group notice feed. @@ -4689,12 +4718,12 @@ msgstr "" #: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" -msgstr "" +msgstr "Actualizacións de %1$s en %2$s!" #: actions/version.php:73 #, php-format msgid "StatusNet %s" -msgstr "" +msgstr "%s de StatusNet" #: actions/version.php:153 #, php-format @@ -4702,10 +4731,12 @@ msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" +"Este sitio foi desenvolvido sobre a versión %2$s de %1$s, propiedade de " +"StatusNet, Inc. e contribuidores, 2008-2010." #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Contribuidores" #: actions/version.php:168 msgid "" @@ -4714,6 +4745,10 @@ msgid "" "Software Foundation, either version 3 of the License, or (at your option) " "any later version. " msgstr "" +"StatusNet é software libre: pode redistribuílo e modificalo baixo os termos " +"da Licenza Pública Xeral Affero de GNU, tal e como a publicou a Free " +"Software Foundation, ben a versión 3 ben calquera versión posterior (a " +"elección do usuario) da licenza. " #: actions/version.php:174 msgid "" @@ -4722,6 +4757,10 @@ msgid "" "FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " "for more details. " msgstr "" +"Este programa distribúese coa esperanza de que resulte útil, pero SEN " +"NINGUNHA GARANTÍA, nin sequera as garantías implícitas de COMERCIALIDADE ou " +"IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Lea a Licenza Pública Xeral Affero " +"de GNU para máis información. " #: actions/version.php:180 #, php-format @@ -4729,19 +4768,21 @@ msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" +"Debeu recibir unha copia da Licenza Pública Xeral Affero de GNU xunto co " +"programa. En caso contrario, vexa %s." #: actions/version.php:189 msgid "Plugins" -msgstr "" +msgstr "Engadidos" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. #: actions/version.php:196 lib/action.php:779 msgid "Version" -msgstr "" +msgstr "Versión" #: actions/version.php:197 msgid "Author(s)" -msgstr "" +msgstr "Autores" #: classes/File.php:169 #, php-format @@ -4749,371 +4790,376 @@ msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"Ningún ficheiro pode superar os %d bytes e o que enviou ocupaba %d. Probe a " +"subir un ficheiro máis pequeno." #: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" +"Un ficheiro deste tamaño excedería da súa cota de usuario, que é de %d bytes." #: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." -msgstr "" +msgstr "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes." #: classes/Group_member.php:41 msgid "Group join failed." -msgstr "" +msgstr "Non se puido unir ao grupo." #: classes/Group_member.php:53 msgid "Not part of group." -msgstr "" +msgstr "Non forma parte do grupo." #: classes/Group_member.php:60 msgid "Group leave failed." -msgstr "" +msgstr "Non se puido deixar o grupo." #: classes/Local_group.php:41 msgid "Could not update local group." -msgstr "" +msgstr "Non se puido actualizar o grupo local." #: classes/Login_token.php:76 #, php-format msgid "Could not create login token for %s" -msgstr "" +msgstr "Non se puido crear un pase de sesión para %s" #: classes/Message.php:45 msgid "You are banned from sending direct messages." -msgstr "" +msgstr "Prohibíuselle enviar mensaxes directas de momento." #: classes/Message.php:61 msgid "Could not insert message." -msgstr "" +msgstr "Non se puido inserir a mensaxe." #: classes/Message.php:71 msgid "Could not update message with new URI." -msgstr "" +msgstr "Non se puido actualizar a mensaxe co novo URI." #. TRANS: Server exception. %s are the error details. #: classes/Notice.php:176 -#, fuzzy, php-format +#, php-format msgid "Database error inserting hashtag: %s" -msgstr "" -"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación " -"OAuth." +msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta %s" #: classes/Notice.php:245 msgid "Problem saving notice. Too long." -msgstr "" +msgstr "Houbo un problema ao gardar a nota. É longa de máis." #: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." -msgstr "" +msgstr "Houbo un problema ao gardar a nota. Descoñécese o usuario." #: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" +"Escribiu demasiadas notas en moi pouco tempo. Tómese un respiro e volva " +"publicar nuns minutos." #: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" +"Repetiu demasiadas mensaxes en moi pouco tempo. Tómese un respiro e volva " +"publicar nuns minutos." #: classes/Notice.php:266 msgid "You are banned from posting notices on this site." -msgstr "" +msgstr "Prohibíuselle publicar notas neste sitio de momento." #: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." -msgstr "" +msgstr "Houbo un problema ao gardar a nota." #: classes/Notice.php:967 msgid "Problem saving group inbox." -msgstr "" +msgstr "Houbo un problema ao gardar a caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" -msgstr "" +msgstr "♻ @%1$s %2$s" #: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." -msgstr "" +msgstr "Prohibíuselle realizar subscricións de momento." #: classes/Subscription.php:78 msgid "Already subscribed!" -msgstr "" +msgstr "Xa está subscrito!" #: classes/Subscription.php:82 msgid "User has blocked you." -msgstr "" +msgstr "O usuario bloqueouno." #: classes/Subscription.php:167 msgid "Not subscribed!" -msgstr "" +msgstr "Non está subscrito!" #: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." -msgstr "" +msgstr "Non se puido borrar a subscrición automática." #: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "" +msgstr "Non se puido borrar o pase de subscrición OMB." #: classes/Subscription.php:211 msgid "Couldn't delete subscription." -msgstr "" +msgstr "Non se puido borrar a subscrición." #: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "" +msgstr "Benvido a %1$s, @%2$s!" #: classes/User_group.php:480 msgid "Could not create group." -msgstr "" +msgstr "Non se puido crear o grupo." #: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "" +msgstr "Non se puido establecer o URI do grupo." #: classes/User_group.php:510 msgid "Could not set group membership." -msgstr "" +msgstr "Non se puido establecer a pertenza ao grupo." #: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "" +msgstr "Non se puido gardar a información do grupo local." #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:109 msgid "Change your profile settings" -msgstr "" +msgstr "Cambie a configuración do seu perfil" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:116 msgid "Upload an avatar" -msgstr "" +msgstr "Cargue un avatar" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:123 msgid "Change your password" -msgstr "" +msgstr "Cambie o seu contrasinal" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:130 msgid "Change email handling" -msgstr "" +msgstr "Cambie a xestión do correo electrónico" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:137 msgid "Design your profile" -msgstr "" +msgstr "Deseñe o seu perfil" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:144 msgid "Other options" -msgstr "" +msgstr "Outras opcións" #. TRANS: Link description in user account settings menu. #: lib/accountsettingsaction.php:146 msgid "Other" -msgstr "" +msgstr "Outros" #. TRANS: Page title. %1$s is the title, %2$s is the site name. #: lib/action.php:145 #, php-format msgid "%1$s - %2$s" -msgstr "" +msgstr "%1$s - %2$s" #. TRANS: Page title for a page without a title set. #: lib/action.php:161 msgid "Untitled page" -msgstr "" +msgstr "Páxina sen título" #. TRANS: DT element for primary navigation menu. String is hidden in default CSS. #: lib/action.php:426 msgid "Primary site navigation" -msgstr "" +msgstr "Navegación principal do sitio" #. TRANS: Tooltip for main menu option "Personal" #: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" -msgstr "" +msgstr "Liña do tempo do perfil persoal e os amigos" #. TRANS: Main menu option when logged in for access to personal profile and friends timeline #: lib/action.php:435 msgctxt "MENU" msgid "Personal" -msgstr "" +msgstr "Persoal" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "" +msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "" +msgstr "Conectarse a servizos" #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services #: lib/action.php:445 msgid "Connect" -msgstr "" +msgstr "Conectarse" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "" +msgstr "Cambiar a configuración do sitio" #. TRANS: Main menu option when logged in and site admin for access to site configuration #: lib/action.php:451 msgctxt "MENU" msgid "Admin" -msgstr "" +msgstr "Administrador" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "" +msgstr "Convide a amigos e compañeiros a unírselle en %s" #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users #: lib/action.php:458 msgctxt "MENU" msgid "Invite" -msgstr "" +msgstr "Convidar" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" -msgstr "" +msgstr "Saír do anonimato" #. TRANS: Main menu option when logged in to log out the current user #: lib/action.php:467 msgctxt "MENU" msgid "Logout" -msgstr "" +msgstr "Saír" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" -msgstr "" +msgstr "Crear unha conta" #. TRANS: Main menu option when not logged in to register a new account #: lib/action.php:475 msgctxt "MENU" msgid "Register" -msgstr "" +msgstr "Rexistrarse" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" -msgstr "" +msgstr "Identificarse no sitio" #: lib/action.php:481 msgctxt "MENU" msgid "Login" -msgstr "" +msgstr "Identificarse" #. TRANS: Tooltip for main menu option "Help" #: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" -msgstr "" +msgstr "Axuda!" #: lib/action.php:487 msgctxt "MENU" msgid "Help" -msgstr "" +msgstr "Axuda" #. TRANS: Tooltip for main menu option "Search" #: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" -msgstr "" +msgstr "Buscar persoas ou palabras" #: lib/action.php:493 msgctxt "MENU" msgid "Search" -msgstr "" +msgstr "Buscar" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration #: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" -msgstr "" +msgstr "Nota do sitio" #. TRANS: DT element for local views block. String is hidden in default CSS. #: lib/action.php:582 msgid "Local views" -msgstr "" +msgstr "Vistas locais" #. TRANS: DT element for page notice. String is hidden in default CSS. #: lib/action.php:649 msgid "Page notice" -msgstr "" +msgstr "Nota da páxina" #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. #: lib/action.php:752 msgid "Secondary site navigation" -msgstr "" +msgstr "Navegación secundaria do sitio" #. TRANS: Secondary navigation menu option leading to help on StatusNet. #: lib/action.php:758 msgid "Help" -msgstr "" +msgstr "Axuda" #. TRANS: Secondary navigation menu option leading to text about StatusNet site. #: lib/action.php:761 msgid "About" -msgstr "" +msgstr "Acerca de" #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. #: lib/action.php:764 msgid "FAQ" -msgstr "" +msgstr "Preguntas máis frecuentes" #. TRANS: Secondary navigation menu option leading to Terms of Service. #: lib/action.php:769 msgid "TOS" -msgstr "" +msgstr "Condicións do servicio" #. TRANS: Secondary navigation menu option leading to privacy policy. #: lib/action.php:773 msgid "Privacy" -msgstr "" +msgstr "Privacidade" #. TRANS: Secondary navigation menu option. #: lib/action.php:776 msgid "Source" -msgstr "" +msgstr "Código fonte" #. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. #: lib/action.php:782 msgid "Contact" -msgstr "" +msgstr "Contacto" #: lib/action.php:784 msgid "Badge" -msgstr "" +msgstr "Insignia" #. TRANS: DT element for StatusNet software license. #: lib/action.php:813 msgid "StatusNet software license" -msgstr "" +msgstr "Licenza do software StatusNet" #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. #: lib/action.php:817 @@ -5122,12 +5168,14 @@ msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." msgstr "" +"**%%site.name%%** é un servizo de microblogue ofrecido por [%%site.broughtby%" +"%](%%site.broughtbyurl%%)." #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. #: lib/action.php:820 #, php-format msgid "**%%site.name%%** is a microblogging service." -msgstr "" +msgstr "**%%site.name%%** é un servizo de microblogue." #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. #: lib/action.php:824 @@ -5137,18 +5185,21 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" +"Utiliza a versión %s do software de microblogue [StatusNet](http://status." +"net/), dispoñible baixo a [Licenza Pública Xeral Affero de GNU](http://www." +"fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)." #. TRANS: DT element for StatusNet site content license. #: lib/action.php:840 msgid "Site content license" -msgstr "" +msgstr "Licenza dos contidos do sitio" #. TRANS: Content license displayed when license is set to 'private'. #. TRANS: %1$s is the site name. #: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "O contido e os datos de %1$s son privados e confidenciais." #. TRANS: Content license displayed when license is set to 'allrightsreserved'. #. TRANS: %1$s is the copyright owner. @@ -5156,215 +5207,223 @@ msgstr "" #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" +"os contidos e datos son propiedade intelectual de %1$s. Quedan reservados " +"todos os dereitos." #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. #: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Os contidos e datos son propiedade intelectual dos contribuidores. Quedan " +"reservados todos os dereitos." #. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. #: lib/action.php:871 #, php-format msgid "All %1$s content and data are available under the %2$s license." -msgstr "" +msgstr "Todos os contidos e datos de %1$s están baixo a licenza %2$s." #. TRANS: DT element for pagination (previous/next, etc.). #: lib/action.php:1182 msgid "Pagination" -msgstr "" +msgstr "Paxinación" #. TRANS: Pagination message to go to a page displaying information more in the #. TRANS: present than the currently displayed information. #: lib/action.php:1193 msgid "After" -msgstr "" +msgstr "Posteriores" #. TRANS: Pagination message to go to a page displaying information more in the #. TRANS: past than the currently displayed information. #: lib/action.php:1203 msgid "Before" -msgstr "" +msgstr "Anteriores" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. #: lib/activity.php:121 msgid "Expecting a root feed element but got a whole XML document." msgstr "" +"Esperábase unha fonte de novas raíz pero recibiuse un documento XML completo." #: lib/activityutils.php:208 msgid "Can't handle remote content yet." -msgstr "" +msgstr "Aínda non é posible manexar contidos remotos." #: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." -msgstr "" +msgstr "Aínda non se poden manexar contidos XML integrados." #: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." -msgstr "" +msgstr "Aínda non se poden manexar contidos Base64." #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." -msgstr "" +msgstr "Non pode realizar cambios neste sitio." #. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." -msgstr "" +msgstr "Non se permite realizar cambios nese panel." #. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." -msgstr "" +msgstr "showForm() non está integrado." #. TRANS: Client error message #: lib/adminpanelaction.php:259 msgid "saveSettings() not implemented." -msgstr "" +msgstr "saveSettings() non está integrado." #. TRANS: Client error message thrown if design settings could not be deleted in #. TRANS: the admin panel Design. #: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." -msgstr "" +msgstr "Non se puido borrar a configuración do deseño." #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:349 msgid "Basic site configuration" -msgstr "" +msgstr "Configuración básica do sitio" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" -msgstr "" +msgstr "Sitio" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:357 msgid "Design configuration" -msgstr "" +msgstr "Configuración do deseño" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" -msgstr "" +msgstr "Deseño" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:365 msgid "User configuration" -msgstr "" +msgstr "Configuración do usuario" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" -msgstr "" +msgstr "Usuario" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:373 msgid "Access configuration" -msgstr "" +msgstr "Configuración do acceso" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:381 msgid "Paths configuration" -msgstr "" +msgstr "Configuración das rutas" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:389 msgid "Sessions configuration" -msgstr "" +msgstr "Configuración das sesións" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:397 msgid "Edit site notice" -msgstr "" +msgstr "Modificar a nota do sitio" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "" +msgstr "Configuración das instantáneas" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" +"O recurso API precisa permisos de lectura e escritura, pero só dispón de " +"permisos de lectura." #. TRANS: Form legend. #: lib/applicationeditform.php:137 msgid "Edit application" -msgstr "" +msgstr "Modificar a aplicación" #. TRANS: Form guide. #: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Icona para esta aplicación" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" -msgstr "" +msgstr "Describa a súa aplicación en %d caracteres" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:213 msgid "Describe your application" -msgstr "" +msgstr "Describa a súa aplicación" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" -msgstr "" +msgstr "URL do sitio web desta aplicación" #. TRANS: Form input field label. #: lib/applicationeditform.php:226 msgid "Source URL" -msgstr "" +msgstr "URL de orixe" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:233 msgid "Organization responsible for this application" -msgstr "" +msgstr "Organización responsable desta aplicación" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" -msgstr "" +msgstr "URL ao sitio web da organización" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" -msgstr "" +msgstr "URL ao que ir tras a autenticación" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:278 msgid "Browser" -msgstr "" +msgstr "Navegador" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:295 msgid "Desktop" -msgstr "" +msgstr "Escritorio" #. TRANS: Form guide. #: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Tipo de aplicación, de navegador ou de escritorio" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:320 msgid "Read-only" -msgstr "" +msgstr "Lectura" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:339 msgid "Read-write" -msgstr "" +msgstr "Lectura e escritura" #. TRANS: Form guide. #: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" +"Permisos por defecto para esta aplicación: lectura, ou lectura e escritura" #. TRANS: Submit button title #: lib/applicationeditform.php:359 @@ -5374,18 +5433,18 @@ msgstr "Cancelar" #. TRANS: Application access type #: lib/applicationlist.php:136 msgid "read-write" -msgstr "" +msgstr "lectura e escritura" #. TRANS: Application access type #: lib/applicationlist.php:138 msgid "read-only" -msgstr "" +msgstr "lectura" #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) #: lib/applicationlist.php:144 #, php-format msgid "Approved %1$s - \"%2$s\" access." -msgstr "" +msgstr "Aprobado o %1$s - Permisos de «%2$s»." #. TRANS: Button label #: lib/applicationlist.php:159 @@ -5396,82 +5455,82 @@ msgstr "Revogar" #. TRANS: DT element label in attachment list. #: lib/attachmentlist.php:88 msgid "Attachments" -msgstr "" +msgstr "Ficheiros anexos" #. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" -msgstr "" +msgstr "Autor" #. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:279 msgid "Provider" -msgstr "" +msgstr "Provedor" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Notas nas que se anexou este ficheiro" #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" -msgstr "" +msgstr "Etiquetas para este ficheiro" #: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 msgid "Password changing failed" -msgstr "" +msgstr "Non se puido cambiar o contrasinal" #: lib/authenticationplugin.php:235 msgid "Password changing is not allowed" -msgstr "" +msgstr "Non se permite cambiar o contrasinal" #: lib/channel.php:157 lib/channel.php:177 msgid "Command results" -msgstr "" +msgstr "Resultados da orde" #: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" -msgstr "" +msgstr "Completouse a orde" #: lib/channel.php:240 msgid "Command failed" -msgstr "" +msgstr "A orde fallou" #: lib/command.php:83 lib/command.php:105 msgid "Notice with that id does not exist" -msgstr "" +msgstr "Non hai ningunha nota con esa id" #: lib/command.php:99 lib/command.php:596 msgid "User has no last notice" -msgstr "" +msgstr "O usuario non ten ningunha última nota" #. TRANS: Message given requesting a profile for a non-existing user. #. TRANS: %s is the nickname of the user for which the profile could not be found. #: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" -msgstr "" +msgstr "Non se deu atopado ningún usuario co alcume %s" #. TRANS: Message given getting a non-existing user. #. TRANS: %s is the nickname of the user that could not be found. #: lib/command.php:147 #, php-format msgid "Could not find a local user with nickname %s" -msgstr "" +msgstr "Non se deu atopado un usuario local co alcume %s" #: lib/command.php:180 msgid "Sorry, this command is not yet implemented." -msgstr "" +msgstr "Esta orde aínda non está integrada." #: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "Non ten sentido ningún facerse un aceno a un mesmo!" #. TRANS: Message given having nudged another user. #. TRANS: %s is the nickname of the user that was nudged. #: lib/command.php:234 #, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "Fíxoselle un aceno a %s" #: lib/command.php:260 #, php-format @@ -5480,54 +5539,57 @@ msgid "" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Subscricións: %1$s\n" +"Subscritores: %2$s\n" +"Notas: %3$s" #: lib/command.php:302 msgid "Notice marked as fave." -msgstr "" +msgstr "Marcouse a nota como favorita." #: lib/command.php:323 msgid "You are already a member of that group" -msgstr "" +msgstr "Xa forma parte dese grupo" #. TRANS: Message given having failed to add a user to a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:339 -#, fuzzy, php-format +#, php-format msgid "Could not join user %1$s to group %2$s" -msgstr "O usuario %1$s non se puido engadir ao grupo %2$s." +msgstr "Non se puido meter ao usuario %1$s no grupo %2$s" #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "O usuario %1$s non se puido eliminar do grupo %2$s." +msgstr "Non se puido eliminar ao usuario %1$s do grupo %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 #, php-format msgid "Fullname: %s" -msgstr "" +msgstr "Nome completo: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail #: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" -msgstr "" +msgstr "Localidade: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail #: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" -msgstr "" +msgstr "Sitio web: %s" #. TRANS: Whois output. %s is the bio information of the queried user. #: lib/command.php:430 #, php-format msgid "About: %s" -msgstr "" +msgstr "Acerca de: %s" #: lib/command.php:457 #, php-format @@ -5535,117 +5597,120 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s é un perfil remoto. Só pode enviarlle mensaxes persoais aos usuarios do " +"mesmo servidor." #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" -msgstr "" +msgstr "A mensaxe é longa de máis. O límite son %1$d caracteres, e enviou %2$d" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. #: lib/command.php:492 #, php-format msgid "Direct message to %s sent" -msgstr "" +msgstr "Envióuselle a mensaxe directa a %s" #: lib/command.php:494 msgid "Error sending direct message." -msgstr "" +msgstr "Houbo un erro ao enviar a mensaxe directa." #: lib/command.php:514 msgid "Cannot repeat your own notice" -msgstr "" +msgstr "Non pode repetir unha nota propia" #: lib/command.php:519 msgid "Already repeated that notice" -msgstr "" +msgstr "Xa repetiu esa nota" #. TRANS: Message given having repeated a notice from another user. #. TRANS: %s is the name of the user for which the notice was repeated. #: lib/command.php:529 #, php-format msgid "Notice from %s repeated" -msgstr "" +msgstr "Repetiuse a nota de %s" #: lib/command.php:531 msgid "Error repeating notice." -msgstr "" +msgstr "Houbo un erro ao repetir a nota." #: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "" +msgstr "A nota é longa de máis. O límite son %d caracteres, e enviou %d" #: lib/command.php:571 #, php-format msgid "Reply to %s sent" -msgstr "" +msgstr "Enviouse a resposta a %s" #: lib/command.php:573 msgid "Error saving notice." -msgstr "" +msgstr "Houbo un erro ao gardar a nota." #: lib/command.php:620 msgid "Specify the name of the user to subscribe to" -msgstr "" +msgstr "Introduza o nome do usuario ao que quere subscribirse" #: lib/command.php:628 msgid "Can't subscribe to OMB profiles by command." -msgstr "" +msgstr "Non se pode subscribirse aos perfís OMB cunha orde." #: lib/command.php:634 #, php-format msgid "Subscribed to %s" -msgstr "" +msgstr "Subscribiuse a %s" #: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" -msgstr "" +msgstr "Introduza o nome do usuario ao que quer deixar de estar subscrito" #: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" -msgstr "" +msgstr "Cancelar a subscrición a %s" #: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." -msgstr "" +msgstr "Aínda non se integrou esa orde." #: lib/command.php:685 msgid "Notification off." -msgstr "" +msgstr "Desactivar a notificación." #: lib/command.php:687 msgid "Can't turn off notification." -msgstr "" +msgstr "Non se pode desactivar a notificación." #: lib/command.php:708 msgid "Notification on." -msgstr "" +msgstr "Activar a notificación." #: lib/command.php:710 msgid "Can't turn on notification." -msgstr "" +msgstr "Non se pode activar a notificación." #: lib/command.php:723 msgid "Login command is disabled" -msgstr "" +msgstr "A orde de identificación está desactivada" #: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Esta ligazón só se pode utilizar unha vez, e só nos próximos dous minutos: %s" #: lib/command.php:761 #, php-format msgid "Unsubscribed %s" -msgstr "" +msgstr "Cancelou a subscrición a %s" #: lib/command.php:778 msgid "You are not subscribed to anyone." -msgstr "" +msgstr "Non está subscrito a ninguén." #: lib/command.php:780 msgid "You are subscribed to this person:" @@ -5655,7 +5720,7 @@ msgstr[1] "Vostede está subscrito a estas persoas:" #: lib/command.php:800 msgid "No one is subscribed to you." -msgstr "" +msgstr "Non hai ninguén subscrito a vostede." #: lib/command.php:802 msgid "This person is subscribed to you:" @@ -5665,7 +5730,7 @@ msgstr[1] "Estas persoas están subscritas a vostede:" #: lib/command.php:822 msgid "You are not a member of any groups." -msgstr "" +msgstr "Non forma parte de ningún grupo." #: lib/command.php:824 msgid "You are a member of this group:" @@ -5714,26 +5779,64 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Ordes:\n" +"on - activa as notificacións\n" +"off - desactiva as notificacións\n" +"help - amosa esta axuda\n" +"follow - subscribirse ao usuario\n" +"groups - lista os grupos nos que está\n" +"subscriptions - lista a xente á que segue\n" +"subscribers - lista a xente que o segue\n" +"leave - cancela a subscrición ao usuario\n" +"d - mensaxe directa a un usuario\n" +"get - obter a última nota do usuario\n" +"whois - obtén a información do perfil do usuario\n" +"lose - facer que o usuario deixe de seguilo\n" +"fav - marcar como “favorita” a última nota do usuario\n" +"fav # - marcar como “favorita” a nota coa id indicada\n" +"repeat # - repetir a nota doa id indicada\n" +"repeat - repetir a última nota do usuario\n" +"reply # - responder a unha nota coa id indicada\n" +"reply - responder á última nota do usuario\n" +"join - unirse ao grupo indicado\n" +"login - obter un enderezo para identificarse na interface web\n" +"drop - deixar o grupo indicado\n" +"stats - obter as súas estatísticas\n" +"stop - idéntico a “off”\n" +"quit - idéntico a “off”\n" +"sub - idéntico a “follow”\n" +"unsub - idéntico a “leave”\n" +"last - idéntico a “get”\n" +"on - aínda non se integrou\n" +"off - aínda non se integrou\n" +"nudge - facerlle un aceno ao usuario indicado\n" +"invite - aínda non se integrou\n" +"track - aínda non se integrou\n" +"untrack - aínda non se integrou\n" +"track off - aínda non se integrou\n" +"untrack all - aínda non se integrou\n" +"tracks - aínda non se integrou\n" +"tracking - aínda non se integrou\n" #: lib/common.php:135 msgid "No configuration file found. " -msgstr "" +msgstr "Non se atopou ningún ficheiro de configuración. " #: lib/common.php:136 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "Buscáronse ficheiros de configuración nos seguintes lugares: " #: lib/common.php:138 msgid "You may wish to run the installer to fix this." -msgstr "" +msgstr "Pode que queira executar o instalador para arranxalo." #: lib/common.php:139 msgid "Go to the installer." -msgstr "" +msgstr "Ir ao instalador." #: lib/connectsettingsaction.php:110 msgid "IM" -msgstr "" +msgstr "MI" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" @@ -6685,56 +6788,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index a755933c93..e86db78549 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:40+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:18:32+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -104,8 +104,8 @@ msgstr "אין הודעה כזו." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -129,7 +129,7 @@ msgstr "%s וחברים" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -190,7 +190,7 @@ msgstr "%s וחברים" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -212,9 +212,9 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -232,7 +232,7 @@ msgstr "קוד האישור לא נמצא." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" @@ -264,7 +264,7 @@ msgstr "שמירת הפרופיל נכשלה." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -661,18 +661,18 @@ msgstr "התמונה עודכנה." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "לא נמצא" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -702,12 +702,12 @@ msgstr "הסטטוס של %1$s ב-%2$s " msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2583,8 +2583,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -4849,7 +4849,7 @@ msgstr "בעיה בשמירת ההודעה." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5343,7 +5343,7 @@ msgid "Snapshots configuration" msgstr "הרשמות" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6811,56 +6811,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "לפני מספר שניות" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "לפני כדקה" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "לפני כ-%d דקות" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "לפני כשעה" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "לפני כ-%d שעות" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "לפני כיום" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "לפני כ-%d ימים" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "לפני כחודש" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "לפני כ-%d חודשים" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "לפני כשנה" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index adc15a7a61..8270756d53 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:44+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:18:36+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -99,8 +99,8 @@ msgstr "Strona njeeksistuje." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -124,7 +124,7 @@ msgstr "%1$s a přećeljo, strona %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -184,7 +184,7 @@ msgstr "Ty a přećeljo" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -206,9 +206,9 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -225,7 +225,7 @@ msgstr "API-metoda njenamakana." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Tuta metoda wužaduje sej POST." @@ -255,7 +255,7 @@ msgstr "Profil njeje so składować dał." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -634,17 +634,17 @@ msgstr "Status zničeny." msgid "No status with that ID found." msgstr "Žadyn status z tym ID namakany." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Njenamakany." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -673,12 +673,12 @@ msgstr "" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2218,9 +2218,8 @@ msgid "" msgstr "" #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom" +msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom." #: actions/login.php:273 #, php-format @@ -2439,8 +2438,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -4590,7 +4589,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5042,7 +5041,7 @@ msgid "Snapshots configuration" msgstr "Konfiguracija wobrazowkowych fotow" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6447,56 +6446,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "před něšto sekundami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "před něhdźe jednej mjeńšinu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "před %d mjeńšinami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "před něhdźe jednej hodźinu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "před něhdźe %d hodźinami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "před něhdźe jednym dnjom" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "před něhdźe %d dnjemi" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "před něhdźe jednym měsacom" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "před něhdźe %d měsacami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "před něhdźe jednym lětom" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index cce9d66f28..a6da5e853a 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:47+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:18:47+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -97,8 +97,8 @@ msgstr "Pagina non existe." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -122,7 +122,7 @@ msgstr "%1$s e amicos, pagina %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -190,7 +190,7 @@ msgstr "Tu e amicos" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -212,9 +212,9 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -231,7 +231,7 @@ msgstr "Methodo API non trovate." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Iste methodo require un POST." @@ -263,7 +263,7 @@ msgstr "Non poteva salveguardar le profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -652,18 +652,18 @@ msgstr "Stato delite." msgid "No status with that ID found." msgstr "Nulle stato trovate con iste ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Isto es troppo longe. Le longitude maximal del notas es %d characteres." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Non trovate." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -695,12 +695,12 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" "Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Chronologia public de %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Actualisationes de totes in %s!" @@ -2323,17 +2323,15 @@ msgstr "" "contrasigno ante de cambiar tu configurationes." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Aperir session con nomine de usator e contrasigno" +msgstr "Aperi un session con tu nomine de usator e contrasigno." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Aperi un session con tu nomine de usator e contrasigno. Non ha ancora un " -"nomine de usator? [Crea](%%action.register%%) un nove conto." +"Non ha ancora un nomine de usator? [Crea](%%action.register%%) un nove conto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2559,8 +2557,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Solmente le URLs %s es permittite super HTTP simple." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Formato de datos non supportate." @@ -4859,7 +4857,7 @@ msgstr "Problema salveguardar le cassa de entrata del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5319,7 +5317,7 @@ msgid "Snapshots configuration" msgstr "Configuration del instantaneos" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Le ressource de API require accesso pro lectura e scriptura, ma tu ha " @@ -6877,56 +6875,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "alcun secundas retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "circa un minuta retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "circa %d minutas retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "circa un hora retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "circa %d horas retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "circa un die retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "circa %d dies retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "circa un mense retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "circa %d menses retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "circa un anno retro" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 434ca44fa8..dd5055757e 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:50+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:18:50+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -107,8 +107,8 @@ msgstr "Ekkert þannig merki." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -132,7 +132,7 @@ msgstr "%s og vinirnir, síða %d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -192,7 +192,7 @@ msgstr "" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -214,9 +214,9 @@ msgstr "Færslur frá %1$s og vinum á %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -234,7 +234,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Þessi aðferð krefst POST." @@ -266,7 +266,7 @@ msgstr "Gat ekki vistað persónulega síðu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -662,17 +662,17 @@ msgstr "" msgid "No status with that ID found." msgstr "Engin staða með þessu kenni fannst." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Fannst ekki." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -702,12 +702,12 @@ msgstr "" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Almenningsrás %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s færslur frá öllum!" @@ -2603,8 +2603,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -4899,7 +4899,7 @@ msgstr "Vandamál komu upp við að vista babl." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5396,7 +5396,7 @@ msgid "Snapshots configuration" msgstr "SMS staðfesting" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6848,56 +6848,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "fyrir um einum degi síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "fyrir um einu ári síðan" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 3dd83d9ac7..96d13101a5 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:53+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:18:53+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -100,8 +100,8 @@ msgstr "Pagina inesistente." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -125,7 +125,7 @@ msgstr "%1$s e amici, pagina %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -194,7 +194,7 @@ msgstr "Tu e i tuoi amici" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -216,9 +216,9 @@ msgstr "Messaggi da %1$s e amici su %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -235,7 +235,7 @@ msgstr "Metodo delle API non trovato." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Questo metodo richiede POST." @@ -267,7 +267,7 @@ msgstr "Impossibile salvare il profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -656,17 +656,17 @@ msgstr "Messaggio eliminato." msgid "No status with that ID found." msgstr "Nessuno stato trovato con quel ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Troppo lungo. Lunghezza massima %d caratteri." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Non trovato." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -696,12 +696,12 @@ msgstr "%1$s / Messaggi che citano %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Attività pubblica di %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Aggiornamenti di %s da tutti!" @@ -2557,8 +2557,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Solo URL %s attraverso HTTP semplice." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -4859,7 +4859,7 @@ msgstr "Problema nel salvare la casella della posta del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5321,7 +5321,7 @@ msgid "Snapshots configuration" msgstr "Configurazione snapshot" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo " @@ -6883,56 +6883,56 @@ msgid "Moderator" msgstr "Moderatore" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "pochi secondi fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "circa un minuto fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "circa un'ora fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "circa un giorno fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "circa un mese fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "circa un anno fa" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 0b1a865961..984d88f199 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:56+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:00+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -102,8 +102,8 @@ msgstr "そのようなページはありません。" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -127,7 +127,7 @@ msgstr "%1$s と友人、ページ %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -193,7 +193,7 @@ msgstr "あなたと友人" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -215,9 +215,9 @@ msgstr "%2$s に %1$s と友人からの更新があります！" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -234,7 +234,7 @@ msgstr "API メソッドが見つかりません。" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "このメソッドには POST が必要です。" @@ -267,7 +267,7 @@ msgstr "プロフィールを保存できませんでした。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -654,17 +654,17 @@ msgstr "ステータスを削除しました。" msgid "No status with that ID found." msgstr "そのＩＤでのステータスはありません。" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "長すぎます。つぶやきは最大 140 字までです。" -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "見つかりません。" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "つぶやきは URL を含めて最大 %d 字までです。" @@ -693,12 +693,12 @@ msgstr "%1$s / %2$s について更新" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%2$s からアップデートに答える %1$s アップデート" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s のパブリックタイムライン" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "皆からの %s アップデート!" @@ -2576,8 +2576,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "サポートされていないデータ形式。" @@ -4890,7 +4890,7 @@ msgstr "グループ受信箱を保存する際に問題が発生しました。 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5371,7 +5371,7 @@ msgid "Snapshots configuration" msgstr "パス設定" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って" @@ -6874,56 +6874,56 @@ msgid "Moderator" msgstr "管理" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "数秒前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "約 1 分前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "約 %d 分前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "約 1 時間前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "約 %d 時間前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "約 1 日前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "約 %d 日前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "約 1 ヵ月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "約 %d ヵ月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "約 1 年前" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 2696240ad7..87af73cadd 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:12:59+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:10+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -97,8 +97,8 @@ msgstr "해당하는 페이지 없음" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -122,7 +122,7 @@ msgstr "%s 및 친구들, %d 페이지" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -184,7 +184,7 @@ msgstr "당신 및 친구들" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -206,9 +206,9 @@ msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -225,7 +225,7 @@ msgstr "API 메서드 발견 안 됨." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "이 메서드는 POST를 요구합니다." @@ -255,7 +255,7 @@ msgstr "프로필을 저장 할 수 없습니다." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -644,17 +644,17 @@ msgstr "삭제된 소식입니다." msgid "No status with that ID found." msgstr "발견된 ID의 상태가 없습니다." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "너무 깁니다. 통지의 최대 길이는 %d 글자 입니다." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "찾을 수가 없습니다." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "소식의 최대 길이는 첨부 URL을 포함하여 %d 글자입니다." @@ -683,12 +683,12 @@ msgstr "%1$s / %2$s에게 답신 업데이트" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s 공개 타임라인" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "모두로부터의 업데이트 %s개!" @@ -2572,8 +2572,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -4871,7 +4871,7 @@ msgstr "통지를 저장하는데 문제가 발생했습니다." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5367,7 +5367,7 @@ msgid "Snapshots configuration" msgstr "SMS 인증" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6823,56 +6823,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "몇 초 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "1분 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "%d분 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "1시간 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "%d시간 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "하루 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "%d일 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "1달 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "%d달 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "1년 전" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index db7c2f3aae..8763ed8fb5 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:02+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:14+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -100,8 +100,8 @@ msgstr "Нема таква страница." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -125,7 +125,7 @@ msgstr "%1$s и пријателите, стр. %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -194,7 +194,7 @@ msgstr "Вие и пријателите" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -216,9 +216,9 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -235,7 +235,7 @@ msgstr "API методот не е пронајден." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Овој метод бара POST." @@ -267,7 +267,7 @@ msgstr "Не може да се зачува профил." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -656,17 +656,17 @@ msgstr "Статусот е избришан." msgid "No status with that ID found." msgstr "Нема пронајдено статус со тој ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ова е предолго. Максималната дозволена должина изнесува %d знаци." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Не е пронајдено." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -697,12 +697,12 @@ msgstr "%1$s / Подновувања кои споменуваат %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Јавна историја на %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s подновуввања од сите!" @@ -2332,17 +2332,15 @@ msgstr "" "име и лозинка пред да ги смените Вашите нагодувања." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Најава со корисничко име и лозинка" +msgstr "Најавете се со корисничко име и лозинка." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Најавете се со Вашето корисничко име и лозинка. Сè уште немате корисничко " -"име? [Регистрирајте](%%action.register%%) нова сметка." +"Сè уште немате корисничко име? [Направете](%%action.register%%) нова сметка." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2567,8 +2565,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Ве молиме користете само %s URL-адреси врз прост HTTP-код." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Ова не е поддржан формат на податотека." @@ -4880,7 +4878,7 @@ msgstr "Проблем при зачувувањето на групното п #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5342,7 +5340,7 @@ msgid "Snapshots configuration" msgstr "Поставки за снимки" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-ресурсот бара да може и да чита и да запишува, а вие можете само да " @@ -6904,56 +6902,56 @@ msgid "Moderator" msgstr "Модератор" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "пред неколку секунди" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "пред една минута" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "пред еден час" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "пред %d часа" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "пред еден ден" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "пред %d денови" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "пред еден месец" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "пред %d месеца" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "пред една година" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index dfffd8082f..690d0aa143 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:05+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:17+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -98,8 +98,8 @@ msgstr "Ingen slik side." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -123,7 +123,7 @@ msgstr "%1$s og venner, side %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -190,7 +190,7 @@ msgstr "Du og venner" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -212,9 +212,9 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -232,7 +232,7 @@ msgstr "API-metode ikke funnet!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Denne metoden krever en POST." @@ -264,7 +264,7 @@ msgstr "Klarte ikke å lagre profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -649,17 +649,17 @@ msgstr "Status slettet." msgid "No status with that ID found." msgstr "Ingen status med den ID-en funnet." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt. Maks notisstørrelse er %d tegn." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Ikke funnet." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL." @@ -688,12 +688,12 @@ msgstr "%1$s / Oppdateringer som nevner %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s offentlig tidslinje" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s oppdateringer fra alle sammen!" @@ -2300,17 +2300,15 @@ msgstr "" "endrer innstillingene dine." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Logg inn med brukernavn og passord" +msgstr "Logg inn med brukernavn og passord." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Logg inn med ditt brukernavn og passord. Har du ikke et brukernavn ennå? " -"[Opprett](%%action.register%%) en ny konto." +"Har du ikke et brukernavn ennå? [Opprett](%%action.register%%) en ny konto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2533,8 +2531,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Bare %s-nettadresser over vanlig HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Ikke et støttet dataformat." @@ -3953,11 +3951,11 @@ msgstr "" #: actions/siteadminpanel.php:239 msgid "Contact email address for your site" -msgstr "" +msgstr "Kontakte-postadresse for nettstedet ditt" #: actions/siteadminpanel.php:245 msgid "Local" -msgstr "" +msgstr "Lokal" #: actions/siteadminpanel.php:256 msgid "Default timezone" @@ -4014,18 +4012,16 @@ msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Slett notis" +msgstr "Tekst for nettstedsnotis" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Innstillinger for IM" +msgstr "Lagre nettstedsnotis" #. TRANS: Title for SMS settings. #: actions/smssettings.php:59 @@ -4046,9 +4042,8 @@ msgstr "SMS er ikke tilgjengelig." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "Direktemeldingsadresse" +msgstr "SMS-adresse" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -4072,7 +4067,6 @@ msgstr "Skriv inn koden du mottok på telefonen din." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" msgstr "Bekreft" @@ -4098,12 +4092,13 @@ msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" +"Send meg notiser via SMS; jeg forstår at dette kan føre til kostnader fra " +"min teleoperatør." #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "Innstillinger lagret." +msgstr "SMS-innstillinger lagret." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4123,28 +4118,26 @@ msgstr "Det er allerede din ditt telefonnummer." #. TRANS: Message given saving SMS phone number that is already set for another user. #: actions/smssettings.php:356 msgid "That phone number already belongs to another user." -msgstr "" +msgstr "Telefonnummeret tilhører allerede en annen bruker." #. TRANS: Message given saving valid SMS phone number that is to be confirmed. #: actions/smssettings.php:384 -#, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen " -"din for koden, og hvordan du skal bruke den." +"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk telefonen " +"din for koden og hvordan du skal bruke den." #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. #: actions/smssettings.php:413 msgid "That is the wrong confirmation number." -msgstr "" +msgstr "Dette er feil bekreftelsesnummer." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "Bekreftelse avbrutt." +msgstr "SMS-bekreftelse avbrutt." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. @@ -4154,9 +4147,8 @@ msgstr "Det er ikke ditt telefonnummer." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "Telefonnummer for SMS" +msgstr "Telefonnummeret for SMS ble fjernet." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4176,11 +4168,14 @@ msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" +"Mobiloperatør for din telefon. Om du kjenner til en operatør som kan motta " +"SMS via e-post men som ikke er listet opp her, send en e-post til %s og " +"fortell oss." #. TRANS: Message given saving SMS phone number confirmation code without having provided one. #: actions/smssettings.php:548 msgid "No code entered" -msgstr "" +msgstr "Ingen kode skrevet inn" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 @@ -4255,9 +4250,8 @@ msgid "This action only accepts POST requests." msgstr "" #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "Ingen slik fil." +msgstr "Ingen slik profil." #: actions/subscribe.php:117 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." @@ -4596,9 +4590,9 @@ msgid "Avatar URL ‘%s’ is not valid." msgstr "" #: actions/userauthorization.php:350 -#, fuzzy, php-format +#, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "Kan ikke lese brukerbilde-URL «%s»" +msgstr "Kan ikke lese avatar-URL ‘%s’" #: actions/userauthorization.php:355 #, php-format @@ -4798,7 +4792,7 @@ msgstr "Problem ved lagring av gruppeinnboks." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5256,7 +5250,7 @@ msgid "Snapshots configuration" msgstr "" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5802,7 +5796,7 @@ msgstr "" #: lib/galleryaction.php:143 msgid "Go" -msgstr "" +msgstr "Gå" #: lib/grantroleform.php:91 #, php-format @@ -6415,7 +6409,7 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:447 msgid "at" -msgstr "" +msgstr "på" #: lib/noticelist.php:567 msgid "in context" @@ -6537,7 +6531,7 @@ msgstr "Medlem siden" #. TRANS: Average count of posts made per day since account registration #: lib/profileaction.php:235 msgid "Daily average" -msgstr "" +msgstr "Daglig gjennomsnitt" #: lib/profileaction.php:264 msgid "All groups" @@ -6772,56 +6766,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "noen få sekunder siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "omtrent ett minutt siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "omtrent én time siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "omtrent én dag siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "omtrent én måned siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "omtrent %d måneder siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "omtrent ett år siden" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index f039ae0be7..5fbe437aa1 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:11+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:27+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -99,8 +99,8 @@ msgstr "Deze pagina bestaat niet." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -124,7 +124,7 @@ msgstr "%1$s en vrienden, pagina %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -193,7 +193,7 @@ msgstr "U en vrienden" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -215,9 +215,9 @@ msgstr "Updates van %1$s en vrienden op %2$s." #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -234,7 +234,7 @@ msgstr "De API-functie is niet aangetroffen." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Deze methode vereist een POST." @@ -266,7 +266,7 @@ msgstr "Het was niet mogelijk het profiel op te slaan." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -666,17 +666,17 @@ msgstr "De status is verwijderd." msgid "No status with that ID found." msgstr "Er is geen status gevonden met dit ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "De mededeling is te lang. Gebruik maximaal %d tekens." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Niet aangetroffen." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -707,12 +707,12 @@ msgstr "%1$s / Updates over %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s publieke tijdlijn" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s updates van iedereen" @@ -2349,17 +2349,16 @@ msgstr "" "invoeren alvorens u uw instellingen kunt wijzigen." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Aanmelden met gebruikersnaam en wachtwoord" +msgstr "Aanmelden met uw gebruikersnaam en wachtwoord." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Meld u aan met uw gebruikersnaam en wachtwoord. Hebt u nog geen " -"gebruikersnaam? [Registreer een nieuwe gebruiker](%%action.register%%)." +"Hebt u nog geen gebruikersnaam? [Registreer een nieuwe gebruiker](%%action." +"register%%)." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2588,8 +2587,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Alleen URL's voor %s via normale HTTP alstublieft." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -4921,7 +4920,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5384,7 +5383,7 @@ msgid "Snapshots configuration" msgstr "Snapshotinstellingen" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen " @@ -6957,56 +6956,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "een paar seconden geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "ongeveer een uur geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "ongeveer een dag geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "ongeveer een maand geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "ongeveer een jaar geleden" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index ca232927da..3bc961f590 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:08+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:21+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -106,8 +106,8 @@ msgstr "Dette emneord finst ikkje." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -131,7 +131,7 @@ msgstr "%s med vener, side %d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -192,7 +192,7 @@ msgstr "%s med vener" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -214,9 +214,9 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -234,7 +234,7 @@ msgstr "Fann ikkje API-metode." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Dette krev ein POST." @@ -266,7 +266,7 @@ msgstr "Kan ikkje lagra profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -665,17 +665,17 @@ msgstr "Lasta opp brukarbilete." msgid "No status with that ID found." msgstr "Fann ingen status med den ID-en." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Finst ikkje." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -705,12 +705,12 @@ msgstr "%1$s / Oppdateringar som svarar til %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s offentleg tidsline" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s oppdateringar frå alle saman!" @@ -2625,8 +2625,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -4938,7 +4938,7 @@ msgstr "Eit problem oppstod ved lagring av notis." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5436,7 +5436,7 @@ msgid "Snapshots configuration" msgstr "SMS bekreftelse" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6901,56 +6901,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "eit par sekund sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "omtrent ein time sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "omtrent ein dag sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "omtrent ein månad sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "~%d månadar sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "omtrent eitt år sidan" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index d4bff1164a..bcab63ee1b 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:14+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:30+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -103,8 +103,8 @@ msgstr "Nie ma takiej strony." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -128,7 +128,7 @@ msgstr "%1$s i przyjaciele, strona %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -197,7 +197,7 @@ msgstr "Ty i przyjaciele" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -219,9 +219,9 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s." #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -238,7 +238,7 @@ msgstr "Nie odnaleziono metody API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Ta metoda wymaga POST." @@ -269,7 +269,7 @@ msgstr "Nie można zapisać profilu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -657,17 +657,17 @@ msgstr "Usunięto stan." msgid "No status with that ID found." msgstr "Nie odnaleziono stanów z tym identyfikatorem." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Nie odnaleziono." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika." @@ -696,12 +696,12 @@ msgstr "%1$s/aktualizacje wspominające %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Publiczna oś czasu użytkownika %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Użytkownik %s aktualizuje od każdego." @@ -2315,17 +2315,16 @@ msgstr "" "zmienianiem ustawień." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła" +msgstr "Logowanie za pomocą nazwy użytkownika i hasła." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? " -"[Zarejestruj](%%action.register%%) nowe konto." +"Nie masz jeszcze nazwy użytkownika? [Zarejestruj](%%action.register%%) nowe " +"konto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2547,8 +2546,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -4852,7 +4851,7 @@ msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5315,7 +5314,7 @@ msgid "Snapshots configuration" msgstr "Konfiguracja migawek" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko " @@ -6877,56 +6876,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "kilka sekund temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "około minutę temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "około %d minut temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "około godzinę temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "około %d godzin temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "blisko dzień temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "około %d dni temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "około miesiąc temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "około %d miesięcy temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "około rok temu" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 78d38fa580..29bbdfefb3 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Portuguese # +# Author@translatewiki.net: Gallaecio # Author@translatewiki.net: Hamilton Abreu # Author@translatewiki.net: Ipublicis # -- @@ -9,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:17+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:34+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -98,8 +99,8 @@ msgstr "Página não foi encontrada." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -123,7 +124,7 @@ msgstr "%1$s e amigos, página %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -190,7 +191,7 @@ msgstr "Você e seus amigos" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -212,9 +213,9 @@ msgstr "Actualizações de %1$s e amigos no %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -231,7 +232,7 @@ msgstr "Método da API não encontrado." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -262,7 +263,7 @@ msgstr "Não foi possível gravar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -648,17 +649,17 @@ msgstr "Estado apagado." msgid "No status with that ID found." msgstr "Não foi encontrado um estado com esse ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Não encontrado." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo." @@ -687,12 +688,12 @@ msgstr "%1$s / Actualizações que mencionam %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Notas públicas de %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s actualizações de todos!" @@ -2316,17 +2317,14 @@ msgstr "" "senha antes de alterar as configurações." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Iniciar sessão com um nome de utilizador e senha" +msgstr "Iniciar sessão com um nome de utilizador e senha." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." -msgstr "" -"Entrar com o seu nome de utilizador e senha. Ainda não está registado? " -"[Registe](%%action.register%%) uma conta." +msgstr "Ainda não está registado? [Registe](%%action.register%%) uma conta." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2548,8 +2546,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Só URLs %s sobre HTTP simples, por favor." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -4851,7 +4849,7 @@ msgstr "Problema na gravação da caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5316,7 +5314,7 @@ msgid "Snapshots configuration" msgstr "Configuração dos instântaneos" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura." @@ -6870,56 +6868,56 @@ msgid "Moderator" msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "há alguns segundos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "há cerca de um minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "há cerca de %d minutos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "há cerca de uma hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "há cerca de %d horas" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "há cerca de um dia" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "há cerca de %d dias" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "há cerca de um mês" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "há cerca de %d meses" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "há cerca de um ano" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index b75e6f1c48..94eacd354c 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:20+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:42+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -102,8 +102,8 @@ msgstr "Esta página não existe." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -127,7 +127,7 @@ msgstr "%1$s e amigos, pág. %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -196,7 +196,7 @@ msgstr "Você e amigos" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -218,9 +218,9 @@ msgstr "Atualizações de %1$s e amigos no %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -237,7 +237,7 @@ msgstr "O método da API não foi encontrado!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -270,7 +270,7 @@ msgstr "Não foi possível salvar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -665,17 +665,17 @@ msgstr "A mensagem foi excluída." msgid "No status with that ID found." msgstr "Não foi encontrada nenhuma mensagem com esse ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Está muito extenso. O tamanho máximo é de %s caracteres." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Não encontrado." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "O tamanho máximo da mensagem é de %s caracteres" @@ -704,12 +704,12 @@ msgstr "%1$s / Mensagens mencionando %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Mensagens públicas de %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s mensagens de todo mundo!" @@ -2596,8 +2596,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Não é um formato de dados suportado." @@ -4915,7 +4915,7 @@ msgstr "Problema no salvamento das mensagens recebidas do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5376,7 +5376,7 @@ msgid "Snapshots configuration" msgstr "Configurações das estatísticas" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Os recursos de API exigem acesso de leitura e escrita, mas você possui " @@ -6915,56 +6915,56 @@ msgid "Moderator" msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "alguns segundos atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "cerca de 1 minuto atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "cerca de %d minutos atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "cerca de 1 hora atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "cerca de %d horas atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "cerca de 1 dia atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "cerca de %d dias atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "cerca de 1 mês atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "cerca de %d meses atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "cerca de 1 ano atrás" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 43013529c3..db0be7ca2a 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:23+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:50+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -103,8 +103,8 @@ msgstr "Нет такой страницы." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -128,7 +128,7 @@ msgstr "%1$s и друзья, страница %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -195,7 +195,7 @@ msgstr "Вы и друзья" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -217,9 +217,9 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -236,7 +236,7 @@ msgstr "Метод API не найден." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Этот метод требует POST." @@ -268,7 +268,7 @@ msgstr "Не удаётся сохранить профиль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -661,17 +661,17 @@ msgstr "Статус удалён." msgid "No status with that ID found." msgstr "Не найдено статуса с таким ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Слишком длинная запись. Максимальная длина — %d знаков." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Не найдено." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Максимальная длина записи — %d символов, включая URL вложения." @@ -700,12 +700,12 @@ msgstr "%1$s / Обновления, упоминающие %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Общая лента %s" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Обновления %s от всех!" @@ -2336,17 +2336,16 @@ msgstr "" "изменять Ваши установки." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Войти с вашим ником и паролем." +msgstr "Войти с вашим именем участника и паролем." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Вход с вашим логином и паролем. Нет аккаунта? [Зарегистрируйте](%%action." -"register%%) новый аккаунт." +"У вас нет логина? [Зарегистрируйте](%%action.register%%) новую учётную " +"запись." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2568,8 +2567,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Только %s URL в простом HTTP, пожалуйста." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -4870,7 +4869,7 @@ msgstr "Проблемы с сохранением входящих сообще #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5331,7 +5330,7 @@ msgid "Snapshots configuration" msgstr "Конфигурация снимков" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API ресурса требует доступ для чтения и записи, но у вас есть только доступ " @@ -6890,56 +6889,56 @@ msgid "Moderator" msgstr "Модератор" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "пару секунд назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "около минуты назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(ы) назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "около часа назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "около %d часа(ов) назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "около дня назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "около %d дня(ей) назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "около месяца назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "около %d месяца(ев) назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "около года назад" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 4fcc7d463d..72a8183ad2 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,8 +95,8 @@ msgstr "" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -120,7 +120,7 @@ msgstr "" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -180,7 +180,7 @@ msgstr "" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -202,9 +202,9 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -221,7 +221,7 @@ msgstr "" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" @@ -251,7 +251,7 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -630,17 +630,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -669,12 +669,12 @@ msgstr "" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2426,8 +2426,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -4575,7 +4575,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5027,7 +5027,7 @@ msgid "Snapshots configuration" msgstr "" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6426,56 +6426,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 7f6d7cdae4..fababcf142 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:26+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:19:54+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -99,8 +99,8 @@ msgstr "Ingen sådan sida" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -124,7 +124,7 @@ msgstr "%1$s och vänner, sida %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -191,7 +191,7 @@ msgstr "Du och vänner" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -213,9 +213,9 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -232,7 +232,7 @@ msgstr "API-metod hittades inte." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Denna metod kräver en POST." @@ -262,7 +262,7 @@ msgstr "Kunde inte spara profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -647,17 +647,17 @@ msgstr "Status borttagen." msgid "No status with that ID found." msgstr "Ingen status med det ID:t hittades." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det är för långt. Maximal notisstorlek är %d tecken." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Hittades inte." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga." @@ -686,12 +686,12 @@ msgstr "%1$s / Uppdateringar som nämner %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s publika tidslinje" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s uppdateringar från alla!" @@ -2312,17 +2312,16 @@ msgstr "" "igen innan du ändrar dina inställningar." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Logga in med ett användarnamn och lösenord" +msgstr "Logga in med ditt användarnamn och lösenord." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? " -"[Registrera](%%action.register%%) ett nytt konto." +"Har du inte ett användarnamn ännu? [Registrera](%%action.register%%) ett " +"nytt konto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2546,8 +2545,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Endast %s-webbadresser över vanlig HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -4847,7 +4846,7 @@ msgstr "Problem med att spara gruppinkorg." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5305,7 +5304,7 @@ msgid "Snapshots configuration" msgstr "Konfiguration av ögonblicksbilder" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet." @@ -6857,56 +6856,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "ett par sekunder sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "för nån minut sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "för en timma sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "för en dag sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "för en månad sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "för %d månader sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "för ett år sedan" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 7991adafad..765226f30d 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:29+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:20:05+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -98,8 +98,8 @@ msgstr "అటువంటి పేజీ లేదు." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -123,7 +123,7 @@ msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -183,7 +183,7 @@ msgstr "మీరు మరియు మీ స్నేహితులు" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -205,9 +205,9 @@ msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండ #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -225,7 +225,7 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" @@ -257,7 +257,7 @@ msgstr "ప్రొఫైలుని భద్రపరచలేకున్ #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -642,17 +642,17 @@ msgstr "స్థితిని తొలగించాం." msgid "No status with that ID found." msgstr "ఆ IDతో ఏ నోటీసు కనబడలేదు." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "అది చాలా పొడవుంది. గరిష్ఠ నోటీసు పరిమాణం %d అక్షరాలు." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "కనబడలేదు." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షరాలు, జోడింపు URLని కలుపుకుని." @@ -681,12 +681,12 @@ msgstr "" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s బహిరంగ కాలరేఖ" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "అందరి నుండి %s తాజాకరణలు!" @@ -2273,17 +2273,14 @@ msgstr "" "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి" +msgstr "మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." -msgstr "" -"మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి. మీకు ఇంకా వాడుకరిపేరు లేదా? కొత్త ఖాతాని [నమోదుచేసుకోండి]" -"(%%action.register%%)." +msgstr "మీకు ఇంకా వాడుకరిపేరు లేదా? కొత్త ఖాతాని [నమోదుచేసుకోండి](%%action.register%%)." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2363,9 +2360,9 @@ msgid "Message sent" msgstr "సందేశాన్ని పంపించాం" #: actions/newmessage.php:185 -#, fuzzy, php-format +#, php-format msgid "Direct message to %s sent." -msgstr "%sకి నేరు సందేశాన్ని పంపించాం" +msgstr "%sకి నేరు సందేశాన్ని పంపించాం." #: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" @@ -2503,8 +2500,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -3353,7 +3350,7 @@ msgstr "" #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "అది స్థానిక ప్రొఫైలు! చందాచేరడానికి ప్రవేశించండి." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." @@ -3413,11 +3410,11 @@ msgid "Replies feed for %s (Atom)" msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)" #: actions/replies.php:199 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." -msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ కానీ ఇంకా ఎవరూ ఏమీ రాయలేదు." +msgstr "ఇది %1$sకి వచ్చిన స్పందనలని చూపించే కాలరేఖ కానీ %2$s దృష్టికి ఇంకా ఎవరూ ఏమీ పంపించలేదు." #: actions/replies.php:204 #, php-format @@ -3708,6 +3705,12 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** అనేది [స్టేటస్‌నెట్](http://status.net/) అనే స్వేచ్ఛా ఉపకరణ అధారిత [సూక్ష్మ-బ్లాగింగు]" +"(http://en.wikipedia.org/wiki/Micro-blogging) సేవ అయిన %%%%site.name%%%%లో ఒక " +"వాడుకరి గుంపు.\n" +"దీని సభ్యులు వారి జీవితం మరియు ఆసక్తుల గురించి చిన్న సందేశాలని పంచుకుంటారు. ఈ గుంపు మరియు ఇంకా " +"చాల వాటిలో భాగస్తులవ్వడానికి [ఇప్పుడే చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%" +"doc.help%%%%))" #: actions/showgroup.php:469 #, php-format @@ -3780,9 +3783,9 @@ msgid "FOAF for %s" msgstr "" #: actions/showstream.php:200 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ కానీ ఇంకా ఎవరూ ఏమీ రాయలేదు." +msgstr "ఇది %1$s యొక్క కాలరేఖ కానీ %2$s ఇంకా ఏమీ రాయలేదు." #: actions/showstream.php:205 msgid "" @@ -3941,9 +3944,8 @@ msgid "Unable to save site notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." #: actions/sitenoticeadminpanel.php:113 -#, fuzzy msgid "Max length for the site-wide notice is 255 chars." -msgstr "సైటు-వారీ నోటీసుకి గరిష్ఠ పొడవు 255 అక్షరాలు" +msgstr "సైటు-వారీ నోటీసుకి గరిష్ఠ పొడవు 255 అక్షరాలు." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -3977,9 +3979,8 @@ msgstr "హోమ్ పేజీ URL సరైనది కాదు." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "IM చిరునామా" +msgstr "SMS చిరునామా" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -4728,7 +4729,7 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5200,7 +5201,7 @@ msgid "Snapshots configuration" msgstr "SMS నిర్ధారణ" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5890,9 +5891,8 @@ msgid "Login with a username and password" msgstr "వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి" #: lib/logingroupnav.php:86 -#, fuzzy msgid "Sign up for a new account" -msgstr "కొత్త ఖాతా సృష్టించుకోండి" +msgstr "కొత్త ఖాతా కొరకై నమోదుచేసుకోండి" #. TRANS: Subject for address confirmation email #: lib/mail.php:174 @@ -6718,56 +6718,56 @@ msgid "Moderator" msgstr "సమన్వయకర్త" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "కొన్ని క్షణాల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "%d గంటల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "%d రోజుల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "ఓ నెల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "%d నెలల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index ead5aaa6eb..7086d89b14 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:33+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:20:09+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -106,8 +106,8 @@ msgstr "Böyle bir durum mesajı yok." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -131,7 +131,7 @@ msgstr "%s ve arkadaşları" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -192,7 +192,7 @@ msgstr "%s ve arkadaşları" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -214,9 +214,9 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -234,7 +234,7 @@ msgstr "Onay kodu bulunamadı." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" @@ -266,7 +266,7 @@ msgstr "Profil kaydedilemedi." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -666,19 +666,19 @@ msgstr "Avatar güncellendi." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "İstek bulunamadı!" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -708,12 +708,12 @@ msgstr "%1$s'in %2$s'deki durum mesajları " msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2587,8 +2587,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -4852,7 +4852,7 @@ msgstr "Durum mesajını kaydederken hata oluştu." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5347,7 +5347,7 @@ msgid "Snapshots configuration" msgstr "Eposta adresi onayı" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6813,56 +6813,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "birkaç saniye önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "yaklaşık bir gün önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "yaklaşık bir ay önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index a1fd4155cb..daa59860f5 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:36+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:20:13+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -103,8 +103,8 @@ msgstr "Немає такої сторінки." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -128,7 +128,7 @@ msgstr "%1$s та друзі, сторінка %2$d" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -194,7 +194,7 @@ msgstr "Ви з друзями" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -216,9 +216,9 @@ msgstr "Оновлення від %1$s та друзів на %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -235,7 +235,7 @@ msgstr "API метод не знайдено." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Цей метод потребує POST." @@ -266,7 +266,7 @@ msgstr "Не вдалося зберегти профіль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -657,17 +657,17 @@ msgstr "Статус видалено." msgid "No status with that ID found." msgstr "Не знайдено жодних статусів з таким ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Надто довго. Максимальний розмір допису — %d знаків." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 msgid "Not found." msgstr "Не знайдено." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -698,12 +698,12 @@ msgstr "%1$s / Оновленні відповіді %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s загальна стрічка" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s оновлення від усіх!" @@ -2322,17 +2322,16 @@ msgstr "" "змінювати налаштування." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Увійти використовуючи ім’я та пароль" +msgstr "Увійти використовуючи ім’я та пароль." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Увійти викристовуючи ім’я та пароль. Ще не маєте імені користувача? " -"[Зареєструвати](%%action.register%%) новий акаунт." +"Ще не маєте імені користувача? [Зареєструвати](%%action.register%%) новий " +"акаунт." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2556,8 +2555,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "URL-адреса %s лише в простому HTTP, будь ласка." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -4855,7 +4854,7 @@ msgstr "Проблема при збереженні вхідних дописі #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5314,7 +5313,7 @@ msgid "Snapshots configuration" msgstr "Конфігурація знімків" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-ресурс вимагає дозвіл типу «читання-запис», але у вас є лише доступ для " @@ -6872,56 +6871,56 @@ msgid "Moderator" msgstr "Модератор" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "мить тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "хвилину тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "годину тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "день тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "місяць тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "близько %d місяців тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "рік тому" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 8fcdfa3cc2..95e64195fa 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:39+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:20:24+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -105,8 +105,8 @@ msgstr "Không có tin nhắn nào." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -130,7 +130,7 @@ msgstr "%s và bạn bè" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -191,7 +191,7 @@ msgstr "%s và bạn bè" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -213,9 +213,9 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -233,7 +233,7 @@ msgstr "Phương thức API không tìm thấy!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Phương thức này yêu cầu là POST." @@ -265,7 +265,7 @@ msgstr "Không thể lưu hồ sơ cá nhân." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -668,18 +668,18 @@ msgstr "Hình đại diện đã được cập nhật." msgid "No status with that ID found." msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Quá dài. Tối đa là 140 ký tự." -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "Không tìm thấy" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -709,12 +709,12 @@ msgstr "%1$s / Các cập nhật đang trả lời tới %2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, fuzzy, php-format msgid "%s public timeline" msgstr "Dòng tin công cộng" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s cập nhật từ tất cả mọi người!" @@ -2677,8 +2677,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -5006,7 +5006,7 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" @@ -5508,7 +5508,7 @@ msgid "Snapshots configuration" msgstr "Xác nhận SMS" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -7056,56 +7056,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "vài giây trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "1 phút trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "1 giờ trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "1 ngày trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "1 tháng trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "1 năm trước" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 0deb9e2463..fc37c2f971 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:42+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:20:28+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -108,8 +108,8 @@ msgstr "没有该页面" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -133,7 +133,7 @@ msgstr "%1$s 和好友，第%2$d页" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -193,7 +193,7 @@ msgstr "你和好友" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -215,9 +215,9 @@ msgstr "来自%2$s 上 %1$s 和好友的更新！" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -235,7 +235,7 @@ msgstr "API 方法未实现！" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "此方法接受POST请求。" @@ -267,7 +267,7 @@ msgstr "无法保存个人信息。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -666,18 +666,18 @@ msgstr "头像已更新。" msgid "No status with that ID found." msgstr "没有找到此ID的信息。" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "超出长度限制。不能超过 140 个字符。" -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "未找到" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -707,12 +707,12 @@ msgstr "%1$s / 回复 %2$s 的消息" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "回复 %2$s / %3$s 的 %1$s 更新。" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s 公众时间表" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "来自所有人的 %s 消息！" @@ -2629,8 +2629,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -4935,7 +4935,7 @@ msgstr "保存通告时出错。" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5440,7 +5440,7 @@ msgid "Snapshots configuration" msgstr "SMS短信确认" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6930,56 +6930,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "几秒前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "一分钟前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "一小时前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "一天前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "%d 天前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "一个月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "%d 个月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "一年前" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index f9f1ec6357..825c8b2e94 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-19 17:11+0000\n" -"PO-Revision-Date: 2010-04-19 17:13:48+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-24 14:20:32+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65277); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -102,8 +102,8 @@ msgstr "無此通知" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -127,7 +127,7 @@ msgstr "%s與好友" #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. #: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -188,7 +188,7 @@ msgstr "%s與好友" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:120 +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 #: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -210,9 +210,9 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 #: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 #: actions/apitimelineuser.php:162 actions/apiusershow.php:101 @@ -230,7 +230,7 @@ msgstr "確認碼遺失" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" @@ -262,7 +262,7 @@ msgstr "無法儲存個人資料" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -657,18 +657,18 @@ msgstr "更新個人圖像" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "目前無請求" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -697,12 +697,12 @@ msgstr "%1$s的狀態是%2$s" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -2537,8 +2537,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1070 -#: lib/apiaction.php:1099 lib/apiaction.php:1216 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -4760,7 +4760,7 @@ msgstr "儲存使用者發生錯誤" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1515 +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5248,7 +5248,7 @@ msgid "Snapshots configuration" msgstr "確認信箱" #. TRANS: Client error 401. -#: lib/apiauth.php:95 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6692,56 +6692,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1054 +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1057 +#: lib/util.php:1086 msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1061 +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1064 +#: lib/util.php:1093 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1068 +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1071 +#: lib/util.php:1100 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1075 +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1078 +#: lib/util.php:1107 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1082 +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1085 +#: lib/util.php:1114 msgid "about a year ago" msgstr "" From 93e76f3b83c2eba4932d467e1693e9c5dd13b9ee Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 24 Apr 2010 12:14:12 -0400 Subject: [PATCH 033/730] use statusnet_ as namespace prefix for JSON --- lib/apiaction.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/apiaction.php b/lib/apiaction.php index 6ee0a94d94..bb4884b45d 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -225,7 +225,7 @@ class ApiAction extends Action // StatusNet-specific - $twitter_user['statusnet:profile_url'] = $profile->profileurl; + $twitter_user['statusnet_profile_url'] = $profile->profileurl; return $twitter_user; } @@ -314,7 +314,7 @@ class ApiAction extends Action // StatusNet-specific - $twitter_status['statusnet:html'] = $notice->rendered; + $twitter_status['statusnet_html'] = $notice->rendered; return $twitter_status; } @@ -508,7 +508,11 @@ class ApiAction extends Action $this->showTwitterXmlStatus($value, 'retweeted_status'); break; default: - $this->element($element, null, $value); + if (strncmp($element, 'statusnet_', 10) == 0) { + $this->element('statusnet:'.substr($element, 10), null, $value); + } else { + $this->element($element, null, $value); + } } } $this->elementEnd($tag); @@ -533,6 +537,8 @@ class ApiAction extends Action foreach($twitter_user as $element => $value) { if ($element == 'status') { $this->showTwitterXmlStatus($twitter_user['status']); + } else if (strncmp($element, 'statusnet_', 10) == 0) { + $this->element('statusnet:'.substr($element, 10), null, $value); } else { $this->element($element, null, $value); } From edc6cf39a0acf9ac77626bb4c11a60a11878d65d Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 26 Apr 2010 15:58:35 -0400 Subject: [PATCH 034/730] Only shorten when notice length exceeds max length --- .../ClientSideShortenPlugin.php | 1 + plugins/ClientSideShorten/shorten.js | 26 ++++++++++--------- plugins/ClientSideShorten/shorten.php | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php index 21763d5b7e..ba1f7d3a7c 100644 --- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php +++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php @@ -51,6 +51,7 @@ class ClientSideShortenPlugin extends Plugin } function onEndShowScripts($action){ + $action->inlineScript('var Notice_maxContent = ' . Notice::maxContent()); if (common_logged_in()) { $action->script('plugins/ClientSideShorten/shorten.js'); } diff --git a/plugins/ClientSideShorten/shorten.js b/plugins/ClientSideShorten/shorten.js index 0db78eceaf..856c7f05fd 100644 --- a/plugins/ClientSideShorten/shorten.js +++ b/plugins/ClientSideShorten/shorten.js @@ -34,29 +34,31 @@ function shorten() { $noticeDataText = $('#'+SN.C.S.NoticeDataText); - var original = $noticeDataText.val(); - shortenAjax = $.ajax({ - url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten', - data: { text: $noticeDataText.val() }, - dataType: 'text', - success: function(data) { - if(original == $noticeDataText.val()) { - $noticeDataText.val(data).keyup(); + if(Notice_maxContent > 0 && $noticeDataText.val().length > Notice_maxContent){ + var original = $noticeDataText.val(); + shortenAjax = $.ajax({ + url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten', + data: { text: $noticeDataText.val() }, + dataType: 'text', + success: function(data) { + if(original == $noticeDataText.val()) { + $noticeDataText.val(data).keyup(); + } } - } - }); + }); + } } $(document).ready(function(){ $noticeDataText = $('#'+SN.C.S.NoticeDataText); $noticeDataText.smartkeypress(function(e){ - if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort(); + //if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort(); if(e.charCode == '32') { shorten(); } }); $noticeDataText.bind('paste', function() { - if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort(); + //if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort(); setTimeout(shorten,1); }); }); diff --git a/plugins/ClientSideShorten/shorten.php b/plugins/ClientSideShorten/shorten.php index 4905c62c21..07c19e2e7c 100644 --- a/plugins/ClientSideShorten/shorten.php +++ b/plugins/ClientSideShorten/shorten.php @@ -61,7 +61,7 @@ class ShortenAction extends Action { parent::handle($args); header('Content-Type: text/plain'); - $shortened_text = common_shorten_links($this->text, true); + $shortened_text = common_shorten_links($this->text); print $shortened_text; } } From 04d7d8fe336add1daeae478ae812367cd643f634 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Tue, 27 Apr 2010 00:21:31 +0200 Subject: [PATCH 035/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/af/LC_MESSAGES/statusnet.po | 4 +- locale/ar/LC_MESSAGES/statusnet.po | 4 +- locale/arz/LC_MESSAGES/statusnet.po | 4 +- locale/bg/LC_MESSAGES/statusnet.po | 4 +- locale/br/LC_MESSAGES/statusnet.po | 4 +- locale/ca/LC_MESSAGES/statusnet.po | 236 +++++------ locale/cs/LC_MESSAGES/statusnet.po | 4 +- locale/de/LC_MESSAGES/statusnet.po | 4 +- locale/el/LC_MESSAGES/statusnet.po | 4 +- locale/en_GB/LC_MESSAGES/statusnet.po | 4 +- locale/es/LC_MESSAGES/statusnet.po | 4 +- locale/fa/LC_MESSAGES/statusnet.po | 4 +- locale/fi/LC_MESSAGES/statusnet.po | 4 +- locale/fr/LC_MESSAGES/statusnet.po | 4 +- locale/ga/LC_MESSAGES/statusnet.po | 4 +- locale/gl/LC_MESSAGES/statusnet.po | 577 +++++++++++++++----------- locale/he/LC_MESSAGES/statusnet.po | 4 +- locale/hsb/LC_MESSAGES/statusnet.po | 4 +- locale/ia/LC_MESSAGES/statusnet.po | 4 +- locale/is/LC_MESSAGES/statusnet.po | 4 +- locale/it/LC_MESSAGES/statusnet.po | 12 +- locale/ja/LC_MESSAGES/statusnet.po | 4 +- locale/ko/LC_MESSAGES/statusnet.po | 4 +- locale/mk/LC_MESSAGES/statusnet.po | 4 +- locale/nb/LC_MESSAGES/statusnet.po | 4 +- locale/nl/LC_MESSAGES/statusnet.po | 4 +- locale/nn/LC_MESSAGES/statusnet.po | 4 +- locale/pl/LC_MESSAGES/statusnet.po | 4 +- locale/pt/LC_MESSAGES/statusnet.po | 4 +- locale/pt_BR/LC_MESSAGES/statusnet.po | 48 +-- locale/ru/LC_MESSAGES/statusnet.po | 4 +- locale/statusnet.pot | 2 +- locale/sv/LC_MESSAGES/statusnet.po | 4 +- locale/te/LC_MESSAGES/statusnet.po | 4 +- locale/tr/LC_MESSAGES/statusnet.po | 4 +- locale/uk/LC_MESSAGES/statusnet.po | 4 +- locale/vi/LC_MESSAGES/statusnet.po | 4 +- locale/zh_CN/LC_MESSAGES/statusnet.po | 4 +- locale/zh_TW/LC_MESSAGES/statusnet.po | 4 +- 39 files changed, 537 insertions(+), 474 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index b8b48f1084..10dab614ef 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:16:38+0000\n" +"PO-Revision-Date: 2010-04-26 22:15:59+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index c5dd909e20..84c856ba8c 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:16:41+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:02+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index a09ec71751..e67405582f 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:16:44+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:06+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 3c4fc0a8eb..c96b66ee6e 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:16:47+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:09+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 18092074c1..9e0994529c 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:17:22+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:12+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index a63f9aa02c..7b59c0ef44 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:17:31+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:15+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -578,11 +578,11 @@ msgstr "Enviament de formulari inesperat." #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" -msgstr "" +msgstr "Una aplicació voldria connectar-se al vostre compte" #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" -msgstr "" +msgstr "Permet o denega l'accés" #: actions/apioauthauthorize.php:292 #, php-format @@ -621,7 +621,7 @@ msgstr "Permet" #: actions/apioauthauthorize.php:351 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "Permet o denega l'accés a la informació del vostre compte." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." @@ -672,9 +672,9 @@ msgid "Unsupported format." msgstr "El format no està implementat." #: actions/apitimelinefavorites.php:109 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Preferits de %s" +msgstr "%1$s / Preferits de %2$s" #: actions/apitimelinefavorites.php:118 #, fuzzy, php-format @@ -755,9 +755,8 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:108 -#, fuzzy msgid "User without matching profile." -msgstr "Usuari sense perfil coincident" +msgstr "L'usuari que no coincideix amb cap perfil" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -1179,15 +1178,15 @@ msgstr "Enllaços" #: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" -msgstr "" +msgstr "Utilitza els paràmetres per defecte" #: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" -msgstr "" +msgstr "Restaura els dissenys per defecte" #: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" -msgstr "" +msgstr "Torna a restaurar al valor per defecte" #. TRANS: Submit button title #: actions/designadminpanel.php:589 actions/othersettings.php:126 @@ -1231,33 +1230,28 @@ msgid "No such application." msgstr "No hi ha tal aplicació." #: actions/editapplication.php:161 -#, fuzzy msgid "Use this form to edit your application." -msgstr "Utilitza aquest formulari per editar el grup." +msgstr "Utilitza el formulari per a editar la vostra aplicació." #: actions/editapplication.php:177 actions/newapplication.php:159 -#, fuzzy msgid "Name is required." -msgstr "Igual a la contrasenya de dalt. Requerit." +msgstr "Cal un nom." #: actions/editapplication.php:180 actions/newapplication.php:165 -#, fuzzy msgid "Name is too long (max 255 chars)." -msgstr "El teu nom és massa llarg (màx. 255 caràcters)." +msgstr "El nom és massa llarg (màx. 255 caràcters)." #: actions/editapplication.php:183 actions/newapplication.php:162 -#, fuzzy msgid "Name already in use. Try another one." -msgstr "Aquest sobrenom ja existeix. Prova un altre. " +msgstr "El nom ja es troba en ús. Proveu-ne un altre." #: actions/editapplication.php:186 actions/newapplication.php:168 -#, fuzzy msgid "Description is required." -msgstr "Descripció" +msgstr "Cal una descripció." #: actions/editapplication.php:194 msgid "Source URL is too long." -msgstr "" +msgstr "L'URL font és massa llarg." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Source URL is not valid." @@ -1265,7 +1259,7 @@ msgstr "La URL d'origen no és vàlida." #: actions/editapplication.php:203 actions/newapplication.php:188 msgid "Organization is required." -msgstr "" +msgstr "Cal una organització." #: actions/editapplication.php:206 actions/newapplication.php:191 msgid "Organization is too long (max 255 chars)." @@ -1273,7 +1267,7 @@ msgstr "El camp organització és massa llarg (màx. 255 caràcters)." #: actions/editapplication.php:209 actions/newapplication.php:194 msgid "Organization homepage is required." -msgstr "" +msgstr "Cal una pàgina d'inici de l'organització." #: actions/editapplication.php:218 actions/newapplication.php:206 msgid "Callback is too long." @@ -1331,9 +1325,8 @@ msgstr "Configuració guardada." #. TRANS: Title for e-mail settings. #: actions/emailsettings.php:61 -#, fuzzy msgid "Email settings" -msgstr "Configuració del correu electrònic" +msgstr "Paràmetres del correu electrònic" #. TRANS: E-mail settings page instructions. #. TRANS: %%site.name%% is the name of the site. @@ -1361,7 +1354,6 @@ msgstr "Adreça electrònica confirmada actualment." #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Suprimeix" @@ -1380,7 +1372,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "Cancel·la" @@ -1395,7 +1386,6 @@ msgstr "Adreça electrònica, com ara «nomusuari@example.org»" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Afegeix" @@ -1471,9 +1461,8 @@ msgstr "Publica una MicroID per al meu correu electrònic." #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "S'han desat les preferències de disseny." +msgstr "S'han desat les preferències del correu electrònic." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1529,15 +1518,13 @@ msgstr "Cap confirmació pendent per a cancel·lar." #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." -msgstr "Aquesta adreça de missatgeria instantània és incorrecta." +msgstr "Aquesta l'adreça de correu electrònic incorrecta." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "Confirmació cancel·lada." +msgstr "S'ha cancel·lat la confirmació de correu electrònic." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1547,9 +1534,8 @@ msgstr "Aquest no és el teu correu electrònic" #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "L'adreça ha estat eliminada." +msgstr "S'ha suprimit l'adreça de correu electrònic." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1597,12 +1583,16 @@ msgstr "Les notificacions més populars en aquest lloc ara mateix." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Els avisos de preferits apareixen en aquesta pàgina però ningú n'ha preferit " +"cap encara." #: actions/favorited.php:153 msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" +"Sigueu el primer en afegir un avís dels vostres preferits fent clic al botó " +"de preferit que es troba al costat dels avisos que us poden agradar." #: actions/favorited.php:156 #, php-format @@ -1610,6 +1600,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Per què no [registreu un compte](%%action.register%%) i sou el primer en " +"afegir un avís als vostres preferits!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1633,7 +1625,7 @@ msgid "Featured users, page %d" msgstr "Usuaris destacats, pàgina %d" #: actions/featured.php:99 -#, fuzzy, php-format +#, php-format msgid "A selection of some great users on %s" msgstr "Una selecció d'alguns dels millors usuaris a %s" @@ -1684,9 +1676,8 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "Versió desconeguda del protocol OMB." #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." -msgstr "Error en actualitzar el perfil remot" +msgstr "S'ha produït un error en actualitzar el perfil remot." #: actions/getfile.php:79 msgid "No such file." @@ -1734,9 +1725,8 @@ msgid "Only an admin can block group members." msgstr "Només un administrador pot blocar membres del grup." #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "Un usuari t'ha bloquejat." +msgstr "L'usuari ja està blocat del grup." #: actions/groupblock.php:100 msgid "User is not a member of group." @@ -1747,14 +1737,14 @@ msgid "Block user from group" msgstr "Bloca l'usuari del grup" #: actions/groupblock.php:160 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"Esteu segur que voleu blocar l'usuari «%s» del grup «%s»? Se suprimiran del " -"grup, i no podran enviar-hi res ni subscriure-s'hi en el futur." +"Esteu segur que voleu blocar l'usuari «%1$s» del grup «%2$s»? Se suprimiran " +"del grup, i no podran enviar-hi res ni subscriure-s'hi en el futur." #. TRANS: Submit button title for 'No' when blocking a user from a group. #: actions/groupblock.php:182 @@ -1771,9 +1761,8 @@ msgid "Database error blocking user from group." msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup." #: actions/groupbyid.php:74 actions/userbyid.php:70 -#, fuzzy msgid "No ID." -msgstr "No ID" +msgstr "Sense ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1805,10 +1794,12 @@ msgid "Group logo" msgstr "Logo del grup" #: actions/grouplogo.php:153 -#, fuzzy, php-format +#, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." -msgstr "Pots pujar una imatge de logo per al grup." +msgstr "" +"Podeu pujar una imatge com a logotip del vostre grup. La mida màxima del " +"fitxer és %s." #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." @@ -1828,9 +1819,9 @@ msgid "%s group members" msgstr "%s membre/s en el grup" #: actions/groupmembers.php:103 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "%s membre/s en el grup, pàgina %d" +msgstr "%1$s membres del grup, pàgina %2$d" #: actions/groupmembers.php:118 msgid "A list of the users in this group." @@ -1997,9 +1988,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Preferències" +msgstr "Preferències de MI" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2077,9 +2067,8 @@ msgstr "No s'ha pogut eliminar la confirmació de correu electrònic." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "Confirmació cancel·lada." +msgstr "S'ha cancel·lat la confirmació de MI." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2089,9 +2078,8 @@ msgstr "Aquest no és el teu Jabber ID." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "L'adreça ha estat eliminada." +msgstr "S'ha suprimit l'adreça de MI." #: actions/inbox.php:59 #, fuzzy, php-format @@ -2281,9 +2269,9 @@ msgstr "No ets membre d'aquest grup." #. TRANS: Message given having removed a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: actions/leavegroup.php:137 lib/command.php:392 -#, fuzzy, php-format +#, php-format msgid "%1$s left group %2$s" -msgstr "%s ha abandonat el grup %s" +msgstr "%1$s ha abandonat el grup %2$s" #: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." @@ -2330,9 +2318,8 @@ msgstr "" "contrasenya abans de canviar la teva configuració." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Accedir amb el nom d'usuari i contrasenya" +msgstr "Inicieu una sessió amb nom d'usuari i contrasenya" #: actions/login.php:273 #, fuzzy, php-format @@ -2348,9 +2335,9 @@ msgid "Only an admin can make another user an admin." msgstr "Només un administrador poc fer a un altre usuari administrador." #: actions/makeadmin.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s ja és un administrador del grup «%s»." +msgstr "%1$s ja és un administrador del grup «%2$s»." #: actions/makeadmin.php:133 #, fuzzy, php-format @@ -2363,9 +2350,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "No es pot fer %s un administrador del grup %s" #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "No té cap estatus ara mateix" +msgstr "No hi ha cap estat actual." #: actions/newapplication.php:52 msgid "New Application" @@ -2385,9 +2371,8 @@ msgid "Source URL is required." msgstr "URL d'origen requerida." #: actions/newapplication.php:258 actions/newapplication.php:267 -#, fuzzy msgid "Could not create application." -msgstr "No s'han pogut crear els àlies." +msgstr "No s'ha pogut crear l'aplicació." #: actions/newgroup.php:53 msgid "New group" @@ -2542,9 +2527,8 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -#, fuzzy msgid "Notice has no profile." -msgstr "Avís sense perfil" +msgstr "L'avís no té cap perfil." #: actions/oembed.php:86 actions/shownotice.php:175 #, php-format @@ -2861,9 +2845,8 @@ msgid "Server to direct SSL requests to" msgstr "Servidor on dirigir les sol·licituds SSL" #: actions/pathsadminpanel.php:352 -#, fuzzy msgid "Save paths" -msgstr "Avís del lloc" +msgstr "Desa els camins" #: actions/peoplesearch.php:52 #, php-format @@ -2889,9 +2872,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usuaris que s'han etiquetat %s - pàgina %d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "El contingut de l'avís és invàlid" +msgstr "El contingut de l'avís no és vàlid." #: actions/postnotice.php:101 #, php-format @@ -2961,7 +2943,7 @@ msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\"" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "Comparteix la meva ubicació actual en enviar avisos" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -3039,7 +3021,7 @@ msgid "Settings saved." msgstr "Configuració guardada." #: actions/public.php:83 -#, fuzzy, php-format +#, php-format msgid "Beyond the page limit (%s)." msgstr "Més enllà del límit de la pàgina (%s)" @@ -3431,9 +3413,8 @@ msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "URL de perfil no vàlid (cap document YADIS)." #: actions/remotesubscribe.php:176 -#, fuzzy msgid "That’s a local profile! Login to subscribe." -msgstr "Aquest és un perfil local! Entra per subscriure-t'hi." +msgstr "Aquest és un perfil local! Inicieu una sessió per a subscriure-us-hi." #: actions/remotesubscribe.php:183 #, fuzzy @@ -3456,9 +3437,8 @@ msgid "You can't repeat your own notice." msgstr "No pots registrar-te si no estàs d'acord amb la llicència." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Ja heu blocat l'usuari." +msgstr "Ja havíeu repetit l'avís." #: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" @@ -3475,9 +3455,9 @@ msgid "Replies to %s" msgstr "Respostes a %s" #: actions/replies.php:128 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "Respostes a %1$s el %2$s!" +msgstr "Respostes a %1$s, pàgina %2$d" #: actions/replies.php:145 #, fuzzy, php-format @@ -3533,9 +3513,8 @@ msgid "User doesn't have this role." msgstr "Usuari sense perfil coincident" #: actions/rsd.php:146 actions/version.php:157 -#, fuzzy msgid "StatusNet" -msgstr "S'ha suprimit l'estat." +msgstr "StatusNet" #: actions/sandbox.php:65 actions/unsandbox.php:65 #, fuzzy @@ -3564,7 +3543,7 @@ msgstr "Gestiona les sessions" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Si cal gestionar les sessions nosaltres mateixos." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" @@ -3585,14 +3564,13 @@ msgid "You must be logged in to view an application." msgstr "Has d'haver entrat per a poder marxar d'un grup." #: actions/showapplication.php:157 -#, fuzzy msgid "Application profile" -msgstr "Avís sense perfil" +msgstr "Perfil de l'aplicació" #. TRANS: Form input field label for application icon. #: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" -msgstr "" +msgstr "Icona" #. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 @@ -3602,9 +3580,8 @@ msgstr "Nom" #. TRANS: Form input field label. #: actions/showapplication.php:178 lib/applicationeditform.php:235 -#, fuzzy msgid "Organization" -msgstr "Paginació" +msgstr "Organització" #. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 @@ -3620,11 +3597,11 @@ msgstr "Estadístiques" #: actions/showapplication.php:203 #, php-format msgid "Created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "Creat per %1$s - %2$s accés per defecte - %3$d usuaris" #: actions/showapplication.php:213 msgid "Application actions" -msgstr "" +msgstr "Accions d'aplicació" #: actions/showapplication.php:236 msgid "Reset key & secret" @@ -3677,17 +3654,17 @@ msgstr "No s'han pogut recuperar els avisos preferits." #: actions/showfavorites.php:171 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Feed per a amics de %s" +msgstr "Canal dels preferits de %s (RSS 1.0)" #: actions/showfavorites.php:178 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Feed per a amics de %s" +msgstr "Canal dels preferits de %s (RSS 2.0)" #: actions/showfavorites.php:185 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Feed per a amics de %s" +msgstr "Canal dels preferits de %s (Atom)" #: actions/showfavorites.php:206 msgid "" @@ -3828,19 +3805,18 @@ msgid "Message from %1$s on %2$s" msgstr "Missatge de %1$s a %2$s" #: actions/shownotice.php:90 -#, fuzzy msgid "Notice deleted." -msgstr "Notificació publicada" +msgstr "S'ha suprimit l'avís." #: actions/showstream.php:73 -#, fuzzy, php-format +#, php-format msgid " tagged %s" -msgstr "Aviso etiquetats amb %s" +msgstr " etiquetats amb %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%s perfils blocats, pàgina %d" +msgstr "%1$s, pàgina %2$d" #: actions/showstream.php:122 #, fuzzy, php-format @@ -3944,7 +3920,7 @@ msgstr "El límit de text mínim és 0 (sense cap límit)." #: actions/siteadminpanel.php:171 msgid "Dupe limit must be one or more seconds." -msgstr "" +msgstr "El límit de duplicats ha de ser d'un o més segons." #: actions/siteadminpanel.php:221 msgid "General" @@ -4032,27 +4008,24 @@ msgid "Edit site-wide message" msgstr "Nou missatge" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "No s'ha pogut guardar la teva configuració de Twitter!" +msgstr "No s'ha pogut desar l'avís del lloc." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars." -msgstr "" +msgstr "La mida màxima per a als avisos per a tot el lloc és de 255 caràcters." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Avís del lloc" +msgstr "Text de l'avís per al lloc" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "Text d'avís per a tot el lloc (màxim 255 caràcters, es permet l'HTML)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Avís del lloc" +msgstr "Desa l'avís del lloc" #. TRANS: Title for SMS settings. #: actions/smssettings.php:59 @@ -4075,9 +4048,8 @@ msgstr "L'SMS no és disponible." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "Adreça de missatgeria instantània" +msgstr "Adreça SMS" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -4493,27 +4465,27 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Usuari" #: actions/useradminpanel.php:70 msgid "User settings for this StatusNet site." -msgstr "" +msgstr "Paràmetres d'usuari d'aquest lloc StatusNet." #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." -msgstr "" +msgstr "El límit de la biografia no és vàlid. Cal que sigui numèric." #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" +"El text de benvinguda no és vàlid. La longitud màxima és de 255 caràcters." #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "" +msgstr "La subscripció per defecte no és vàlida: «%1$s» no és cap usuari." #. TRANS: Link description in user account settings menu. #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 @@ -4539,7 +4511,7 @@ msgstr "Benvinguda als usuaris nous" #: actions/useradminpanel.php:236 msgid "Welcome text for new users (Max 255 chars)." -msgstr "" +msgstr "Text de benvinguda per a nous usuaris (màx. 255 caràcters)." #: actions/useradminpanel.php:241 msgid "Default subscription" @@ -4559,7 +4531,7 @@ msgstr "S'han habilitat les invitacions" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "Si es permet als usuaris invitar-ne de nous." #: actions/userauthorization.php:105 msgid "Authorize subscription" @@ -4827,9 +4799,8 @@ msgid "Database error inserting hashtag: %s" msgstr "Hashtag de l'error de la base de dades:%s" #: classes/Notice.php:245 -#, fuzzy msgid "Problem saving notice. Too long." -msgstr "Problema en guardar l'avís." +msgstr "S'ha produït un problema en desar l'avís. És massa llarg." #: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." @@ -4867,9 +4838,9 @@ msgstr "Problema en guardar l'avís." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. #: classes/Notice.php:1535 -#, fuzzy, php-format +#, php-format msgid "RT @%1$s %2$s" -msgstr "%1$s (%2$s)" +msgstr "RT @%1$s %2$s" #: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." @@ -4889,9 +4860,8 @@ msgid "Not subscribed!" msgstr "No estàs subscrit!" #: classes/Subscription.php:173 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "No s'ha pogut eliminar la subscripció." +msgstr "No s'ha pogut eliminar l'autosubscripció." #: classes/Subscription.php:200 #, fuzzy @@ -4963,9 +4933,9 @@ msgstr "Altres" #. TRANS: Page title. %1$s is the title, %2$s is the site name. #: lib/action.php:145 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s - %2$s" #. TRANS: Page title for a page without a title set. #: lib/action.php:161 @@ -4979,24 +4949,21 @@ msgstr "Navegació primària del lloc" #. TRANS: Tooltip for main menu option "Personal" #: lib/action.php:432 -#, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Perfil personal i línia temporal dels amics" #. TRANS: Main menu option when logged in for access to personal profile and friends timeline #: lib/action.php:435 -#, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Personal" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:437 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Canviar correu electrònic, avatar, contrasenya, perfil" +msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:442 @@ -5074,33 +5041,28 @@ msgid "Login to the site" msgstr "Inicia una sessió al lloc" #: lib/action.php:481 -#, fuzzy msgctxt "MENU" msgid "Login" msgstr "Inici de sessió" #. TRANS: Tooltip for main menu option "Help" #: lib/action.php:484 -#, fuzzy msgctxt "TOOLTIP" msgid "Help me!" -msgstr "Ajuda'm" +msgstr "Ajuda'm!" #: lib/action.php:487 -#, fuzzy msgctxt "MENU" msgid "Help" msgstr "Ajuda" #. TRANS: Tooltip for main menu option "Search" #: lib/action.php:490 -#, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Cerca gent o text" #: lib/action.php:493 -#, fuzzy msgctxt "MENU" msgid "Search" msgstr "Cerca" @@ -5913,7 +5875,7 @@ msgstr "Vés-hi" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Atorga a l'usuari el rol «%s»" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index f941ed775f..e619430aa9 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:17:38+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:18+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index cb48bf4907..f0225630f4 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:17:41+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:22+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 08061b15ea..8fa761ae81 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:17:45+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:29+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 1429e2439b..a52c4b5701 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:17:49+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:33+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index e0071a8a3c..4e4d4bf06d 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -15,11 +15,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:17:59+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:36+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 1532ea9432..76e68fda7c 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:18:10+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:48+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index d9c89e0088..b015ccdbe7 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:18:04+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:45+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 6f1fcbc604..07c850bdd0 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:18:18+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:52+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 7c677f89fb..d16b9d2d96 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:18:22+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:55+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index 01110eaff0..ee17dbd292 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:18:29+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:07+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -2231,7 +2231,7 @@ msgid "" msgstr "" "%1$s convidouno a unirse a el en %2$s (%3$s).\n" "\n" -"%2$s é un servizo de microblogging que lle permite estar ao día coas persoas " +"%2$s é un servizo de microblogue que lle permite estar ao día coas persoas " "que coñece e coas que lle interesen.\n" "\n" "Tamén pode compartir novas persoais, pensamentos ou a súa vida en liña con " @@ -3091,7 +3091,7 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" -"Isto é %%site.name%%, un servizo de [microblogging](http://en.wikipedia.org/" +"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/" "wiki/Microblogging) (en inglés) baseado na ferramenta de software libre " "[StatusNet](http://status.net/). [Únase agora](%%action.register%%) para " "compartir notas persoais cos amigos, a familia e os compañeiros! ([Máis " @@ -3104,7 +3104,7 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" -"Isto é %%site.name%%, un servizo de [microblogging](http://en.wikipedia.org/" +"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/" "wiki/Microblogging) (en inglés) baseado na ferramenta de software libre " "[StatusNet](http://status.net/)." @@ -3422,7 +3422,7 @@ msgstr "URL do perfil" #: actions/remotesubscribe.php:134 msgid "URL of your profile on another compatible microblogging service" -msgstr "URL do seu perfil noutro servizo de microblogging compatible" +msgstr "URL do seu perfil noutro servizo de microblogue compatible" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:406 @@ -3802,7 +3802,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" "**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de " -"[microblogging](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " +"[microblogue](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " "baseado na ferramenta de software libre [StatusNet](http://status.net/). Os " "seus membros comparten mensaxes curtas sobre as súas vidas e intereses. " "[Únase agora](%%%%action.register%%%%) para pasar a formar parte deste grupo " @@ -3817,7 +3817,7 @@ msgid "" "their life and interests. " msgstr "" "**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de " -"[microblogging](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " +"[microblogue](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " "baseado na ferramenta de software libre [StatusNet](http://status.net/). Os " "seus membros comparten mensaxes curtas sobre as súas vidas e intereses. " @@ -3912,7 +3912,7 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogging]" +"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]" "(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na " "ferramenta de software libre [StatusNet](http://status.net/). [Únase agora](%" "%%%action.register%%%%) para seguir as notas de **%s** e de moita máis " @@ -3925,7 +3925,7 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" -"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogging]" +"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]" "(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na " "ferramenta de software libre [StatusNet](http://status.net/). " @@ -4569,7 +4569,7 @@ msgstr "Activáronse as invitacións" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "Se se permite aos usuarios invitar a novos usuarios." +msgstr "Permitir ou non que os usuarios poidan invitar a novos usuarios." #: actions/userauthorization.php:105 msgid "Authorize subscription" @@ -4581,9 +4581,9 @@ msgid "" "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " "click “Reject”." msgstr "" -"Verifique estes detalles para asegurar que quere subscribirse ás notas deste " -"usuario. Se non acaba de pedir subscribirse ás notas de alguén, prema en " -"«Rexeitar»." +"Verifique estes detalles para certificar que quere subscribirse ás notas " +"deste usuario. Se non pediu a subscrición ás notas de alguén, prema en " +"\"Rexeitar\"." #: actions/userauthorization.php:196 actions/version.php:165 msgid "License" @@ -4641,37 +4641,37 @@ msgstr "" #: actions/userauthorization.php:303 #, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "Non se atopou o URI do seguidor, «%s», aquí." +msgstr "Non se atopou o URI do seguidor, \"%s\", aquí." #: actions/userauthorization.php:308 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "O URI do seguido, «%s», é longa de máis." +msgstr "O URI do seguidor, \"%s\", é longo de máis." #: actions/userauthorization.php:314 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "O URI do seguido, «%s», é dun usuario local." +msgstr "O URI do seguidor, \"%s\", é dun usuario local." #: actions/userauthorization.php:329 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "O URL de perfil «%s» pertence a un usuario local." +msgstr "O URL do perfil, \"%s\", pertence a un usuario local." #: actions/userauthorization.php:345 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "O URL do avatar, «%s», é incorrecto." +msgstr "O URL do avatar, \"%s\", é incorrecto." #: actions/userauthorization.php:350 #, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "Non se puido ler o URL do avatar, «%s»." +msgstr "Non se puido ler o URL do avatar, \"%s\"." #: actions/userauthorization.php:355 #, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "O tipo de imaxe do URL do avatar, «%s», é incorrecto." +msgstr "O tipo de imaxe do URL do avatar, \"%s\", é incorrecto." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4707,7 +4707,7 @@ msgstr "%s non pertence a ningún grupo." #: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." -msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse a el." +msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse a eles." #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom group notice feed. @@ -4732,11 +4732,11 @@ msgid "" "Inc. and contributors." msgstr "" "Este sitio foi desenvolvido sobre a versión %2$s de %1$s, propiedade de " -"StatusNet, Inc. e contribuidores, 2008-2010." +"StatusNet, Inc. e colaboradores, 2008-2010." #: actions/version.php:161 msgid "Contributors" -msgstr "Contribuidores" +msgstr "Colaboradores" #: actions/version.php:168 msgid "" @@ -4747,8 +4747,8 @@ msgid "" msgstr "" "StatusNet é software libre: pode redistribuílo e modificalo baixo os termos " "da Licenza Pública Xeral Affero de GNU, tal e como a publicou a Free " -"Software Foundation, ben a versión 3 ben calquera versión posterior (a " -"elección do usuario) da licenza. " +"Software Foundation, versión 3 ou calquera versión posterior (a elección do " +"usuario) da licenza. " #: actions/version.php:174 msgid "" @@ -4758,9 +4758,9 @@ msgid "" "for more details. " msgstr "" "Este programa distribúese coa esperanza de que resulte útil, pero SEN " -"NINGUNHA GARANTÍA, nin sequera as garantías implícitas de COMERCIALIDADE ou " -"IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Lea a Licenza Pública Xeral Affero " -"de GNU para máis información. " +"NINGUNHA GARANTÍA, nin sequera as garantías implícitas de COMERCIALIZACIÓN " +"ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Lea a Licenza Pública Xeral " +"Affero de GNU para máis información. " #: actions/version.php:180 #, php-format @@ -4773,7 +4773,7 @@ msgstr "" #: actions/version.php:189 msgid "Plugins" -msgstr "Engadidos" +msgstr "Complementos" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. #: actions/version.php:196 lib/action.php:779 @@ -4797,7 +4797,7 @@ msgstr "" #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -"Un ficheiro deste tamaño excedería da súa cota de usuario, que é de %d bytes." +"Un ficheiro deste tamaño excedería a súa cota de usuario, que é de %d bytes." #: classes/File.php:186 #, php-format @@ -4841,7 +4841,7 @@ msgstr "Non se puido actualizar a mensaxe co novo URI." #: classes/Notice.php:176 #, php-format msgid "Database error inserting hashtag: %s" -msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta %s" +msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta: %s" #: classes/Notice.php:245 msgid "Problem saving notice. Too long." @@ -4903,7 +4903,7 @@ msgstr "Non está subscrito!" #: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." -msgstr "Non se puido borrar a subscrición automática." +msgstr "Non se puido borrar a subscrición a si mesmo." #: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." @@ -5007,7 +5007,7 @@ msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil" #: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "Conectarse a servizos" +msgstr "Conectarse aos servizos" #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services #: lib/action.php:445 @@ -5043,7 +5043,7 @@ msgstr "Convidar" #: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" -msgstr "Saír do anonimato" +msgstr "Saír ao anonimato" #. TRANS: Main menu option when logged in to log out the current user #: lib/action.php:467 @@ -5140,7 +5140,7 @@ msgstr "Condicións do servicio" #. TRANS: Secondary navigation menu option leading to privacy policy. #: lib/action.php:773 msgid "Privacy" -msgstr "Privacidade" +msgstr "Protección de datos" #. TRANS: Secondary navigation menu option. #: lib/action.php:776 @@ -5207,21 +5207,22 @@ msgstr "O contido e os datos de %1$s son privados e confidenciais." #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -"os contidos e datos son propiedade intelectual de %1$s. Quedan reservados " +"Os contidos e datos son propiedade intelectual de %1$s. Quedan reservados " "todos os dereitos." #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. #: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -"Os contidos e datos son propiedade intelectual dos contribuidores. Quedan " +"Os contidos e datos son propiedade intelectual dos colaboradores. Quedan " "reservados todos os dereitos." #. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. #: lib/action.php:871 #, php-format msgid "All %1$s content and data are available under the %2$s license." -msgstr "Todos os contidos e datos de %1$s están baixo a licenza %2$s." +msgstr "" +"Todos os contidos e datos de %1$s están dispoñibles baixo a licenza %2$s." #. TRANS: DT element for pagination (previous/next, etc.). #: lib/action.php:1182 @@ -5319,7 +5320,7 @@ msgstr "Usuario" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:373 msgid "Access configuration" -msgstr "Configuración do acceso" +msgstr "Configuración de acceso" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:381 @@ -5387,7 +5388,7 @@ msgstr "Organización responsable desta aplicación" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" -msgstr "URL ao sitio web da organización" +msgstr "URL do sitio web da organización" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:251 @@ -5423,7 +5424,7 @@ msgstr "Lectura e escritura" #: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -"Permisos por defecto para esta aplicación: lectura, ou lectura e escritura" +"Permisos por defecto para esta aplicación: lectura ou lectura e escritura" #. TRANS: Submit button title #: lib/applicationeditform.php:359 @@ -5444,7 +5445,7 @@ msgstr "lectura" #: lib/applicationlist.php:144 #, php-format msgid "Approved %1$s - \"%2$s\" access." -msgstr "Aprobado o %1$s - Permisos de «%2$s»." +msgstr "Aprobado o %1$s - permisos de \"%2$s\"." #. TRANS: Button label #: lib/applicationlist.php:159 @@ -5515,7 +5516,7 @@ msgstr "Non se deu atopado ningún usuario co alcume %s" #: lib/command.php:147 #, php-format msgid "Could not find a local user with nickname %s" -msgstr "Non se deu atopado un usuario local co alcume %s" +msgstr "Non se deu atopado ningún usuario local co alcume %s" #: lib/command.php:180 msgid "Sorry, this command is not yet implemented." @@ -5657,7 +5658,7 @@ msgstr "Introduza o nome do usuario ao que quere subscribirse" #: lib/command.php:628 msgid "Can't subscribe to OMB profiles by command." -msgstr "Non se pode subscribirse aos perfís OMB cunha orde." +msgstr "Non se pode subscribir aos perfís OMB cunha orde." #: lib/command.php:634 #, php-format @@ -5844,76 +5845,78 @@ msgstr "" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "" +msgstr "Actualizacións por SMS" #: lib/connectsettingsaction.php:120 msgid "Connections" -msgstr "" +msgstr "Conexións" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "Aplicacións conectadas autorizadas" #: lib/dberroraction.php:60 msgid "Database error" -msgstr "" +msgstr "Houbo un erro na base de datos" #: lib/designsettings.php:105 msgid "Upload file" -msgstr "" +msgstr "Cargar un ficheiro" #: lib/designsettings.php:109 msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "" +"Pode cargar a súa imaxe de fondo persoal. O ficheiro non pode ocupar máis de " +"2 MiB." #: lib/designsettings.php:418 msgid "Design defaults restored." -msgstr "" +msgstr "Restableceuse o deseño por defecto." #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" -msgstr "" +msgstr "Desmarcar esta nota como favorita" #: lib/favorform.php:114 lib/favorform.php:140 msgid "Favor this notice" -msgstr "" +msgstr "Marcar esta nota como favorita" #: lib/favorform.php:140 msgid "Favor" -msgstr "" +msgstr "Marcar como favorito" #: lib/feed.php:85 msgid "RSS 1.0" -msgstr "" +msgstr "RSS 1.0" #: lib/feed.php:87 msgid "RSS 2.0" -msgstr "" +msgstr "RSS 2.0" #: lib/feed.php:89 msgid "Atom" -msgstr "" +msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "FOAF" #: lib/feedlist.php:64 msgid "Export data" -msgstr "" +msgstr "Exportar os datos" #: lib/galleryaction.php:121 msgid "Filter tags" -msgstr "" +msgstr "Filtrar etiquetas" #: lib/galleryaction.php:131 msgid "All" -msgstr "" +msgstr "Todas" #: lib/galleryaction.php:139 msgid "Select tag to filter" -msgstr "" +msgstr "Escolla unha etiqueta a filtrar" #: lib/galleryaction.php:140 msgid "Tag" @@ -5921,157 +5924,161 @@ msgstr "Etiqueta" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" -msgstr "" +msgstr "Escolla unha etiqueta para reducir a lista" #: lib/galleryaction.php:143 msgid "Go" -msgstr "" +msgstr "Continuar" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Atribuírlle a este usuario o rol «%s»" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" -msgstr "" +msgstr "URL do sitio web persoal ou blogue do grupo ou tema" #: lib/groupeditform.php:168 msgid "Describe the group or topic" -msgstr "" +msgstr "Describa o grupo ou o tema" #: lib/groupeditform.php:170 #, php-format msgid "Describe the group or topic in %d characters" -msgstr "" +msgstr "Describa o grupo ou o tema en %d caracteres" #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" msgstr "" +"Localidade do grupo, e a ten, como por exemplo «Cidade, Provincia, " +"Comunidade, País»." #: lib/groupeditform.php:187 #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +"Alcumes adicionais para o grupo, separados por comas ou espazos, %d como " +"máximo" #: lib/groupnav.php:85 msgid "Group" -msgstr "" +msgstr "Grupo" #: lib/groupnav.php:101 msgid "Blocked" -msgstr "" +msgstr "Bloqueado" #: lib/groupnav.php:102 #, php-format msgid "%s blocked users" -msgstr "" +msgstr "%s usuarios bloqueados" #: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" -msgstr "" +msgstr "Modificar as propiedades do grupo %s" #: lib/groupnav.php:113 msgid "Logo" -msgstr "" +msgstr "Logotipo" #: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" -msgstr "" +msgstr "Engadir ou modificar o logotipo de %s" #: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" -msgstr "" +msgstr "Engadir ou modificar o deseño de %s" #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" -msgstr "" +msgstr "Grupos con máis membros" #: lib/groupsbypostssection.php:71 msgid "Groups with most posts" -msgstr "" +msgstr "Grupos con máis notas" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "" +msgstr "Etiquetas nas notas do grupo %s" #. TRANS: Client exception 406 #: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" -msgstr "" +msgstr "Esta páxina non está dispoñible nun formato axeitado para vostede" #: lib/imagefile.php:72 msgid "Unsupported image file format." -msgstr "" +msgstr "Non se soporta o formato da imaxe." #: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "" +msgstr "Ese ficheiro é grande de máis. O tamaño máximo por ficheiro son %s." #: lib/imagefile.php:93 msgid "Partial upload." -msgstr "" +msgstr "Carga parcial." #: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." -msgstr "" +msgstr "Houbo un erro no sistema ao cargar o ficheiro." #: lib/imagefile.php:109 msgid "Not an image or corrupt file." -msgstr "" +msgstr "O ficheiro está mal ou non é unha imaxe." #: lib/imagefile.php:122 msgid "Lost our file." -msgstr "" +msgstr "Perdeuse o noso ficheiro." #: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" -msgstr "" +msgstr "Non se coñece o tipo de ficheiro" #: lib/imagefile.php:244 msgid "MB" -msgstr "" +msgstr "MiB" #: lib/imagefile.php:246 msgid "kB" -msgstr "" +msgstr "KiB" #: lib/jabber.php:387 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." -msgstr "" +msgstr "Non se coñece a fonte %d da caixa de entrada." #: lib/joinform.php:114 msgid "Join" -msgstr "" +msgstr "Unirse" #: lib/leaveform.php:114 msgid "Leave" -msgstr "" +msgstr "Deixar" #: lib/logingroupnav.php:80 msgid "Login with a username and password" -msgstr "" +msgstr "Identificarse cun nome de usuario e contrasinal" #: lib/logingroupnav.php:86 msgid "Sign up for a new account" -msgstr "" +msgstr "Rexistrar unha conta nova" #. TRANS: Subject for address confirmation email #: lib/mail.php:174 msgid "Email address confirmation" -msgstr "" +msgstr "Confirmación do enderezo de correo electrónico" #. TRANS: Body for address confirmation email. #: lib/mail.php:177 @@ -6090,12 +6097,24 @@ msgid "" "Thanks for your time, \n" "%s\n" msgstr "" +"Ola, %s:\n" +"\n" +"Alguén acaba de introducir este enderezo de correo electrónico en %s.\n" +"\n" +"Se foi vostede, e quere confirmalo, utilice o seguinte URL:\n" +"\n" +"%s\n" +"\n" +"En caso contrario, simplemente ignore esta mensaxe.\n" +"\n" +"Grazas polo seu tempo, \n" +"%s\n" #. TRANS: Subject of new-subscriber notification e-mail #: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." -msgstr "" +msgstr "Agora %1$s segue as súas notas en %2$s." #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:249 @@ -6112,18 +6131,29 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" +"Agora %1$s segue as súas notas en %2$s.\n" +"\n" +"%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"Atentamente,\n" +"%7$s.\n" +"\n" +"----\n" +"Modifique o seu enderezo de correo electrónico ou as súas preferencias de " +"notificación en %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail #: lib/mail.php:269 #, php-format msgid "Bio: %s" -msgstr "" +msgstr "Biografía: %s" #. TRANS: Subject of notification mail for new posting email address #: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" -msgstr "" +msgstr "Novo enderezo de correo electrónico para publicar en %s" #. TRANS: Body of notification mail for new posting email address #: lib/mail.php:302 @@ -6138,29 +6168,38 @@ msgid "" "Faithfully yours,\n" "%4$s" msgstr "" +"Ten un novo enderezo de correo electrónico para publicar en %1$s.\n" +"\n" +"Envíe un correo electrónico a %2$s para publicar mensaxes novas.\n" +"\n" +"Máis información en %3$s.\n" +"\n" +"Atentamente,\n" +"%4$s" #. TRANS: Subject line for SMS-by-email notification messages #: lib/mail.php:427 #, php-format msgid "%s status" -msgstr "" +msgstr "Estado de %s" #. TRANS: Subject line for SMS-by-email address confirmation message #: lib/mail.php:454 msgid "SMS confirmation" -msgstr "" +msgstr "Confirmación dos SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:457 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" +"%s: utilice o seguinte código para confirmar que o número de teléfono é seu:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" -msgstr "" +msgstr "%s fíxolle un aceno" #. TRANS: Body for 'nudge' notification email #: lib/mail.php:483 @@ -6178,12 +6217,23 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) pregúntase que estivo a facer vostede estes días, e convídao a " +"publicar algunha nova.\n" +"\n" +"Así que anímese, conte algo :)\n" +"\n" +"%3$s\n" +"\n" +"Non responda a esta mensaxe, non lle chegará ao remitente.\n" +"\n" +"Atentamente,\n" +"%4$s\n" #. TRANS: Subject for direct-message notification email #: lib/mail.php:530 #, php-format msgid "New private message from %s" -msgstr "" +msgstr "Nova mensaxe privada de %s" #. TRANS: Body for direct-message notification email #: lib/mail.php:535 @@ -6204,12 +6254,26 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) envioulle unha mensaxe privada:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Pode responder á mensaxe aquí:\n" +"\n" +"%4$s\n" +"\n" +"Non responda a este correo, non lle chegará ao remitente.\n" +"\n" +"Atentamente,\n" +"%5$s\n" #. TRANS: Subject for favorite notification email #: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "" +msgstr "%s (@%s) marcou a súa nota como favorita" #. TRANS: Body for favorite notification email #: lib/mail.php:586 @@ -6232,6 +6296,23 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) acaba de marcar a súa nota en %2$s coma unha das súas " +"favoritas.\n" +"\n" +"O URL da súa nota é:\n" +"\n" +"%3$s\n" +"\n" +"O texto da nota di:\n" +"\n" +"%4$s\n" +"\n" +"Pode ver a lista das notas favoritas de %1$s en:\n" +"\n" +"%5$s\n" +"\n" +"Atentamente,\n" +"%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. #: lib/mail.php:645 @@ -6241,11 +6322,14 @@ msgid "" "\n" "\t%s" msgstr "" +"Pode ler a conversación completa en:\n" +"\n" +"%s" #: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) enviou unha nota á súa atención" #. TRANS: Body of @-reply notification e-mail. #: lib/mail.php:654 @@ -6274,210 +6358,240 @@ msgid "" "\n" "P.S. You can turn off these email notifications here: %8$s\n" msgstr "" +"%1$s (@%9$s) acaba de enviar unha nota á súa atención (un “respost@”) en %2" +"$s.\n" +"\n" +"A nota está en:\n" +"\n" +"%3$s\n" +"\n" +"Di:\n" +"\n" +"%4$s\n" +"\n" +"%5$sPode responder en:\n" +"\n" +"%6$s\n" +"\n" +"A lista de todas as notas á súa @tención está en:\n" +"\n" +"%7$s\n" +"\n" +"Atentamente,\n" +"%2$s\n" +"\n" +"P.S: pode desactivar estas notificacións por correo electrónico en %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." -msgstr "" +msgstr "Só o usuario pode ler as súas caixas de entrada." #: lib/mailbox.php:139 msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" +"Non ten mensaxes privadas. Pode enviar mensaxes privadas para conversar con " +"outros usuarios. A xente pode enviarlle mensaxes para que só as lea vostede." #: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" -msgstr "" +msgstr "de" #: lib/mailhandler.php:37 msgid "Could not parse message." -msgstr "" +msgstr "Non se puido analizar a mensaxe." #: lib/mailhandler.php:42 msgid "Not a registered user." -msgstr "" +msgstr "Non está rexistrado." #: lib/mailhandler.php:46 msgid "Sorry, that is not your incoming email address." -msgstr "" +msgstr "Ese non é o seu enderezo de correo electrónico para recibir correos." #: lib/mailhandler.php:50 msgid "Sorry, no incoming email allowed." -msgstr "" +msgstr "Non se permite recibir correo electrónico." #: lib/mailhandler.php:228 #, php-format msgid "Unsupported message type: %s" -msgstr "" +msgstr "Non se soporta o tipo de mensaxe %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" +"Houbo un erro na base de datos ao gardar o seu ficheiro. Volva intentalo." #: lib/mediafile.php:142 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." -msgstr "" +msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini." #: lib/mediafile.php:147 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no " +"formulario HTML." #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "O ficheiro só se subiu parcialmente." #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "Falta un cartafol temporal." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "Non se puido escribir o ficheiro en disco." #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "Interrompeuse a carga do ficheiro por mor da extensión." #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota." -msgstr "" +msgstr "O ficheiro supera a cota do usuario." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "Non se puido mover o ficheiro ao directorio de destino." #: lib/mediafile.php:201 lib/mediafile.php:237 msgid "Could not determine file's MIME type." -msgstr "" +msgstr "Non se puido determinar o tipo MIME do ficheiro." #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr "Inténteo utilizando outro formato %s." #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported file type on this server." -msgstr "" +msgstr "Neste servidor non se soporta o tipo de ficheiro %s." #: lib/messageform.php:120 msgid "Send a direct notice" -msgstr "" +msgstr "Enviar unha nota directa" #: lib/messageform.php:146 msgid "To" -msgstr "" +msgstr "a" #: lib/messageform.php:159 lib/noticeform.php:185 msgid "Available characters" -msgstr "" +msgstr "Caracteres dispoñibles" #: lib/messageform.php:178 lib/noticeform.php:236 msgctxt "Send button for sending notice" msgid "Send" -msgstr "" +msgstr "Enviar" #: lib/noticeform.php:160 msgid "Send a notice" -msgstr "" +msgstr "Enviar unha nota" #: lib/noticeform.php:173 #, php-format msgid "What's up, %s?" -msgstr "" +msgstr "Que hai de novo, %s?" #: lib/noticeform.php:192 msgid "Attach" -msgstr "" +msgstr "Anexar" #: lib/noticeform.php:196 msgid "Attach a file" -msgstr "" +msgstr "Anexar un ficheiro" #: lib/noticeform.php:212 msgid "Share my location" -msgstr "" +msgstr "Publicar a miña localidade" #: lib/noticeform.php:215 msgid "Do not share my location" -msgstr "" +msgstr "Non publicar a miña localidade" #: lib/noticeform.php:216 msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"Estase tardando máis do esperado en obter a súa xeolocalización, vólvao " +"intentar máis tarde." #. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" -msgstr "" +msgstr "N" #. TRANS: Used in coordinates as abbreviation of south #: lib/noticelist.php:432 msgid "S" -msgstr "" +msgstr "S" #. TRANS: Used in coordinates as abbreviation of east #: lib/noticelist.php:434 msgid "E" -msgstr "" +msgstr "L" #. TRANS: Used in coordinates as abbreviation of west #: lib/noticelist.php:436 msgid "W" -msgstr "" +msgstr "O" #: lib/noticelist.php:438 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" +msgstr "1% u $ ½% 2 $ u '% 3 $ u \"s% 4% 5 $ u $ ½% 6 $ u' 7% $ u\" 8% $ s" #: lib/noticelist.php:447 msgid "at" -msgstr "" +msgstr "en" #: lib/noticelist.php:567 msgid "in context" -msgstr "" +msgstr "no contexto" #: lib/noticelist.php:602 msgid "Repeated by" -msgstr "" +msgstr "Repetida por" #: lib/noticelist.php:629 msgid "Reply to this notice" -msgstr "" +msgstr "Responder a esta nota" #: lib/noticelist.php:630 msgid "Reply" -msgstr "" +msgstr "Responder" #: lib/noticelist.php:674 msgid "Notice repeated" -msgstr "" +msgstr "Repetiuse a nota" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "" +msgstr "Facerlle un aceno a este usuario" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "" +msgstr "Facer un aceno" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" -msgstr "" +msgstr "Facerlle un aceno a este usuario" #: lib/oauthstore.php:283 msgid "Error inserting new profile" -msgstr "" +msgstr "Houbo un erro ao inserir o novo perfil" #: lib/oauthstore.php:291 msgid "Error inserting avatar" -msgstr "" +msgstr "Houbo un erro ao inserir o avatar" #: lib/oauthstore.php:306 msgid "Error updating remote profile" @@ -6485,117 +6599,117 @@ msgstr "Houbo un erro ao actualizar o perfil remoto" #: lib/oauthstore.php:311 msgid "Error inserting remote profile" -msgstr "" +msgstr "Houbo un erro ao inserir o perfil remoto" #: lib/oauthstore.php:345 msgid "Duplicate notice" -msgstr "" +msgstr "Nota duplicada" #: lib/oauthstore.php:490 msgid "Couldn't insert new subscription." -msgstr "" +msgstr "Non se puido inserir unha subscrición nova." #: lib/personalgroupnav.php:99 msgid "Personal" -msgstr "" +msgstr "Persoal" #: lib/personalgroupnav.php:104 msgid "Replies" -msgstr "" +msgstr "Respostas" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "" +msgstr "Favoritas" #: lib/personalgroupnav.php:125 msgid "Inbox" -msgstr "" +msgstr "Caixa de entrada" #: lib/personalgroupnav.php:126 msgid "Your incoming messages" -msgstr "" +msgstr "As mensaxes recibidas" #: lib/personalgroupnav.php:130 msgid "Outbox" -msgstr "" +msgstr "Caixa de saída" #: lib/personalgroupnav.php:131 msgid "Your sent messages" -msgstr "" +msgstr "As mensaxes enviadas" #: lib/personaltagcloudsection.php:56 #, php-format msgid "Tags in %s's notices" -msgstr "" +msgstr "Etiquetas nas notas de %s" #: lib/plugin.php:114 msgid "Unknown" -msgstr "" +msgstr "Descoñecida" #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" -msgstr "" +msgstr "Subscricións" #: lib/profileaction.php:126 msgid "All subscriptions" -msgstr "" +msgstr "Todas as subscricións" #: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" -msgstr "" +msgstr "Subscritores" #: lib/profileaction.php:161 msgid "All subscribers" -msgstr "" +msgstr "Todos os subscritores" #: lib/profileaction.php:191 msgid "User ID" -msgstr "" +msgstr "ID do usuario" #: lib/profileaction.php:196 msgid "Member since" -msgstr "" +msgstr "Membro dende" #. TRANS: Average count of posts made per day since account registration #: lib/profileaction.php:235 msgid "Daily average" -msgstr "" +msgstr "Media diaria" #: lib/profileaction.php:264 msgid "All groups" -msgstr "" +msgstr "Todos os grupos" #: lib/profileformaction.php:114 msgid "Unimplemented method." -msgstr "" +msgstr "Aínda non se implantou o método." #: lib/publicgroupnav.php:78 msgid "Public" -msgstr "" +msgstr "Públicas" #: lib/publicgroupnav.php:82 msgid "User groups" -msgstr "" +msgstr "Grupos do usuario" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" -msgstr "" +msgstr "Últimas etiquetas" #: lib/publicgroupnav.php:88 msgid "Featured" -msgstr "" +msgstr "Salientadas" #: lib/publicgroupnav.php:92 msgid "Popular" -msgstr "" +msgstr "Populares" #: lib/redirectingaction.php:94 msgid "No return-to arguments." -msgstr "" +msgstr "Sen argumentos “return-to”." #: lib/repeatform.php:107 msgid "Repeat this notice?" -msgstr "" +msgstr "Quere repetir esta nova?" #: lib/repeatform.php:132 msgid "Yes" @@ -6603,255 +6717,256 @@ msgstr "Si" #: lib/repeatform.php:132 msgid "Repeat this notice" -msgstr "" +msgstr "Repetir esta nova" #: lib/revokeroleform.php:91 #, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "" +msgstr "Revogarlle o rol “%s” a este usuario" #: lib/router.php:704 msgid "No single user defined for single-user mode." -msgstr "" +msgstr "Non se estableceu ningún usuario único para o modo de usuario único." #: lib/sandboxform.php:67 msgid "Sandbox" -msgstr "" +msgstr "Illar" #: lib/sandboxform.php:78 msgid "Sandbox this user" -msgstr "" +msgstr "Illar a este usuario" #: lib/searchaction.php:120 msgid "Search site" -msgstr "" +msgstr "Buscar no sitio" #: lib/searchaction.php:126 msgid "Keyword(s)" -msgstr "" +msgstr "Termos de busca" #: lib/searchaction.php:127 msgid "Search" -msgstr "" +msgstr "Buscar" #: lib/searchaction.php:162 msgid "Search help" -msgstr "" +msgstr "Buscar na axuda" #: lib/searchgroupnav.php:80 msgid "People" -msgstr "" +msgstr "Xente" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "" +msgstr "Atopar xente neste sitio" #: lib/searchgroupnav.php:83 msgid "Find content of notices" -msgstr "" +msgstr "Buscar nos contidos das notas" #: lib/searchgroupnav.php:85 msgid "Find groups on this site" -msgstr "" +msgstr "Buscar grupos neste sitio" #: lib/section.php:89 msgid "Untitled section" -msgstr "" +msgstr "Sección sen título" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "Máis..." #: lib/silenceform.php:67 msgid "Silence" -msgstr "" +msgstr "Silenciar" #: lib/silenceform.php:78 msgid "Silence this user" -msgstr "" +msgstr "Silenciar a este usuario" #: lib/subgroupnav.php:83 #, php-format msgid "People %s subscribes to" -msgstr "" +msgstr "Persoas ás que está subscrito %s" #: lib/subgroupnav.php:91 #, php-format msgid "People subscribed to %s" -msgstr "" +msgstr "Persoas subscritas a %s" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "" +msgstr "Grupos aos que pertence %s" #: lib/subgroupnav.php:105 msgid "Invite" -msgstr "" +msgstr "Convidar" #: lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "" +msgstr "Convida a amigos e compañeiros a unírseche en %s" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 msgid "People Tagcloud as self-tagged" -msgstr "" +msgstr "Nube de etiquetas que as persoas se puxeron a si mesmas" #: lib/subscriberspeopletagcloudsection.php:48 #: lib/subscriptionspeopletagcloudsection.php:48 msgid "People Tagcloud as tagged" -msgstr "" +msgstr "Nube de etiquetas que lle puxo a outras persoas" #: lib/tagcloudsection.php:56 msgid "None" -msgstr "" +msgstr "Ningún" #: lib/topposterssection.php:74 msgid "Top posters" -msgstr "" +msgstr "Os que máis publican" #: lib/unsandboxform.php:69 msgid "Unsandbox" -msgstr "" +msgstr "Deixar de illar" #: lib/unsandboxform.php:80 msgid "Unsandbox this user" -msgstr "" +msgstr "Deixar de illar a este usuario" #: lib/unsilenceform.php:67 msgid "Unsilence" -msgstr "" +msgstr "Dar voz" #: lib/unsilenceform.php:78 msgid "Unsilence this user" -msgstr "" +msgstr "Darlle voz a este usuario" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" -msgstr "" +msgstr "Cancelar a subscrición a este usuario" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" -msgstr "" +msgstr "Cancelar a subscrición" #: lib/usernoprofileexception.php:58 #, php-format msgid "User %s (%d) has no profile record." -msgstr "" +msgstr "O usuario %s (%d) non ten perfil." #: lib/userprofile.php:117 msgid "Edit Avatar" -msgstr "" +msgstr "Modificar o avatar" #: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" -msgstr "" +msgstr "Accións do usuario" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Procedendo a borrar o usuario..." #: lib/userprofile.php:263 msgid "Edit profile settings" -msgstr "" +msgstr "Modificar a configuración do perfil" #: lib/userprofile.php:264 msgid "Edit" -msgstr "" +msgstr "Modificar" #: lib/userprofile.php:287 msgid "Send a direct message to this user" -msgstr "" +msgstr "Enviarlle unha mensaxe directa a este usuario" #: lib/userprofile.php:288 msgid "Message" -msgstr "" +msgstr "Mensaxe" #: lib/userprofile.php:326 msgid "Moderate" -msgstr "" +msgstr "Moderar" #: lib/userprofile.php:364 msgid "User role" -msgstr "" +msgstr "Rol do usuario" #: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "" +msgstr "Administrador" #: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "" +msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1083 msgid "a few seconds ago" -msgstr "" +msgstr "hai uns segundos" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1086 msgid "about a minute ago" -msgstr "" +msgstr "hai como un minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1090 #, php-format msgid "about %d minutes ago" -msgstr "" +msgstr "hai como %d minutos" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1093 msgid "about an hour ago" -msgstr "" +msgstr "hai como unha hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1097 #, php-format msgid "about %d hours ago" -msgstr "" +msgstr "hai como %d horas" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1100 msgid "about a day ago" -msgstr "" +msgstr "hai como un día" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1104 #, php-format msgid "about %d days ago" -msgstr "" +msgstr "hai como %d días" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1107 msgid "about a month ago" -msgstr "" +msgstr "hai como un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1111 #, php-format msgid "about %d months ago" -msgstr "" +msgstr "hai como %d meses" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1114 msgid "about a year ago" -msgstr "" +msgstr "hai como un ano" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "" +msgstr "%s non é unha cor correcta!" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "" +msgstr "%s non é unha cor correcta! Use 3 ou 6 caracteres hexadecimais." #: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" +"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d." diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index e86db78549..857ce5a2c3 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:18:32+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:10+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 8270756d53..5d226be60a 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:18:36+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:21+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index a6da5e853a..62ec146c31 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:18:47+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:24+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index dd5055757e..34f87d2441 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:18:50+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:27+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 96d13101a5..de429fe9b6 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:18:53+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:37+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -2323,17 +2323,15 @@ msgstr "" "la tua password prima di modificare le impostazioni." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Accedi con nome utente e password" +msgstr "Accedi con nome utente e password." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Accedi col tuo nome utente e password. Non hai ancora un nome utente? [Crea]" -"(%%action.register%%) un nuovo account." +"Non hai ancora un nome utente? [Crea](%%action.register%%) un nuovo account." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 984d88f199..76ca28c248 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:00+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:40+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 87af73cadd..8411920419 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:10+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:43+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 8763ed8fb5..76cd8f711f 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:14+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:47+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 690d0aa143..4ac3bff575 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:17+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:50+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 5fbe437aa1..cef426ff5a 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:27+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:57+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 3bc961f590..6a2a705d75 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:21+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:54+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index bcab63ee1b..cd23aea291 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:30+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:01+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 29bbdfefb3..048664eb81 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:34+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:04+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 94eacd354c..4263dde6b5 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:42+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:12+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -89,7 +89,6 @@ msgstr "Salvar" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -#, fuzzy msgid "No such page." msgstr "Esta página não existe." @@ -242,13 +241,12 @@ msgid "This method requires a POST." msgstr "Este método requer um POST." #: actions/apiaccountupdatedeliverydevice.php:105 -#, fuzzy msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" -"Você pode especificar um parâmetro denominado 'device', com um dos valores: " -"sms, im, none" +"Você tem que especificar um parâmetro denominado 'device', com um desses " +"valores: sms, im, none" #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -450,9 +448,9 @@ msgid "Too many aliases! Maximum %d." msgstr "Muitos apelidos! O máximo são %d." #: actions/apigroupcreate.php:266 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"." -msgstr "Apelido inválido: \"%s\"" +msgstr "Apelido inválido: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -468,9 +466,8 @@ msgstr "O apelido não pode ser igual à identificação." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found." -msgstr "O grupo não foi encontrado!" +msgstr "O grupo não foi encontrado." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." @@ -502,9 +499,9 @@ msgstr "Grupos de %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s #: actions/apigrouplist.php:107 -#, fuzzy, php-format +#, php-format msgid "%1$s groups %2$s is a member of." -msgstr "Grupos dos quais %s é membro" +msgstr "Grupos de %1$s nos quais %2$s é membro." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. @@ -850,7 +847,6 @@ msgstr "" #: actions/block.php:145 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 -#, fuzzy msgctxt "BUTTON" msgid "No" msgstr "Não" @@ -869,7 +865,6 @@ msgstr "Não bloquear este usuário" #: actions/block.php:152 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 -#, fuzzy msgctxt "BUTTON" msgid "Yes" msgstr "Sim" @@ -925,9 +920,9 @@ msgstr "Desbloquear este usuário" #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 -#, fuzzy, php-format +#, php-format msgid "Post to %s" -msgstr "Enviar para " +msgstr "Publicar em %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -943,9 +938,9 @@ msgstr "Esse não é o seu código de confirmação!" #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. #: actions/confirmaddress.php:91 -#, fuzzy, php-format +#, php-format msgid "Unrecognized address type %s." -msgstr "Tipo de endereço desconhecido %s" +msgstr "Tipo de endereço %s não reconhecido." #. TRANS: Client error for an already confirmed email/jabbel/sms address. #: actions/confirmaddress.php:96 @@ -1116,9 +1111,9 @@ msgid "Invalid logo URL." msgstr "A URL da logo é inválida." #: actions/designadminpanel.php:280 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s." -msgstr "Tema não disponível: %s" +msgstr "Tema não disponível: %s." #: actions/designadminpanel.php:376 msgid "Change logo" @@ -1372,7 +1367,6 @@ msgstr "Endereço de e-mail já confirmado." #: actions/emailsettings.php:115 actions/emailsettings.php:158 #: actions/imsettings.php:116 actions/smssettings.php:124 #: actions/smssettings.php:180 -#, fuzzy msgctxt "BUTTON" msgid "Remove" msgstr "Remover" @@ -1391,7 +1385,6 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" msgstr "Cancelar" @@ -1406,7 +1399,6 @@ msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\"" #. TRANS: Button label for adding a SMS phone number in SMS settings form. #: actions/emailsettings.php:139 actions/imsettings.php:148 #: actions/smssettings.php:162 -#, fuzzy msgctxt "BUTTON" msgid "Add" msgstr "Adicionar" @@ -1432,16 +1424,14 @@ msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo." #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. #: actions/emailsettings.php:168 actions/smssettings.php:189 -#, fuzzy msgctxt "BUTTON" msgid "New" msgstr "Novo" #. TRANS: Form legend for e-mail preferences form. #: actions/emailsettings.php:174 -#, fuzzy msgid "Email preferences" -msgstr "Preferências" +msgstr "Preferências de e-mail" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 @@ -1484,9 +1474,8 @@ msgstr "Publique um MicroID para meu endereço de e-mail." #. TRANS: Confirmation message for successful e-mail preferences save. #: actions/emailsettings.php:334 -#, fuzzy msgid "Email preferences saved." -msgstr "As configurações da aparência foram salvas." +msgstr "As configurações de e-mail foram salvas." #. TRANS: Message given saving e-mail address without having provided one. #: actions/emailsettings.php:353 @@ -1542,9 +1531,8 @@ msgstr "Nenhuma confirmação pendente para cancelar." #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 -#, fuzzy msgid "That is the wrong email address." -msgstr "Isso é um endereço de MI errado." +msgstr "Esse é o endereço de e-mail errado." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index db0be7ca2a..7f697bd8d5 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:50+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:15+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 72a8183ad2..e0aad71466 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"POT-Creation-Date: 2010-04-26 22:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index fababcf142..65a64dc320 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:19:54+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:20+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 765226f30d..54e7d0de18 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:20:05+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:38+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 7086d89b14..8514f78d5d 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:20:09+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:42+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index daa59860f5..efdcae240f 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:20:13+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:45+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 95e64195fa..4dd5e6ceb8 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:20:24+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:48+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index fc37c2f971..e38cda2ec6 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:20:28+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:51+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 825c8b2e94..4240b921ab 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-24 14:20:32+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:54+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65510); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" From 42348bc16711316918efef634d6d83bf19b0b1fe Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 27 Apr 2010 22:00:26 -0400 Subject: [PATCH 036/730] add rsd to the list of login actions Allows rsd.xml to be reached on private sites. Fixes http://status.net/trac/ticket/2309 --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 6bfbc11da8..fa9f67269c 100644 --- a/index.php +++ b/index.php @@ -185,7 +185,7 @@ function checkMirror($action_obj, $args) function isLoginAction($action) { - static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch'); + static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch', 'rsd'); $login = null; From f5c82d9d60afd044f9652865d3e481dec974075f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 28 Apr 2010 11:05:31 -0700 Subject: [PATCH 037/730] add rsd to the list of login actions Allows rsd.xml to be reached on private sites. Fixes http://status.net/trac/ticket/2309 Conflicts: index.php --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index ea5c802779..3778ffe420 100644 --- a/index.php +++ b/index.php @@ -185,7 +185,7 @@ function checkMirror($action_obj, $args) function isLoginAction($action) { - static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp'); + static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'rsd'); $login = null; From 4973d6a2885790d6e02d6e1e7ef33549293e4ec6 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 22 Mar 2010 00:25:49 -0400 Subject: [PATCH 038/730] user sitemap --- plugins/Sitemap/SitemapPlugin.php | 111 ++++++++++++++++++++++++++++++ plugins/Sitemap/sitemapaction.php | 90 ++++++++++++++++++++++++ plugins/Sitemap/usersitemap.php | 79 +++++++++++++++++++++ 3 files changed, 280 insertions(+) create mode 100644 plugins/Sitemap/SitemapPlugin.php create mode 100644 plugins/Sitemap/sitemapaction.php create mode 100644 plugins/Sitemap/usersitemap.php diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php new file mode 100644 index 0000000000..42ea1dbe62 --- /dev/null +++ b/plugins/Sitemap/SitemapPlugin.php @@ -0,0 +1,111 @@ +. + * + * @category Sample + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Sitemap plugin + * + * @category Sample + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +class SitemapPlugin extends Plugin +{ + /** + * Load related modules when needed + * + * Most non-trivial plugins will require extra modules to do their work. Typically + * these include data classes, action classes, widget classes, or external libraries. + * + * This method receives a class name and loads the PHP file related to that class. By + * tradition, action classes typically have files named for the action, all lower-case. + * Data classes are in files with the data class name, initial letter capitalized. + * + * Note that this method will be called for *all* overloaded classes, not just ones + * in this plugin! So, make sure to return true by default to let other plugins, and + * the core code, get a chance. + * + * @param string $cls Name of the class to be loaded + * + * @return boolean hook value; true means continue processing, false means stop. + */ + + function onAutoload($cls) + { + $dir = dirname(__FILE__); + + switch ($cls) + { + case 'SitemapindexAction': + case 'NoticesitemapAction': + case 'UsersitemapAction': + require_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; + return false; + case 'SitemapAction': + require_once $dir . '/' . strtolower($cls) . '.php'; + default: + return true; + } + } + + /** + * Map URLs to actions + * + * @param Net_URL_Mapper $m path-to-action mapper + * + * @return boolean hook value; true means continue processing, false means stop. + */ + + function onRouterInitialized($m) + { + $m->connect('sitemapindex.xml', + array('action' => 'sitemapindex')); + $m->connect('/sitemaps/notice/:year/:month/:day.xml', + array('action' => 'noticesitemap'), + array('year' => '[0-9]{4}', + 'month' => '[1]?[0-9]', + 'day' => '[123]?[0-9]')); + $m->connect('/sitemaps/user/:index.xml', + array('action' => 'usersitemap'), + array('index' => '[0-9]+', + 'month' => '[1]?[0-9]', + 'day' => '[123]?[0-9]')); + return true; + } +} diff --git a/plugins/Sitemap/sitemapaction.php b/plugins/Sitemap/sitemapaction.php new file mode 100644 index 0000000000..ab80b85eaa --- /dev/null +++ b/plugins/Sitemap/sitemapaction.php @@ -0,0 +1,90 @@ +. + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * superclass for sitemap actions + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class SitemapAction extends Action +{ + /** + * handle the action + * + * @param array $args unused. + * + * @return void + */ + + function handle($args) + { + header('Content-Type: text/xml; charset=UTF-8'); + $this->startXML(); + + $this->elementStart('sitemap'); + + while (list($url, $lm, $cf, $p) = $this->nextUrl()) { + $this->showUrl($url, $lm, $cf, $p); + } + + $this->elementEnd('sitemap'); + + $this->endXML(); + } + + function showUrl($url, $lastMod=null, $changeFreq=null, $priority=null) + { + $this->elementStart('url'); + $this->element('loc', null, $url); + if (!is_null($lastMod)) { + $this->element('lastmod', null, $lastMod); + } + if (!is_null($changeFreq)) { + $this->element('changefreq', null, $changeFreq); + } + if (!is_null($priority)) { + $this->element('priority', null, $priority); + } + $this->elementEnd('url'); + } + + function nextUrl() + { + return null; + } +} diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php new file mode 100644 index 0000000000..582a13b664 --- /dev/null +++ b/plugins/Sitemap/usersitemap.php @@ -0,0 +1,79 @@ +. + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * sitemap for users + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class UsersitemapAction extends SitemapAction +{ + const USERS_PER_MAP = 25000; + + var $user = null; + + function prepare($args) + { + parent::prepare($args); + + $i = $this->trimmed('index'); + + $i += 0; + + $offset = ($i-1) * self::USERS_PER_MAP; + $limit = self::USERS_PER_MAP; + + $this->user = new User(); + + $this->user->orderBy('id'); + $this->user->limit($offset, $limit); + + $this->user->find(); + + return true; + } + + function nextUrl() + { + if ($this->user->fetch()) { + return array(common_profile_url($this->user->nickname), null, null, null); + } else { + return null; + } + } +} From 3a9fdb7647d9439da0c12762c4b255d507995713 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 22 Mar 2010 08:09:15 -0400 Subject: [PATCH 039/730] Add a Notice sitemap --- plugins/Sitemap/SitemapPlugin.php | 6 +- plugins/Sitemap/noticesitemap.php | 94 +++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 plugins/Sitemap/noticesitemap.php diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 42ea1dbe62..8889c89306 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -96,11 +96,13 @@ class SitemapPlugin extends Plugin { $m->connect('sitemapindex.xml', array('action' => 'sitemapindex')); - $m->connect('/sitemaps/notice/:year/:month/:day.xml', + $m->connect('/sitemaps/notice/:year/:month/:day/:index.xml', array('action' => 'noticesitemap'), array('year' => '[0-9]{4}', 'month' => '[1]?[0-9]', - 'day' => '[123]?[0-9]')); + 'day' => '[123]?[0-9]', + 'index' => '[0-9]+')); + $m->connect('/sitemaps/user/:index.xml', array('action' => 'usersitemap'), array('index' => '[0-9]+', diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php new file mode 100644 index 0000000000..7eec886363 --- /dev/null +++ b/plugins/Sitemap/noticesitemap.php @@ -0,0 +1,94 @@ +. + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * sitemap for users + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class NoticesitemapAction extends SitemapAction +{ + const NOTICES_PER_MAP = 25000; + + var $notice = null; + + function prepare($args) + { + parent::prepare($args); + + $y = $this->trimmed('year'); + + $m = $this->trimmed('month'); + $d = $this->trimmed('day'); + + $i = $this->trimmed('index'); + + $y += 0; + $m += 0; + $d += 0; + $i += 0; + + $offset = ($i-1) * self::NOTICES_PER_MAP; + $limit = self::NOTICES_PER_MAP; + + $this->notice = new Notice(); + + $this->notice->whereAdd("created > '$y-$m-$d 00:00:00'"); + $this->notice->whereAdd("created <= '$y-$m-$d 11:59:59'"); + $this->notice->whereAdd('is_local = 1'); + + $this->notice->orderBy('id'); + $this->notice->limit($offset, $limit); + + $this->notice->find(); + + return true; + } + + function nextUrl() + { + if ($this->notice->fetch()) { + return array(common_local_url('shownotice', array('notice' => $this->notice->id)), + common_date_w3dtf($this->notice->created), + null, + null); + } else { + return null; + } + } +} From cf7dd2a6afbc5477dd29352e9a6a6de735540c11 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 25 Mar 2010 23:56:09 -0400 Subject: [PATCH 040/730] better query for notices by date --- plugins/Sitemap/SitemapPlugin.php | 17 +++-------------- plugins/Sitemap/noticesitemap.php | 9 ++++++--- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 8889c89306..bb404cd25e 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -50,17 +50,6 @@ class SitemapPlugin extends Plugin /** * Load related modules when needed * - * Most non-trivial plugins will require extra modules to do their work. Typically - * these include data classes, action classes, widget classes, or external libraries. - * - * This method receives a class name and loads the PHP file related to that class. By - * tradition, action classes typically have files named for the action, all lower-case. - * Data classes are in files with the data class name, initial letter capitalized. - * - * Note that this method will be called for *all* overloaded classes, not just ones - * in this plugin! So, make sure to return true by default to let other plugins, and - * the core code, get a chance. - * * @param string $cls Name of the class to be loaded * * @return boolean hook value; true means continue processing, false means stop. @@ -99,9 +88,9 @@ class SitemapPlugin extends Plugin $m->connect('/sitemaps/notice/:year/:month/:day/:index.xml', array('action' => 'noticesitemap'), array('year' => '[0-9]{4}', - 'month' => '[1]?[0-9]', - 'day' => '[123]?[0-9]', - 'index' => '[0-9]+')); + 'month' => '[01][0-9]', + 'day' => '[0123][0-9]', + 'index' => '[1-9][0-9]*')); $m->connect('/sitemaps/user/:index.xml', array('action' => 'usersitemap'), diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index 7eec886363..0024084863 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -68,9 +68,12 @@ class NoticesitemapAction extends SitemapAction $this->notice = new Notice(); - $this->notice->whereAdd("created > '$y-$m-$d 00:00:00'"); - $this->notice->whereAdd("created <= '$y-$m-$d 11:59:59'"); - $this->notice->whereAdd('is_local = 1'); + $dt = sprintf('%04d-%02d-%02d', $y, $m, $d); + + $this->notice->whereAdd("created > '$dt 00:00:00'"); + $this->notice->whereAdd("created <= '$dt 23:59:59'"); + + $this->notice->whereAdd('is_local != 0'); $this->notice->orderBy('id'); $this->notice->limit($offset, $limit); From e7e50926416f5617bcb94928a2d27a9de8b2f231 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Apr 2010 10:03:37 -0400 Subject: [PATCH 041/730] correct element name and namespace for sitemapactions --- plugins/Sitemap/sitemapaction.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Sitemap/sitemapaction.php b/plugins/Sitemap/sitemapaction.php index ab80b85eaa..bab04ed9d2 100644 --- a/plugins/Sitemap/sitemapaction.php +++ b/plugins/Sitemap/sitemapaction.php @@ -56,13 +56,13 @@ class SitemapAction extends Action header('Content-Type: text/xml; charset=UTF-8'); $this->startXML(); - $this->elementStart('sitemap'); + $this->elementStart('urlset', array('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9')); while (list($url, $lm, $cf, $p) = $this->nextUrl()) { $this->showUrl($url, $lm, $cf, $p); } - $this->elementEnd('sitemap'); + $this->elementEnd('urlset'); $this->endXML(); } From 8e2766957bf0f6f023385bfa6783d703b3d9a28e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Apr 2010 10:03:57 -0400 Subject: [PATCH 042/730] move USERS_PER_MAP to plugin --- plugins/Sitemap/SitemapPlugin.php | 3 +++ plugins/Sitemap/usersitemap.php | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index bb404cd25e..40263aaeef 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -47,6 +47,8 @@ if (!defined('STATUSNET')) { class SitemapPlugin extends Plugin { + const USERS_PER_MAP = 25000; + /** * Load related modules when needed * @@ -85,6 +87,7 @@ class SitemapPlugin extends Plugin { $m->connect('sitemapindex.xml', array('action' => 'sitemapindex')); + $m->connect('/sitemaps/notice/:year/:month/:day/:index.xml', array('action' => 'noticesitemap'), array('year' => '[0-9]{4}', diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php index 582a13b664..b7cc939a9f 100644 --- a/plugins/Sitemap/usersitemap.php +++ b/plugins/Sitemap/usersitemap.php @@ -43,8 +43,6 @@ if (!defined('STATUSNET')) { class UsersitemapAction extends SitemapAction { - const USERS_PER_MAP = 25000; - var $user = null; function prepare($args) @@ -55,8 +53,8 @@ class UsersitemapAction extends SitemapAction $i += 0; - $offset = ($i-1) * self::USERS_PER_MAP; - $limit = self::USERS_PER_MAP; + $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP; + $limit = SitemapPlugin::USERS_PER_MAP; $this->user = new User(); From 8957d2bdea569594593c55b7d84f05e2998c0633 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Apr 2010 10:21:19 -0400 Subject: [PATCH 043/730] change URLs for user sitemap --- plugins/Sitemap/SitemapPlugin.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 40263aaeef..5b2af48795 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -95,11 +95,12 @@ class SitemapPlugin extends Plugin 'day' => '[0123][0-9]', 'index' => '[1-9][0-9]*')); - $m->connect('/sitemaps/user/:index.xml', + $m->connect('/sitemaps/user/:year/:month/:day/:index.xml', array('action' => 'usersitemap'), - array('index' => '[0-9]+', - 'month' => '[1]?[0-9]', - 'day' => '[123]?[0-9]')); + array('year' => '[0-9]{4}', + 'month' => '[01][0-9]', + 'day' => '[0123][0-9]', + 'index' => '[1-9][0-9]*')); return true; } } From 816138a6f11ecf1ec44c261d660f8b2aafe49b21 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Apr 2010 10:24:58 -0400 Subject: [PATCH 044/730] Start of an action for sitemap index --- plugins/Sitemap/sitemapindex.php | 75 ++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 plugins/Sitemap/sitemapindex.php diff --git a/plugins/Sitemap/sitemapindex.php b/plugins/Sitemap/sitemapindex.php new file mode 100644 index 0000000000..09aebe0d8f --- /dev/null +++ b/plugins/Sitemap/sitemapindex.php @@ -0,0 +1,75 @@ +. + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Show the sitemap index + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class SitemapAction extends Action +{ + /** + * handle the action + * + * @param array $args unused. + * + * @return void + */ + + function handle($args) + { + header('Content-Type: text/xml; charset=UTF-8'); + $this->startXML(); + + $this->elementStart('sitemapindex', array('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9')); + + $this->showUserSitemaps(); + $this->showNoticeSitemaps(); + + $this->elementEnd('sitemapindex'); + + $this->endXML(); + } + + function showUserSitemaps() + { + $user = new User(); + $cnt = $user->count(); + + } +} From 1c40e7c139af98e4fe9c73093da4183ad8d9e234 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 10:11:18 -0400 Subject: [PATCH 045/730] better calculation for end date in notice sitemaps --- plugins/Sitemap/noticesitemap.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index 0024084863..12a22dbb22 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -68,14 +68,21 @@ class NoticesitemapAction extends SitemapAction $this->notice = new Notice(); - $dt = sprintf('%04d-%02d-%02d', $y, $m, $d); + $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); - $this->notice->whereAdd("created > '$dt 00:00:00'"); - $this->notice->whereAdd("created <= '$dt 23:59:59'"); + // XXX: estimates 1d == 24h, which screws up days + // with leap seconds (1d == 24h + 1s). Thankfully they're + // few and far between. + + $enddt = common_sql_date(strtotime($begindt) + (24 * 60 * 60)); + + $this->notice->whereAdd("created >= '$begindt'"); + $this->notice->whereAdd("created < '$enddt'"); $this->notice->whereAdd('is_local != 0'); - $this->notice->orderBy('id'); + $this->notice->orderBy('created'); + $this->notice->limit($offset, $limit); $this->notice->find(); From a4f0dfd3a134ddfa0e16b0a7ae3d205680eda4cf Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 10:11:45 -0400 Subject: [PATCH 046/730] bundle users by reg date --- plugins/Sitemap/usersitemap.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php index b7cc939a9f..42cadaca7d 100644 --- a/plugins/Sitemap/usersitemap.php +++ b/plugins/Sitemap/usersitemap.php @@ -49,8 +49,16 @@ class UsersitemapAction extends SitemapAction { parent::prepare($args); + $y = $this->trimmed('year'); + + $m = $this->trimmed('month'); + $d = $this->trimmed('day'); + $i = $this->trimmed('index'); + $y += 0; + $m += 0; + $d += 0; $i += 0; $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP; @@ -58,7 +66,19 @@ class UsersitemapAction extends SitemapAction $this->user = new User(); - $this->user->orderBy('id'); + $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); + + // XXX: estimates 1d == 24h, which screws up days + // with leap seconds (1d == 24h + 1s). Thankfully they're + // few and far between. + + $enddt = common_sql_date(strtotime($begindt) + (24 * 60 * 60)); + + $this->user->whereAdd("created >= '$begindt'"); + $this->user->whereAdd("created < '$enddt'"); + + $this->user->orderBy('created'); + $this->user->limit($offset, $limit); $this->user->find(); From 9970645aa271ad85d19c77d362678b964070d5ed Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 10:23:32 -0400 Subject: [PATCH 047/730] Move NOTICES_PER_MAP to SitemapPlugin --- plugins/Sitemap/SitemapPlugin.php | 3 ++- plugins/Sitemap/noticesitemap.php | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 5b2af48795..fa9c9a76d0 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -47,7 +47,8 @@ if (!defined('STATUSNET')) { class SitemapPlugin extends Plugin { - const USERS_PER_MAP = 25000; + const USERS_PER_MAP = 25000; + const NOTICES_PER_MAP = 25000; /** * Load related modules when needed diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index 12a22dbb22..c8db24efee 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -43,8 +43,6 @@ if (!defined('STATUSNET')) { class NoticesitemapAction extends SitemapAction { - const NOTICES_PER_MAP = 25000; - var $notice = null; function prepare($args) @@ -63,8 +61,8 @@ class NoticesitemapAction extends SitemapAction $d += 0; $i += 0; - $offset = ($i-1) * self::NOTICES_PER_MAP; - $limit = self::NOTICES_PER_MAP; + $offset = ($i-1) * SitemapPlugin::NOTICES_PER_MAP; + $limit = SitemapPlugin::NOTICES_PER_MAP; $this->notice = new Notice(); From a18115bec934fb4c27040f02bb3aec8b28083297 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 11:04:56 -0400 Subject: [PATCH 048/730] show sitemapindex with user and notice sitemaps --- plugins/Sitemap/sitemapindex.php | 95 +++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 3 deletions(-) diff --git a/plugins/Sitemap/sitemapindex.php b/plugins/Sitemap/sitemapindex.php index 09aebe0d8f..7942bc3bd0 100644 --- a/plugins/Sitemap/sitemapindex.php +++ b/plugins/Sitemap/sitemapindex.php @@ -41,7 +41,7 @@ if (!defined('STATUSNET')) { * @link http://status.net/ */ -class SitemapAction extends Action +class SitemapindexAction extends Action { /** * handle the action @@ -68,8 +68,97 @@ class SitemapAction extends Action function showUserSitemaps() { - $user = new User(); - $cnt = $user->count(); + $userCounts = $this->getUserCounts(); + foreach ($userCounts as $dt => $cnt) { + $cnt = $cnt+0; + assert($cnt != 0); + $n = (int)$cnt / (int)SitemapPlugin::USERS_PER_MAP; + if (($cnt % SitemapPlugin::USERS_PER_MAP) != 0) { + $n++; + } + for ($i = 1; $i <= $n; $i++) { + $this->showSitemap('user', $dt, $i); + } + } + } + + function showNoticeSitemaps() + { + $noticeCounts = $this->getNoticeCounts(); + + foreach ($noticeCounts as $dt => $cnt) { + assert($cnt != 0); + $n = $cnt / SitemapPlugin::NOTICES_PER_MAP; + if ($cnt % SitemapPlugin::NOTICES_PER_MAP) { + $n++; + } + for ($i = 1; $i <= $n; $i++) { + $this->showSitemap('notice', $dt, $i); + } + } + } + + function getUserCounts() + { + // XXX: cachemeplease + + $user = new User(); + + $user->selectAdd(); + $user->selectAdd('date(created) as regdate, count(*) as regcount'); + $user->groupBy('regdate'); + + $user->find(); + + $userCounts = array(); + + while ($user->fetch()) { + $userCounts[$user->regdate] = $user->regcount; + } + + return $userCounts; + } + + function getNoticeCounts() + { + // XXX: cachemeplease + + $notice = new Notice(); + + $notice->selectAdd(); + $notice->selectAdd('date(created) as postdate, count(*) as postcount'); + $notice->groupBy('postdate'); + + $notice->find(); + + $noticeCounts = array(); + + while ($notice->fetch()) { + $noticeCounts[$notice->postdate] = $notice->postcount; + } + + return $noticeCounts; + } + + function showSitemap($prefix, $dt, $i) + { + list($y, $m, $d) = explode('-', $dt); + + $this->elementStart('sitemap'); + $this->element('loc', null, common_local_url($prefix.'sitemap', + array('year' => $y, + 'month' => $m, + 'day' => $d, + 'index' => $i))); + + $begdate = strtotime("$y-$m-$d 00:00:00"); + $enddate = $begdate + (24 * 60 * 60); + + if ($enddate < time()) { + $this->element('lastmod', null, date(DATE_W3C, $enddate)); + } + + $this->elementEnd('sitemap'); } } From b919f837971c583118e6139e1bea84fd1a51d3a0 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 11:05:19 -0400 Subject: [PATCH 049/730] max users, notices per sitemap = 50K --- plugins/Sitemap/SitemapPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index fa9c9a76d0..29c32a6242 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -47,8 +47,8 @@ if (!defined('STATUSNET')) { class SitemapPlugin extends Plugin { - const USERS_PER_MAP = 25000; - const NOTICES_PER_MAP = 25000; + const USERS_PER_MAP = 50000; + const NOTICES_PER_MAP = 50000; /** * Load related modules when needed From 9d69906d6b74000bd455b4c14eccf00f8a5d2549 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 11:28:41 -0400 Subject: [PATCH 050/730] use an array for notice sitemap --- plugins/Sitemap/noticesitemap.php | 58 +++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index c8db24efee..6cf2b3d01f 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -43,7 +43,8 @@ if (!defined('STATUSNET')) { class NoticesitemapAction extends SitemapAction { - var $notice = null; + var $notices = null; + var $j = 0; function prepare($args) { @@ -61,10 +62,32 @@ class NoticesitemapAction extends SitemapAction $d += 0; $i += 0; + $this->notices = $this->getNotices($y, $m, $d, $i); + $this->j = 0; + + return true; + } + + function nextUrl() + { + if ($this->j < count($this->notices)) { + $n = $this->notices[$this->j]; + $this->j++; + return array(common_local_url('shownotice', array('notice' => $n[0])), + common_date_w3dtf($n[1]), + null, + null); + } else { + return null; + } + } + + function getNotices($y, $m, $d, $i) + { $offset = ($i-1) * SitemapPlugin::NOTICES_PER_MAP; $limit = SitemapPlugin::NOTICES_PER_MAP; - $this->notice = new Notice(); + $notice = new Notice(); $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); @@ -74,29 +97,26 @@ class NoticesitemapAction extends SitemapAction $enddt = common_sql_date(strtotime($begindt) + (24 * 60 * 60)); - $this->notice->whereAdd("created >= '$begindt'"); - $this->notice->whereAdd("created < '$enddt'"); + $notice->selectAdd(); + $notice->selectAdd('id, created'); - $this->notice->whereAdd('is_local != 0'); + $notice->whereAdd("created >= '$begindt'"); + $notice->whereAdd("created < '$enddt'"); - $this->notice->orderBy('created'); + $notice->whereAdd('is_local != 0'); - $this->notice->limit($offset, $limit); + $notice->orderBy('created'); - $this->notice->find(); + $notice->limit($offset, $limit); - return true; - } + $notice->find(); - function nextUrl() - { - if ($this->notice->fetch()) { - return array(common_local_url('shownotice', array('notice' => $this->notice->id)), - common_date_w3dtf($this->notice->created), - null, - null); - } else { - return null; + $n = array(); + + while ($notice->fetch()) { + $n[] = array($notice->id, $notice->created); } + + return $n; } } From 1030bf35db46044797e521f45d5be38e184ed2db Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 11:52:19 -0400 Subject: [PATCH 051/730] cache results of notice sitemap query --- plugins/Sitemap/noticesitemap.php | 53 ++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index 6cf2b3d01f..bc8a7bfd65 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -84,37 +84,52 @@ class NoticesitemapAction extends SitemapAction function getNotices($y, $m, $d, $i) { - $offset = ($i-1) * SitemapPlugin::NOTICES_PER_MAP; - $limit = SitemapPlugin::NOTICES_PER_MAP; + $n = Notice::cacheGet("sitemap:notice:$y:$m:$d:$i"); - $notice = new Notice(); + if ($n === false) { - $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); + $notice = new Notice(); - // XXX: estimates 1d == 24h, which screws up days - // with leap seconds (1d == 24h + 1s). Thankfully they're - // few and far between. + $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); - $enddt = common_sql_date(strtotime($begindt) + (24 * 60 * 60)); + // XXX: estimates 1d == 24h, which screws up days + // with leap seconds (1d == 24h + 1s). Thankfully they're + // few and far between. - $notice->selectAdd(); - $notice->selectAdd('id, created'); + $theend = strtotime($begindt) + (24 * 60 * 60); + $enddt = common_sql_date($theend); - $notice->whereAdd("created >= '$begindt'"); - $notice->whereAdd("created < '$enddt'"); + $notice->selectAdd(); + $notice->selectAdd('id, created'); - $notice->whereAdd('is_local != 0'); + $notice->whereAdd("created >= '$begindt'"); + $notice->whereAdd("created < '$enddt'"); - $notice->orderBy('created'); + $notice->whereAdd('is_local != 0'); - $notice->limit($offset, $limit); + $notice->orderBy('created'); - $notice->find(); + $offset = ($i-1) * SitemapPlugin::NOTICES_PER_MAP; + $limit = SitemapPlugin::NOTICES_PER_MAP; - $n = array(); + $notice->limit($offset, $limit); - while ($notice->fetch()) { - $n[] = array($notice->id, $notice->created); + $notice->find(); + + $n = array(); + + while ($notice->fetch()) { + $n[] = array($notice->id, $notice->created); + } + + $c = Cache::instance(); + + if (!empty($c)) { + $c->set(Cache::key("sitemap:notice:$y:$m:$d:$i"), + $n, + Cache::COMPRESSED, + ((time() > $theend) ? (time() + 90 * 24 * 60 * 60) : (time() + 5 * 60))); + } } return $n; From c6d9001db552a0980daae82170e00a8373904065 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 12:00:15 -0400 Subject: [PATCH 052/730] cache user data for user sitemap --- plugins/Sitemap/usersitemap.php | 81 +++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 25 deletions(-) diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php index 42cadaca7d..3e5ac46525 100644 --- a/plugins/Sitemap/usersitemap.php +++ b/plugins/Sitemap/usersitemap.php @@ -43,7 +43,8 @@ if (!defined('STATUSNET')) { class UsersitemapAction extends SitemapAction { - var $user = null; + var $users = null; + var $j = 0; function prepare($args) { @@ -61,37 +62,67 @@ class UsersitemapAction extends SitemapAction $d += 0; $i += 0; - $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP; - $limit = SitemapPlugin::USERS_PER_MAP; - - $this->user = new User(); - - $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); - - // XXX: estimates 1d == 24h, which screws up days - // with leap seconds (1d == 24h + 1s). Thankfully they're - // few and far between. - - $enddt = common_sql_date(strtotime($begindt) + (24 * 60 * 60)); - - $this->user->whereAdd("created >= '$begindt'"); - $this->user->whereAdd("created < '$enddt'"); - - $this->user->orderBy('created'); - - $this->user->limit($offset, $limit); - - $this->user->find(); - + $this->users = $this->getUsers($y, $m, $d, $i); + $this->j = 0; return true; } function nextUrl() { - if ($this->user->fetch()) { - return array(common_profile_url($this->user->nickname), null, null, null); + if ($this->j < count($this->users)) { + $nickname = $this->users[$this->j]; + $this->j++; + return array(common_profile_url($nickname), null, null, null); } else { return null; } } + + function getUsers($y, $m, $d, $i) + { + $u = User::cacheGet("sitemap:user:$y:$m:$d:$i"); + + if ($u === false) { + + $user = new User(); + + $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); + + // XXX: estimates 1d == 24h, which screws up days + // with leap seconds (1d == 24h + 1s). Thankfully they're + // few and far between. + + $theend = strtotime($begindt) + (24 * 60 * 60); + $enddt = common_sql_date($theend); + + $user->selectAdd(); + $user->selectAdd('nickname'); + $user->whereAdd("created >= '$begindt'"); + $user->whereAdd("created < '$enddt'"); + + $user->orderBy('created'); + + $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP; + $limit = SitemapPlugin::USERS_PER_MAP; + + $user->limit($offset, $limit); + + $user->find(); + + while ($user->fetch()) { + $u[] = $user->nickname; + } + + $c = Cache::instance(); + + if (!empty($c)) { + $c->set(Cache::key("sitemap:user:$y:$m:$d:$i"), + $u, + Cache::COMPRESSED, + ((time() > $theend) ? (time() + 90 * 24 * 60 * 60) : (time() + 5 * 60))); + } + } + + return $u; + } } From da8b231d2ee4c3b30489d0e010aa2dd29f8e80ec Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 12:06:08 -0400 Subject: [PATCH 053/730] make sure notice and user sitemap are 'in' top level directory --- plugins/Sitemap/SitemapPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 29c32a6242..ed876d94f8 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -89,14 +89,14 @@ class SitemapPlugin extends Plugin $m->connect('sitemapindex.xml', array('action' => 'sitemapindex')); - $m->connect('/sitemaps/notice/:year/:month/:day/:index.xml', + $m->connect('/notice-sitemap-:year-:month-:day-:index.xml', array('action' => 'noticesitemap'), array('year' => '[0-9]{4}', 'month' => '[01][0-9]', 'day' => '[0123][0-9]', 'index' => '[1-9][0-9]*')); - $m->connect('/sitemaps/user/:year/:month/:day/:index.xml', + $m->connect('/user-sitemap-:year-:month-:day-:index.xml', array('action' => 'usersitemap'), array('year' => '[0-9]{4}', 'month' => '[01][0-9]', From 09e5046dd388baf2629aceea66b5101ee4c4fb86 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 12:13:48 -0400 Subject: [PATCH 054/730] cache notice and user counts in sitemap index --- plugins/Sitemap/sitemapindex.php | 46 +++++++++++++++++++------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/plugins/Sitemap/sitemapindex.php b/plugins/Sitemap/sitemapindex.php index 7942bc3bd0..2055dd7f06 100644 --- a/plugins/Sitemap/sitemapindex.php +++ b/plugins/Sitemap/sitemapindex.php @@ -101,20 +101,25 @@ class SitemapindexAction extends Action function getUserCounts() { - // XXX: cachemeplease + $userCounts = User::cacheGet('sitemap:user:counts'); - $user = new User(); + if ($userCounts === false) { - $user->selectAdd(); - $user->selectAdd('date(created) as regdate, count(*) as regcount'); - $user->groupBy('regdate'); + $user = new User(); - $user->find(); + $user->selectAdd(); + $user->selectAdd('date(created) as regdate, count(*) as regcount'); + $user->groupBy('regdate'); - $userCounts = array(); + $user->find(); - while ($user->fetch()) { - $userCounts[$user->regdate] = $user->regcount; + $userCounts = array(); + + while ($user->fetch()) { + $userCounts[$user->regdate] = $user->regcount; + } + + User::cacheSet('sitemap:user:counts', $userCounts); } return $userCounts; @@ -122,20 +127,25 @@ class SitemapindexAction extends Action function getNoticeCounts() { - // XXX: cachemeplease + $noticeCounts = Notice::cacheGet('sitemap:notice:counts'); - $notice = new Notice(); + if ($noticeCounts === false) { - $notice->selectAdd(); - $notice->selectAdd('date(created) as postdate, count(*) as postcount'); - $notice->groupBy('postdate'); + $notice = new Notice(); - $notice->find(); + $notice->selectAdd(); + $notice->selectAdd('date(created) as postdate, count(*) as postcount'); + $notice->groupBy('postdate'); - $noticeCounts = array(); + $notice->find(); - while ($notice->fetch()) { - $noticeCounts[$notice->postdate] = $notice->postcount; + $noticeCounts = array(); + + while ($notice->fetch()) { + $noticeCounts[$notice->postdate] = $notice->postcount; + } + + Notice::cacheSet('sitemap:notice:counts', $noticeCounts); } return $noticeCounts; From f3f652e451bceb64d919f3e8a2fcbeeb6c9dd187 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 14:32:01 -0400 Subject: [PATCH 055/730] add sitemap statement to robots.txt --- plugins/Sitemap/SitemapPlugin.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index ed876d94f8..6fc7021049 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -76,6 +76,23 @@ class SitemapPlugin extends Plugin } } + /** + * Add sitemap-related information at the end of robots.txt + * + * @param Action $action Action being run + * + * @return boolean hook value. + */ + + function onEndRobotsTxt($action) + { + $url = common_local_url('sitemapindex'); + + print "\nSitemap: $url\n"; + + return true; + } + /** * Map URLs to actions * From 5a9ff7c575fb2b23d8b7b3eaf896852bb3501b80 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 14:34:22 -0400 Subject: [PATCH 056/730] note that sitemap actions are readonly --- plugins/Sitemap/sitemapaction.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/Sitemap/sitemapaction.php b/plugins/Sitemap/sitemapaction.php index bab04ed9d2..45edfccc51 100644 --- a/plugins/Sitemap/sitemapaction.php +++ b/plugins/Sitemap/sitemapaction.php @@ -87,4 +87,9 @@ class SitemapAction extends Action { return null; } + + function isReadOnly() + { + return true; + } } From cb5d6d5c30ab6235283005530fadd0d185b38499 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 28 Apr 2010 23:06:08 +0000 Subject: [PATCH 057/730] Fix charset setting for plugin localizations; default setting was blanking out non-ASCII chars. Needed for eg Bulgarian translation of Facebook plugin, was previously showing all as ???s. Now works yay! --- lib/plugin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/plugin.php b/lib/plugin.php index 65ccdafbb0..f63bdf3093 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -91,6 +91,7 @@ class Plugin $path = INSTALLDIR . "/plugins/$name/locale"; if (file_exists($path) && is_dir($path)) { bindtextdomain($name, $path); + bind_textdomain_codeset($name, 'UTF-8'); } } } From ae2986527ce749f22b38f7d1cb9034366ea55566 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 29 Apr 2010 15:49:59 -0700 Subject: [PATCH 058/730] Pull localization updates from 0.9.x --- locale/af/LC_MESSAGES/statusnet.po | 6544 ++++++++++++++++ locale/ar/LC_MESSAGES/statusnet.po | 1958 +++-- locale/arz/LC_MESSAGES/statusnet.po | 1862 +++-- locale/bg/LC_MESSAGES/statusnet.po | 1980 +++-- locale/br/LC_MESSAGES/statusnet.po | 2537 +++--- locale/ca/LC_MESSAGES/statusnet.po | 2270 +++--- locale/cs/LC_MESSAGES/statusnet.po | 1864 +++-- locale/de/LC_MESSAGES/statusnet.po | 2074 +++-- locale/el/LC_MESSAGES/statusnet.po | 1893 +++-- locale/en_GB/LC_MESSAGES/statusnet.po | 1991 +++-- locale/es/LC_MESSAGES/statusnet.po | 2899 ++++--- locale/fa/LC_MESSAGES/statusnet.po | 1886 +++-- locale/fi/LC_MESSAGES/statusnet.po | 1870 +++-- locale/fr/LC_MESSAGES/statusnet.po | 1908 +++-- locale/ga/LC_MESSAGES/statusnet.po | 1854 +++-- locale/gl/LC_MESSAGES/statusnet.po | 6972 +++++++++++++++++ locale/he/LC_MESSAGES/statusnet.po | 1861 +++-- locale/hsb/LC_MESSAGES/statusnet.po | 2080 +++-- locale/ia/LC_MESSAGES/statusnet.po | 2028 +++-- locale/is/LC_MESSAGES/statusnet.po | 1863 +++-- locale/it/LC_MESSAGES/statusnet.po | 1900 +++-- locale/ja/LC_MESSAGES/statusnet.po | 1879 +++-- locale/ko/LC_MESSAGES/statusnet.po | 2206 +++--- locale/mk/LC_MESSAGES/statusnet.po | 1913 +++-- locale/nb/LC_MESSAGES/statusnet.po | 2979 ++++--- locale/nl/LC_MESSAGES/statusnet.po | 1896 +++-- locale/nn/LC_MESSAGES/statusnet.po | 1875 +++-- locale/pl/LC_MESSAGES/statusnet.po | 1899 +++-- locale/pt/LC_MESSAGES/statusnet.po | 2405 +++--- locale/pt_BR/LC_MESSAGES/statusnet.po | 2040 +++-- locale/ru/LC_MESSAGES/statusnet.po | 1922 +++-- locale/statusnet.pot | 1781 +++-- locale/sv/LC_MESSAGES/statusnet.po | 1957 +++-- locale/te/LC_MESSAGES/statusnet.po | 2300 +++--- locale/tr/LC_MESSAGES/statusnet.po | 1860 +++-- locale/uk/LC_MESSAGES/statusnet.po | 1954 +++-- locale/vi/LC_MESSAGES/statusnet.po | 1857 +++-- locale/zh_CN/LC_MESSAGES/statusnet.po | 1878 +++-- locale/zh_TW/LC_MESSAGES/statusnet.po | 1850 +++-- .../OStatus/locale/fr/LC_MESSAGES/OStatus.po | 3 + .../OpenID/locale/nl/LC_MESSAGES/OpenID.po | 340 + 41 files changed, 59655 insertions(+), 29233 deletions(-) create mode 100644 locale/af/LC_MESSAGES/statusnet.po create mode 100644 locale/gl/LC_MESSAGES/statusnet.po create mode 100644 plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po new file mode 100644 index 0000000000..10dab614ef --- /dev/null +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -0,0 +1,6544 @@ +# Translation of StatusNet to Afrikaans +# +# Author@translatewiki.net: Naudefj +# -- +# This file is distributed under the same license as the StatusNet package. +# +msgid "" +msgstr "" +"Project-Id-Version: StatusNet\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:15:59+0000\n" +"Language-Team: Afrikaans\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Translation-Project: translatewiki.net at http://translatewiki.net\n" +"X-Language-Code: af\n" +"X-Message-Group: out-statusnet\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. TRANS: Page title +#. TRANS: Menu item for site administration +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 +msgid "Access" +msgstr "Toegang" + +#. TRANS: Page notice +#: actions/accessadminpanel.php:67 +msgid "Site access settings" +msgstr "Instellings vir toegang tot webwerf" + +#. TRANS: Form legend for registration form. +#: actions/accessadminpanel.php:161 +msgid "Registration" +msgstr "Registratie" + +#. TRANS: Checkbox instructions for admin setting "Private" +#: actions/accessadminpanel.php:165 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "Mag anonieme gebruikers (nie aangeteken nie) die webwerf besigtig?" + +#. TRANS: Checkbox label for prohibiting anonymous users from viewing site. +#: actions/accessadminpanel.php:167 +msgctxt "LABEL" +msgid "Private" +msgstr "Geen anonieme toegang" + +#. TRANS: Checkbox instructions for admin setting "Invite only" +#: actions/accessadminpanel.php:174 +msgid "Make registration invitation only." +msgstr "Registrasie slegs op uitnodiging." + +#. TRANS: Checkbox label for configuring site as invite only. +#: actions/accessadminpanel.php:176 +msgid "Invite only" +msgstr "Slegs op uitnodiging" + +#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations) +#: actions/accessadminpanel.php:183 +msgid "Disable new registrations." +msgstr "Deaktiveer nuwe registrasies." + +#. TRANS: Checkbox label for disabling new user registrations. +#: actions/accessadminpanel.php:185 +msgid "Closed" +msgstr "Gesluit" + +#. TRANS: Title / tooltip for button to save access settings in site admin panel +#: actions/accessadminpanel.php:202 +msgid "Save access settings" +msgstr "Stoor toegangsinstellings" + +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 +msgctxt "BUTTON" +msgid "Save" +msgstr "Stoor" + +#. TRANS: Server error when page not found (404) +#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/showfavorites.php:138 actions/tag.php:52 +#, fuzzy +msgid "No such page." +msgstr "Hierdie bladsy bestaan nie" + +#: actions/all.php:75 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/otp.php:76 actions/remotesubscribe.php:145 +#: actions/remotesubscribe.php:154 actions/replies.php:73 +#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 +msgid "No such user." +msgstr "Onbekende gebruiker." + +#. TRANS: Page title. %1$s is user nickname, %2$d is page number +#: actions/all.php:86 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s en vriende, bladsy %2$d" + +#. TRANS: Page title. %1$s is user nickname +#. TRANS: H1 text. %1$s is user nickname +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 +#, php-format +msgid "%s and friends" +msgstr "%s en vriende" + +#. TRANS: %1$s is user nickname +#: actions/all.php:103 +#, php-format +msgid "Feed for friends of %s (RSS 1.0)" +msgstr "Voer vir vriende van %s (RSS 1.0)" + +#. TRANS: %1$s is user nickname +#: actions/all.php:112 +#, php-format +msgid "Feed for friends of %s (RSS 2.0)" +msgstr "Voer vir vriende van %s (RSS 2.0)" + +#. TRANS: %1$s is user nickname +#: actions/all.php:121 +#, php-format +msgid "Feed for friends of %s (Atom)" +msgstr "Voer vir vriende van %s (Atom)" + +#. TRANS: %1$s is user nickname +#: actions/all.php:134 +#, php-format +msgid "" +"This is the timeline for %s and friends but no one has posted anything yet." +msgstr "" +"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos " +"nie." + +#: actions/all.php:139 +#, php-format +msgid "" +"Try subscribing to more people, [join a group](%%action.groups%%) or post " +"something yourself." +msgstr "" + +#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" +#: actions/all.php:142 +#, php-format +msgid "" +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." +msgstr "" + +#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and then nudge %s or " +"post a notice to his or her attention." +msgstr "" + +#. TRANS: H1 text +#: actions/all.php:178 +msgid "You and friends" +msgstr "U en vriende" + +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 +#, php-format +msgid "Updates from %1$s and friends on %2$s!" +msgstr "Opdaterings van %1$s en vriende op %2$s." + +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 +#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 +#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 +#: actions/apigroupshow.php:115 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +msgid "API method not found." +msgstr "Die API-funksie is nie gevind nie." + +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 +#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +msgid "This method requires a POST." +msgstr "Hierdie metode benodig 'n POST." + +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none." +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "Kon nie die gebruiker opdateer nie." + +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 +#: lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Hierdie gebruiker het nie 'n profiel nie." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Kon nie die profiel stoor nie." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 +#: lib/designsettings.php:283 +#, php-format +msgid "" +"The server was unable to handle that much POST data (%s bytes) due to its " +"current configuration." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 +msgid "Unable to save your design settings." +msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie." + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "Dit was nie moontlik om u ontwerp by te werk nie." + +#: actions/apiblockcreate.php:105 +msgid "You cannot block yourself!" +msgstr "U kan nie uself blokkeer nie!" + +#: actions/apiblockcreate.php:126 +msgid "Block user failed." +msgstr "Die blokkering van die gebruiker het gefaal." + +#: actions/apiblockdestroy.php:114 +msgid "Unblock user failed." +msgstr "Die deblokkering van die gebruiker het gefaal." + +#: actions/apidirectmessage.php:89 +#, php-format +msgid "Direct messages from %s" +msgstr "Direkte boodskappe vanaf %s" + +#: actions/apidirectmessage.php:93 +#, php-format +msgid "All the direct messages sent from %s" +msgstr "Alle direkte boodskappe deur %s gestuur" + +#: actions/apidirectmessage.php:101 +#, php-format +msgid "Direct messages to %s" +msgstr "Direkte boodskappe aan %s" + +#: actions/apidirectmessage.php:105 +#, php-format +msgid "All the direct messages sent to %s" +msgstr "Alle direkte boodskappe gestuur aan %s" + +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Die boodskap bevat geen inhoud nie!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Dit is te lank. Die maksimum boodskaplengte is %d karakters." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Die ontvanger kon gevind word nie." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"U kan nie direkte boodskappe aan gebruikers wat nie op u viendelys is stuur " +"nie." + +#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 +#: actions/apistatusesdestroy.php:113 +msgid "No status found with that ID." +msgstr "Geen status met die ID gevind nie." + +#: actions/apifavoritecreate.php:119 +msgid "This status is already a favorite." +msgstr "Hierdie status is reeds 'n gunsteling." + +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +msgid "Could not create favorite." +msgstr "Dit was nie moontlik om 'n gunsteling te skep nie." + +#: actions/apifavoritedestroy.php:122 +msgid "That status is not a favorite." +msgstr "Hierdie status is nie 'n gunsteling nie." + +#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +msgid "Could not delete favorite." +msgstr "" +"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie." + +#: actions/apifriendshipscreate.php:109 +msgid "Could not follow user: User not found." +msgstr "U kan nie die gebruiker volg nie: die gebruiker bestaan nie." + +#: actions/apifriendshipscreate.php:118 +#, php-format +msgid "Could not follow user: %s is already on your list." +msgstr "U kan nie die gebruiker volg nie: %1 is alreeds op u lys." + +#: actions/apifriendshipsdestroy.php:109 +msgid "Could not unfollow user: User not found." +msgstr "" +"U kan nie die gebruiker van u volglys verwyder nie: die gebruiker bestaan " +"nie." + +#: actions/apifriendshipsdestroy.php:120 +msgid "You cannot unfollow yourself." +msgstr "U kan nie ophou om uself te volg nie." + +#: actions/apifriendshipsexists.php:94 +msgid "Two user ids or screen_names must be supplied." +msgstr "" + +#: actions/apifriendshipsshow.php:134 +msgid "Could not determine source user." +msgstr "" + +#: actions/apifriendshipsshow.php:142 +msgid "Could not find target user." +msgstr "" + +#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/newgroup.php:126 actions/profilesettings.php:215 +#: actions/register.php:205 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "" +"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen " +"spasies bevat nie." + +#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/newgroup.php:130 actions/profilesettings.php:238 +#: actions/register.php:208 +msgid "Nickname already in use. Try another one." +msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een." + +#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/newgroup.php:133 actions/profilesettings.php:218 +#: actions/register.php:210 +msgid "Not a valid nickname." +msgstr "Nie 'n geldige gebruikersnaam nie." + +#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/editgroup.php:199 actions/newapplication.php:203 +#: actions/newgroup.php:139 actions/profilesettings.php:222 +#: actions/register.php:217 +msgid "Homepage is not a valid URL." +msgstr "Tuisblad is nie 'n geldige URL nie." + +#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/newgroup.php:142 actions/profilesettings.php:225 +#: actions/register.php:220 +msgid "Full name is too long (max 255 chars)." +msgstr "Volledige naam is te lang (maksimum 255 karakters)." + +#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/newapplication.php:172 +#, php-format +msgid "Description is too long (max %d chars)." +msgstr "Die beskrywing is te lank (die maksimum is %d karakters)." + +#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/newgroup.php:148 actions/profilesettings.php:232 +#: actions/register.php:227 +msgid "Location is too long (max 255 chars)." +msgstr "Ligging is te lank is (maksimum 255 karakters)." + +#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/newgroup.php:159 +#, php-format +msgid "Too many aliases! Maximum %d." +msgstr "Te veel aliasse! Die maksimum aantal is %d." + +#: actions/apigroupcreate.php:266 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"." +msgstr "Ongeldige alias: \"%s\"" + +#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/newgroup.php:172 +#, php-format +msgid "Alias \"%s\" already in use. Try another one." +msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een." + +#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/newgroup.php:178 +msgid "Alias can't be the same as nickname." +msgstr "Die alias kan nie dieselfde as die gebruikersnaam wees nie." + +#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 +#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 +#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#, fuzzy +msgid "Group not found." +msgstr "Groep nie gevind nie!" + +#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +msgid "You are already a member of that group." +msgstr "U is reeds 'n lid van die groep." + +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +msgid "You have been blocked from that group by the admin." +msgstr "" + +#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#, php-format +msgid "Could not join user %1$s to group %2$s." +msgstr "" + +#: actions/apigroupleave.php:114 +msgid "You are not a member of this group." +msgstr "" + +#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#, php-format +msgid "Could not remove user %1$s from group %2$s." +msgstr "" + +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 +#, php-format +msgid "%s's groups" +msgstr "%s se groepe" + +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Groepe op %1$s waar %2$s lid van is." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#, php-format +msgid "%s groups" +msgstr "%s groepe" + +#: actions/apigrouplistall.php:95 +#, php-format +msgid "groups on %s" +msgstr "groepe op %s" + +#: actions/apioauthauthorize.php:101 +msgid "No oauth_token parameter provided." +msgstr "" + +#: actions/apioauthauthorize.php:106 +msgid "Invalid token." +msgstr "Ongeldige token." + +#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/groupblock.php:66 actions/grouplogo.php:312 +#: actions/groupunblock.php:66 actions/imsettings.php:227 +#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 +#: actions/subscribe.php:86 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/apioauthauthorize.php:135 +msgid "Invalid nickname / password!" +msgstr "Ongeldige gebruikersnaam of wagwoord!" + +#: actions/apioauthauthorize.php:159 +msgid "Database error deleting OAuth application user." +msgstr "" + +#: actions/apioauthauthorize.php:185 +msgid "Database error inserting OAuth application user." +msgstr "" + +#: actions/apioauthauthorize.php:214 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:227 +#, php-format +msgid "The request token %s has been denied and revoked." +msgstr "" + +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. +#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 +#: actions/smssettings.php:277 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Die vorm is onverwags ingestuur." + +#: actions/apioauthauthorize.php:259 +msgid "An application would like to connect to your account" +msgstr "'n Toepassing vra toegang tot u gebruikersinligting" + +#: actions/apioauthauthorize.php:276 +msgid "Allow or deny access" +msgstr "Toegang toelaat of weier" + +#: actions/apioauthauthorize.php:292 +#, php-format +msgid "" +"The application %1$s by %2$s would like " +"the ability to %3$s your %4$s account data. You should only " +"give access to your %4$s account to third parties you trust." +msgstr "" + +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 +msgid "Account" +msgstr "Gebruiker" + +#: actions/apioauthauthorize.php:313 actions/login.php:230 +#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/showgroup.php:245 actions/tagother.php:94 +#: actions/userauthorization.php:145 lib/groupeditform.php:152 +#: lib/userprofile.php:132 +msgid "Nickname" +msgstr "Bynaam" + +#. TRANS: Link description in user account settings menu. +#: actions/apioauthauthorize.php:316 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:125 +msgid "Password" +msgstr "Wagwoord" + +#: actions/apioauthauthorize.php:328 +msgid "Deny" +msgstr "Ontsê" + +#: actions/apioauthauthorize.php:334 +msgid "Allow" +msgstr "Toestaan" + +#: actions/apioauthauthorize.php:351 +msgid "Allow or deny access to your account information." +msgstr "Laat toegang tot u gebruikersinligting toe of weier dit." + +#: actions/apistatusesdestroy.php:107 +msgid "This method requires a POST or DELETE." +msgstr "Hierdie metode vereis 'n POST of DELETE." + +#: actions/apistatusesdestroy.php:130 +msgid "You may not delete another user's status." +msgstr "U mag nie 'n ander gebruiker se status verwyder nie." + +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." +msgstr "Die kennisgewing bestaan nie." + +#: actions/apistatusesretweet.php:83 +msgid "Cannot repeat your own notice." +msgstr "U kan nie u eie kennisgewings herhaal nie." + +#: actions/apistatusesretweet.php:91 +msgid "Already repeated that notice." +msgstr "U het reeds die kennisgewing herhaal." + +#: actions/apistatusesshow.php:138 +msgid "Status deleted." +msgstr "Die status is verwyder." + +#: actions/apistatusesshow.php:144 +msgid "No status with that ID found." +msgstr "Geen status met die ID gevind nie." + +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: lib/mailhandler.php:60 +#, php-format +msgid "That's too long. Max notice size is %d chars." +msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters." + +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Nie gevind nie." + +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#, php-format +msgid "Max notice size is %d chars, including attachment URL." +msgstr "" + +#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 +msgid "Unsupported format." +msgstr "Nie-ondersteunde formaat." + +#: actions/apitimelinefavorites.php:109 +#, php-format +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s / Gunstelinge van %2$s" + +#: actions/apitimelinefavorites.php:118 +#, php-format +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "" + +#: actions/apitimelinementions.php:117 +#, php-format +msgid "%1$s / Updates mentioning %2$s" +msgstr "" + +#: actions/apitimelinementions.php:130 +#, php-format +msgid "%1$s updates that reply to updates from %2$s / %3$s." +msgstr "" + +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#, php-format +msgid "%s public timeline" +msgstr "" + +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#, php-format +msgid "%s updates from everyone!" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, php-format +msgid "Repeated to %s" +msgstr "Na %s herhaal" + +#: actions/apitimelineretweetsofme.php:114 +#, php-format +msgid "Repeats of %s" +msgstr "Herhalings van %s" + +#: actions/apitimelinetag.php:104 actions/tag.php:67 +#, php-format +msgid "Notices tagged with %s" +msgstr "" + +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#, php-format +msgid "Updates tagged with %1$s on %2$s!" +msgstr "" + +#: actions/attachment.php:73 +msgid "No such attachment." +msgstr "Die aanhangsel bestaan nie." + +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/showgroup.php:121 +msgid "No nickname." +msgstr "Geen gebruikersnaam nie." + +#: actions/avatarbynickname.php:64 +msgid "No size." +msgstr "Geen grootte nie." + +#: actions/avatarbynickname.php:69 +msgid "Invalid size." +msgstr "Ongeldige grootte." + +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 +msgid "Avatar" +msgstr "Avatar" + +#: actions/avatarsettings.php:78 +#, php-format +msgid "You can upload your personal avatar. The maximum file size is %s." +msgstr "" + +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "" + +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 +#: actions/grouplogo.php:254 +msgid "Avatar settings" +msgstr "Avatar-instellings" + +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 +#: actions/grouplogo.php:202 actions/grouplogo.php:262 +msgid "Original" +msgstr "Oorspronklik" + +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 +#: actions/grouplogo.php:213 actions/grouplogo.php:274 +msgid "Preview" +msgstr "Voorskou" + +#: actions/avatarsettings.php:149 actions/showapplication.php:252 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 +msgid "Delete" +msgstr "Skrap" + +#: actions/avatarsettings.php:166 actions/grouplogo.php:236 +msgid "Upload" +msgstr "Oplaai" + +#: actions/avatarsettings.php:231 actions/grouplogo.php:289 +msgid "Crop" +msgstr "Uitsny" + +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Geen lêer opgelaai nie." + +#: actions/avatarsettings.php:332 +msgid "Pick a square area of the image to be your avatar" +msgstr "" + +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 +msgid "Lost our file data." +msgstr "" + +#: actions/avatarsettings.php:370 +msgid "Avatar updated." +msgstr "Die avatar is opgedateer." + +#: actions/avatarsettings.php:373 +msgid "Failed updating avatar." +msgstr "Die opdatering van die avatar het gefaal." + +#: actions/avatarsettings.php:397 +msgid "Avatar deleted." +msgstr "Die avatar is verwyder." + +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "U het reeds die gebruiker geblokkeer." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +msgid "Block user" +msgstr "Blokkeer gebruiker" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 +#: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" +msgid "No" +msgstr "Nee" + +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 +msgid "Do not block this user" +msgstr "Moenie hierdie gebruiker blokkeer nie" + +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" +msgid "Yes" +msgstr "Ja" + +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +msgid "Block this user" +msgstr "Blokkeer hierdie gebruiker" + +#: actions/block.php:179 +msgid "Failed to save block information." +msgstr "" + +#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87 +#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62 +#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83 +#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102 +#: actions/groupmembers.php:83 actions/groupmembers.php:90 +#: actions/grouprss.php:98 actions/grouprss.php:105 +#: actions/groupunblock.php:86 actions/joingroup.php:82 +#: actions/joingroup.php:93 actions/leavegroup.php:82 +#: actions/leavegroup.php:93 actions/makeadmin.php:86 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 +msgid "No such group." +msgstr "Die groep bestaan nie." + +#: actions/blockedfromgroup.php:97 +#, php-format +msgid "%s blocked profiles" +msgstr "" + +#: actions/blockedfromgroup.php:100 +#, php-format +msgid "%1$s blocked profiles, page %2$d" +msgstr "" + +#: actions/blockedfromgroup.php:115 +msgid "A list of the users blocked from joining this group." +msgstr "" + +#: actions/blockedfromgroup.php:288 +msgid "Unblock user from group" +msgstr "Gee gebruiker weer toegang tot die groep" + +#: actions/blockedfromgroup.php:320 lib/unblockform.php:69 +msgid "Unblock" +msgstr "Deblokkeer" + +#: actions/blockedfromgroup.php:320 lib/unblockform.php:80 +msgid "Unblock this user" +msgstr "Deblokkeer hierdie gebruiker" + +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" +msgstr "Stuur aan " + +#: actions/confirmaddress.php:75 +msgid "No confirmation code." +msgstr "Geen bevestigingskode." + +#: actions/confirmaddress.php:80 +msgid "Confirmation code not found." +msgstr "" + +#: actions/confirmaddress.php:85 +msgid "That confirmation code is not for you!" +msgstr "" + +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, php-format +msgid "Unrecognized address type %s." +msgstr "" + +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 +msgid "That address has already been confirmed." +msgstr "" + +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 +msgid "Couldn't update user." +msgstr "Kon nie gebruiker opdateer nie." + +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 +msgid "Couldn't delete email confirmation." +msgstr "" + +#: actions/confirmaddress.php:146 +msgid "Confirm address" +msgstr "Bevestig adres" + +#: actions/confirmaddress.php:161 +#, php-format +msgid "The address \"%s\" has been confirmed for your account." +msgstr "" + +#: actions/conversation.php:99 +msgid "Conversation" +msgstr "Gesprek" + +#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 +msgid "Notices" +msgstr "Kennisgewings" + +#: actions/deleteapplication.php:63 +msgid "You must be logged in to delete an application." +msgstr "" + +#: actions/deleteapplication.php:71 +msgid "Application not found." +msgstr "Die applikasie is nie gevind nie." + +#: actions/deleteapplication.php:78 actions/editapplication.php:77 +#: actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "U is nie die eienaar van hierdie applikasie nie." + +#: actions/deleteapplication.php:102 actions/editapplication.php:127 +#: actions/newapplication.php:110 actions/showapplication.php:118 +#: lib/action.php:1253 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/deleteapplication.php:123 actions/deleteapplication.php:147 +msgid "Delete application" +msgstr "Skrap applikasie" + +#: actions/deleteapplication.php:149 +msgid "" +"Are you sure you want to delete this application? This will clear all data " +"about the application from the database, including all existing user " +"connections." +msgstr "" + +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 +msgid "Do not delete this application" +msgstr "Moenie die applikasie verwyder nie" + +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 +msgid "Delete this application" +msgstr "Skrap hierdie applikasie" + +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. +#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 +#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 +#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 +#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 +msgid "Not logged in." +msgstr "Nie aangeteken nie." + +#: actions/deletenotice.php:71 +msgid "Can't delete this notice." +msgstr "Hierdie kennisgewing kan nie verwyder word nie." + +#: actions/deletenotice.php:103 +msgid "" +"You are about to permanently delete a notice. Once this is done, it cannot " +"be undone." +msgstr "" + +#: actions/deletenotice.php:109 actions/deletenotice.php:141 +msgid "Delete notice" +msgstr "Verwyder kennisgewing" + +#: actions/deletenotice.php:144 +msgid "Are you sure you want to delete this notice?" +msgstr "Is u seker u wil hierdie kennisgewing verwyder?" + +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 +msgid "Do not delete this notice" +msgstr "Moenie hierdie kennisgewing verwyder nie" + +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 +msgid "Delete this notice" +msgstr "Verwyder hierdie kennisgewing" + +#: actions/deleteuser.php:67 +msgid "You cannot delete users." +msgstr "U kan nie gebruikers verwyder nie." + +#: actions/deleteuser.php:74 +msgid "You can only delete local users." +msgstr "U kan slegs lokale gebruikers verwyder." + +#: actions/deleteuser.php:110 actions/deleteuser.php:133 +msgid "Delete user" +msgstr "Verwyder gebruiker" + +#: actions/deleteuser.php:136 +msgid "" +"Are you sure you want to delete this user? This will clear all data about " +"the user from the database, without a backup." +msgstr "" + +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 +msgid "Delete this user" +msgstr "Verwyder die gebruiker" + +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 +#: lib/groupnav.php:119 +msgid "Design" +msgstr "Ontwerp" + +#: actions/designadminpanel.php:74 +msgid "Design settings for this StatusNet site." +msgstr "" + +#: actions/designadminpanel.php:276 +msgid "Invalid logo URL." +msgstr "Die logo-URL is ongeldig." + +#: actions/designadminpanel.php:280 +#, fuzzy, php-format +msgid "Theme not available: %s." +msgstr "Tema is nie beskikbaar nie: %s" + +#: actions/designadminpanel.php:376 +msgid "Change logo" +msgstr "Verander logo" + +#: actions/designadminpanel.php:381 +msgid "Site logo" +msgstr "Webwerf-logo" + +#: actions/designadminpanel.php:388 +msgid "Change theme" +msgstr "Verander tema" + +#: actions/designadminpanel.php:405 +msgid "Site theme" +msgstr "Werf se tema" + +#: actions/designadminpanel.php:406 +msgid "Theme for the site." +msgstr "Tema vir die werf." + +#: actions/designadminpanel.php:418 lib/designsettings.php:101 +msgid "Change background image" +msgstr "Verander die agtergrond-prent" + +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 +#: lib/designsettings.php:178 +msgid "Background" +msgstr "Agtergrond" + +#: actions/designadminpanel.php:428 +#, php-format +msgid "" +"You can upload a background image for the site. The maximum file size is %1" +"$s." +msgstr "" + +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 +msgid "On" +msgstr "Aan" + +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 +msgid "Off" +msgstr "Af" + +#: actions/designadminpanel.php:477 lib/designsettings.php:156 +msgid "Turn background image on or off." +msgstr "" + +#: actions/designadminpanel.php:482 lib/designsettings.php:161 +msgid "Tile background image" +msgstr "" + +#: actions/designadminpanel.php:491 lib/designsettings.php:170 +msgid "Change colours" +msgstr "Verander kleure" + +#: actions/designadminpanel.php:513 lib/designsettings.php:191 +msgid "Content" +msgstr "Inhoud" + +#: actions/designadminpanel.php:526 lib/designsettings.php:204 +msgid "Sidebar" +msgstr "Kantstrook" + +#: actions/designadminpanel.php:539 lib/designsettings.php:217 +msgid "Text" +msgstr "Text" + +#: actions/designadminpanel.php:552 lib/designsettings.php:230 +msgid "Links" +msgstr "Skakels" + +#: actions/designadminpanel.php:580 lib/designsettings.php:247 +msgid "Use defaults" +msgstr "Gebruik verstekwaardes" + +#: actions/designadminpanel.php:581 lib/designsettings.php:248 +msgid "Restore default designs" +msgstr "" + +#: actions/designadminpanel.php:587 lib/designsettings.php:254 +msgid "Reset back to default" +msgstr "Stel terug na standaard" + +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 +#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Stoor" + +#: actions/designadminpanel.php:590 lib/designsettings.php:257 +msgid "Save design" +msgstr "Stoor ontwerp" + +#: actions/disfavor.php:81 +msgid "This notice is not a favorite!" +msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!" + +#: actions/disfavor.php:94 +msgid "Add to favorites" +msgstr "Voeg by gunstelinge" + +#: actions/doc.php:158 +#, php-format +msgid "No such document \"%s\"" +msgstr "Onbekende dokument \"%s\"" + +#: actions/editapplication.php:54 +msgid "Edit Application" +msgstr "Wysig applikasie" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "Die applikasie bestaan nie." + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "Gebruik die vorm om u applikasie te wysig." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "'n Naam is verpligtend." + +#: actions/editapplication.php:180 actions/newapplication.php:165 +msgid "Name is too long (max 255 chars)." +msgstr "Die naam is te lank (maksimum 255 karakters)." + +#: actions/editapplication.php:183 actions/newapplication.php:162 +msgid "Name already in use. Try another one." +msgstr "Die naam is reeds in gebruik. Kies 'n ander een." + +#: actions/editapplication.php:186 actions/newapplication.php:168 +msgid "Description is required." +msgstr "Beskrywing word vereis." + +#: actions/editapplication.php:194 +msgid "Source URL is too long." +msgstr "Die bron-URL is te lank." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Source URL is not valid." +msgstr "Die bron-URL is nie geldig nie." + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is required." +msgstr "Organisasie is verpligtend." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization is too long (max 255 chars)." +msgstr "Die organisasienaam is te lang (maksimum 255 karakters)." + +#: actions/editapplication.php:209 actions/newapplication.php:194 +msgid "Organization homepage is required." +msgstr "Die tuisblad vir die organisasie is verpligtend." + +#: actions/editapplication.php:218 actions/newapplication.php:206 +msgid "Callback is too long." +msgstr "Die \"callback\" is te lank." + +#: actions/editapplication.php:225 actions/newapplication.php:215 +msgid "Callback URL is not valid." +msgstr "Die \"callback\"-URL is nie geldig nie." + +#: actions/editapplication.php:258 +msgid "Could not update application." +msgstr "Dit was nie moontlik om die applikasie by te werk nie." + +#: actions/editgroup.php:56 +#, php-format +msgid "Edit %s group" +msgstr "Groep %s wysig" + +#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 +msgid "You must be logged in to create a group." +msgstr "U moet aangeteken wees alvorens u 'n groep kan skep." + +#: actions/editgroup.php:107 actions/editgroup.php:172 +#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109 +msgid "You must be an admin to edit the group." +msgstr "U moet 'n administrateur wees alvorens u 'n groep kan wysig." + +#: actions/editgroup.php:158 +msgid "Use this form to edit the group." +msgstr "Gebruik hierdie vorm om die groep te wysig." + +#: actions/editgroup.php:205 actions/newgroup.php:145 +#, php-format +msgid "description is too long (max %d chars)." +msgstr "Die beskrywing is te lank (die maksimum is %d karakters)." + +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Ongeldige alias: \"%s\"" + +#: actions/editgroup.php:258 +msgid "Could not update group." +msgstr "Dit was nie moontlik om die groep by te werk nie." + +#: actions/editgroup.php:264 classes/User_group.php:496 +msgid "Could not create aliases." +msgstr "Dit was nie moontlik om die aliasse te skep nie." + +#: actions/editgroup.php:280 +msgid "Options saved." +msgstr "Opsies is gestoor." + +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 +msgid "Email settings" +msgstr "E-posvoorkeure" + +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 +#, php-format +msgid "Manage how you get email from %%site.name%%." +msgstr "" + +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "E-posadres" + +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 +msgid "Current confirmed email address." +msgstr "Huidige bevestigde e-posadres." + +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" +msgid "Remove" +msgstr "Verwyder" + +#: actions/emailsettings.php:122 +msgid "" +"Awaiting confirmation on this address. Check your inbox (and spam box!) for " +"a message with further instructions." +msgstr "" + +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" +msgid "Cancel" +msgstr "Kanselleer" + +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 +msgid "Email address, like \"UserName@example.org\"" +msgstr "E-posadres, soos \"UserName@example.org\"" + +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" +msgid "Add" +msgstr "Voeg by" + +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 +msgid "Incoming email" +msgstr "Inkomende e-pos" + +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 +msgid "Send email to this address to post new notices." +msgstr "" + +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 +msgid "Make a new email address for posting to; cancels the old one." +msgstr "" + +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" +msgid "New" +msgstr "Nuut" + +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" +msgstr "Voorkeure" + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 +msgid "Send me notices of new subscriptions through email." +msgstr "" + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 +msgid "Send me email when someone adds my notice as a favorite." +msgstr "" + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 +msgid "Send me email when someone sends me a private message." +msgstr "" + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 +msgid "Send me email when someone sends me an \"@-reply\"." +msgstr "" + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 +msgid "Allow friends to nudge me and send me an email." +msgstr "" + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 +msgid "I want to post notices by email." +msgstr "" + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 +msgid "Publish a MicroID for my email address." +msgstr "" + +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." +msgstr "Voorkeure is gestoor." + +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 +msgid "No email address." +msgstr "Geen e-posadres." + +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 +msgid "Cannot normalize that email address" +msgstr "" + +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/siteadminpanel.php:144 +msgid "Not a valid email address." +msgstr "Nie 'n geldige e-posadres nie." + +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 +msgid "That is already your email address." +msgstr "Dit is al reeds u e-posadres." + +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 +msgid "That email address already belongs to another user." +msgstr "" + +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 +msgid "Couldn't insert confirmation code." +msgstr "" + +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 +msgid "" +"A confirmation code was sent to the email address you added. Check your " +"inbox (and spam box!) for the code and instructions on how to use it." +msgstr "" + +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 +msgid "No pending confirmation to cancel." +msgstr "" + +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." +msgstr "Dit is die verkeerde IM-adres." + +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." +msgstr "Bevestiging gekanselleer." + +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 +msgid "That is not your email address." +msgstr "Dit is nie u e-posadres nie." + +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." +msgstr "Die adres is verwyder." + +#: actions/emailsettings.php:493 actions/smssettings.php:568 +msgid "No incoming email address." +msgstr "Geen inkomende e-posadres." + +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 +msgid "Couldn't update user record." +msgstr "Kon nie gebruikersdata opdateer nie." + +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 +msgid "Incoming email address removed." +msgstr "Inkomende e-posadres is verwyder." + +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 +msgid "New incoming email address added." +msgstr "" + +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + +#: actions/favorited.php:65 lib/popularnoticesection.php:91 +#: lib/publicgroupnav.php:93 +msgid "Popular notices" +msgstr "Populêre kennisgewings" + +#: actions/favorited.php:67 +#, php-format +msgid "Popular notices, page %d" +msgstr "Populêre kennisgewings, bladsy %d" + +#: actions/favorited.php:79 +msgid "The most popular notices on the site right now." +msgstr "" + +#: actions/favorited.php:150 +msgid "Favorite notices appear on this page but no one has favorited one yet." +msgstr "" + +#: actions/favorited.php:153 +msgid "" +"Be the first to add a notice to your favorites by clicking the fave button " +"next to any notice you like." +msgstr "" + +#: actions/favorited.php:156 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to add a " +"notice to your favorites!" +msgstr "" + +#: actions/favoritesrss.php:111 actions/showfavorites.php:77 +#: lib/personalgroupnav.php:115 +#, php-format +msgid "%s's favorite notices" +msgstr "%s se gunsteling kennisgewings" + +#: actions/favoritesrss.php:115 +#, php-format +msgid "Updates favored by %1$s on %2$s!" +msgstr "" + +#: actions/featured.php:69 lib/featureduserssection.php:87 +#: lib/publicgroupnav.php:89 +msgid "Featured users" +msgstr "Nuwe gebruikers" + +#: actions/featured.php:71 +#, php-format +msgid "Featured users, page %d" +msgstr "Nuwe gebruikers, bladsy %d" + +#: actions/featured.php:99 +#, php-format +msgid "A selection of some great users on %s" +msgstr "" + +#: actions/file.php:34 +msgid "No notice ID." +msgstr "Geen kennisgewing-ID." + +#: actions/file.php:38 +msgid "No notice." +msgstr "Geen kennisgewing." + +#: actions/file.php:42 +msgid "No attachments." +msgstr "Geen aanhangsels." + +#: actions/file.php:51 +msgid "No uploaded attachments." +msgstr "" + +#: actions/finishremotesubscribe.php:69 +msgid "Not expecting this response!" +msgstr "" + +#: actions/finishremotesubscribe.php:80 +msgid "User being listened to does not exist." +msgstr "" + +#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 +msgid "You can use the local subscription!" +msgstr "" + +#: actions/finishremotesubscribe.php:99 +msgid "That user has blocked you from subscribing." +msgstr "" + +#: actions/finishremotesubscribe.php:110 +msgid "You are not authorized." +msgstr "" + +#: actions/finishremotesubscribe.php:113 +msgid "Could not convert request token to access token." +msgstr "" + +#: actions/finishremotesubscribe.php:118 +msgid "Remote service uses unknown version of OMB protocol." +msgstr "" + +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." +msgstr "Kon nie die profiel stoor nie." + +#: actions/getfile.php:79 +msgid "No such file." +msgstr "Die lêer bestaan nie." + +#: actions/getfile.php:83 +msgid "Cannot read file." +msgstr "Die lêer kan nie gelees word nie." + +#: actions/grantrole.php:62 actions/revokerole.php:62 +msgid "Invalid role." +msgstr "Ongeldige rol." + +#: actions/grantrole.php:66 actions/revokerole.php:66 +msgid "This role is reserved and cannot be set." +msgstr "" + +#: actions/grantrole.php:75 +msgid "You cannot grant user roles on this site." +msgstr "" + +#: actions/grantrole.php:82 +msgid "User already has this role." +msgstr "" + +#: actions/groupblock.php:71 actions/groupunblock.php:71 +#: actions/makeadmin.php:71 actions/subedit.php:46 +#: lib/profileformaction.php:70 +msgid "No profile specified." +msgstr "Geen profiel verskaf nie." + +#: actions/groupblock.php:76 actions/groupunblock.php:76 +#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +msgid "No profile with that ID." +msgstr "Daar is geen profiel met daardie ID nie." + +#: actions/groupblock.php:81 actions/groupunblock.php:81 +#: actions/makeadmin.php:81 +msgid "No group specified." +msgstr "Geen groep verskaf nie." + +#: actions/groupblock.php:91 +msgid "Only an admin can block group members." +msgstr "" + +#: actions/groupblock.php:95 +msgid "User is already blocked from group." +msgstr "" + +#: actions/groupblock.php:100 +msgid "User is not a member of group." +msgstr "" + +#: actions/groupblock.php:134 actions/groupmembers.php:360 +msgid "Block user from group" +msgstr "Blok gebruiker toegang tot die groep" + +#: actions/groupblock.php:160 +#, php-format +msgid "" +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." +msgstr "" + +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 +msgid "Do not block this user from this group" +msgstr "" + +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 +msgid "Block this user from this group" +msgstr "Blok hierdie gebruiker van hierdie groep" + +#: actions/groupblock.php:206 +msgid "Database error blocking user from group." +msgstr "" + +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Geen ID." + +#: actions/groupdesignsettings.php:68 +msgid "You must be logged in to edit a group." +msgstr "" + +#: actions/groupdesignsettings.php:144 +msgid "Group design" +msgstr "" + +#: actions/groupdesignsettings.php:155 +msgid "" +"Customize the way your group looks with a background image and a colour " +"palette of your choice." +msgstr "" + +#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 +msgid "Couldn't update your design." +msgstr "" + +#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231 +msgid "Design preferences saved." +msgstr "" + +#: actions/grouplogo.php:142 actions/grouplogo.php:195 +msgid "Group logo" +msgstr "Groepslogo" + +#: actions/grouplogo.php:153 +#, php-format +msgid "" +"You can upload a logo image for your group. The maximum file size is %s." +msgstr "" + +#: actions/grouplogo.php:365 +msgid "Pick a square area of the image to be the logo." +msgstr "" + +#: actions/grouplogo.php:399 +msgid "Logo updated." +msgstr "Logo opgedateer." + +#: actions/grouplogo.php:401 +msgid "Failed updating logo." +msgstr "Die opdatering van die logo het gefaal." + +#: actions/groupmembers.php:100 lib/groupnav.php:92 +#, php-format +msgid "%s group members" +msgstr "lede van die groep %s" + +#: actions/groupmembers.php:103 +#, php-format +msgid "%1$s group members, page %2$d" +msgstr "" + +#: actions/groupmembers.php:118 +msgid "A list of the users in this group." +msgstr "" + +#: actions/groupmembers.php:182 lib/groupnav.php:107 +msgid "Admin" +msgstr "Administrateur" + +#: actions/groupmembers.php:392 lib/blockform.php:69 +msgid "Block" +msgstr "Blokkeer" + +#: actions/groupmembers.php:487 +msgid "Make user an admin of the group" +msgstr "" + +#: actions/groupmembers.php:519 +msgid "Make Admin" +msgstr "Maak Admin" + +#: actions/groupmembers.php:519 +msgid "Make this user an admin" +msgstr "Maak hierdie gebruiker 'n administrateur" + +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#, php-format +msgid "%s timeline" +msgstr "%s tydlyn" + +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 +#, php-format +msgid "Updates from members of %1$s on %2$s!" +msgstr "" + +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Groepe" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Groepe, bladsy %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Skep 'n nuwe groep" + +#: actions/groupsearch.php:52 +#, php-format +msgid "" +"Search for groups on %%site.name%% by their name, location, or description. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/groupsearch.php:58 +msgid "Group search" +msgstr "" + +#: actions/groupsearch.php:79 actions/noticesearch.php:117 +#: actions/peoplesearch.php:83 +msgid "No results." +msgstr "Geen resultate nie." + +#: actions/groupsearch.php:82 +#, php-format +msgid "" +"If you can't find the group you're looking for, you can [create it](%%action." +"newgroup%%) yourself." +msgstr "" + +#: actions/groupsearch.php:85 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and [create the group](%%" +"action.newgroup%%) yourself!" +msgstr "" + +#: actions/groupunblock.php:91 +msgid "Only an admin can unblock group members." +msgstr "" + +#: actions/groupunblock.php:95 +msgid "User is not blocked from group." +msgstr "" + +#: actions/groupunblock.php:128 actions/unblock.php:86 +msgid "Error removing the block." +msgstr "" + +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 +msgid "IM settings" +msgstr "IM-instellings" + +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 +#, php-format +msgid "" +"You can send and receive notices through Jabber/GTalk [instant messages](%%" +"doc.im%%). Configure your address and settings below." +msgstr "" + +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 +msgid "IM is not available." +msgstr "IM is nie beskikbaar nie." + +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "IP-adres" + +#: actions/imsettings.php:113 +msgid "Current confirmed Jabber/GTalk address." +msgstr "" + +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 +#, php-format +msgid "" +"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " +"message with further instructions. (Did you add %s to your buddy list?)" +msgstr "" + +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 +#, php-format +msgid "" +"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " +"add %s to your buddy list in your IM client or on GTalk." +msgstr "" + +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Voorkeure" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 +msgid "Send me notices through Jabber/GTalk." +msgstr "" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 +msgid "Post a notice when my Jabber/GTalk status changes." +msgstr "" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 +msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." +msgstr "" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 +msgid "Publish a MicroID for my Jabber/GTalk address." +msgstr "" + +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Voorkeure is gestoor." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 +msgid "No Jabber ID." +msgstr "Geen Jabber-ID nie." + +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 +msgid "Cannot normalize that Jabber ID" +msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie" + +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 +msgid "Not a valid Jabber ID" +msgstr "Nie 'n geldige Jabber-ID nie" + +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 +msgid "That is already your Jabber ID." +msgstr "Dit is al reeds u Jabber-ID." + +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 +msgid "Jabber ID already belongs to another user." +msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik." + +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 +#, php-format +msgid "" +"A confirmation code was sent to the IM address you added. You must approve %" +"s for sending messages to you." +msgstr "" + +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Dit is die verkeerde IM-adres." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "" +"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "Bevestiging gekanselleer." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 +msgid "That is not your Jabber ID." +msgstr "Dit is nie u Jabber-ID nie." + +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Die adres is verwyder." + +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "" + +#: actions/inbox.php:62 +#, php-format +msgid "Inbox for %s" +msgstr "" + +#: actions/inbox.php:115 +msgid "This is your inbox, which lists your incoming private messages." +msgstr "" + +#: actions/invite.php:39 +msgid "Invites have been disabled." +msgstr "" + +#: actions/invite.php:41 +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." +msgstr "U moet aanteken alvorens u by groep kan aansluit." + +#: actions/invite.php:72 +#, php-format +msgid "Invalid email address: %s" +msgstr "Ongeldige e-posadres: %s" + +#: actions/invite.php:110 +msgid "Invitation(s) sent" +msgstr "" + +#: actions/invite.php:112 +msgid "Invite new users" +msgstr "Nooi nuwe gebruikers" + +#: actions/invite.php:128 +msgid "You are already subscribed to these users:" +msgstr "" + +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 +#, php-format +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" + +#: actions/invite.php:136 +msgid "" +"These people are already users and you were automatically subscribed to them:" +msgstr "" + +#: actions/invite.php:144 +msgid "Invitation(s) sent to the following people:" +msgstr "" + +#: actions/invite.php:150 +msgid "" +"You will be notified when your invitees accept the invitation and register " +"on the site. Thanks for growing the community!" +msgstr "" + +#: actions/invite.php:162 +msgid "" +"Use this form to invite your friends and colleagues to use this service." +msgstr "" + +#: actions/invite.php:187 +msgid "Email addresses" +msgstr "E-posadresse" + +#: actions/invite.php:189 +msgid "Addresses of friends to invite (one per line)" +msgstr "" + +#: actions/invite.php:192 +msgid "Personal message" +msgstr "Persoonlike boodskap" + +#: actions/invite.php:194 +msgid "Optionally add a personal message to the invitation." +msgstr "" + +#. TRANS: Send button for inviting friends +#: actions/invite.php:198 +msgctxt "BUTTON" +msgid "Send" +msgstr "Stuur" + +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 +#, php-format +msgid "%1$s has invited you to join them on %2$s" +msgstr "" + +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 +#, php-format +msgid "" +"%1$s has invited you to join them on %2$s (%3$s).\n" +"\n" +"%2$s is a micro-blogging service that lets you keep up-to-date with people " +"you know and people who interest you.\n" +"\n" +"You can also share news about yourself, your thoughts, or your life online " +"with people who know about you. It's also great for meeting new people who " +"share your interests.\n" +"\n" +"%1$s said:\n" +"\n" +"%4$s\n" +"\n" +"You can see %1$s's profile page on %2$s here:\n" +"\n" +"%5$s\n" +"\n" +"If you'd like to try the service, click on the link below to accept the " +"invitation.\n" +"\n" +"%6$s\n" +"\n" +"If not, you can ignore this message. Thanks for your patience and your " +"time.\n" +"\n" +"Sincerely, %2$s\n" +msgstr "" + +#: actions/joingroup.php:60 +msgid "You must be logged in to join a group." +msgstr "U moet aanteken alvorens u by groep kan aansluit." + +#: actions/joingroup.php:88 actions/leavegroup.php:88 +msgid "No nickname or ID." +msgstr "Geen gebruikersnaam of ID nie." + +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 +#, php-format +msgid "%1$s joined group %2$s" +msgstr "%1$s het by groep %2$s aangesluit" + +#: actions/leavegroup.php:60 +msgid "You must be logged in to leave a group." +msgstr "U moet aanteken alvorens u 'n groep kan verlaat." + +#: actions/leavegroup.php:100 lib/command.php:373 +msgid "You are not a member of that group." +msgstr "U is nie 'n lid van daardie groep nie." + +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 +#, php-format +msgid "%1$s left group %2$s" +msgstr "%1$s het die groep %2$s verlaat" + +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +msgid "Already logged in." +msgstr "U is reeds aangeteken." + +#: actions/login.php:126 +msgid "Incorrect username or password." +msgstr "Verkeerde gebruikersnaam of wagwoord." + +#: actions/login.php:132 actions/otp.php:120 +msgid "Error setting user. You are probably not authorized." +msgstr "" + +#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +msgid "Login" +msgstr "Aanteken" + +#: actions/login.php:227 +msgid "Login to site" +msgstr "Teken aan" + +#: actions/login.php:236 actions/register.php:478 +msgid "Remember me" +msgstr "Onthou my" + +#: actions/login.php:237 actions/register.php:480 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" + +#: actions/login.php:247 +msgid "Lost or forgotten password?" +msgstr "Wagwoord verloor of vergeet?" + +#: actions/login.php:266 +msgid "" +"For security reasons, please re-enter your user name and password before " +"changing your settings." +msgstr "" + +#: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Verkeerde gebruikersnaam of wagwoord." + +#: actions/login.php:273 +#, php-format +msgid "" +"Don't have a username yet? [Register](%%action.register%%) a new account." +msgstr "" + +#: actions/makeadmin.php:92 +msgid "Only an admin can make another user an admin." +msgstr "" + +#: actions/makeadmin.php:96 +#, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "" + +#: actions/makeadmin.php:133 +#, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "" + +#: actions/makeadmin.php:146 +#, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "" + +#: actions/microsummary.php:69 +#, fuzzy +msgid "No current status." +msgstr "Geen huidige status" + +#: actions/newapplication.php:52 +msgid "New Application" +msgstr "Nuwe appplikasie" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "" + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "" + +#: actions/newapplication.php:176 +msgid "Source URL is required." +msgstr "'n Bron-URL is verpligtend." + +#: actions/newapplication.php:258 actions/newapplication.php:267 +msgid "Could not create application." +msgstr "Dit was nie moontlik om die applikasie te skep nie." + +#: actions/newgroup.php:53 +msgid "New group" +msgstr "Nuwe groep" + +#: actions/newgroup.php:110 +msgid "Use this form to create a new group." +msgstr "" + +#: actions/newmessage.php:71 actions/newmessage.php:231 +msgid "New message" +msgstr "Nuwe boodskap" + +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 +msgid "You can't send a message to this user." +msgstr "U kan nie 'n boodskap aan hierdie gebruiker stuur nie." + +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 +msgid "No content!" +msgstr "Geen inhoud nie!" + +#: actions/newmessage.php:158 +msgid "No recipient specified." +msgstr "Geen ontvanger gespesifiseer nie." + +#: actions/newmessage.php:164 lib/command.php:484 +msgid "" +"Don't send a message to yourself; just say it to yourself quietly instead." +msgstr "" + +#: actions/newmessage.php:181 +msgid "Message sent" +msgstr "Boodskap is gestuur." + +#: actions/newmessage.php:185 +#, php-format +msgid "Direct message to %s sent." +msgstr "" + +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 +msgid "Ajax Error" +msgstr "Ajax-fout" + +#: actions/newnotice.php:69 +msgid "New notice" +msgstr "" + +#: actions/newnotice.php:217 +msgid "Notice posted" +msgstr "" + +#: actions/noticesearch.php:68 +#, php-format +msgid "" +"Search for notices on %%site.name%% by their contents. Separate search terms " +"by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/noticesearch.php:78 +msgid "Text search" +msgstr "Teks soektog" + +#: actions/noticesearch.php:91 +#, php-format +msgid "Search results for \"%1$s\" on %2$s" +msgstr "" + +#: actions/noticesearch.php:121 +#, php-format +msgid "" +"Be the first to [post on this topic](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" +msgstr "" + +#: actions/noticesearch.php:124 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and be the first to " +"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" +msgstr "" + +#: actions/noticesearchrss.php:96 +#, php-format +msgid "Updates with \"%s\"" +msgstr "Opdaterings met \"%s\"" + +#: actions/noticesearchrss.php:98 +#, php-format +msgid "Updates matching search term \"%1$s\" on %2$s!" +msgstr "" + +#: actions/nudge.php:85 +msgid "" +"This user doesn't allow nudges or hasn't confirmed or set his email yet." +msgstr "" + +#: actions/nudge.php:94 +msgid "Nudge sent" +msgstr "Die por is gestuur" + +#: actions/nudge.php:97 +msgid "Nudge sent!" +msgstr "Die por is gestuur!" + +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "" + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:72 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:83 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:175 +msgid "You are not a user of that application." +msgstr "" + +#: actions/oauthconnectionssettings.php:186 +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "" + +#: actions/oauthconnectionssettings.php:198 +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:211 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + +#: actions/oembed.php:79 actions/shownotice.php:100 +#, fuzzy +msgid "Notice has no profile." +msgstr "Hierdie gebruiker het nie 'n profiel nie." + +#: actions/oembed.php:86 actions/shownotice.php:175 +#, php-format +msgid "%1$s's status on %2$s" +msgstr "Status van %1$s op %2$s" + +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "" + +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "" + +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 +msgid "Not a supported data format." +msgstr "" + +#: actions/opensearch.php:64 +msgid "People Search" +msgstr "Mense soek" + +#: actions/opensearch.php:67 +msgid "Notice Search" +msgstr "" + +#: actions/othersettings.php:60 +msgid "Other settings" +msgstr "" + +#: actions/othersettings.php:71 +msgid "Manage various other options." +msgstr "" + +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "(gratis diens)" + +#: actions/othersettings.php:116 +msgid "Shorten URLs with" +msgstr "" + +#: actions/othersettings.php:117 +msgid "Automatic shortening service to use." +msgstr "" + +#: actions/othersettings.php:122 +msgid "View profile designs" +msgstr "" + +#: actions/othersettings.php:123 +msgid "Show or hide profile designs." +msgstr "" + +#: actions/othersettings.php:153 +msgid "URL shortening service is too long (max 50 chars)." +msgstr "" + +#: actions/otp.php:69 +msgid "No user ID specified." +msgstr "" + +#: actions/otp.php:83 +msgid "No login token specified." +msgstr "" + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "" + +#: actions/otp.php:95 +msgid "Invalid login token specified." +msgstr "" + +#: actions/otp.php:104 +msgid "Login token expired." +msgstr "" + +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "" + +#: actions/outbox.php:61 +#, php-format +msgid "Outbox for %s" +msgstr "" + +#: actions/outbox.php:116 +msgid "This is your outbox, which lists private messages you have sent." +msgstr "" + +#: actions/passwordsettings.php:58 +msgid "Change password" +msgstr "Verander wagwoord" + +#: actions/passwordsettings.php:69 +msgid "Change your password." +msgstr "Verander u wagwoord." + +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 +msgid "Password change" +msgstr "Verander wagwoord" + +#: actions/passwordsettings.php:104 +msgid "Old password" +msgstr "Ou wagwoord" + +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 +msgid "New password" +msgstr "Nuwe wagwoord" + +#: actions/passwordsettings.php:109 +msgid "6 or more characters" +msgstr "6 of meer karakters" + +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 +#: actions/register.php:433 +msgid "Confirm" +msgstr "Bevestig" + +#: actions/passwordsettings.php:113 actions/recoverpassword.php:240 +msgid "Same as password above" +msgstr "Dieselfde as wagwoord hierbo" + +#: actions/passwordsettings.php:117 +msgid "Change" +msgstr "Wysig" + +#: actions/passwordsettings.php:154 actions/register.php:230 +msgid "Password must be 6 or more characters." +msgstr "Wagwoord moet 6 of meer karakters bevat." + +#: actions/passwordsettings.php:157 actions/register.php:233 +msgid "Passwords don't match." +msgstr "Wagwoorde is nie dieselfde nie." + +#: actions/passwordsettings.php:165 +msgid "Incorrect old password" +msgstr "Verkeerde ou wagwoord" + +#: actions/passwordsettings.php:181 +msgid "Error saving user; invalid." +msgstr "Fout tydens stoor van gebruiker; ongeldig." + +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 +msgid "Can't save new password." +msgstr "Kon nie nuwe wagwoord stoor nie." + +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 +msgid "Password saved." +msgstr "Wagwoord gestoor." + +#. TRANS: Menu item for site administration +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 +msgid "Paths" +msgstr "Paaie" + +#: actions/pathsadminpanel.php:70 +msgid "Path and server settings for this StatusNet site." +msgstr "" + +#: actions/pathsadminpanel.php:157 +#, fuzzy, php-format +msgid "Theme directory not readable: %s." +msgstr "Tema is nie beskikbaar nie: %s" + +#: actions/pathsadminpanel.php:163 +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Avatar-gids" + +#: actions/pathsadminpanel.php:169 +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "Agtergrond-gids" + +#: actions/pathsadminpanel.php:177 +#, php-format +msgid "Locales directory not readable: %s." +msgstr "" + +#: actions/pathsadminpanel.php:183 +msgid "Invalid SSL server. The maximum length is 255 characters." +msgstr "" + +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 +msgid "Site" +msgstr "Webtuiste" + +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Bediener" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 +msgid "Path" +msgstr "Pad" + +#: actions/pathsadminpanel.php:242 +msgid "Site path" +msgstr "" + +#: actions/pathsadminpanel.php:246 +msgid "Path to locales" +msgstr "" + +#: actions/pathsadminpanel.php:246 +msgid "Directory path to locales" +msgstr "" + +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "Tema" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "Tema-bediener" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "Tema-pad" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "Tema-gids" + +#: actions/pathsadminpanel.php:279 +msgid "Avatars" +msgstr "Avatars" + +#: actions/pathsadminpanel.php:284 +msgid "Avatar server" +msgstr "Avatar-bediener" + +#: actions/pathsadminpanel.php:288 +msgid "Avatar path" +msgstr "Avatar-pad" + +#: actions/pathsadminpanel.php:292 +msgid "Avatar directory" +msgstr "Avatar-gids" + +#: actions/pathsadminpanel.php:301 +msgid "Backgrounds" +msgstr "Agtergronde" + +#: actions/pathsadminpanel.php:305 +msgid "Background server" +msgstr "Agtergrond-bediener" + +#: actions/pathsadminpanel.php:309 +msgid "Background path" +msgstr "Agtergrond-pad" + +#: actions/pathsadminpanel.php:313 +msgid "Background directory" +msgstr "Agtergrond-gids" + +#: actions/pathsadminpanel.php:320 +msgid "SSL" +msgstr "SSL" + +#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202 +msgid "Never" +msgstr "Nooit" + +#: actions/pathsadminpanel.php:324 +msgid "Sometimes" +msgstr "Soms" + +#: actions/pathsadminpanel.php:325 +msgid "Always" +msgstr "Altyd" + +#: actions/pathsadminpanel.php:329 +msgid "Use SSL" +msgstr "Gebruik SSL" + +#: actions/pathsadminpanel.php:330 +msgid "When to use SSL" +msgstr "Wanneer SSL gebruik moet word" + +#: actions/pathsadminpanel.php:335 +msgid "SSL server" +msgstr "SSL-bediener" + +#: actions/pathsadminpanel.php:336 +msgid "Server to direct SSL requests to" +msgstr "" + +#: actions/pathsadminpanel.php:352 +msgid "Save paths" +msgstr "" + +#: actions/peoplesearch.php:52 +#, php-format +msgid "" +"Search for people on %%site.name%% by their name, location, or interests. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/peoplesearch.php:58 +msgid "People search" +msgstr "Soek gebruikers" + +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." +msgstr "Nie 'n geldige e-posadres nie." + +#: actions/peopletag.php:142 +#, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "" + +#: actions/postnotice.php:95 +#, fuzzy +msgid "Invalid notice content." +msgstr "Ongeldige token." + +#: actions/postnotice.php:101 +#, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." +msgstr "" + +#: actions/profilesettings.php:60 +msgid "Profile settings" +msgstr "" + +#: actions/profilesettings.php:71 +msgid "" +"You can update your personal profile info here so people know more about you." +msgstr "" + +#: actions/profilesettings.php:99 +msgid "Profile information" +msgstr "" + +#: actions/profilesettings.php:108 lib/groupeditform.php:154 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" + +#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 +msgid "Full name" +msgstr "Volledige naam" + +#. TRANS: Form input field label. +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 +msgid "Homepage" +msgstr "Tuisblad" + +#: actions/profilesettings.php:117 actions/register.php:455 +msgid "URL of your homepage, blog, or profile on another site" +msgstr "" + +#: actions/profilesettings.php:122 actions/register.php:461 +#, php-format +msgid "Describe yourself and your interests in %d chars" +msgstr "" + +#: actions/profilesettings.php:125 actions/register.php:464 +msgid "Describe yourself and your interests" +msgstr "" + +#: actions/profilesettings.php:127 actions/register.php:466 +msgid "Bio" +msgstr "Bio" + +#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/showgroup.php:265 actions/tagother.php:112 +#: actions/userauthorization.php:166 lib/groupeditform.php:177 +#: lib/userprofile.php:165 +msgid "Location" +msgstr "Ligging" + +#: actions/profilesettings.php:134 actions/register.php:473 +msgid "Where you are, like \"City, State (or Region), Country\"" +msgstr "" + +#: actions/profilesettings.php:138 +msgid "Share my current location when posting notices" +msgstr "" + +#: actions/profilesettings.php:145 actions/tagother.php:149 +#: actions/tagother.php:209 lib/subscriptionlist.php:106 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 +msgid "Tags" +msgstr "Etikette" + +#: actions/profilesettings.php:147 +msgid "" +"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" +msgstr "" + +#: actions/profilesettings.php:151 +msgid "Language" +msgstr "Taal" + +#: actions/profilesettings.php:152 +msgid "Preferred language" +msgstr "" + +#: actions/profilesettings.php:161 +msgid "Timezone" +msgstr "Tydsone" + +#: actions/profilesettings.php:162 +msgid "What timezone are you normally in?" +msgstr "" + +#: actions/profilesettings.php:167 +msgid "" +"Automatically subscribe to whoever subscribes to me (best for non-humans)" +msgstr "" + +#: actions/profilesettings.php:228 actions/register.php:223 +#, php-format +msgid "Bio is too long (max %d chars)." +msgstr "" + +#: actions/profilesettings.php:235 actions/siteadminpanel.php:151 +msgid "Timezone not selected." +msgstr "" + +#: actions/profilesettings.php:241 +msgid "Language is too long (max 50 chars)." +msgstr "" + +#: actions/profilesettings.php:253 actions/tagother.php:178 +#, php-format +msgid "Invalid tag: \"%s\"" +msgstr "Ongeldige etiket: \"$s\"" + +#: actions/profilesettings.php:306 +msgid "Couldn't update user for autosubscribe." +msgstr "" + +#: actions/profilesettings.php:363 +msgid "Couldn't save location prefs." +msgstr "" + +#: actions/profilesettings.php:375 +msgid "Couldn't save profile." +msgstr "" + +#: actions/profilesettings.php:383 +msgid "Couldn't save tags." +msgstr "" + +#. TRANS: Message after successful saving of administrative settings. +#: actions/profilesettings.php:391 lib/adminpanelaction.php:141 +msgid "Settings saved." +msgstr "Voorkeure is gestoor." + +#: actions/public.php:83 +#, php-format +msgid "Beyond the page limit (%s)." +msgstr "" + +#: actions/public.php:92 +msgid "Could not retrieve public stream." +msgstr "" + +#: actions/public.php:130 +#, php-format +msgid "Public timeline, page %d" +msgstr "" + +#: actions/public.php:132 lib/publicgroupnav.php:79 +msgid "Public timeline" +msgstr "" + +#: actions/public.php:160 +msgid "Public Stream Feed (RSS 1.0)" +msgstr "" + +#: actions/public.php:164 +msgid "Public Stream Feed (RSS 2.0)" +msgstr "" + +#: actions/public.php:168 +msgid "Public Stream Feed (Atom)" +msgstr "" + +#: actions/public.php:188 +#, php-format +msgid "" +"This is the public timeline for %%site.name%% but no one has posted anything " +"yet." +msgstr "" + +#: actions/public.php:191 +msgid "Be the first to post!" +msgstr "U kan die eerste een wees om 'n boodskap te plaas!" + +#: actions/public.php:195 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post!" +msgstr "" + +#: actions/public.php:242 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool. [Join now](%%action.register%%) to share notices about yourself with " +"friends, family, and colleagues! ([Read more](%%doc.help%%))" +msgstr "" + +#: actions/public.php:247 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool." +msgstr "" + +#: actions/publictagcloud.php:57 +msgid "Public tag cloud" +msgstr "" + +#: actions/publictagcloud.php:63 +#, php-format +msgid "These are most popular recent tags on %s " +msgstr "" + +#: actions/publictagcloud.php:69 +#, php-format +msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." +msgstr "" + +#: actions/publictagcloud.php:72 +msgid "Be the first to post one!" +msgstr "" + +#: actions/publictagcloud.php:75 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post " +"one!" +msgstr "" + +#: actions/publictagcloud.php:134 +msgid "Tag cloud" +msgstr "" + +#: actions/recoverpassword.php:36 +msgid "You are already logged in!" +msgstr "" + +#: actions/recoverpassword.php:62 +msgid "No such recovery code." +msgstr "" + +#: actions/recoverpassword.php:66 +msgid "Not a recovery code." +msgstr "" + +#: actions/recoverpassword.php:73 +msgid "Recovery code for unknown user." +msgstr "" + +#: actions/recoverpassword.php:86 +msgid "Error with confirmation code." +msgstr "" + +#: actions/recoverpassword.php:97 +msgid "This confirmation code is too old. Please start again." +msgstr "" + +#: actions/recoverpassword.php:111 +msgid "Could not update user with confirmed email address." +msgstr "" + +#: actions/recoverpassword.php:152 +msgid "" +"If you have forgotten or lost your password, you can get a new one sent to " +"the email address you have stored in your account." +msgstr "" + +#: actions/recoverpassword.php:158 +msgid "You have been identified. Enter a new password below. " +msgstr "" + +#: actions/recoverpassword.php:188 +msgid "Password recovery" +msgstr "" + +#: actions/recoverpassword.php:191 +msgid "Nickname or email address" +msgstr "" + +#: actions/recoverpassword.php:193 +msgid "Your nickname on this server, or your registered email address." +msgstr "" + +#: actions/recoverpassword.php:199 actions/recoverpassword.php:200 +msgid "Recover" +msgstr "" + +#: actions/recoverpassword.php:208 +msgid "Reset password" +msgstr "" + +#: actions/recoverpassword.php:209 +msgid "Recover password" +msgstr "" + +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 +msgid "Password recovery requested" +msgstr "" + +#: actions/recoverpassword.php:213 +msgid "Unknown action" +msgstr "Onbekende aksie" + +#: actions/recoverpassword.php:236 +msgid "6 or more characters, and don't forget it!" +msgstr "" + +#: actions/recoverpassword.php:243 +msgid "Reset" +msgstr "Herstel" + +#: actions/recoverpassword.php:252 +msgid "Enter a nickname or email address." +msgstr "" + +#: actions/recoverpassword.php:282 +msgid "No user with that email address or username." +msgstr "" + +#: actions/recoverpassword.php:299 +msgid "No registered email address for that user." +msgstr "" + +#: actions/recoverpassword.php:313 +msgid "Error saving address confirmation." +msgstr "" + +#: actions/recoverpassword.php:338 +msgid "" +"Instructions for recovering your password have been sent to the email " +"address registered to your account." +msgstr "" + +#: actions/recoverpassword.php:357 +msgid "Unexpected password reset." +msgstr "" + +#: actions/recoverpassword.php:365 +msgid "Password must be 6 chars or more." +msgstr "" + +#: actions/recoverpassword.php:369 +msgid "Password and confirmation do not match." +msgstr "" + +#: actions/recoverpassword.php:388 actions/register.php:248 +msgid "Error setting user." +msgstr "" + +#: actions/recoverpassword.php:395 +msgid "New password successfully saved. You are now logged in." +msgstr "" + +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +msgid "Sorry, only invited people can register." +msgstr "" + +#: actions/register.php:92 +msgid "Sorry, invalid invitation code." +msgstr "" + +#: actions/register.php:112 +msgid "Registration successful" +msgstr "Die registrasie is voltooi" + +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +msgid "Register" +msgstr "Registreer" + +#: actions/register.php:135 +msgid "Registration not allowed." +msgstr "Registrasie nie toegelaat nie." + +#: actions/register.php:198 +msgid "You can't register if you don't agree to the license." +msgstr "" + +#: actions/register.php:212 +msgid "Email address already exists." +msgstr "Die E-posadres bestaan reeds." + +#: actions/register.php:243 actions/register.php:265 +msgid "Invalid username or password." +msgstr "Ongeldige gebruikersnaam of wagwoord." + +#: actions/register.php:343 +msgid "" +"With this form you can create a new account. You can then post notices and " +"link up to friends and colleagues. " +msgstr "" + +#: actions/register.php:425 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." +msgstr "" + +#: actions/register.php:430 +msgid "6 or more characters. Required." +msgstr "" + +#: actions/register.php:434 +msgid "Same as password above. Required." +msgstr "" + +#. TRANS: Link description in user account settings menu. +#: actions/register.php:438 actions/register.php:442 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 +msgid "Email" +msgstr "E-pos" + +#: actions/register.php:439 actions/register.php:443 +msgid "Used only for updates, announcements, and password recovery" +msgstr "" + +#: actions/register.php:450 +msgid "Longer name, preferably your \"real\" name" +msgstr "" + +#: actions/register.php:494 +#, php-format +msgid "" +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." +msgstr "" + +#: actions/register.php:542 +#, php-format +msgid "" +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " +"want to...\n" +"\n" +"* Go to [your profile](%2$s) and post your first message.\n" +"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " +"notices through instant messages.\n" +"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " +"share your interests. \n" +"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell " +"others more about you. \n" +"* Read over the [online docs](%%%%doc.help%%%%) for features you may have " +"missed. \n" +"\n" +"Thanks for signing up and we hope you enjoy using this service." +msgstr "" + +#: actions/register.php:566 +msgid "" +"(You should receive a message by email momentarily, with instructions on how " +"to confirm your email address.)" +msgstr "" + +#: actions/remotesubscribe.php:98 +#, php-format +msgid "" +"To subscribe, you can [login](%%action.login%%), or [register](%%action." +"register%%) a new account. If you already have an account on a [compatible " +"microblogging site](%%doc.openmublog%%), enter your profile URL below." +msgstr "" + +#: actions/remotesubscribe.php:112 +msgid "Remote subscribe" +msgstr "" + +#: actions/remotesubscribe.php:124 +msgid "Subscribe to a remote user" +msgstr "" + +#: actions/remotesubscribe.php:129 +msgid "User nickname" +msgstr "" + +#: actions/remotesubscribe.php:130 +msgid "Nickname of the user you want to follow" +msgstr "" + +#: actions/remotesubscribe.php:133 +msgid "Profile URL" +msgstr "" + +#: actions/remotesubscribe.php:134 +msgid "URL of your profile on another compatible microblogging service" +msgstr "" + +#: actions/remotesubscribe.php:137 lib/subscribeform.php:139 +#: lib/userprofile.php:406 +msgid "Subscribe" +msgstr "" + +#: actions/remotesubscribe.php:159 +msgid "Invalid profile URL (bad format)" +msgstr "" + +#: actions/remotesubscribe.php:168 +msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." +msgstr "" + +#: actions/remotesubscribe.php:176 +msgid "That’s a local profile! Login to subscribe." +msgstr "" + +#: actions/remotesubscribe.php:183 +msgid "Couldn’t get a request token." +msgstr "" + +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +msgid "No notice specified." +msgstr "" + +#: actions/repeat.php:76 +msgid "You can't repeat your own notice." +msgstr "" + +#: actions/repeat.php:90 +msgid "You already repeated that notice." +msgstr "" + +#: actions/repeat.php:114 lib/noticelist.php:675 +msgid "Repeated" +msgstr "Herhalend" + +#: actions/repeat.php:119 +msgid "Repeated!" +msgstr "Herhaal!" + +#: actions/replies.php:126 actions/repliesrss.php:68 +#: lib/personalgroupnav.php:105 +#, php-format +msgid "Replies to %s" +msgstr "" + +#: actions/replies.php:128 +#, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "" + +#: actions/replies.php:145 +#, php-format +msgid "Replies feed for %s (RSS 1.0)" +msgstr "" + +#: actions/replies.php:152 +#, php-format +msgid "Replies feed for %s (RSS 2.0)" +msgstr "" + +#: actions/replies.php:159 +#, php-format +msgid "Replies feed for %s (Atom)" +msgstr "" + +#: actions/replies.php:199 +#, php-format +msgid "" +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." +msgstr "" + +#: actions/replies.php:204 +#, php-format +msgid "" +"You can engage other users in a conversation, subscribe to more people or " +"[join groups](%%action.groups%%)." +msgstr "" + +#: actions/replies.php:206 +#, php-format +msgid "" +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." +msgstr "" + +#: actions/repliesrss.php:72 +#, php-format +msgid "Replies to %1$s on %2$s!" +msgstr "" + +#: actions/revokerole.php:75 +msgid "You cannot revoke user roles on this site." +msgstr "" + +#: actions/revokerole.php:82 +msgid "User doesn't have this role." +msgstr "" + +#: actions/rsd.php:146 actions/version.php:157 +msgid "StatusNet" +msgstr "StatusNet" + +#: actions/sandbox.php:65 actions/unsandbox.php:65 +msgid "You cannot sandbox users on this site." +msgstr "" + +#: actions/sandbox.php:72 +msgid "User is already sandboxed." +msgstr "" + +#. TRANS: Menu item for site administration +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:391 +msgid "Sessions" +msgstr "Sessies" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 +#: actions/useradminpanel.php:294 +msgid "Save site settings" +msgstr "" + +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "" + +#: actions/showapplication.php:157 +msgid "Application profile" +msgstr "" + +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "Ikoon" + +#. TRANS: Form input field label for application name. +#: actions/showapplication.php:169 actions/version.php:195 +#: lib/applicationeditform.php:199 +msgid "Name" +msgstr "Naam" + +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 +msgid "Organization" +msgstr "Organisasie" + +#. TRANS: Form input field label. +#: actions/showapplication.php:187 actions/version.php:198 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 +msgid "Description" +msgstr "Beskrywing" + +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 +msgid "Statistics" +msgstr "Statistieke" + +#: actions/showapplication.php:203 +#, php-format +msgid "Created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:213 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:236 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:261 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:268 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:273 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:278 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:283 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:288 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + +#: actions/showapplication.php:309 +msgid "Are you sure you want to reset your consumer key and secret?" +msgstr "" + +#: actions/showfavorites.php:79 +#, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "" + +#: actions/showfavorites.php:132 +msgid "Could not retrieve favorite notices." +msgstr "" + +#: actions/showfavorites.php:171 +#, php-format +msgid "Feed for favorites of %s (RSS 1.0)" +msgstr "" + +#: actions/showfavorites.php:178 +#, php-format +msgid "Feed for favorites of %s (RSS 2.0)" +msgstr "" + +#: actions/showfavorites.php:185 +#, php-format +msgid "Feed for favorites of %s (Atom)" +msgstr "" + +#: actions/showfavorites.php:206 +msgid "" +"You haven't chosen any favorite notices yet. Click the fave button on " +"notices you like to bookmark them for later or shed a spotlight on them." +msgstr "" + +#: actions/showfavorites.php:208 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Post something interesting " +"they would add to their favorites :)" +msgstr "" + +#: actions/showfavorites.php:212 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Why not [register an " +"account](%%%%action.register%%%%) and then post something interesting they " +"would add to their favorites :)" +msgstr "" + +#: actions/showfavorites.php:243 +msgid "This is a way to share what you like." +msgstr "" + +#: actions/showgroup.php:82 lib/groupnav.php:86 +#, php-format +msgid "%s group" +msgstr "%s groep" + +#: actions/showgroup.php:84 +#, php-format +msgid "%1$s group, page %2$d" +msgstr "Groep %1$s, bladsy %2$d" + +#: actions/showgroup.php:227 +msgid "Group profile" +msgstr "Groepsprofiel" + +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 +msgid "URL" +msgstr "URL" + +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 +msgid "Note" +msgstr "Nota" + +#: actions/showgroup.php:293 lib/groupeditform.php:184 +msgid "Aliases" +msgstr "Aliasse" + +#: actions/showgroup.php:302 +msgid "Group actions" +msgstr "Groepsaksies" + +#: actions/showgroup.php:338 +#, php-format +msgid "Notice feed for %s group (RSS 1.0)" +msgstr "" + +#: actions/showgroup.php:344 +#, php-format +msgid "Notice feed for %s group (RSS 2.0)" +msgstr "" + +#: actions/showgroup.php:350 +#, php-format +msgid "Notice feed for %s group (Atom)" +msgstr "" + +#: actions/showgroup.php:355 +#, php-format +msgid "FOAF for %s group" +msgstr "Vriend van 'n vriend vir die groep %s" + +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 +msgid "Members" +msgstr "Lede" + +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 +msgid "(None)" +msgstr "(geen)" + +#: actions/showgroup.php:404 +msgid "All members" +msgstr "Alle lede" + +#: actions/showgroup.php:447 +msgid "Created" +msgstr "Geskep" + +#: actions/showgroup.php:463 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. [Join now](%%%%action.register%%%%) to become part " +"of this group and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" + +#: actions/showgroup.php:469 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. " +msgstr "" + +#: actions/showgroup.php:497 +msgid "Admins" +msgstr "Administrateurs" + +#: actions/showmessage.php:81 +msgid "No such message." +msgstr "Die boodskap bestaan nie." + +#: actions/showmessage.php:98 +msgid "Only the sender and recipient may read this message." +msgstr "" + +#: actions/showmessage.php:108 +#, php-format +msgid "Message to %1$s on %2$s" +msgstr "" + +#: actions/showmessage.php:113 +#, php-format +msgid "Message from %1$s on %2$s" +msgstr "" + +#: actions/shownotice.php:90 +msgid "Notice deleted." +msgstr "Hierdie kennisgewing is verwyder." + +#: actions/showstream.php:73 +#, php-format +msgid " tagged %s" +msgstr "met die etiket %s" + +#: actions/showstream.php:79 +#, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s, bladsy %2$d" + +#: actions/showstream.php:122 +#, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "" + +#: actions/showstream.php:129 +#, php-format +msgid "Notice feed for %s (RSS 1.0)" +msgstr "" + +#: actions/showstream.php:136 +#, php-format +msgid "Notice feed for %s (RSS 2.0)" +msgstr "" + +#: actions/showstream.php:143 +#, php-format +msgid "Notice feed for %s (Atom)" +msgstr "" + +#: actions/showstream.php:148 +#, php-format +msgid "FOAF for %s" +msgstr "Vriend van 'n vriend (FOAF) vir %s" + +#: actions/showstream.php:200 +#, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "" + +#: actions/showstream.php:205 +msgid "" +"Seen anything interesting recently? You haven't posted any notices yet, now " +"would be a good time to start :)" +msgstr "" + +#: actions/showstream.php:207 +#, php-format +msgid "" +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." +msgstr "" + +#: actions/showstream.php:243 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " +"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" + +#: actions/showstream.php:248 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. " +msgstr "" + +#: actions/showstream.php:305 +#, php-format +msgid "Repeat of %s" +msgstr "Herhaling van %s" + +#: actions/silence.php:65 actions/unsilence.php:65 +msgid "You cannot silence users on this site." +msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie." + +#: actions/silence.php:72 +msgid "User is already silenced." +msgstr "Hierdie gebruiker is reeds stilgemaak." + +#: actions/siteadminpanel.php:69 +msgid "Basic settings for this StatusNet site" +msgstr "" + +#: actions/siteadminpanel.php:133 +msgid "Site name must have non-zero length." +msgstr "" + +#: actions/siteadminpanel.php:141 +msgid "You must have a valid contact email address." +msgstr "" + +#: actions/siteadminpanel.php:159 +#, php-format +msgid "Unknown language \"%s\"." +msgstr "Onbekende taal \"%s\"." + +#: actions/siteadminpanel.php:165 +msgid "Minimum text limit is 0 (unlimited)." +msgstr "" + +#: actions/siteadminpanel.php:171 +msgid "Dupe limit must be one or more seconds." +msgstr "" + +#: actions/siteadminpanel.php:221 +msgid "General" +msgstr "Algemeen" + +#: actions/siteadminpanel.php:224 +msgid "Site name" +msgstr "" + +#: actions/siteadminpanel.php:225 +msgid "The name of your site, like \"Yourcompany Microblog\"" +msgstr "" + +#: actions/siteadminpanel.php:229 +msgid "Brought by" +msgstr "" + +#: actions/siteadminpanel.php:230 +msgid "Text used for credits link in footer of each page" +msgstr "" + +#: actions/siteadminpanel.php:234 +msgid "Brought by URL" +msgstr "" + +#: actions/siteadminpanel.php:235 +msgid "URL used for credits link in footer of each page" +msgstr "" + +#: actions/siteadminpanel.php:239 +msgid "Contact email address for your site" +msgstr "" + +#: actions/siteadminpanel.php:245 +msgid "Local" +msgstr "Lokaal" + +#: actions/siteadminpanel.php:256 +msgid "Default timezone" +msgstr "Standaardtydsone" + +#: actions/siteadminpanel.php:257 +msgid "Default timezone for the site; usually UTC." +msgstr "" + +#: actions/siteadminpanel.php:262 +msgid "Default language" +msgstr "" + +#: actions/siteadminpanel.php:263 +msgid "Site language when autodetection from browser settings is not available" +msgstr "" + +#: actions/siteadminpanel.php:271 +msgid "Limits" +msgstr "Limiete" + +#: actions/siteadminpanel.php:274 +msgid "Text limit" +msgstr "Tekslimiet" + +#: actions/siteadminpanel.php:274 +msgid "Maximum number of characters for notices." +msgstr "Maksimum aantal karakters vir kennisgewings." + +#: actions/siteadminpanel.php:278 +msgid "Dupe limit" +msgstr "Duplikaatlimiet" + +#: actions/siteadminpanel.php:278 +msgid "How long users must wait (in seconds) to post the same thing again." +msgstr "" + +#: actions/sitenoticeadminpanel.php:56 +msgid "Site Notice" +msgstr "" + +#: actions/sitenoticeadminpanel.php:67 +msgid "Edit site-wide message" +msgstr "" + +#: actions/sitenoticeadminpanel.php:103 +msgid "Unable to save site notice." +msgstr "" + +#: actions/sitenoticeadminpanel.php:113 +msgid "Max length for the site-wide notice is 255 chars." +msgstr "" + +#: actions/sitenoticeadminpanel.php:176 +msgid "Site notice text" +msgstr "" + +#: actions/sitenoticeadminpanel.php:178 +msgid "Site-wide notice text (255 chars max; HTML okay)" +msgstr "" + +#: actions/sitenoticeadminpanel.php:198 +msgid "Save site notice" +msgstr "" + +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 +msgid "SMS settings" +msgstr "SMS-instellings" + +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 +#, php-format +msgid "You can receive SMS messages through email from %%site.name%%." +msgstr "" + +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 +msgid "SMS is not available." +msgstr "" + +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "IP-adres" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 +msgid "Current confirmed SMS-enabled phone number." +msgstr "" + +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 +msgid "Awaiting confirmation on this phone number." +msgstr "" + +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 +msgid "Confirmation code" +msgstr "" + +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 +msgid "Enter the code you received on your phone." +msgstr "" + +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Bevestig" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 +msgid "SMS phone number" +msgstr "SMS-nommer" + +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 +msgid "Phone number, no punctuation or spaces, with area code" +msgstr "" + +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Voorkeure" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 +msgid "" +"Send me notices through SMS; I understand I may incur exorbitant charges " +"from my carrier." +msgstr "" + +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "Voorkeure is gestoor." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 +msgid "No phone number." +msgstr "Geen telefoonnommer." + +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 +msgid "No carrier selected." +msgstr "" + +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 +msgid "That is already your phone number." +msgstr "" + +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 +msgid "That phone number already belongs to another user." +msgstr "" + +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 +msgid "" +"A confirmation code was sent to the phone number you added. Check your phone " +"for the code and instructions on how to use it." +msgstr "" + +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 +msgid "That is the wrong confirmation number." +msgstr "" + +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Bevestiging gekanselleer." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 +msgid "That is not your phone number." +msgstr "" + +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "SMS-nommer" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 +msgid "Mobile carrier" +msgstr "" + +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 +msgid "Select a carrier" +msgstr "" + +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 +#, php-format +msgid "" +"Mobile carrier for your phone. If you know a carrier that accepts SMS over " +"email but isn't listed here, send email to let us know at %s." +msgstr "" + +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 +msgid "No code entered" +msgstr "" + +#. TRANS: Menu item for site administration +#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 +#: lib/adminpanelaction.php:407 +msgid "Snapshots" +msgstr "" + +#: actions/snapshotadminpanel.php:65 +msgid "Manage snapshot configuration" +msgstr "" + +#: actions/snapshotadminpanel.php:127 +msgid "Invalid snapshot run value." +msgstr "" + +#: actions/snapshotadminpanel.php:133 +msgid "Snapshot frequency must be a number." +msgstr "" + +#: actions/snapshotadminpanel.php:144 +msgid "Invalid snapshot report URL." +msgstr "" + +#: actions/snapshotadminpanel.php:200 +msgid "Randomly during web hit" +msgstr "" + +#: actions/snapshotadminpanel.php:201 +msgid "In a scheduled job" +msgstr "" + +#: actions/snapshotadminpanel.php:206 +msgid "Data snapshots" +msgstr "" + +#: actions/snapshotadminpanel.php:208 +msgid "When to send statistical data to status.net servers" +msgstr "" + +#: actions/snapshotadminpanel.php:217 +msgid "Frequency" +msgstr "Frekwensie" + +#: actions/snapshotadminpanel.php:218 +msgid "Snapshots will be sent once every N web hits" +msgstr "" + +#: actions/snapshotadminpanel.php:226 +msgid "Report URL" +msgstr "" + +#: actions/snapshotadminpanel.php:227 +msgid "Snapshots will be sent to this URL" +msgstr "" + +#: actions/snapshotadminpanel.php:248 +msgid "Save snapshot settings" +msgstr "" + +#: actions/subedit.php:70 +msgid "You are not subscribed to that profile." +msgstr "" + +#: actions/subedit.php:83 classes/Subscription.php:132 +msgid "Could not save subscription." +msgstr "" + +#: actions/subscribe.php:77 +msgid "This action only accepts POST requests." +msgstr "" + +#: actions/subscribe.php:107 +msgid "No such profile." +msgstr "" + +#: actions/subscribe.php:117 +msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." +msgstr "" + +#: actions/subscribe.php:145 +msgid "Subscribed" +msgstr "" + +#: actions/subscribers.php:50 +#, php-format +msgid "%s subscribers" +msgstr "" + +#: actions/subscribers.php:52 +#, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "" + +#: actions/subscribers.php:63 +msgid "These are the people who listen to your notices." +msgstr "" + +#: actions/subscribers.php:67 +#, php-format +msgid "These are the people who listen to %s's notices." +msgstr "" + +#: actions/subscribers.php:108 +msgid "" +"You have no subscribers. Try subscribing to people you know and they might " +"return the favor" +msgstr "" + +#: actions/subscribers.php:110 +#, php-format +msgid "%s has no subscribers. Want to be the first?" +msgstr "" + +#: actions/subscribers.php:114 +#, php-format +msgid "" +"%s has no subscribers. Why not [register an account](%%%%action.register%%%" +"%) and be the first?" +msgstr "" + +#: actions/subscriptions.php:52 +#, php-format +msgid "%s subscriptions" +msgstr "" + +#: actions/subscriptions.php:54 +#, php-format +msgid "%1$s subscriptions, page %2$d" +msgstr "" + +#: actions/subscriptions.php:65 +msgid "These are the people whose notices you listen to." +msgstr "" + +#: actions/subscriptions.php:69 +#, php-format +msgid "These are the people whose notices %s listens to." +msgstr "" + +#: actions/subscriptions.php:126 +#, php-format +msgid "" +"You're not listening to anyone's notices right now, try subscribing to " +"people you know. Try [people search](%%action.peoplesearch%%), look for " +"members in groups you're interested in and in our [featured users](%%action." +"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " +"automatically subscribe to people you already follow there." +msgstr "" + +#: actions/subscriptions.php:128 actions/subscriptions.php:132 +#, php-format +msgid "%s is not listening to anyone." +msgstr "%s volg niemand nie." + +#: actions/subscriptions.php:208 +msgid "Jabber" +msgstr "Jabber" + +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 +msgid "SMS" +msgstr "SMS" + +#: actions/tag.php:69 +#, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "" + +#: actions/tag.php:87 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:93 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "" + +#: actions/tag.php:99 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + +#: actions/tagother.php:39 +msgid "No ID argument." +msgstr "Geen ID-argument." + +#: actions/tagother.php:65 +#, php-format +msgid "Tag %s" +msgstr "Etiket $s" + +#: actions/tagother.php:77 lib/userprofile.php:76 +msgid "User profile" +msgstr "Gebruikersprofiel" + +#: actions/tagother.php:81 actions/userauthorization.php:132 +#: lib/userprofile.php:103 +msgid "Photo" +msgstr "Foto" + +#: actions/tagother.php:141 +msgid "Tag user" +msgstr "Etiketteer gebruiker" + +#: actions/tagother.php:151 +msgid "" +"Tags for this user (letters, numbers, -, ., and _), comma- or space- " +"separated" +msgstr "" + +#: actions/tagother.php:193 +msgid "" +"You can only tag people you are subscribed to or who are subscribed to you." +msgstr "" + +#: actions/tagother.php:200 +msgid "Could not save tags." +msgstr "" + +#: actions/tagother.php:236 +msgid "Use this form to add tags to your subscribers or subscriptions." +msgstr "" + +#: actions/tagrss.php:35 +msgid "No such tag." +msgstr "Onbekende etiket." + +#: actions/twitapitrends.php:85 +msgid "API method under construction." +msgstr "" + +#: actions/unblock.php:59 +msgid "You haven't blocked that user." +msgstr "" + +#: actions/unsandbox.php:72 +msgid "User is not sandboxed." +msgstr "" + +#: actions/unsilence.php:72 +msgid "User is not silenced." +msgstr "" + +#: actions/unsubscribe.php:77 +#, fuzzy +msgid "No profile ID in request." +msgstr "Daar is geen profiel met daardie ID nie." + +#: actions/unsubscribe.php:98 +msgid "Unsubscribed" +msgstr "" + +#: actions/updateprofile.php:64 actions/userauthorization.php:337 +#, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." +msgstr "" + +#. TRANS: User admin panel title +#: actions/useradminpanel.php:59 +msgctxt "TITLE" +msgid "User" +msgstr "Gebruiker" + +#: actions/useradminpanel.php:70 +msgid "User settings for this StatusNet site." +msgstr "" + +#: actions/useradminpanel.php:149 +msgid "Invalid bio limit. Must be numeric." +msgstr "" + +#: actions/useradminpanel.php:155 +msgid "Invalid welcome text. Max length is 255 characters." +msgstr "" + +#: actions/useradminpanel.php:165 +#, php-format +msgid "Invalid default subscripton: '%1$s' is not user." +msgstr "" + +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 +#: lib/personalgroupnav.php:109 +msgid "Profile" +msgstr "Profiel" + +#: actions/useradminpanel.php:222 +msgid "Bio Limit" +msgstr "Profiellimiet" + +#: actions/useradminpanel.php:223 +msgid "Maximum length of a profile bio in characters." +msgstr "" + +#: actions/useradminpanel.php:231 +msgid "New users" +msgstr "Nuwe gebruikers" + +#: actions/useradminpanel.php:235 +msgid "New user welcome" +msgstr "" + +#: actions/useradminpanel.php:236 +msgid "Welcome text for new users (Max 255 chars)." +msgstr "" + +#: actions/useradminpanel.php:241 +msgid "Default subscription" +msgstr "" + +#: actions/useradminpanel.php:242 +msgid "Automatically subscribe new users to this user." +msgstr "" + +#: actions/useradminpanel.php:251 +msgid "Invitations" +msgstr "Uitnodigings" + +#: actions/useradminpanel.php:256 +msgid "Invitations enabled" +msgstr "" + +#: actions/useradminpanel.php:258 +msgid "Whether to allow users to invite new users." +msgstr "" + +#: actions/userauthorization.php:105 +msgid "Authorize subscription" +msgstr "" + +#: actions/userauthorization.php:110 +msgid "" +"Please check these details to make sure that you want to subscribe to this " +"user’s notices. If you didn’t just ask to subscribe to someone’s notices, " +"click “Reject”." +msgstr "" + +#: actions/userauthorization.php:196 actions/version.php:165 +msgid "License" +msgstr "Lisensie" + +#: actions/userauthorization.php:217 +msgid "Accept" +msgstr "Aanvaar" + +#: actions/userauthorization.php:218 lib/subscribeform.php:115 +#: lib/subscribeform.php:139 +msgid "Subscribe to this user" +msgstr "" + +#: actions/userauthorization.php:219 +msgid "Reject" +msgstr "Verwerp" + +#: actions/userauthorization.php:220 +msgid "Reject this subscription" +msgstr "" + +#: actions/userauthorization.php:232 +msgid "No authorization request!" +msgstr "" + +#: actions/userauthorization.php:254 +msgid "Subscription authorized" +msgstr "" + +#: actions/userauthorization.php:256 +msgid "" +"The subscription has been authorized, but no callback URL was passed. Check " +"with the site’s instructions for details on how to authorize the " +"subscription. Your subscription token is:" +msgstr "" + +#: actions/userauthorization.php:266 +msgid "Subscription rejected" +msgstr "" + +#: actions/userauthorization.php:268 +msgid "" +"The subscription has been rejected, but no callback URL was passed. Check " +"with the site’s instructions for details on how to fully reject the " +"subscription." +msgstr "" + +#: actions/userauthorization.php:303 +#, php-format +msgid "Listener URI ‘%s’ not found here." +msgstr "" + +#: actions/userauthorization.php:308 +#, php-format +msgid "Listenee URI ‘%s’ is too long." +msgstr "" + +#: actions/userauthorization.php:314 +#, php-format +msgid "Listenee URI ‘%s’ is a local user." +msgstr "" + +#: actions/userauthorization.php:329 +#, php-format +msgid "Profile URL ‘%s’ is for a local user." +msgstr "" + +#: actions/userauthorization.php:345 +#, php-format +msgid "Avatar URL ‘%s’ is not valid." +msgstr "" + +#: actions/userauthorization.php:350 +#, php-format +msgid "Can’t read avatar URL ‘%s’." +msgstr "Kan nie die avatar-URL \"%s\" lees nie." + +#: actions/userauthorization.php:355 +#, php-format +msgid "Wrong image type for avatar URL ‘%s’." +msgstr "" + +#: actions/userdesignsettings.php:76 lib/designsettings.php:65 +msgid "Profile design" +msgstr "" + +#: actions/userdesignsettings.php:87 lib/designsettings.php:76 +msgid "" +"Customize the way your profile looks with a background image and a colour " +"palette of your choice." +msgstr "" + +#: actions/userdesignsettings.php:282 +msgid "Enjoy your hotdog!" +msgstr "Geniet u worsbroodjie!" + +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 +#, php-format +msgid "%1$s groups, page %2$d" +msgstr "%1$s groepe, bladsy %2$d" + +#: actions/usergroups.php:132 +msgid "Search for more groups" +msgstr "Soek vir meer groepe" + +#: actions/usergroups.php:159 +#, php-format +msgid "%s is not a member of any group." +msgstr "" + +#: actions/usergroups.php:164 +#, php-format +msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." +msgstr "" + +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 +#, php-format +msgid "Updates from %1$s on %2$s!" +msgstr "Opdaterings van %1$s op %2$s." + +#: actions/version.php:73 +#, php-format +msgid "StatusNet %s" +msgstr "StatusNet %s" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "Medewerkers" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 +msgid "Version" +msgstr "Weergawe" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "Outeur(s)" + +#: classes/File.php:169 +#, php-format +msgid "" +"No file may be larger than %d bytes and the file you sent was %d bytes. Try " +"to upload a smaller version." +msgstr "" + +#: classes/File.php:179 +#, php-format +msgid "A file this large would exceed your user quota of %d bytes." +msgstr "" + +#: classes/File.php:186 +#, php-format +msgid "A file this large would exceed your monthly quota of %d bytes." +msgstr "" + +#: classes/Group_member.php:41 +msgid "Group join failed." +msgstr "" + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "Nie lid van die groep nie." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "" + +#: classes/Local_group.php:41 +msgid "Could not update local group." +msgstr "" + +#: classes/Login_token.php:76 +#, php-format +msgid "Could not create login token for %s" +msgstr "" + +#: classes/Message.php:45 +msgid "You are banned from sending direct messages." +msgstr "" + +#: classes/Message.php:61 +msgid "Could not insert message." +msgstr "" + +#: classes/Message.php:71 +msgid "Could not update message with new URI." +msgstr "" + +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, php-format +msgid "Database error inserting hashtag: %s" +msgstr "" + +#: classes/Notice.php:245 +msgid "Problem saving notice. Too long." +msgstr "" + +#: classes/Notice.php:249 +msgid "Problem saving notice. Unknown user." +msgstr "" + +#: classes/Notice.php:254 +msgid "" +"Too many notices too fast; take a breather and post again in a few minutes." +msgstr "" + +#: classes/Notice.php:260 +msgid "" +"Too many duplicate messages too quickly; take a breather and post again in a " +"few minutes." +msgstr "" + +#: classes/Notice.php:266 +msgid "You are banned from posting notices on this site." +msgstr "" + +#: classes/Notice.php:332 classes/Notice.php:358 +msgid "Problem saving notice." +msgstr "" + +#: classes/Notice.php:967 +msgid "Problem saving group inbox." +msgstr "" + +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "RT @%1$s %2$s" + +#: classes/Subscription.php:74 lib/oauthstore.php:465 +msgid "You have been banned from subscribing." +msgstr "" + +#: classes/Subscription.php:78 +msgid "Already subscribed!" +msgstr "" + +#: classes/Subscription.php:82 +msgid "User has blocked you." +msgstr "" + +#: classes/Subscription.php:167 +msgid "Not subscribed!" +msgstr "" + +#: classes/Subscription.php:173 +msgid "Couldn't delete self-subscription." +msgstr "" + +#: classes/Subscription.php:200 +msgid "Couldn't delete subscription OMB token." +msgstr "" + +#: classes/Subscription.php:211 +msgid "Couldn't delete subscription." +msgstr "" + +#: classes/User.php:363 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Welkom by %1$s, @%2$s!" + +#: classes/User_group.php:480 +msgid "Could not create group." +msgstr "Kon nie die groep skep nie." + +#: classes/User_group.php:489 +msgid "Could not set group URI." +msgstr "" + +#: classes/User_group.php:510 +msgid "Could not set group membership." +msgstr "" + +#: classes/User_group.php:524 +msgid "Could not save local group info." +msgstr "" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 +msgid "Change your profile settings" +msgstr "Verander u profiel gegewens" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 +msgid "Upload an avatar" +msgstr "" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 +msgid "Change your password" +msgstr "Verander u wagwoord" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 +msgid "Change email handling" +msgstr "" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 +msgid "Design your profile" +msgstr "Ontwerp u profiel" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 +msgid "Other options" +msgstr "Ander opsies" + +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Ander" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 +msgid "Untitled page" +msgstr "" + +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 +msgid "Primary site navigation" +msgstr "" + +#. TRANS: Tooltip for main menu option "Personal" +#: lib/action.php:432 +msgctxt "TOOLTIP" +msgid "Personal profile and friends timeline" +msgstr "" + +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 +msgctxt "MENU" +msgid "Personal" +msgstr "Persoonlik" + +#. TRANS: Tooltip for main menu option "Account" +#: lib/action.php:437 +msgctxt "TOOLTIP" +msgid "Change your email, avatar, password, profile" +msgstr "" + +#. TRANS: Tooltip for main menu option "Services" +#: lib/action.php:442 +msgctxt "TOOLTIP" +msgid "Connect to services" +msgstr "" + +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 +msgid "Connect" +msgstr "Konnekteer" + +#. TRANS: Tooltip for menu option "Admin" +#: lib/action.php:448 +msgctxt "TOOLTIP" +msgid "Change site configuration" +msgstr "" + +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 +msgctxt "MENU" +msgid "Admin" +msgstr "Beheer" + +#. TRANS: Tooltip for main menu option "Invite" +#: lib/action.php:455 +#, php-format +msgctxt "TOOLTIP" +msgid "Invite friends and colleagues to join you on %s" +msgstr "" + +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 +msgctxt "MENU" +msgid "Invite" +msgstr "Uitnodig" + +#. TRANS: Tooltip for main menu option "Logout" +#: lib/action.php:464 +msgctxt "TOOLTIP" +msgid "Logout from the site" +msgstr "" + +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 +msgctxt "MENU" +msgid "Logout" +msgstr "Teken uit" + +#. TRANS: Tooltip for main menu option "Register" +#: lib/action.php:472 +msgctxt "TOOLTIP" +msgid "Create an account" +msgstr "Skep 'n gebruiker" + +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 +msgctxt "MENU" +msgid "Register" +msgstr "Registreer" + +#. TRANS: Tooltip for main menu option "Login" +#: lib/action.php:478 +msgctxt "TOOLTIP" +msgid "Login to the site" +msgstr "Meld by die webwerf aan" + +#: lib/action.php:481 +msgctxt "MENU" +msgid "Login" +msgstr "Teken in" + +#. TRANS: Tooltip for main menu option "Help" +#: lib/action.php:484 +msgctxt "TOOLTIP" +msgid "Help me!" +msgstr "Help my!" + +#: lib/action.php:487 +msgctxt "MENU" +msgid "Help" +msgstr "Help" + +#. TRANS: Tooltip for main menu option "Search" +#: lib/action.php:490 +msgctxt "TOOLTIP" +msgid "Search for people or text" +msgstr "Soek na mense of teks" + +#: lib/action.php:493 +msgctxt "MENU" +msgid "Search" +msgstr "Soek" + +#. TRANS: DT element for site notice. String is hidden in default CSS. +#. TRANS: Menu item for site administration +#: lib/action.php:515 lib/adminpanelaction.php:399 +msgid "Site notice" +msgstr "" + +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 +msgid "Local views" +msgstr "" + +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 +msgid "Page notice" +msgstr "" + +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 +msgid "Secondary site navigation" +msgstr "" + +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 +msgid "Help" +msgstr "Help" + +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 +msgid "About" +msgstr "Aangaande" + +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 +msgid "FAQ" +msgstr "Gewilde vrae" + +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 +msgid "TOS" +msgstr "Gebruiksvoorwaardes" + +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 +msgid "Privacy" +msgstr "Privaatheid" + +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 +msgid "Source" +msgstr "Bron" + +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 +msgid "Contact" +msgstr "Kontak" + +#: lib/action.php:784 +msgid "Badge" +msgstr "" + +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 +msgid "StatusNet software license" +msgstr "" + +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, php-format +msgid "" +"**%%site.name%%** is a microblogging service brought to you by [%%site." +"broughtby%%](%%site.broughtbyurl%%)." +msgstr "" + +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 +#, php-format +msgid "**%%site.name%%** is a microblogging service." +msgstr "" + +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 +#, php-format +msgid "" +"It runs the [StatusNet](http://status.net/) microblogging software, version %" +"s, available under the [GNU Affero General Public License](http://www.fsf." +"org/licensing/licenses/agpl-3.0.html)." +msgstr "" + +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 +msgid "Site content license" +msgstr "" + +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 +#, php-format +msgid "Content and data of %1$s are private and confidential." +msgstr "" + +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 +#, php-format +msgid "Content and data copyright by %1$s. All rights reserved." +msgstr "" + +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 +msgid "Content and data copyright by contributors. All rights reserved." +msgstr "" + +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" + +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 +msgid "Pagination" +msgstr "" + +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 +msgid "After" +msgstr "Na" + +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 +msgid "Before" +msgstr "Voor" + +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 +msgid "Can't handle remote content yet." +msgstr "" + +#: lib/activityutils.php:236 +msgid "Can't handle embedded XML content yet." +msgstr "" + +#: lib/activityutils.php:240 +msgid "Can't handle embedded Base64 content yet." +msgstr "" + +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. +#: lib/adminpanelaction.php:98 +msgid "You cannot make changes to this site." +msgstr "" + +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. +#: lib/adminpanelaction.php:110 +msgid "Changes to that panel are not allowed." +msgstr "" + +#. TRANS: Client error message. +#: lib/adminpanelaction.php:229 +msgid "showForm() not implemented." +msgstr "" + +#. TRANS: Client error message +#: lib/adminpanelaction.php:259 +msgid "saveSettings() not implemented." +msgstr "" + +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 +msgid "Unable to delete design setting." +msgstr "" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:349 +msgid "Basic site configuration" +msgstr "" + +#. TRANS: Menu item for site administration +#: lib/adminpanelaction.php:351 +msgctxt "MENU" +msgid "Site" +msgstr "Webtuiste" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:357 +msgid "Design configuration" +msgstr "" + +#. TRANS: Menu item for site administration +#: lib/adminpanelaction.php:359 +msgctxt "MENU" +msgid "Design" +msgstr "Ontwerp" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:365 +msgid "User configuration" +msgstr "" + +#. TRANS: Menu item for site administration +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 +msgid "User" +msgstr "Gebruiker" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:373 +msgid "Access configuration" +msgstr "" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:381 +msgid "Paths configuration" +msgstr "" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:389 +msgid "Sessions configuration" +msgstr "" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:397 +msgid "Edit site notice" +msgstr "" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:405 +msgid "Snapshots configuration" +msgstr "" + +#. TRANS: Client error 401. +#: lib/apiauth.php:113 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 +msgid "Edit application" +msgstr "" + +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 +msgid "Icon for this application" +msgstr "" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 +#, php-format +msgid "Describe your application in %d characters" +msgstr "" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 +msgid "Describe your application" +msgstr "" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 +msgid "URL of the homepage of this application" +msgstr "" + +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 +msgid "Organization responsible for this application" +msgstr "" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 +msgid "URL for the homepage of the organization" +msgstr "" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 +msgid "URL to redirect to after authentication" +msgstr "" + +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 +msgid "Browser" +msgstr "Webblaaier" + +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 +msgid "Desktop" +msgstr "" + +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 +msgid "Type of application, browser or desktop" +msgstr "" + +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 +msgid "Read-only" +msgstr "Lees-alleen" + +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 +msgid "Read-write" +msgstr "Lees-skryf" + +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Kanselleer" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +#, fuzzy +msgid "read-write" +msgstr "Lees-skryf" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +#, fuzzy +msgid "read-only" +msgstr "Lees-alleen" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 +#, fuzzy +msgctxt "BUTTON" +msgid "Revoke" +msgstr "Herroep" + +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 +msgid "Attachments" +msgstr "Aanhangsels" + +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:265 +msgid "Author" +msgstr "Outeur" + +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 +msgid "Provider" +msgstr "Verskaffer" + +#: lib/attachmentnoticesection.php:67 +msgid "Notices where this attachment appears" +msgstr "" + +#: lib/attachmenttagcloudsection.php:48 +msgid "Tags for this attachment" +msgstr "Etikette vir hierdie aanhangsel" + +#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +msgid "Password changing failed" +msgstr "Wagwoord wysiging het misluk" + +#: lib/authenticationplugin.php:235 +msgid "Password changing is not allowed" +msgstr "Wagwoord verandering word nie toegelaat nie" + +#: lib/channel.php:157 lib/channel.php:177 +msgid "Command results" +msgstr "Opdragresultate" + +#: lib/channel.php:229 lib/mailhandler.php:142 +msgid "Command complete" +msgstr "Opdrag voltooi" + +#: lib/channel.php:240 +msgid "Command failed" +msgstr "" + +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "" + +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 +#, php-format +msgid "Could not find a user with nickname %s" +msgstr "" + +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 +msgid "It does not make a lot of sense to nudge yourself!" +msgstr "" + +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 +#, php-format +msgid "Nudge sent to %s" +msgstr "" + +#: lib/command.php:260 +#, php-format +msgid "" +"Subscriptions: %1$s\n" +"Subscribers: %2$s\n" +"Notices: %3$s" +msgstr "" + +#: lib/command.php:302 +msgid "Notice marked as fave." +msgstr "" + +#: lib/command.php:323 +msgid "You are already a member of that group" +msgstr "" + +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s" +msgstr "U kan nie die gebruiker volg nie: die gebruiker bestaan nie." + +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" +msgstr "Kon nie die groep skep nie." + +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 +#, php-format +msgid "Fullname: %s" +msgstr "Volle naam: %s" + +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 +#, php-format +msgid "Location: %s" +msgstr "Ligging: %s" + +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 +#, php-format +msgid "Homepage: %s" +msgstr "Tuisblad: %s" + +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 +#, php-format +msgid "About: %s" +msgstr "Oor: %s" + +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters " +"gestuur." + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + +#: lib/command.php:494 +msgid "Error sending direct message." +msgstr "" + +#: lib/command.php:514 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:519 +msgid "Already repeated that notice" +msgstr "" + +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 +#, php-format +msgid "Notice from %s repeated" +msgstr "" + +#: lib/command.php:531 +msgid "Error repeating notice." +msgstr "" + +#: lib/command.php:562 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" +msgstr "" + +#: lib/command.php:571 +#, php-format +msgid "Reply to %s sent" +msgstr "" + +#: lib/command.php:573 +msgid "Error saving notice." +msgstr "" + +#: lib/command.php:620 +msgid "Specify the name of the user to subscribe to" +msgstr "" + +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" + +#: lib/command.php:634 +#, php-format +msgid "Subscribed to %s" +msgstr "" + +#: lib/command.php:655 lib/command.php:754 +msgid "Specify the name of the user to unsubscribe from" +msgstr "" + +#: lib/command.php:664 +#, php-format +msgid "Unsubscribed from %s" +msgstr "" + +#: lib/command.php:682 lib/command.php:705 +msgid "Command not yet implemented." +msgstr "" + +#: lib/command.php:685 +msgid "Notification off." +msgstr "" + +#: lib/command.php:687 +msgid "Can't turn off notification." +msgstr "" + +#: lib/command.php:708 +msgid "Notification on." +msgstr "" + +#: lib/command.php:710 +msgid "Can't turn on notification." +msgstr "" + +#: lib/command.php:723 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:734 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:761 +#, php-format +msgid "Unsubscribed %s" +msgstr "" + +#: lib/command.php:778 +msgid "You are not subscribed to anyone." +msgstr "" + +#: lib/command.php:780 +msgid "You are subscribed to this person:" +msgid_plural "You are subscribed to these people:" +msgstr[0] "U volg hierdie gebruiker:" +msgstr[1] "U volg hierdie gebruikers:" + +#: lib/command.php:800 +msgid "No one is subscribed to you." +msgstr "" + +#: lib/command.php:802 +msgid "This person is subscribed to you:" +msgid_plural "These people are subscribed to you:" +msgstr[0] "Hierdie gebruiker volg u:" +msgstr[1] "Hierdie gebruikers volg u:" + +#: lib/command.php:822 +msgid "You are not a member of any groups." +msgstr "U is nie 'n lid van enige groep nie." + +#: lib/command.php:824 +msgid "You are a member of this group:" +msgid_plural "You are a member of these groups:" +msgstr[0] "U is 'n lid van hierdie groep:" +msgstr[1] "U is 'n lid van hierdie groepe:" + +#: lib/command.php:838 +msgid "" +"Commands:\n" +"on - turn on notifications\n" +"off - turn off notifications\n" +"help - show this help\n" +"follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" +"leave - unsubscribe from user\n" +"d - direct message to user\n" +"get - get last notice from user\n" +"whois - get profile info on user\n" +"lose - force user to stop following you\n" +"fav - add user's last notice as a 'fave'\n" +"fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" +"reply # - reply to notice with a given id\n" +"reply - reply to the last notice from user\n" +"join - join group\n" +"login - Get a link to login to the web interface\n" +"drop - leave group\n" +"stats - get your stats\n" +"stop - same as 'off'\n" +"quit - same as 'off'\n" +"sub - same as 'follow'\n" +"unsub - same as 'leave'\n" +"last - same as 'get'\n" +"on - not yet implemented.\n" +"off - not yet implemented.\n" +"nudge - remind a user to update.\n" +"invite - not yet implemented.\n" +"track - not yet implemented.\n" +"untrack - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" +msgstr "" + +#: lib/common.php:135 +msgid "No configuration file found. " +msgstr "" + +#: lib/common.php:136 +msgid "I looked for configuration files in the following places: " +msgstr "" + +#: lib/common.php:138 +msgid "You may wish to run the installer to fix this." +msgstr "" + +#: lib/common.php:139 +msgid "Go to the installer." +msgstr "Gaan na die installeerder." + +#: lib/connectsettingsaction.php:110 +msgid "IM" +msgstr "IM" + +#: lib/connectsettingsaction.php:111 +msgid "Updates by instant messenger (IM)" +msgstr "" + +#: lib/connectsettingsaction.php:116 +msgid "Updates by SMS" +msgstr "" + +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + +#: lib/dberroraction.php:60 +msgid "Database error" +msgstr "Databasisfout" + +#: lib/designsettings.php:105 +msgid "Upload file" +msgstr "" + +#: lib/designsettings.php:109 +msgid "" +"You can upload your personal background image. The maximum file size is 2MB." +msgstr "" + +#: lib/designsettings.php:418 +msgid "Design defaults restored." +msgstr "" + +#: lib/disfavorform.php:114 lib/disfavorform.php:140 +msgid "Disfavor this notice" +msgstr "" + +#: lib/favorform.php:114 lib/favorform.php:140 +msgid "Favor this notice" +msgstr "" + +#: lib/favorform.php:140 +msgid "Favor" +msgstr "" + +#: lib/feed.php:85 +msgid "RSS 1.0" +msgstr "RSS 1.0" + +#: lib/feed.php:87 +msgid "RSS 2.0" +msgstr "RSS 2.0" + +#: lib/feed.php:89 +msgid "Atom" +msgstr "Atom" + +#: lib/feed.php:91 +msgid "FOAF" +msgstr "Vriende van vriende (FOAF)" + +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + +#: lib/galleryaction.php:121 +msgid "Filter tags" +msgstr "" + +#: lib/galleryaction.php:131 +msgid "All" +msgstr "Alle" + +#: lib/galleryaction.php:139 +msgid "Select tag to filter" +msgstr "" + +#: lib/galleryaction.php:140 +msgid "Tag" +msgstr "Etiket" + +#: lib/galleryaction.php:141 +msgid "Choose a tag to narrow list" +msgstr "" + +#: lib/galleryaction.php:143 +msgid "Go" +msgstr "OK" + +#: lib/grantroleform.php:91 +#, php-format +msgid "Grant this user the \"%s\" role" +msgstr "" + +#: lib/groupeditform.php:163 +msgid "URL of the homepage or blog of the group or topic" +msgstr "" + +#: lib/groupeditform.php:168 +msgid "Describe the group or topic" +msgstr "" + +#: lib/groupeditform.php:170 +#, php-format +msgid "Describe the group or topic in %d characters" +msgstr "" + +#: lib/groupeditform.php:179 +msgid "" +"Location for the group, if any, like \"City, State (or Region), Country\"" +msgstr "" + +#: lib/groupeditform.php:187 +#, php-format +msgid "Extra nicknames for the group, comma- or space- separated, max %d" +msgstr "" + +#: lib/groupnav.php:85 +msgid "Group" +msgstr "Groep" + +#: lib/groupnav.php:101 +msgid "Blocked" +msgstr "Geblokkeer" + +#: lib/groupnav.php:102 +#, php-format +msgid "%s blocked users" +msgstr "%s geblokkeerde gebruikers" + +#: lib/groupnav.php:108 +#, php-format +msgid "Edit %s group properties" +msgstr "" + +#: lib/groupnav.php:113 +msgid "Logo" +msgstr "Logo" + +#: lib/groupnav.php:114 +#, php-format +msgid "Add or edit %s logo" +msgstr "" + +#: lib/groupnav.php:120 +#, php-format +msgid "Add or edit %s design" +msgstr "" + +#: lib/groupsbymemberssection.php:71 +msgid "Groups with most members" +msgstr "" + +#: lib/groupsbypostssection.php:71 +msgid "Groups with most posts" +msgstr "" + +#: lib/grouptagcloudsection.php:56 +#, php-format +msgid "Tags in %s group's notices" +msgstr "" + +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 +msgid "This page is not available in a media type you accept" +msgstr "" + +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:88 +#, php-format +msgid "That file is too big. The maximum file size is %s." +msgstr "" + +#: lib/imagefile.php:93 +msgid "Partial upload." +msgstr "" + +#: lib/imagefile.php:101 lib/mediafile.php:170 +msgid "System error uploading file." +msgstr "" + +#: lib/imagefile.php:109 +msgid "Not an image or corrupt file." +msgstr "" + +#: lib/imagefile.php:122 +msgid "Lost our file." +msgstr "" + +#: lib/imagefile.php:163 lib/imagefile.php:224 +msgid "Unknown file type" +msgstr "Onbekende lêertipe" + +#: lib/imagefile.php:244 +msgid "MB" +msgstr "MB" + +#: lib/imagefile.php:246 +msgid "kB" +msgstr "kB" + +#: lib/jabber.php:387 +#, php-format +msgid "[%s]" +msgstr "[%s]" + +#: lib/jabber.php:567 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + +#: lib/joinform.php:114 +msgid "Join" +msgstr "Aansluit" + +#: lib/leaveform.php:114 +msgid "Leave" +msgstr "Verlaat" + +#: lib/logingroupnav.php:80 +msgid "Login with a username and password" +msgstr "" + +#: lib/logingroupnav.php:86 +msgid "Sign up for a new account" +msgstr "" + +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 +msgid "Email address confirmation" +msgstr "" + +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 +#, php-format +msgid "" +"Hey, %s.\n" +"\n" +"Someone just entered this email address on %s.\n" +"\n" +"If it was you, and you want to confirm your entry, use the URL below:\n" +"\n" +"\t%s\n" +"\n" +"If not, just ignore this message.\n" +"\n" +"Thanks for your time, \n" +"%s\n" +msgstr "" + +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 +#, php-format +msgid "%1$s is now listening to your notices on %2$s." +msgstr "" + +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 +#, php-format +msgid "" +"%1$s is now listening to your notices on %2$s.\n" +"\n" +"\t%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"Faithfully yours,\n" +"%7$s.\n" +"\n" +"----\n" +"Change your email address or notification options at %8$s\n" +msgstr "" + +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 +#, php-format +msgid "Bio: %s" +msgstr "Beskrywing: %s" + +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 +#, php-format +msgid "New email address for posting to %s" +msgstr "" + +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 +#, php-format +msgid "" +"You have a new posting address on %1$s.\n" +"\n" +"Send email to %2$s to post new messages.\n" +"\n" +"More email instructions at %3$s.\n" +"\n" +"Faithfully yours,\n" +"%4$s" +msgstr "" + +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 +#, php-format +msgid "%s status" +msgstr "%s status" + +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 +msgid "SMS confirmation" +msgstr "SMS-bevestiging" + +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 +#, php-format +msgid "You've been nudged by %s" +msgstr "" + +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 +#, php-format +msgid "" +"%1$s (%2$s) is wondering what you are up to these days and is inviting you " +"to post some news.\n" +"\n" +"So let's hear from you :)\n" +"\n" +"%3$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%4$s\n" +msgstr "" + +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 +#, php-format +msgid "New private message from %s" +msgstr "Nuwe privaat boodskap vanaf %s" + +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 +#, php-format +msgid "" +"%1$s (%2$s) sent you a private message:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"You can reply to their message here:\n" +"\n" +"%4$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%5$s\n" +msgstr "" + +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 +#, php-format +msgid "%s (@%s) added your notice as a favorite" +msgstr "" + +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 +#, php-format +msgid "" +"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" +"\n" +"The URL of your notice is:\n" +"\n" +"%3$s\n" +"\n" +"The text of your notice is:\n" +"\n" +"%4$s\n" +"\n" +"You can see the list of %1$s's favorites here:\n" +"\n" +"%5$s\n" +"\n" +"Faithfully yours,\n" +"%6$s\n" +msgstr "" + +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 +#, php-format +msgid "%s (@%s) sent a notice to your attention" +msgstr "" + +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 +#, php-format +msgid "" +"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" +"\n" +"The notice is here:\n" +"\n" +"\t%3$s\n" +"\n" +"It reads:\n" +"\n" +"\t%4$s\n" +"\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" +msgstr "" + +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: lib/mailbox.php:139 +msgid "" +"You have no private messages. You can send private message to engage other " +"users in conversation. People can send you messages for your eyes only." +msgstr "" + +#: lib/mailbox.php:227 lib/noticelist.php:494 +msgid "from" +msgstr "van" + +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Kan nie boodskap verwerk nie." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Nie 'n geregistreerde gebruiker nie." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Jammer, dit is nie u inkomende e-posadres nie." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Jammer, inkomende e-pos word nie toegelaat nie." + +#: lib/mailhandler.php:228 +#, php-format +msgid "Unsupported message type: %s" +msgstr "" + +#: lib/mediafile.php:98 lib/mediafile.php:123 +msgid "There was a database error while saving your file. Please try again." +msgstr "" + +#: lib/mediafile.php:142 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." +msgstr "" + +#: lib/mediafile.php:147 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form." +msgstr "" + +#: lib/mediafile.php:152 +msgid "The uploaded file was only partially uploaded." +msgstr "" + +#: lib/mediafile.php:159 +msgid "Missing a temporary folder." +msgstr "" + +#: lib/mediafile.php:162 +msgid "Failed to write file to disk." +msgstr "" + +#: lib/mediafile.php:165 +msgid "File upload stopped by extension." +msgstr "" + +#: lib/mediafile.php:179 lib/mediafile.php:216 +msgid "File exceeds user's quota." +msgstr "" + +#: lib/mediafile.php:196 lib/mediafile.php:233 +msgid "File could not be moved to destination directory." +msgstr "" + +#: lib/mediafile.php:201 lib/mediafile.php:237 +msgid "Could not determine file's MIME type." +msgstr "" + +#: lib/mediafile.php:270 +#, php-format +msgid " Try using another %s format." +msgstr "" + +#: lib/mediafile.php:275 +#, php-format +msgid "%s is not a supported file type on this server." +msgstr "" + +#: lib/messageform.php:120 +msgid "Send a direct notice" +msgstr "" + +#: lib/messageform.php:146 +msgid "To" +msgstr "Aan" + +#: lib/messageform.php:159 lib/noticeform.php:185 +msgid "Available characters" +msgstr "Beskikbare karakters" + +#: lib/messageform.php:178 lib/noticeform.php:236 +msgctxt "Send button for sending notice" +msgid "Send" +msgstr "Stuur" + +#: lib/noticeform.php:160 +msgid "Send a notice" +msgstr "" + +#: lib/noticeform.php:173 +#, php-format +msgid "What's up, %s?" +msgstr "Hallo, %s." + +#: lib/noticeform.php:192 +msgid "Attach" +msgstr "Aanheg" + +#: lib/noticeform.php:196 +msgid "Attach a file" +msgstr "Heg 'n lêer aan" + +#: lib/noticeform.php:212 +msgid "Share my location" +msgstr "" + +#: lib/noticeform.php:215 +msgid "Do not share my location" +msgstr "" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + +#. TRANS: Used in coordinates as abbreviation of north +#: lib/noticelist.php:430 +msgid "N" +msgstr "N" + +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 +msgid "S" +msgstr "S" + +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 +msgid "E" +msgstr "O" + +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 +msgid "W" +msgstr "W" + +#: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 +msgid "at" +msgstr "op" + +#: lib/noticelist.php:567 +msgid "in context" +msgstr "in konteks" + +#: lib/noticelist.php:602 +msgid "Repeated by" +msgstr "Herhaal deur" + +#: lib/noticelist.php:629 +msgid "Reply to this notice" +msgstr "" + +#: lib/noticelist.php:630 +msgid "Reply" +msgstr "Antwoord" + +#: lib/noticelist.php:674 +msgid "Notice repeated" +msgstr "" + +#: lib/nudgeform.php:116 +msgid "Nudge this user" +msgstr "" + +#: lib/nudgeform.php:128 +msgid "Nudge" +msgstr "Aanpor" + +#: lib/nudgeform.php:128 +msgid "Send a nudge to this user" +msgstr "" + +#: lib/oauthstore.php:283 +msgid "Error inserting new profile" +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar" +msgstr "" + +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile" +msgstr "" + +#: lib/oauthstore.php:345 +msgid "Duplicate notice" +msgstr "" + +#: lib/oauthstore.php:490 +msgid "Couldn't insert new subscription." +msgstr "" + +#: lib/personalgroupnav.php:99 +msgid "Personal" +msgstr "Persoonlik" + +#: lib/personalgroupnav.php:104 +msgid "Replies" +msgstr "Antwoorde" + +#: lib/personalgroupnav.php:114 +msgid "Favorites" +msgstr "Gunstelinge" + +#: lib/personalgroupnav.php:125 +msgid "Inbox" +msgstr "" + +#: lib/personalgroupnav.php:126 +msgid "Your incoming messages" +msgstr "U inkomende boodskappe" + +#: lib/personalgroupnav.php:130 +msgid "Outbox" +msgstr "" + +#: lib/personalgroupnav.php:131 +msgid "Your sent messages" +msgstr "" + +#: lib/personaltagcloudsection.php:56 +#, php-format +msgid "Tags in %s's notices" +msgstr "" + +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "Onbekend" + +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 +msgid "Subscriptions" +msgstr "" + +#: lib/profileaction.php:126 +msgid "All subscriptions" +msgstr "" + +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 +msgid "Subscribers" +msgstr "" + +#: lib/profileaction.php:161 +msgid "All subscribers" +msgstr "" + +#: lib/profileaction.php:191 +msgid "User ID" +msgstr "Gebruikers-ID" + +#: lib/profileaction.php:196 +msgid "Member since" +msgstr "Lid sedert" + +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Daaglikse gemiddelde" + +#: lib/profileaction.php:264 +msgid "All groups" +msgstr "Alle groepe" + +#: lib/profileformaction.php:114 +msgid "Unimplemented method." +msgstr "" + +#: lib/publicgroupnav.php:78 +msgid "Public" +msgstr "Openbaar" + +#: lib/publicgroupnav.php:82 +msgid "User groups" +msgstr "Gebruikersgroepe" + +#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 +msgid "Recent tags" +msgstr "Onlangse etikette" + +#: lib/publicgroupnav.php:88 +msgid "Featured" +msgstr "Uitgelig" + +#: lib/publicgroupnav.php:92 +msgid "Popular" +msgstr "Gewild" + +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "" + +#: lib/repeatform.php:107 +msgid "Repeat this notice?" +msgstr "" + +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Ja" + +#: lib/repeatform.php:132 +msgid "Repeat this notice" +msgstr "" + +#: lib/revokeroleform.php:91 +#, php-format +msgid "Revoke the \"%s\" role from this user" +msgstr "" + +#: lib/router.php:704 +msgid "No single user defined for single-user mode." +msgstr "" + +#: lib/sandboxform.php:67 +msgid "Sandbox" +msgstr "" + +#: lib/sandboxform.php:78 +msgid "Sandbox this user" +msgstr "" + +#: lib/searchaction.php:120 +msgid "Search site" +msgstr "" + +#: lib/searchaction.php:126 +msgid "Keyword(s)" +msgstr "Term(e)" + +#: lib/searchaction.php:127 +msgid "Search" +msgstr "Soek" + +#: lib/searchaction.php:162 +msgid "Search help" +msgstr "" + +#: lib/searchgroupnav.php:80 +msgid "People" +msgstr "Gebruikers" + +#: lib/searchgroupnav.php:81 +msgid "Find people on this site" +msgstr "" + +#: lib/searchgroupnav.php:83 +msgid "Find content of notices" +msgstr "" + +#: lib/searchgroupnav.php:85 +msgid "Find groups on this site" +msgstr "" + +#: lib/section.php:89 +msgid "Untitled section" +msgstr "" + +#: lib/section.php:106 +msgid "More..." +msgstr "Meer..." + +#: lib/silenceform.php:67 +msgid "Silence" +msgstr "Maak stil" + +#: lib/silenceform.php:78 +msgid "Silence this user" +msgstr "Maak die gebruikers stil" + +#: lib/subgroupnav.php:83 +#, php-format +msgid "People %s subscribes to" +msgstr "" + +#: lib/subgroupnav.php:91 +#, php-format +msgid "People subscribed to %s" +msgstr "" + +#: lib/subgroupnav.php:99 +#, php-format +msgid "Groups %s is a member of" +msgstr "Groepe waarvan %s lid is" + +#: lib/subgroupnav.php:105 +msgid "Invite" +msgstr "Uitnodig" + +#: lib/subgroupnav.php:106 +#, php-format +msgid "Invite friends and colleagues to join you on %s" +msgstr "" + +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/tagcloudsection.php:56 +msgid "None" +msgstr "Geen" + +#: lib/topposterssection.php:74 +msgid "Top posters" +msgstr "Mees aktiewe gebruikers" + +#: lib/unsandboxform.php:69 +msgid "Unsandbox" +msgstr "" + +#: lib/unsandboxform.php:80 +msgid "Unsandbox this user" +msgstr "" + +#: lib/unsilenceform.php:67 +msgid "Unsilence" +msgstr "" + +#: lib/unsilenceform.php:78 +msgid "Unsilence this user" +msgstr "" + +#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 +msgid "Unsubscribe from this user" +msgstr "" + +#: lib/unsubscribeform.php:137 +msgid "Unsubscribe" +msgstr "" + +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "" + +#: lib/userprofile.php:117 +msgid "Edit Avatar" +msgstr "Wysig Avatar" + +#: lib/userprofile.php:234 lib/userprofile.php:248 +msgid "User actions" +msgstr "Gebruikershandelinge" + +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 +msgid "Edit profile settings" +msgstr "Wysig profiel-instellings" + +#: lib/userprofile.php:264 +msgid "Edit" +msgstr "Wysig" + +#: lib/userprofile.php:287 +msgid "Send a direct message to this user" +msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker" + +#: lib/userprofile.php:288 +msgid "Message" +msgstr "Boodskap" + +#: lib/userprofile.php:326 +msgid "Moderate" +msgstr "Modereer" + +#: lib/userprofile.php:364 +msgid "User role" +msgstr "Gebruikersrol" + +#: lib/userprofile.php:366 +msgctxt "role" +msgid "Administrator" +msgstr "Administrateur" + +#: lib/userprofile.php:367 +msgctxt "role" +msgid "Moderator" +msgstr "Moderator" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 +msgid "a few seconds ago" +msgstr "'n paar sekondes gelede" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 +msgid "about a minute ago" +msgstr "ongeveer 'n minuut gelede" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 +#, php-format +msgid "about %d minutes ago" +msgstr "ongeveer %d minute gelede" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 +msgid "about an hour ago" +msgstr "ongeveer 'n uur gelede" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 +#, php-format +msgid "about %d hours ago" +msgstr "ongeveer %d uur gelede" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 +msgid "about a day ago" +msgstr "ongeveer een dag gelede" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 +#, php-format +msgid "about %d days ago" +msgstr "ongeveer %d dae gelede" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 +msgid "about a month ago" +msgstr "ongeveer een maand gelede" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 +#, php-format +msgid "about %d months ago" +msgstr "ongeveer %d maande gelede" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 +msgid "about a year ago" +msgstr "ongeveer een jaar gelede" + +#: lib/webcolor.php:82 +#, php-format +msgid "%s is not a valid color!" +msgstr "%s is nie 'n geldige kleur nie!" + +#: lib/webcolor.php:123 +#, php-format +msgid "%s is not a valid color! Use 3 or 6 hex chars." +msgstr "" +"%s is nie 'n geldige kleur nie. Gebruik drie of ses heksadesimale karakters." + +#: lib/xmppmanager.php:403 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" +"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters " +"gestuur." diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 56029bc82d..84c856ba8c 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:16+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:02+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -23,7 +23,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "نفاذ" @@ -51,7 +51,7 @@ msgstr "خاص" #. TRANS: Checkbox instructions for admin setting "Invite only" #: actions/accessadminpanel.php:174 msgid "Make registration invitation only." -msgstr "" +msgstr "اجعل التسجيل عبر الدعوة فقط." #. TRANS: Checkbox label for configuring site as invite only. #: actions/accessadminpanel.php:176 @@ -73,7 +73,13 @@ msgstr "مُغلق" msgid "Save access settings" msgstr "حفظ إعدادت الوصول" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "احفظ" @@ -81,8 +87,8 @@ msgstr "احفظ" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "لا صفحة كهذه" +msgid "No such page." +msgstr "لا صفحة كهذه." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -92,9 +98,9 @@ msgstr "لا صفحة كهذه" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -102,11 +108,9 @@ msgstr "لا صفحة كهذه" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "لا مستخدم كهذا." @@ -118,8 +122,9 @@ msgstr "%1$s والأصدقاء, الصفحة %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -177,8 +182,10 @@ msgstr "" msgid "You and friends" msgstr "أنت والأصدقاء" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -193,18 +200,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "لم يتم العثور على وسيلة API." @@ -217,15 +224,15 @@ msgstr "لم يتم العثور على وسيلة API." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقة POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -237,7 +244,7 @@ msgstr "تعذّر تحديث المستخدم." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "ليس للمستخدم ملف شخصي." @@ -247,9 +254,9 @@ msgid "Could not save profile." msgstr "لم يمكن حفظ الملف." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -331,7 +338,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "هذه الحالة مفضلة بالفعل." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "تعذّر إنشاء مفضلة." @@ -421,10 +428,9 @@ msgstr "" msgid "Too many aliases! Maximum %d." msgstr "كنيات كيرة! العدد الأقصى هو %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 -#, php-format -msgid "Invalid alias: \"%s\"" +#: actions/apigroupcreate.php:266 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"." msgstr "كنية غير صالحة: \"%s\"" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -441,14 +447,14 @@ msgstr "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "لم توجد المجموعة!" +msgid "Group not found." +msgstr "المجموعة غير موجودة." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -466,17 +472,26 @@ msgstr "لست عضوًا في هذه المجموعة" msgid "Could not remove user %1$s from group %2$s." msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "مجموعات %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "المجموعات التي %s عضو فيها" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "مجموعات %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "مجموعات %s" @@ -491,17 +506,17 @@ msgid "Invalid token." msgstr "حجم غير صالح." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -534,12 +549,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" @@ -559,20 +577,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "الحساب" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "الاسم المستعار" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "كلمة السر" @@ -617,17 +637,17 @@ msgstr "حُذِفت الحالة." msgid "No status with that ID found." msgstr "لا حالة وُجدت بهذه الهوية." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "لم يوجد" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "لم يوجد." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -636,12 +656,12 @@ msgstr "" msgid "Unsupported format." msgstr "نسق غير مدعوم." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" @@ -651,17 +671,17 @@ msgstr "" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "مسار %s الزمني العام" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -676,20 +696,16 @@ msgstr "كرر إلى %s" msgid "Repeats of %s" msgstr "تكرارات %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "الإشعارات الموسومة ب%s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "لم يوجد." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "لا مرفق كهذا." @@ -709,8 +725,9 @@ msgstr "لا حجم." msgid "Invalid size." msgstr "حجم غير صالح." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "أفتار" @@ -720,10 +737,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "بإمكانك رفع أفتارك الشخصي. أقصى حجم للملف هو %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "المستخدم بدون ملف مطابق." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -741,7 +758,7 @@ msgid "Preview" msgstr "معاينة" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "احذف" @@ -753,23 +770,27 @@ msgstr "ارفع" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "لم يُرفع ملف." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "رُفع الأفتار." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "فشل تحديث الأفتار." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "حُذف الأفتار." @@ -777,7 +798,7 @@ msgstr "حُذف الأفتار." msgid "You already blocked that user." msgstr "لقد منعت مسبقا هذا المستخدم." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "امنع المستخدم" @@ -788,27 +809,42 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "لا" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "لا تمنع هذا المستخدم" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "نعم" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "امنع هذا المستخدم" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "فشل حفظ معلومات المنع." @@ -821,8 +857,8 @@ msgstr "فشل حفظ معلومات المنع." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "لا مجموعة كهذه." @@ -852,9 +888,11 @@ msgstr "ألغِ المنع" msgid "Unblock this user" msgstr "ألغِ منع هذا المستخدم" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "" +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "أرسل إلى %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -868,33 +906,43 @@ msgstr "لم يوجد رمز التأكيد." msgid "That confirmation code is not for you!" msgstr "رمز التأكيد ليس لك!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" +msgid "Unrecognized address type %s." msgstr "" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "" -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "تعذّر تحديث المستخدم." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "تعذّر حذف تأكيد البريد الإلكتروني." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "أكد العنوان" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "" @@ -904,7 +952,7 @@ msgid "Conversation" msgstr "محادثة" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "الإشعارات" @@ -923,7 +971,7 @@ msgstr "أنت لست مالك هذا التطبيق." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -938,15 +986,17 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "لا تحذف هذا التطبيق" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "احذف هذا التطبيق" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -975,11 +1025,13 @@ msgstr "احذف الإشعار" msgid "Are you sure you want to delete this notice?" msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1001,125 +1053,129 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "احذف هذا المستخدم" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "التصميم" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "مسار شعار غير صالح." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "السمة غير متوفرة: %s" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "غيّر الشعار" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "شعار الموقع" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "غيّر السمة" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "سمة الموقع" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "سمة الموقع." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "تغيير صورة الخلفية" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "الخلفية" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "بإمكانك رفع صورة خلفية للموقع. أقصى حجم للملف هو %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "مكّن" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "عطّل" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "مكّن صورة الخلفية أو عطّلها." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "تغيير الألوان" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "المحتوى" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "الشريط الجانبي" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "النص" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "وصلات" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "استخدم المبدئيات" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "استعد التصميمات المبدئية" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "ارجع إلى المبدئي" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "أرسل" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "احفظ التصميم" @@ -1224,11 +1280,16 @@ msgstr "استخدم هذا النموذج لتعديل المجموعة." msgid "description is too long (max %d chars)." msgstr "" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "كنية غير صالحة: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "تعذر تحديث المجموعة." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "تعذّر إنشاء الكنى." @@ -1236,178 +1297,229 @@ msgstr "تعذّر إنشاء الكنى." msgid "Options saved." msgstr "حُفظت الخيارات." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "إعدادات البريد الإلكتروني" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "أدر كيف تستلم البريد الإلكتروني من %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "العنوان" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "عنوان البريد الإلكتروني" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "عنوان البريد الإلكتروني المُؤكد الحالي." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "أزل" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "ألغِ" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "عنوان البريد الإلكتروني" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "أضف" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "البريد الإلكتروني الوارد" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديدة." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "أنشئ عنوان بريد إلكتروني لترسل إليه؛ ألغِ القديم." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "جديد" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "التفضيلات" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "تفضيلات البريد الإلكتروني" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "أرسل لي بريدًا إلكرتونيًا عندما يضيف أحدهم إشعاري مفضلة." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد رسالة خاصة." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد \"@-رد\"." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "اسمح لأصدقائي بتنبيهي ومراسلتي عبر البريد الإلكتروني." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكتروني." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "حُفِظت التفضيلات." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "حُفظت تفضيلات البريد الإلكرتوني." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "لا عنوان بريد إلكتروني." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "ليس عنوان بريد صالح." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "هذا هو عنوان بريدك الإكتروني سابقًا." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "تعذّر إدراج رمز التأكيد." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "" -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "هذا عنوان محادثة فورية خاطئ." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "هذا عنوان بريد إلكتروني خطأ." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "أُلغي التأكيد." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "أُلغي تأكيد البريد الإلكتروني." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "هذا ليس عنوان بريدك الإلكتروني." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "أزيل هذا العنوان." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "أزيل عنوان البريد الإلكتروني." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "لا عنوان بريد إلكتروني وارد." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "تعذّر تحديث سجل المستخدم." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" @@ -1520,8 +1632,9 @@ msgstr "" msgid "Remote service uses unknown version of OMB protocol." msgstr "" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "خطأ أثناء تحديث الملف الشخصي البعيد" #: actions/getfile.php:79 @@ -1580,11 +1693,11 @@ msgstr "" msgid "User is not a member of group." msgstr "المستخدم ليس عضوًا في المجموعة." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "امنع المستخدم من المجموعة" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1592,15 +1705,17 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "لا تمنع هذا المستخدم من هذه المجموعة" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "امنع هذا المستخدم من هذه المجموعة" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "خطأ في قاعدة البيانات أثناء منع المستخدم من المجموعة." @@ -1641,10 +1756,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "بإمكانك رفع صورة شعار مجموعتك. أقصى حجم للملف هو %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "المستخدم بدون ملف مطابق." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1675,34 +1786,38 @@ msgstr "قائمة بمستخدمي هذه المجموعة." msgid "Admin" msgstr "إداري" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "امنع" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "اجعل المستخدم إداريًا في المجموعة" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" -msgstr "" +msgstr "اجعله إداريًا" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "اجعل هذا المستخدم إداريًا" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "مسار %s الزمني" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "مجموعات" @@ -1721,8 +1836,12 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" +"تتيح لك مجموعات %%%%site.name%%%% إيجاد أشخاص ذوي اهتمامات مشتركة والتحدث " +"معهم. تستطيع إرسال رسائل إلى جميع أعضاء المجموعة الآخرين بعد الانضمام إليها " +"عبر الصياغة \"!اسم_المجموعة\". ألا ترى مجموعة تعجبك؟ جرّب [البحث عن مجموعة](%%" +"%%action.groupsearch%%%%) أو [ابدأ مجموعتك!](%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "أنشئ مجموعة جديدة" @@ -1732,6 +1851,8 @@ msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" +"ابحث عن مجموعات على %%site.name%% بدلالة الاسم أو الموقع أو الوصف. افصل " +"عبارات البحث بمسافات؛ ويجب أن تتكون تلك العبارات من 3 أحرف أو أكثر." #: actions/groupsearch.php:58 msgid "Group search" @@ -1768,90 +1889,147 @@ msgstr "المستخدم ليس ممنوعًا من المجموعة." msgid "Error removing the block." msgstr "خطأ أثناء منع الحجب." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "إعدادات المراسلة الفورية" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "المراسلة الفورية غير متوفرة." -#: actions/imsettings.php:106 -msgid "Current confirmed Jabber/GTalk address." -msgstr "" +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "عنوان المراسلة الفورية" -#: actions/imsettings.php:114 +#: actions/imsettings.php:113 +msgid "Current confirmed Jabber/GTalk address." +msgstr "عنوان جابر أو محادثة غوغل المعتمد حاليًا." + +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "عنوان المراسلة الفورية" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "تفضيلات المحادثة الفورية" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "حُفِظت التفضيلات." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "لا هوية جابر." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "ليست هوية جابر صالحة" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "" -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." msgstr "" -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "هذا عنوان محادثة فورية خاطئ." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "تعذّر حذف تأكيد البريد الإلكتروني." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "أُلغي التأكيد." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "هذه ليست هويتك في جابر." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "أزيل هذا العنوان." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1871,9 +2049,9 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." +msgstr "يجب أن تلج لتُعدّل المجموعات." #: actions/invite.php:72 #, php-format @@ -1892,7 +2070,9 @@ msgstr "دعوة مستخدمين جدد" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1939,12 +2119,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "أرسل" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -1984,7 +2166,9 @@ msgstr "يجب أن تلج لتنضم إلى مجموعة." msgid "No nickname or ID." msgstr "لا اسم مستعار." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s انضم للمجموعة %2$s" @@ -1993,11 +2177,13 @@ msgstr "%1$s انضم للمجموعة %2$s" msgid "You must be logged in to leave a group." msgstr "يجب أن تلج لتغادر مجموعة." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "لست عضوا في تلك المجموعة." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s ترك المجموعة %2$s" @@ -2042,10 +2228,14 @@ msgstr "" "لأسباب أمنية، من فضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "لُج باسم مستخدم وكلمة سر" + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 @@ -2068,7 +2258,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "لم يمكن جعل %1$s إداريا للمجموعة %2$s." #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "لا حالة حالية" #: actions/newapplication.php:52 @@ -2103,12 +2294,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة. msgid "New message" msgstr "رسالة جديدة" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "لا محتوى!" @@ -2116,7 +2307,7 @@ msgstr "لا محتوى!" msgid "No recipient specified." msgstr "لا مستلم حُدّد." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2130,7 +2321,7 @@ msgstr "أُرسلت الرسالة" msgid "Direct message to %s sent." msgstr "رسالة مباشرة ل%s تم إرسالها." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "خطأ أجاكس" @@ -2138,7 +2329,7 @@ msgstr "خطأ أجاكس" msgid "New notice" msgstr "إشعار جديد" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "أُرسل الإشعار" @@ -2227,11 +2418,11 @@ msgid "You are not a user of that application." msgstr "لست مستخدما لهذا التطبيق." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2240,24 +2431,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "" +#, fuzzy +msgid "Notice has no profile." +msgstr "ليس للمستخدم ملف شخصي." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "حالة %1$s في يوم %2$s" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "نوع المحتوى " -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2360,7 +2557,7 @@ msgid "6 or more characters" msgstr "6 أحرف أو أكثر" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "أكّد" @@ -2388,7 +2585,7 @@ msgstr "كلمة السر القديمة غير صحيحة" msgid "Error saving user; invalid." msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "تعذّر حفظ كلمة السر الجديدة." @@ -2397,7 +2594,7 @@ msgid "Password saved." msgstr "حُفظت كلمة السر." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "المسارات" @@ -2406,23 +2603,23 @@ msgid "Path and server settings for this StatusNet site." msgstr "" #: actions/pathsadminpanel.php:157 -#, php-format -msgid "Theme directory not readable: %s" +#, fuzzy, php-format +msgid "Theme directory not readable: %s." msgstr "لا يمكن قراءة دليل السمات: %s" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." msgstr "لا يمكن الكتابة في دليل الأفتارات: %s" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" +#, fuzzy, php-format +msgid "Background directory not writable: %s." msgstr "لا يمكن الكتابة في دليل الخلفيات: %s" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." msgstr "لا يمكن قراءة دليل المحليات: %s" #: actions/pathsadminpanel.php:183 @@ -2555,23 +2752,26 @@ msgid "" "Search for people on %%site.name%% by their name, location, or interests. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" +"ابحث عن أشخاص على %%site.name%% بدلالة الاسم أو الموقع أو الاهتمامات. افصل " +"عبارات البحث بمسافات؛ ويجب أن تتكون تلك العبارات من 3 أحرف أو أكثر." #: actions/peoplesearch.php:58 msgid "People search" msgstr "بحث في الأشخاص" -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "ليس وسم أشخاص صالح: %s" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "المستخدمون الذين وسموا أنفسهم ب%1$s - الصفحة %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "محتوى إشعار غير صالح" #: actions/postnotice.php:101 @@ -2597,13 +2797,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "الاسم الكامل" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "الصفحة الرئيسية" @@ -2625,9 +2826,9 @@ msgid "Bio" msgstr "السيرة" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "الموقع" @@ -2641,7 +2842,7 @@ msgstr "شارك مكاني الحالي عند إرسال إشعارات" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "الوسوم" @@ -2712,8 +2913,8 @@ msgid "Settings saved." msgstr "حُفظت الإعدادات." #: actions/public.php:83 -#, php-format -msgid "Beyond the page limit (%s)" +#, fuzzy, php-format +msgid "Beyond the page limit (%s)." msgstr "وراء حد الصفحة (%s)" #: actions/public.php:92 @@ -2872,7 +3073,7 @@ msgstr "أعد ضبط كلمة السر" msgid "Recover password" msgstr "استعد كلمة السر" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "طُلبت استعادة كلمة السر" @@ -2892,41 +3093,41 @@ msgstr "أعد الضبط" msgid "Enter a nickname or email address." msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." -msgstr "" +msgstr "لا يوجد عنوان بريد إلكتروني مُسجّل لهذا المستخدم." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "خطأ أثناء حفظ تأكيد العنوان." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "خطأ أثناء ضبط المستخدم." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -2942,7 +3143,7 @@ msgstr "عذرا، رمز دعوة غير صالح." msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -2964,7 +3165,7 @@ msgstr "اسم مستخدم أو كلمة سر غير صالحة." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -2980,8 +3181,9 @@ msgstr "6 حروف أو أكثر. مطلوب." msgid "Same as password above. Required." msgstr "نفس كلمة السر أعلاه. مطلوب." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "البريد الإلكتروني" @@ -2994,20 +3196,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "نصوصي وملفاتي متاحة تحت رخصة " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "المشاع المبدع نسبة المنصف إلى مؤلفه 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3026,7 +3221,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3065,7 +3260,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "اشترك" @@ -3101,7 +3296,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية." msgid "You already repeated that notice." msgstr "أنت كررت هذه الملاحظة بالفعل." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "مكرر" @@ -3116,9 +3311,9 @@ msgid "Replies to %s" msgstr "الردود على %s" #: actions/replies.php:128 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "الردود على %s" +msgstr "الردود على %1$s، الصفحة %2$d" #: actions/replies.php:145 #, php-format @@ -3185,7 +3380,7 @@ msgstr "" #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "الجلسات" @@ -3223,26 +3418,30 @@ msgstr "يجب أن تكون مسجل الدخول لرؤية تطبيق." msgid "Application profile" msgstr "" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "أيقونة" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "الاسم" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "المنظمة" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "الوصف" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "إحصاءات" @@ -3261,7 +3460,7 @@ msgstr "" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "معلومات التطبيق" #: actions/showapplication.php:263 msgid "Consumer key" @@ -3290,14 +3489,13 @@ msgid "" msgstr "" #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" +msgstr "أمتأكد من أنك تريد إعادة ضبط مفتاح المستهلك وكلمة سره؟" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "إشعارات %s المُفضلة" +msgstr "إشعارات %1$s المُفضلة، الصفحة %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3353,71 +3551,71 @@ msgid "%s group" msgstr "مجموعة %s" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "%1$s أعضاء المجموعة, الصفحة %2$d" +msgstr "مجموعة %1$، الصفحة %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "ملف المجموعة الشخصي" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "مسار" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "ملاحظة" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "الكنى" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "الأعضاء" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(لا شيء)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "جميع الأعضاء" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" -msgstr "أنشئ" +msgstr "أنشئت" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3432,7 +3630,7 @@ msgstr "" "[انضم الآن](%%%%action.register%%%%) لتصبح عضوًا في هذه المجموعة ومجموعات " "أخرى عديدة! ([اقرأ المزيد](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3444,7 +3642,7 @@ msgstr "" "en.wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [StatusNet]" "(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "الإداريون" @@ -3531,7 +3729,7 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -"لدى **%s** حساب على %%site.name%%، خدمة [التدوين المُصغّر](http://en." +"لدى **%s** حساب على %%%%site.name%%%%، خدمة [التدوين المُصغّر](http://en." "wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [StatusNet]" "(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. " "[انضم الآن](%%%%action.register%%%%) لتتابع إشعارت **%s** وغيره! ([اقرأ " @@ -3544,6 +3742,9 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" +"لدى **%s** حساب على %%%%site.name%%%%، خدمة [التدوين المُصغّر](http://en." +"wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [StatusNet]" +"(http://status.net/). " #: actions/showstream.php:305 #, php-format @@ -3576,11 +3777,11 @@ msgid "Unknown language \"%s\"." msgstr "لغة غير معروفة \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "حد النص الأدنى هو 140 حرفًا." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "حد النص الأدنى 0 (غير محدود)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3664,12 +3865,11 @@ msgid "Edit site-wide message" msgstr "عدّل رسالة الموقع العامة" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "مشكلة أثناء حفظ الإشعار." +msgstr "تعذّر حفظ إشعار الموقع." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3684,101 +3884,156 @@ msgstr "نص إشعار عام للموقع (255 حرف كحد أقصى؛ يسم msgid "Save site notice" msgstr "احفظ إشعار الموقع" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "إعدادات الرسائل القصيرة" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "لا يمكنك استلام رسائل قصيرة عبر البريد الإلكرتوني من %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "الرسائل القصيرة غير متوفرة." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "عنوان الرسائل القصيرة" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "" -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "رمز التأكيد" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "أكّد" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "رقم هاتف SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" -msgstr "" +msgstr "رقم الهاتف بدون شرطات أو مسافات مع رمز المنطقة" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "تفضيلات الرسائل القصيرة" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "حُفظت تفضيلات الرسائل القصيرة." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "لا رقم هاتف." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "" -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "إن رقم التأكيد هذا خاطئ." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "أُلغي تأكيد الرسائل القصيرة." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "هذا ليس رقم هاتفك." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "تمت إزالة رقم هاتف الرسائل القصيرة." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "لم تدخل رمزًا" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3800,7 +4055,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3840,8 +4095,7 @@ msgstr "اذف إعدادت الموقع" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "تعذّر حفظ الاشتراك." @@ -3932,18 +4186,18 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "جابر" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "رسائل قصيرة" #: actions/tag.php:69 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "الإشعارات الموسومة ب%s" +msgstr "الإشعارات الموسومة ب%s، الصفحة %2$d" #: actions/tag.php:87 #, php-format @@ -3969,12 +4223,12 @@ msgstr "لا مدخل هوية." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "ملف المستخدم الشخصي" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "صورة" @@ -4022,12 +4276,13 @@ msgid "User is not silenced." msgstr "المستخدم ليس مُسكتًا." #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "" +#, fuzzy +msgid "No profile ID in request." +msgstr "لا طلب استيثاق." #: actions/unsubscribe.php:98 msgid "Unsubscribed" -msgstr "" +msgstr "غير مشترك" #: actions/updateprofile.php:64 actions/userauthorization.php:337 #, php-format @@ -4058,7 +4313,8 @@ msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "الملف الشخصي" @@ -4210,27 +4466,33 @@ msgstr "خصّص أسلوب عرض ملفك بصورة خلفية ومخطط أ msgid "Enjoy your hotdog!" msgstr "استمتع بالنقانق!" -#: actions/usergroups.php:64 -#, fuzzy, php-format +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 +#, php-format msgid "%1$s groups, page %2$d" -msgstr "%1$s أعضاء المجموعة, الصفحة %2$d" +msgstr "مجموعات %1$s، الصفحة %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "ابحث عن المزيد من المجموعات" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s ليس عضوًا في أي مجموعة." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." -msgstr "" +msgstr "جرّب [البحث عن مجموعات](%%action.groupsearch%%) والانضمام إليها." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4280,7 +4542,8 @@ msgstr "" msgid "Plugins" msgstr "الملحقات" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "النسخة" @@ -4288,19 +4551,19 @@ msgstr "النسخة" msgid "Author(s)" msgstr "المؤلف(ون)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4338,316 +4601,349 @@ msgstr "تعذّر إدراج الرسالة." msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" +msgstr "خطأ قاعدة البيانات أثناء إدخال المستخدم OAuth app" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "مشكلة في حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "مشكلة أثناء حفظ الإشعار." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "مشكلة أثناء حفظ الإشعار." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "مُشترك أصلا!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "لقد منعك المستخدم." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "غير مشترك!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "لم يمكن حذف اشتراك ذاتي." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "تعذّر حذف الاشتراك." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم في %1$s يا @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "تعذّر إنشاء المجموعة." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "تعذّر ضبط عضوية المجموعة." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "تعذّر ضبط عضوية المجموعة." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "تعذّر حفظ الاشتراك." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "غيّر إعدادات ملفك الشخصي" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "ارفع أفتارًا" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "غير كلمة سرّك" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "غير أسلوب التعامل مع البريد الإلكتروني" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "صمّم ملفك الشخصي" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "أخرى" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "خيارات أخرى" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "أخرى" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "صفحة غير مُعنونة" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "الملف الشخصي ومسار الأصدقاء الزمني" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "الصفحة الشخصية" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "غير بريدك الإلكتروني وكلمة سرّك وأفتارك وملفك الشخصي" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "اتصالات" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "اتصل" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "غيّر ضبط الموقع" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "إداري" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "ادعُ أصدقائك وزملائك للانضمام إليك في %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "ادعُ" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "اخرج من الموقع" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "اخرج" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "أنشئ حسابًا" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "سجّل" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "لُج إلى الموقع" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "لُج" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "ساعدني!" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "مساعدة" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "ابحث عن أشخاص أو نصوص" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "ابحث" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "إشعار الموقع" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "المشاهدات المحلية" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "إشعار الصفحة" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "مساعدة" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "عن" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "الأسئلة المكررة" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "الشروط" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "خصوصية" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "المصدر" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "اتصل" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "الجسر" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "رخصة برنامج StatusNet" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** خدمة تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "" -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4658,67 +4954,81 @@ msgstr "" "المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/" "agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "رخصة محتوى الموقع" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "الرخصة." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "بعد" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "قبل" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "لا يمكنك إجراء تغييرات على هذا الموقع." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "التغييرات لهذه اللوحة غير مسموح بها." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4728,152 +5038,191 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "تعذّر حذف إعدادات التصميم." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "ضبط الموقع الأساسي" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "الموقع" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "ضبط التصميم" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "التصميم" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "ضبط المستخدم" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "المستخدم" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "ضبط الحساب" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "ضبط المسارات" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "ضبط الجلسات" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 msgid "Edit site notice" msgstr "عدّل إشعار الموقع" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "ضبط المسارات" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "عدّل التطبيق" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "أيقونة لهذا التطبيق" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "صف تطبيقك" -#: lib/applicationeditform.php:216 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 +msgid "URL of the homepage of this application" +msgstr "مسار صفحة هذا التطبيق" + +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 msgid "Source URL" msgstr "مسار المصدر" -#: lib/applicationeditform.php:218 -msgid "URL of the homepage of this application" -msgstr "" - -#: lib/applicationeditform.php:224 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "متصفح" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "ألغِ" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 +#, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "اسحب" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "مرفقات" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "المؤلف" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "المزود" @@ -4893,37 +5242,56 @@ msgstr "تغيير كلمة السر فشل" msgid "Password changing is not allowed" msgstr "تغيير كلمة السر غير مسموح به" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "نتائج الأمر" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "اكتمل الأمر" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "فشل الأمر" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "الملاحظة بهذا الرقم غير موجودة" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "ليس للمستخدم إشعار أخير" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "لم يمكن إيجاد مستخدم بالاسم %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "لم يمكن إيجاد مستخدم بالاسم %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "التنبيه تم إرساله إلى %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -4934,169 +5302,173 @@ msgstr "" "المشتركون: %2$s\n" "الإشعارات: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "الملاحظة بهذا الرقم غير موجودة" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "ليس للمستخدم إشعار أخير" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "أنت بالفعل عضو في هذه المجموعة" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "لم يمكن ضم المستخدم %s إلى المجموعة %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s." -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s انضم إلى مجموعة %s" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" +msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s." -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "لم يمكن إزالة المستخدم %s من المجموعة %s" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s ترك المجموعة %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "الصفحة الرئيسية: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "رسالة مباشرة إلى %s تم إرسالها" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "لا يمكنك تكرار ملاحظتك الخاصة" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "كرر بالفعل هذا الإشعار" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "الإشعار من %s مكرر" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "خطأ تكرار الإشعار." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "رُد على رسالة %s" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "لا مستخدم كهذا" +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "الأمر لم يُجهزّ بعد." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "الإشعار مُطفأ." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "تعذّر إطفاء الإشعارات." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "الإشعار يعمل." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "تعذّر تشغيل الإشعار." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "ألغِ الاشتراك" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأي أحد." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -5106,11 +5478,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -5120,11 +5492,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "لست عضوًا في أي مجموعة." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا في أي مجموعة." @@ -5134,7 +5506,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5175,20 +5547,58 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"الأوامر:\n" +"on - شغّل الإشعار\n" +"off - أطفئ الإشعار\n" +"help - أظهر هذه المساعدة\n" +"follow - اشترك بالمستخدم\n" +"groups - اسرد المجموعات التي أنا عضو فيها\n" +"subscriptions - اسرد الذين أتابعهم\n" +"subscribers - اسرد الذين يتابعونني\n" +"leave - ألغِ الاشتراك بمستخدم\n" +"d - وجّه رسالة مباشرة إلى مستخدم\n" +"get - اجلب آخر رسالة من مستخدم\n" +"whois - اجلب معلومات ملف المستخدم\n" +"lose - أجبر المستخدم على عدم تتبعك\n" +"fav - اجعل آخر إشعار من المستخدم مفضلًا\n" +"fav # - اجعل الإشعار ذا رقم الهوية المعطى مفضلا\n" +"repeat # - كرّر الإشعار ذا رقم الهوية المعطى\n" +"repeat - كرّر آخر إشعار من المستخدم\n" +"reply # - رُد على الإشعار ذي رقم الهوية المعطى\n" +"reply - رُد على آخر إشعار من المستخدم\n" +"join - انضم إلى مجموعة\n" +"login - اجلب وصلة الولوج إلى واجهة الوب\n" +"drop - اترك المجموعة\n" +"stats - اجلب إحصاءاتك\n" +"stop - مثل 'off'\n" +"quit - مثل 'off'\n" +"sub - مثل 'follow'\n" +"unsub - مثل 'leave'\n" +"last - مثل 'get'\n" +"on - لم يطبق بعد.\n" +"off - لم يطبق بعد.\n" +"nudge - ذكّر مستخدمًا بإشعار أرسلته.\n" +"invite - لم يطبق بعد.\n" +"track - لم يطبق بعد.\n" +"untrack - لم يطبق بعد.\n" +"track off - لم يطبق بعد.\n" +"untrack all - لم يطبق بعد.\n" +"tracks - لم يطبق بعد.\n" +"tracking - لم يطبق بعد.\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "اذهب إلى المُثبّت." @@ -5202,7 +5612,7 @@ msgstr "" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "" +msgstr "تحديثات عبر الرسائل القصيرة" #: lib/connectsettingsaction.php:120 msgid "Connections" @@ -5296,7 +5706,7 @@ msgstr "" #: lib/groupeditform.php:168 msgid "Describe the group or topic" -msgstr "" +msgstr "صِف المجموعة أو الموضوع" #: lib/groupeditform.php:170 #, php-format @@ -5356,55 +5766,56 @@ msgstr "المجموعات الأكثر مرسلات" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "وسوم في إشعارات المجموعة %s" +msgstr "وسوم في إشعارات مجموعة %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 -msgid "Not an image or corrupt file." -msgstr "" - #: lib/imagefile.php:109 -msgid "Unsupported image file format." +msgid "Not an image or corrupt file." msgstr "" #: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "نوع ملف غير معروف" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "ميجابايت" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "كيلوبايت" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "مصدر صندوق وارد غير معروف %d." @@ -5425,11 +5836,13 @@ msgstr "لُج باسم مستخدم وكلمة سر" msgid "Sign up for a new account" msgstr "سجّل حسابًا جديدًا" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "تأكيد عنوان البريد الإلكتروني" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5458,12 +5871,14 @@ msgstr "" "شكرًا على الوقت الذي أمضيته، \n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5488,17 +5903,20 @@ msgstr "" "----\n" "غيّر خيارات البريد الإلكتروني والإشعار في %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "السيرة: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5511,21 +5929,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "حالة %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "تأكيد الرسالة القصيرة" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "لقد نبهك %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5541,12 +5969,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "رسالة خاصة جديدة من %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5565,12 +5995,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5591,12 +6023,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "لقد أرسل %s (@%s) إشعارًا إليك" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5609,6 +6051,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5621,7 +6075,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "من" @@ -5746,48 +6200,52 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "ش" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "ج" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "ر" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "غ" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "في" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "في السياق" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "مكرر بواسطة" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "رُد" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "الإشعار مكرر" @@ -5811,6 +6269,10 @@ msgstr "خطأ أثناء إدراج الملف الشخصي الجديد" msgid "Error inserting avatar" msgstr "خطأ في إدراج الأفتار" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "خطأ أثناء تحديث الملف الشخصي البعيد" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "خطأ أثناء إدراج الملف الشخصي البعيد" @@ -5860,7 +6322,7 @@ msgstr "وسوم في إشعارات %s" msgid "Unknown" msgstr "غير معروفة" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "الاشتراكات" @@ -5868,31 +6330,32 @@ msgstr "الاشتراكات" msgid "All subscriptions" msgstr "جميع الاشتراكات" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "المشتركون" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "جميع المشتركين" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "هوية المستخدم" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "عضو منذ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "المُعدّل اليومي" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "كل المجموعات" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "لا مدخلات رجوع إلى." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -5916,10 +6379,18 @@ msgstr "مُختارون" msgid "Popular" msgstr "محبوبة" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "لا مدخلات رجوع إلى." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "أأكرّر هذا الإشعار؟ّ" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "نعم" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "كرّر هذا الإشعار" @@ -5929,7 +6400,7 @@ msgstr "كرّر هذا الإشعار" msgid "Revoke the \"%s\" role from this user" msgstr "امنع هذا المستخدم من هذه المجموعة" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6055,90 +6526,109 @@ msgstr "ألغِ الاشتراك مع هذا المستخدم" msgid "Unsubscribe" msgstr "ألغِ الاشتراك" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "ليس للمستخدم ملف شخصي." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "عدّل الأفتار" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "تصرفات المستخدم" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "حذف المستخدم قيد التنفيذ..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "عدّل إعدادات الملف الشخصي" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "عدّل" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "أرسل رسالة مباشرة إلى هذا المستخدم" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "رسالة" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" -msgstr "" +msgstr "راقب" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "ملف المستخدم الشخصي" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "إداري" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "مراقب" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "قبل سنة تقريبًا" @@ -6152,7 +6642,7 @@ msgstr "%s ليس لونًا صحيحًا!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index aaf1d89bd2..e67405582f 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:19+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:06+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -24,7 +24,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "نفاذ" @@ -78,7 +78,13 @@ msgstr "مُغلق" msgid "Save access settings" msgstr "اذف إعدادت الموقع" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -87,7 +93,8 @@ msgstr "أرسل" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +#, fuzzy +msgid "No such page." msgstr "لا صفحه كهذه" #: actions/all.php:75 actions/allrss.php:68 @@ -98,9 +105,9 @@ msgstr "لا صفحه كهذه" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -108,11 +115,9 @@ msgstr "لا صفحه كهذه" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "لا مستخدم كهذا." @@ -124,8 +129,9 @@ msgstr "%1$s و الصحاب, صفحه %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -183,8 +189,10 @@ msgstr "" msgid "You and friends" msgstr "أنت والأصدقاء" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -199,18 +207,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "الـ API method مش موجوده." @@ -223,15 +231,15 @@ msgstr "الـ API method مش موجوده." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقه POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -243,7 +251,7 @@ msgstr "تعذّر تحديث المستخدم." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "ليس للمستخدم ملف شخصى." @@ -253,9 +261,9 @@ msgid "Could not save profile." msgstr "لم يمكن حفظ الملف." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -337,7 +345,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "الحاله دى موجوده فعلا فى التفضيلات." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "تعذّر إنشاء مفضله." @@ -427,10 +435,9 @@ msgstr "" msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 -#, php-format -msgid "Invalid alias: \"%s\"" +#: actions/apigroupcreate.php:266 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"." msgstr "كنيه غير صالحة: \"%s\"" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -447,14 +454,15 @@ msgstr "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" +#, fuzzy +msgid "Group not found." msgstr "لم توجد المجموعة!" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -472,17 +480,26 @@ msgstr "" msgid "Could not remove user %1$s from group %2$s." msgstr "ما نفعش يتشال اليوزر %1$s من الجروپ %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "مجموعات %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "المجموعات التى %s عضو فيها" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "مجموعات %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "مجموعات %s" @@ -497,17 +514,17 @@ msgid "Invalid token." msgstr "حجم غير صالح." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -540,12 +557,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" @@ -565,20 +585,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "الحساب" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "الاسم المستعار" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "كلمه السر" @@ -623,17 +645,17 @@ msgstr "حُذِفت الحاله." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "لم يوجد" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "لم يوجد." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -642,12 +664,12 @@ msgstr "" msgid "Unsupported format." msgstr "نسق غير مدعوم." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" @@ -657,17 +679,17 @@ msgstr "" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "مسار %s الزمنى العام" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -682,20 +704,16 @@ msgstr "كرر إلى %s" msgid "Repeats of %s" msgstr "تكرارات %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "الإشعارات الموسومه ب%s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "لم يوجد." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "لا مرفق كهذا." @@ -715,8 +733,9 @@ msgstr "لا حجم." msgid "Invalid size." msgstr "حجم غير صالح." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "أفتار" @@ -726,10 +745,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "يوزر من-غير پروفايل زيّه." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -747,7 +766,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "احذف" @@ -759,23 +778,28 @@ msgstr "ارفع" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "لا ملف شخصى مُحدّد." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "رُفع الأفتار." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "فشل تحديث الأفتار." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "حُذف الأفتار." @@ -783,7 +807,7 @@ msgstr "حُذف الأفتار." msgid "You already blocked that user." msgstr "لقد منعت مسبقا هذا المستخدم." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "امنع المستخدم" @@ -794,27 +818,44 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "لا" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "لا تمنع هذا المستخدم" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "نعم" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "امنع هذا المستخدم" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "فشل حفظ معلومات المنع." @@ -827,8 +868,8 @@ msgstr "فشل حفظ معلومات المنع." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "لا مجموعه كهذه." @@ -858,9 +899,11 @@ msgstr "ألغِ المنع" msgid "Unblock this user" msgstr "ألغِ منع هذا المستخدم" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "" +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" +msgstr "مجموعات %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -874,33 +917,43 @@ msgstr "لم يوجد رمز التأكيد." msgid "That confirmation code is not for you!" msgstr "رمز التأكيد ليس لك!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" +msgid "Unrecognized address type %s." msgstr "" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "" -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "تعذّر تحديث المستخدم." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "تعذّر حذف تأكيد البريد الإلكترونى." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "اكد العنوان" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "" @@ -910,7 +963,7 @@ msgid "Conversation" msgstr "محادثة" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "الإشعارات" @@ -931,7 +984,7 @@ msgstr "انت مش بتملك الapplication دى." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -947,17 +1000,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "لا تحذف هذا الإشعار" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "احذف هذا الإشعار" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -986,11 +1041,13 @@ msgstr "احذف الإشعار" msgid "Are you sure you want to delete this notice?" msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1012,125 +1069,129 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "احذف هذا المستخدم" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "التصميم" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "مسار شعار غير صالح." -#: actions/designadminpanel.php:279 -#, php-format -msgid "Theme not available: %s" +#: actions/designadminpanel.php:280 +#, fuzzy, php-format +msgid "Theme not available: %s." msgstr "السمه غير متوفرة: %s" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "غيّر الشعار" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "شعار الموقع" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "غيّر السمة" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "سمه الموقع" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "سمه الموقع." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "تغيير صوره الخلفية" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "الخلفية" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "مكّن" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "عطّل" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "مكّن صوره الخلفيه أو عطّلها." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "تغيير الألوان" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "المحتوى" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "الشريط الجانبي" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "النص" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "وصلات" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "استخدم المبدئيات" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "استعد التصميمات المبدئية" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "ارجع إلى المبدئي" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "أرسل" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "احفظ التصميم" @@ -1236,11 +1297,16 @@ msgstr "استخدم هذا النموذج لتعديل المجموعه." msgid "description is too long (max %d chars)." msgstr "" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "كنيه غير صالحة: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "تعذر تحديث المجموعه." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "تعذّر إنشاء الكنى." @@ -1248,178 +1314,238 @@ msgstr "تعذّر إنشاء الكنى." msgid "Options saved." msgstr "حُفظت الخيارات." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "تظبيطات الايميل" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "أدر كيف تستلم البريد الإلكترونى من %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "العنوان" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "عنوان الايميل" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "عنوان البريد الإلكترونى المُؤكد الحالى." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "أزل" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "ألغِ" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "عنوان الايميل" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "عنوان البريد الإلكترونى، مثل \"UserName@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "أضف" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "البريد الإلكترونى الوارد" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديده." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ ألغِ القديم." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "جديد" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "التفضيلات" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكترونى." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." msgstr "حُفِظت التفضيلات." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "لا عنوان بريد إلكترونى." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "ليس عنوان بريد صالح." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "هذا هو عنوان بريدك الإكترونى سابقًا." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "تعذّر إدراج رمز التأكيد." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "" -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "هذا عنوان محادثه فوريه خاطئ." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "أُلغى التأكيد." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "هذا ليس عنوان بريدك الإلكترونى." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "أزيل هذا العنوان." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" @@ -1532,8 +1658,9 @@ msgstr "" msgid "Remote service uses unknown version of OMB protocol." msgstr "" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "خطأ أثناء تحديث الملف الشخصى البعيد" #: actions/getfile.php:79 @@ -1592,11 +1719,11 @@ msgstr "" msgid "User is not a member of group." msgstr "المستخدم ليس عضوًا فى المجموعه." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "امنع المستخدم من المجموعة" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1604,15 +1731,17 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "لا تمنع هذا المستخدم من هذه المجموعة" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "امنع هذا المستخدم من هذه المجموعة" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "خطأ فى قاعده البيانات أثناء منع المستخدم من المجموعه." @@ -1653,10 +1782,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "يوزر من-غير پروفايل زيّه." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1687,34 +1812,38 @@ msgstr "قائمه بمستخدمى هذه المجموعه." msgid "Admin" msgstr "إداري" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "امنع" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "اجعل هذا المستخدم إداريًا" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "مسار %s الزمني" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "مجموعات" @@ -1734,7 +1863,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "أنشئ مجموعه جديدة" @@ -1780,90 +1909,148 @@ msgstr "المستخدم ليس ممنوعًا من المجموعه." msgid "Error removing the block." msgstr "خطأ أثناء منع الحجب." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "تظبيطات بعت الرسايل الفوريه" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "المراسله الفوريه غير متوفره." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "عنوان الرساله الفوريه" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "عنوان الرساله الفوريه" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "التفضيلات" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "حُفِظت التفضيلات." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "لا هويه جابر." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "ليست هويه جابر صالحة" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "" -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." msgstr "" -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "هذا عنوان محادثه فوريه خاطئ." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "تعذّر حذف تأكيد البريد الإلكترونى." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "أُلغى التأكيد." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "هذه ليست هويتك فى جابر." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "أزيل هذا العنوان." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1883,9 +2070,9 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." +msgstr "يجب أن تلج لتُعدّل المجموعات." #: actions/invite.php:72 #, php-format @@ -1904,7 +2091,9 @@ msgstr "دعوه مستخدمين جدد" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1952,12 +2141,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "أرسل" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -1997,7 +2188,9 @@ msgstr "" msgid "No nickname or ID." msgstr "لا اسم مستعار." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s دخل جروپ %2$s" @@ -2006,11 +2199,13 @@ msgstr "%1$s دخل جروپ %2$s" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "لست عضوا فى تلك المجموعه." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s ساب جروپ %2$s" @@ -2054,10 +2249,14 @@ msgid "" msgstr "" #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "اسم المستخدم أو كلمه السر غير صحيحان." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 @@ -2080,7 +2279,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "%1$s مش نافع يبقى ادارى لجروپ %2$s." #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "لا حاله حالية" #: actions/newapplication.php:52 @@ -2116,12 +2316,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده. msgid "New message" msgstr "رساله جديدة" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "لا محتوى!" @@ -2129,7 +2329,7 @@ msgstr "لا محتوى!" msgid "No recipient specified." msgstr "لا مستلم حُدّد." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2143,7 +2343,7 @@ msgstr "أُرسلت الرسالة" msgid "Direct message to %s sent." msgstr "رساله مباشره اتبعتت لـ%s." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "خطأ أجاكس" @@ -2151,7 +2351,7 @@ msgstr "خطأ أجاكس" msgid "New notice" msgstr "إشعار جديد" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "أُرسل الإشعار" @@ -2238,11 +2438,11 @@ msgid "You are not a user of that application." msgstr "انت مش يوزر للapplication دى." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2251,24 +2451,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "" +#, fuzzy +msgid "Notice has no profile." +msgstr "ليس للمستخدم ملف شخصى." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "نوع المحتوى " -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr " مش نظام بيانات مدعوم." @@ -2371,7 +2577,7 @@ msgid "6 or more characters" msgstr "" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "أكّد" @@ -2399,7 +2605,7 @@ msgstr "كلمه السر القديمه غير صحيحة" msgid "Error saving user; invalid." msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "تعذّر حفظ كلمه السر الجديده." @@ -2408,7 +2614,7 @@ msgid "Password saved." msgstr "حُفظت كلمه السر." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "المسارات" @@ -2417,23 +2623,23 @@ msgid "Path and server settings for this StatusNet site." msgstr "" #: actions/pathsadminpanel.php:157 -#, php-format -msgid "Theme directory not readable: %s" +#, fuzzy, php-format +msgid "Theme directory not readable: %s." msgstr "لا يمكن قراءه دليل السمات: %s" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." msgstr "لا يمكن الكتابه فى دليل الأفتارات: %s" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" +#, fuzzy, php-format +msgid "Background directory not writable: %s." msgstr "لا يمكن الكتابه فى دليل الخلفيات: %s" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." msgstr "لا يمكن قراءه دليل المحليات: %s" #: actions/pathsadminpanel.php:183 @@ -2571,18 +2777,19 @@ msgstr "" msgid "People search" msgstr "بحث فى الأشخاص" -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "ليس وسم أشخاص صالح: %s" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "محتوى إشعار غير صالح" #: actions/postnotice.php:101 @@ -2608,13 +2815,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "الاسم الكامل" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "الصفحه الرئيسية" @@ -2636,9 +2844,9 @@ msgid "Bio" msgstr "السيرة" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "الموقع" @@ -2652,7 +2860,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "الوسوم" @@ -2722,8 +2930,8 @@ msgid "Settings saved." msgstr "حُفظت الإعدادات." #: actions/public.php:83 -#, php-format -msgid "Beyond the page limit (%s)" +#, fuzzy, php-format +msgid "Beyond the page limit (%s)." msgstr "وراء حد الصفحه (%s)" #: actions/public.php:92 @@ -2882,7 +3090,7 @@ msgstr "أعد ضبط كلمه السر" msgid "Recover password" msgstr "استعد كلمه السر" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "طُلبت استعاده كلمه السر" @@ -2902,41 +3110,41 @@ msgstr "أعد الضبط" msgid "Enter a nickname or email address." msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكترونى." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "خطأ أثناء حفظ تأكيد العنوان." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "خطأ أثناء ضبط المستخدم." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -2952,7 +3160,7 @@ msgstr "عذرا، رمز دعوه غير صالح." msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -2974,7 +3182,7 @@ msgstr "اسم مستخدم أو كلمه سر غير صالحه." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -2990,8 +3198,9 @@ msgstr "6 حروف أو أكثر. مطلوب." msgid "Same as password above. Required." msgstr "نفس كلمه السر أعلاه. مطلوب." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "البريد الإلكتروني" @@ -3004,20 +3213,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "نصوصى وملفاتى متاحه تحت رخصه " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "المشاع المبدع نسبه المنصف إلى مؤلفه 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3036,7 +3238,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3075,7 +3277,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "اشترك" @@ -3111,7 +3313,7 @@ msgstr "ما ينفعش تكرر الملاحظه بتاعتك." msgid "You already repeated that notice." msgstr "انت عيدت الملاحظه دى فعلا." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "مكرر" @@ -3195,7 +3397,7 @@ msgstr "" #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "الجلسات" @@ -3233,26 +3435,30 @@ msgstr "لازم تكون مسجل دخولك علشان تشوف اى applicati msgid "Application profile" msgstr "" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "الاسم" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "المنظمه" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "الوصف" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "إحصاءات" @@ -3367,67 +3573,67 @@ msgstr "مجموعه %s" msgid "%1$s group, page %2$d" msgstr "%1$s أعضاء المجموعة, الصفحه %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "ملف المجموعه الشخصي" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "مسار" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "ملاحظة" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "الكنى" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "الأعضاء" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(لا شيء)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "جميع الأعضاء" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "أنشئ" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3437,7 +3643,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3446,7 +3652,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "الإداريون" @@ -3574,11 +3780,12 @@ msgid "Unknown language \"%s\"." msgstr "لغه مش معروفه \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "حد النص الأدنى هو 140 حرفًا." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3670,7 +3877,7 @@ msgid "Unable to save site notice." msgstr "مشكله أثناء حفظ الإشعار." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3687,101 +3894,162 @@ msgstr "" msgid "Save site notice" msgstr "إشعار الموقع" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "تظبيطات الـSMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "لا يمكنك استلام رسائل قصيره عبر البريد الإلكرتونى من %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "الرسائل القصيره غير متوفره." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "عنوان الرساله الفوريه" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "" -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "رمز التأكيد" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "أكّد" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "نمرة تليفون الـSMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "التفضيلات" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "حُفِظت التفضيلات." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "لا رقم هاتف." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "" -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "" -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "أُلغى التأكيد." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "هذا ليس رقم هاتفك." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "نمرة تليفون الـSMS" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3803,7 +4071,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3843,8 +4111,7 @@ msgstr "اذف إعدادت الموقع" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "تعذّر حفظ الاشتراك." @@ -3936,11 +4203,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "جابر" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "رسائل قصيرة" @@ -3973,12 +4240,12 @@ msgstr "لا مدخل هويه." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "ملف المستخدم الشخصي" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "صورة" @@ -4026,8 +4293,9 @@ msgid "User is not silenced." msgstr "المستخدم ليس مُسكتًا." #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "" +#, fuzzy +msgid "No profile ID in request." +msgstr "ما فيش طلب تسجيل دخول مطلوب." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4063,7 +4331,8 @@ msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "الملف الشخصي" @@ -4215,27 +4484,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "استمتع بالنقانق!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "%1$s أعضاء المجموعة, الصفحه %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4283,7 +4558,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "النسخه" @@ -4291,19 +4567,19 @@ msgstr "النسخه" msgid "Author(s)" msgstr "المؤلف/ين" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4342,258 +4618,277 @@ msgstr "تعذّر إدراج الرساله." msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" +msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "مشكله فى حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "مشكله أثناء حفظ الإشعار." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "مشكله أثناء حفظ الإشعار." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "مُشترك أصلا!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "لقد منعك المستخدم." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "غير مشترك!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "ما نفعش يمسح الاشتراك الشخصى." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "تعذّر حذف الاشتراك." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم فى %1$s يا @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "تعذّر إنشاء المجموعه." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "تعذّر ضبط عضويه المجموعه." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "تعذّر ضبط عضويه المجموعه." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "تعذّر حفظ الاشتراك." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "غيّر إعدادات ملفك الشخصي" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "ارفع أفتارًا" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "غير كلمه سرّك" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "غير أسلوب التعامل مع البريد الإلكتروني" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "صمّم ملفك الشخصي" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "أخرى" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "خيارات أخرى" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "أخرى" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "صفحه غير مُعنونة" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 #, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "الملف الشخصى ومسار الأصدقاء الزمني" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "شخصية" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "غير كلمه سرّك" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "كونيكشونات (Connections)" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "اتصل" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "غيّر ضبط الموقع" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "إداري" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "ادعُ" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 #, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "اخرج من الموقع" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "اخرج" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "أنشئ حسابًا" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "سجّل" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 #, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "لُج إلى الموقع" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "لُج" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "ساعدني!" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "مساعدة" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 #, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "ابحث عن أشخاص أو نص" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4601,73 +4896,87 @@ msgstr "ابحث" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "إشعار الموقع" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "المشاهدات المحلية" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "إشعار الصفحة" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "مساعدة" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "عن" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "الأسئله المكررة" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "الشروط" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "خصوصية" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "المصدر" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "اتصل" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "" -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4678,67 +4987,81 @@ msgstr "" "المتوفر تحت [رخصه غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/" "agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "رخصه محتوى الموقع" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "الرخصه." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "بعد" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "قبل" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "التغييرات مش مسموحه للـ لوحه دى." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4748,158 +5071,197 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "تعذّر حذف إعدادات التصميم." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "ضبط الموقع الأساسي" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "الموقع" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "ضبط التصميم" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "التصميم" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "ضبط المسارات" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "المستخدم" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "ضبط التصميم" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "ضبط المسارات" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "ضبط التصميم" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "إشعار الموقع" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "ضبط المسارات" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "اوصف الapplication بتاعتك" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "Source URL" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "Source URL" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "ألغِ" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 +#, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "بطّل" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "مرفقات" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "المؤلف" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "المزود" @@ -4919,37 +5281,56 @@ msgstr "تغيير الپاسوورد فشل" msgid "Password changing is not allowed" msgstr "تغيير الپاسوورد مش مسموح" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "نتائج الأمر" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "اكتمل الأمر" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "فشل الأمر" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "الملاحظه بالـID ده مالهاش وجود" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "ليس للمستخدم إشعار أخير" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "ما نفعش يلاقى يوزر بإسم %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "ما نفعش يلاقى يوزر بإسم %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Nudge اتبعتت لـ %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -4960,170 +5341,173 @@ msgstr "" "المشتركون: %2$s\n" "الإشعارات: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "الملاحظه بالـID ده مالهاش وجود" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "ليس للمستخدم إشعار أخير" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "انت اصلا عضو فى الجروپ ده" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "ما نفعش يدخل اليوزر %s لجروپ %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "ما نفعش يضم %1$s للجروپ %2$s." -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s انضم إلى مجموعه %s" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" +msgstr "ما نفعش يتشال اليوزر %1$s من الجروپ %2$s." -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "ما نفعش يشيل اليوزر %s لجروپ %s" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s ساب الجروپ %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "الصفحه الرئيسية: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "رساله مباشره اتبعتت لـ %s" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "الملاحظه بتاعتك مش نافعه تتكرر" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "كرر بالفعل هذا الإشعار" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "الإشعار من %s مكرر" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "خطأ تكرار الإشعار." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "رُد على رساله %s" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -#, fuzzy -msgid "No such user" -msgstr "لا مستخدم كهذا." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "ألغِ الاشتراك" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأى أحد." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -5133,11 +5517,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -5147,11 +5531,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "لست عضوًا فى أى مجموعه." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا فى أى مجموعه." @@ -5161,7 +5545,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5203,19 +5587,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "اذهب إلى المُثبّت." @@ -5385,53 +5769,54 @@ msgstr "المجموعات الأكثر مرسلات" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 -msgid "Not an image or corrupt file." -msgstr "" - #: lib/imagefile.php:109 -msgid "Unsupported image file format." +msgid "Not an image or corrupt file." msgstr "" #: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "نوع ملف غير معروف" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "ميجابايت" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "كيلوبايت" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "مصدر الـinbox مش معروف %d." @@ -5452,11 +5837,13 @@ msgstr "" msgid "Sign up for a new account" msgstr "" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "تأكيد عنوان البريد الإلكتروني" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5473,12 +5860,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5493,17 +5882,20 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "عن نفسك: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5516,21 +5908,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "حاله %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5546,12 +5948,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "رساله خاصه جديده من %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5570,12 +5974,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5596,12 +6002,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5614,6 +6030,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5626,7 +6054,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "من" @@ -5752,48 +6180,52 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "ش" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "ج" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "ر" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "غ" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "في" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "فى السياق" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "متكرر من" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "رُد" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "الإشعار مكرر" @@ -5817,6 +6249,10 @@ msgstr "خطأ أثناء إدراج الملف الشخصى الجديد" msgid "Error inserting avatar" msgstr "خطأ فى إدراج الأفتار" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "خطأ أثناء تحديث الملف الشخصى البعيد" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "خطأ أثناء إدراج الملف الشخصى البعيد" @@ -5866,7 +6302,7 @@ msgstr "" msgid "Unknown" msgstr "مش معروف" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "الاشتراكات" @@ -5874,31 +6310,32 @@ msgstr "الاشتراكات" msgid "All subscriptions" msgstr "جميع الاشتراكات" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "المشتركون" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "جميع المشتركين" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "هويه المستخدم" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "عضو منذ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "كل المجموعات" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "لا مدخلات رجوع إلى." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -5922,10 +6359,18 @@ msgstr "مُختارون" msgid "Popular" msgstr "مشهورة" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "لا مدخلات رجوع إلى." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "كرر هذا الإشعار؟" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "نعم" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "كرر هذا الإشعار" @@ -5935,7 +6380,7 @@ msgstr "كرر هذا الإشعار" msgid "Revoke the \"%s\" role from this user" msgstr "امنع هذا المستخدم من هذه المجموعة" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6061,91 +6506,110 @@ msgstr "ألغِ الاشتراك مع هذا المستخدم" msgid "Unsubscribe" msgstr "ألغِ الاشتراك" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "ليس للمستخدم ملف شخصى." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "عدّل الأفتار" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "تصرفات المستخدم" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "عدّل إعدادات الملف الشخصي" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "عدّل" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "أرسل رساله مباشره إلى هذا المستخدم" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "رسالة" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "ملف المستخدم الشخصي" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "الإداريون" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "قبل سنه تقريبًا" @@ -6159,7 +6623,7 @@ msgstr "%s ليس لونًا صحيحًا!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 3a6b5b0472..c96b66ee6e 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:22+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:09+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -22,7 +22,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Достъп" @@ -73,8 +73,13 @@ msgstr "Затворен" msgid "Save access settings" msgstr "Запазване настройките за достъп" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Запазване" @@ -82,7 +87,8 @@ msgstr "Запазване" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +#, fuzzy +msgid "No such page." msgstr "Няма такака страница." #: actions/all.php:75 actions/allrss.php:68 @@ -93,9 +99,9 @@ msgstr "Няма такака страница." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -103,11 +109,9 @@ msgstr "Няма такака страница." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Няма такъв потребител" @@ -119,8 +123,9 @@ msgstr "%1$s и приятели, страница %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -178,8 +183,10 @@ msgstr "" msgid "You and friends" msgstr "Вие и приятелите" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Бележки от %1$s и приятели в %2$s." @@ -194,18 +201,18 @@ msgstr "Бележки от %1$s и приятели в %2$s." #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Не е открит методът в API." @@ -218,15 +225,15 @@ msgstr "Не е открит методът в API." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Този метод изисква заявка POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -238,7 +245,7 @@ msgstr "Грешка при обновяване на потребителя." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Потребителят няма профил." @@ -248,9 +255,9 @@ msgid "Could not save profile." msgstr "Грешка при запазване на профила." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -333,18 +340,16 @@ msgid "No status found with that ID." msgstr "Не е открита бележка с такъв идентификатор." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite." -msgstr "Тази бележка вече е отбелязана като любима!" +msgstr "Тази бележка вече е отбелязана като любима." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Грешка при отбелязване като любима." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite." -msgstr "Тази бележка не е отбелязана като любима!" +msgstr "Тази бележка не е отбелязана като любима." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -364,9 +369,8 @@ msgid "Could not unfollow user: User not found." msgstr "Грешка при спиране на проследяването — потребителят не е намерен." #: actions/apifriendshipsdestroy.php:120 -#, fuzzy msgid "You cannot unfollow yourself." -msgstr "Не можете да спрете да следите себе си!" +msgstr "Не можете да спрете да следите себе си." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -432,10 +436,9 @@ msgstr "Името на местоположението е твърде дъл msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 -#, php-format -msgid "Invalid alias: \"%s\"" +#: actions/apigroupcreate.php:266 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"." msgstr "Неправилен псевдоним: \"%s\"" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -452,14 +455,14 @@ msgstr "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" +msgid "Group not found." msgstr "Групата не е открита." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Вече членувате в тази група." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -477,17 +480,26 @@ msgstr "Не членувате в тази група." msgid "Could not remove user %1$s from group %2$s." msgstr "Грешка при проследяване — потребителят не е намерен." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Групи на %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Групи, в които участва %s" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Групи на %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "групи в %s" @@ -502,17 +514,17 @@ msgid "Invalid token." msgstr "Неправилен размер." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -520,9 +532,8 @@ msgid "There was a problem with your session token. Try again, please." msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!" #: actions/apioauthauthorize.php:135 -#, fuzzy msgid "Invalid nickname / password!" -msgstr "Неправилно име или парола." +msgstr "Неправилно име или парола!" #: actions/apioauthauthorize.php:159 #, fuzzy @@ -546,12 +557,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Неочаквано изпращане на форма." @@ -571,20 +585,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Сметка" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Псевдоним" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Парола" @@ -630,17 +646,17 @@ msgstr "Бележката е изтрита." msgid "No status with that ID found." msgstr "Не е открита бележка с такъв идентификатор." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Твърде дълга бележка. Трябва да е най-много 140 знака." -#: actions/apistatusesupdate.php:202 -msgid "Not found" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." msgstr "Не е открито." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -649,12 +665,12 @@ msgstr "" msgid "Unsupported format." msgstr "Неподдържан формат." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Отбелязани като любими от %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s бележки отбелязани като любими от %s / %s." @@ -664,17 +680,17 @@ msgstr "%s бележки отбелязани като любими от %s / % msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Реплики на %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s реплики на съобщения от %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Общ поток на %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -689,20 +705,16 @@ msgstr "Повторено за %s" msgid "Repeats of %s" msgstr "Повторения на %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Бележки с етикет %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Не е открито." - #: actions/attachment.php:73 #, fuzzy msgid "No such attachment." @@ -723,8 +735,9 @@ msgstr "Няма размер." msgid "Invalid size." msgstr "Неправилен размер." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Аватар" @@ -735,9 +748,10 @@ msgstr "" "Можете да качите личен аватар тук. Максималната големина на файла е %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." msgstr "Потребител без съответстващ профил" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -756,7 +770,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Изтриване" @@ -768,23 +782,27 @@ msgstr "Качване" msgid "Crop" msgstr "Изрязване" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Няма качен файл." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Изберете квадратна област от изображението за аватар" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватарът е обновен." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Неуспешно обновяване на аватара." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватарът е изтрит." @@ -792,7 +810,7 @@ msgstr "Аватарът е изтрит." msgid "You already blocked that user." msgstr "Вече сте блокирали този потребител." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Блокиране на потребителя" @@ -803,27 +821,42 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Не" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Да не се блокира този потребител" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Да" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Блокиране на потребителя" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Грешка при записване данните за блокирането." @@ -836,8 +869,8 @@ msgstr "Грешка при записване данните за блокир #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Няма такава група" @@ -868,9 +901,10 @@ msgstr "Разблокиране" msgid "Unblock this user" msgstr "Разблокиране на този потребител" -#: actions/bookmarklet.php:50 -#, fuzzy -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" msgstr "Снимка" #: actions/confirmaddress.php:75 @@ -885,33 +919,43 @@ msgstr "Кодът за потвърждение не е открит." msgid "That confirmation code is not for you!" msgstr "Този код за потвърждение не е за вас!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "Неразпознат вид адрес %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Този адрес е вече потвърден." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Грешка при обновяване на потребителя." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Грешка при изтриване потвърждението по е-поща." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Потвърждаване на адрес" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Адресът \"%s\" е потвърден за сметката ви." @@ -921,36 +965,32 @@ msgid "Conversation" msgstr "Разговор" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Бележки" #: actions/deleteapplication.php:63 -#, fuzzy msgid "You must be logged in to delete an application." -msgstr "За да редактирате група, трябва да сте влезли." +msgstr "За да изтриете приложение, трябва да сте влезли." #: actions/deleteapplication.php:71 -#, fuzzy msgid "Application not found." -msgstr "Бележката няма профил" +msgstr "Приложението не е открито." #: actions/deleteapplication.php:78 actions/editapplication.php:77 #: actions/showapplication.php:94 -#, fuzzy msgid "You are not the owner of this application." -msgstr "Не членувате в тази група." +msgstr "Не сте собственик на това приложение." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Имаше проблем със сесията ви в сайта." #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 -#, fuzzy msgid "Delete application" -msgstr "Няма такава бележка." +msgstr "Изтриване на приложението" #: actions/deleteapplication.php:149 msgid "" @@ -959,17 +999,17 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 -#, fuzzy +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" -msgstr "Да не се изтрива бележката" +msgstr "Да не се изтрива приложението" -#: actions/deleteapplication.php:160 -#, fuzzy +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" -msgstr "Изтриване на бележката" +msgstr "Изтриване на това приложение" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -998,11 +1038,13 @@ msgstr "Изтриване на бележката" msgid "Are you sure you want to delete this notice?" msgstr "Наистина ли искате да изтриете тази бележка?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Да не се изтрива бележката" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Изтриване на бележката" @@ -1024,130 +1066,134 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Изтриване на този потребител" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "Неправилен размер." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "Страницата не е достъпна във вида медия, който приемате" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Смяна на логото" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Лого на сайта" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "Промяна" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "Нова бележка" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 #, fuzzy msgid "Theme for the site." msgstr "Излизане от сайта" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Смяна на изображението за фон" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Фон" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Може да качите лого за групата ви." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Вкл." -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Изкл." -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Смяна на цветовете" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Съдържание" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Страничен панел" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Текст" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Списък" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Запазване" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1165,20 +1211,17 @@ msgid "No such document \"%s\"" msgstr "Няма такъв документ." #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" -msgstr "Други настройки" +msgstr "Редактиране на приложението" #: actions/editapplication.php:66 -#, fuzzy msgid "You must be logged in to edit an application." -msgstr "За да редактирате група, трябва да сте влезли." +msgstr "За да редактирате приложение, трябва да сте влезли." #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166 #: actions/showapplication.php:87 -#, fuzzy msgid "No such application." -msgstr "Няма такава бележка." +msgstr "Няма такова приложение." #: actions/editapplication.php:161 #, fuzzy @@ -1186,9 +1229,8 @@ msgid "Use this form to edit your application." msgstr "Използвайте тази бланка за създаване на нова група." #: actions/editapplication.php:177 actions/newapplication.php:159 -#, fuzzy msgid "Name is required." -msgstr "Същото като паролата по-горе. Задължително поле." +msgstr "Името е задължително." #: actions/editapplication.php:180 actions/newapplication.php:165 #, fuzzy @@ -1201,9 +1243,8 @@ msgid "Name already in use. Try another one." msgstr "Опитайте друг псевдоним, този вече е зает." #: actions/editapplication.php:186 actions/newapplication.php:168 -#, fuzzy msgid "Description is required." -msgstr "Описание" +msgstr "Описанието е задължително." #: actions/editapplication.php:194 msgid "Source URL is too long." @@ -1219,9 +1260,8 @@ msgid "Organization is required." msgstr "" #: actions/editapplication.php:206 actions/newapplication.php:191 -#, fuzzy msgid "Organization is too long (max 255 chars)." -msgstr "Името на местоположението е твърде дълго (макс. 255 знака)." +msgstr "Името на организацията е твърде дълго (макс. 255 знака)." #: actions/editapplication.php:209 actions/newapplication.php:194 msgid "Organization homepage is required." @@ -1264,11 +1304,16 @@ msgstr "" msgid "description is too long (max %d chars)." msgstr "Описанието е твърде дълго (до %d символа)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Неправилен псевдоним: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Грешка при обновяване на групата." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Грешка при отбелязване като любима." @@ -1277,31 +1322,42 @@ msgstr "Грешка при отбелязване като любима." msgid "Options saved." msgstr "Настройките са запазени." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Настройки на е-поща" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Управление на пощата, идваща от %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Адрес" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Адрес на е-поща" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Текущ потвърден адрес на е-поща." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Премахване" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1309,107 +1365,141 @@ msgstr "" "Очаква се потвърждение за този адрес. Проверете кутията си (или папката за " "спам) за съобщение с указания." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "Отказ" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Адрес на е-поща" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Адрес на е-поща, като \"UserName@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Добавяне" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Входяща поща" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Изпратете писмо до този адрес за публикуване като бележка." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Задаване на нова е-поща, от която да се публикува. Отменя предишната." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "Ново" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "Настройки" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Изпращане на уведомления за нови абонаменти по пощата." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Изпращане на писмо при отбелязване на моя бележка като любима." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Изпращане на писмо при ново лично съобщение." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 #, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Изпращане на писмо при ново лично съобщение." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Искам да изпращам бележки по пощата." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Публикуване на MicroID за адреса на е-пощата." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." msgstr "Настройките са запазени." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Не е въведена е-поща." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Грешка при нормализиране адреса на е-пощата" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Неправилен адрес на е-поща." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Това и сега е адресът на е-пощата ви." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Тази е-поща вече се използва от друг потребител." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Не може да се вмъкне код за потвърждение." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1418,43 +1508,56 @@ msgstr "" "Проверете кутията (или папката за спам) за кода и указанията за използването " "му." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Няма потвърждения, очакващи да бъдат отказани." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "Грешен IM адрес." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "Потвърждаването е прекъснато." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Това не е вашият адрес на е-поща." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "Адресът е премахнат." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Няма входящ адрес на е-поща." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Грешка при обновяване записа на потребител." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Входящият адрес на е-поща е премахнат." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Добавен е нов входящ адрес на е-поща." @@ -1573,8 +1676,9 @@ msgstr "Грешка при преобразуване на tokens за одоб msgid "Remote service uses unknown version of OMB protocol." msgstr "Непозната версия на протокола OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "Грешка при обновяване на отдалечен профил" #: actions/getfile.php:79 @@ -1633,12 +1737,12 @@ msgstr "Потребителят вече е блокиран за групат msgid "User is not a member of group." msgstr "Потребителят не членува в групата." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 #, fuzzy msgid "Block user from group" msgstr "Блокиране на потребителя" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1646,17 +1750,19 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 #, fuzzy msgid "Do not block this user from this group" msgstr "Списък с потребителите в тази група." -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 #, fuzzy msgid "Block this user from this group" msgstr "Списък с потребителите в тази група." -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1700,11 +1806,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "Може да качите лого за групата ви." -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "Потребител без съответстващ профил" - #: actions/grouplogo.php:365 #, fuzzy msgid "Pick a square area of the image to be the logo." @@ -1736,35 +1837,39 @@ msgstr "Списък с потребителите в тази група." msgid "Admin" msgstr "Настройки" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Блокиране" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 #, fuzzy msgid "Make user an admin of the group" msgstr "За да редактирате групата, трябва да сте й администратор." -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Поток на %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Групи" @@ -1784,7 +1889,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Създаване на нова група" @@ -1834,12 +1939,16 @@ msgstr "Потребителят ви е блокирал." msgid "Error removing the block." msgstr "Грешка при запазване на потребител." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "IM настройки" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1848,16 +1957,26 @@ msgstr "" "Можете да получавате съобщения по Jabber/GTalk [instant messages](%%doc.im%" "%). Въведете адреса си в настройките по-долу." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 #, fuzzy msgid "IM is not available." msgstr "Страницата не е достъпна във вида медия, който приемате" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "IM адрес" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Текущ потвърден Jabber/GTalk адрес." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1866,12 +1985,9 @@ msgstr "" "Oчаква се потвърждение на този адрес. Проверете акаунта си в Jabber/GTalk за " "съобщение с инструкции. (Добавихте ли %s в списъка си там?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "IM адрес" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1880,43 +1996,65 @@ msgstr "" "Jabber или GTalk адрес, като \"UserName@example.org\". Първо се уверете, че " "сте добавили %s в списъка си с приятели в IM или GTalk клиента си." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Настройки" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Изпращане на бележките по Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Публикуване промяната на състоянието ми в Jabber/GTalk." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "Изпращане по Jabber/GTalk на отговори от хора, " -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Публикуване на MicroID за адреса в Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Настройките са запазени." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Няма Jabber ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Грешка при нормализация на този Jabber ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Неправилен Jabber ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Това вече е вашият Jabber ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Този Jabber ID принадлежи на друг потребител." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1925,10 +2063,35 @@ msgstr "" "На месинджъра ви е изпратен код за потвърждение. За да получавате съобщения " "от %s, трябва да го одобрите." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Грешен IM адрес." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Грешка при изтриване потвърждението по е-поща." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "Потвърждаването е прекъснато." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Това не е вашият Jabber ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Адресът е премахнат." + #: actions/inbox.php:59 #, fuzzy, php-format msgid "Inbox for %1$s - page %2$d" @@ -1948,8 +2111,8 @@ msgid "Invites have been disabled." msgstr "Поканите са изключени." #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "За да каните хора в %s, трябва да сте влезли." #: actions/invite.php:72 @@ -1969,7 +2132,9 @@ msgstr "Покани за нови потребители" msgid "You are already subscribed to these users:" msgstr "Вече сте абонирани за следните потребители:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2021,12 +2186,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Прати" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s ви кани да ползвате заедно %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2092,7 +2259,9 @@ msgstr "За да се присъедините към група, трябва msgid "No nickname or ID." msgstr "Няма псевдоним." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s се присъедини към групата %s" @@ -2101,11 +2270,13 @@ msgstr "%s се присъедини към групата %s" msgid "You must be logged in to leave a group." msgstr "За напуснете група, трябва да сте влезли." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Не членувате в тази група." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s напусна групата %2$s" @@ -2152,10 +2323,14 @@ msgstr "" "при промяна на настройките." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Вход с име и парола" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Влезте с име и парола. Нямате такива? [Регистрирайте](%%action.register%%) " "нова сметка или опитайте с [OpenID](%%action.openidlogin%%). " @@ -2180,13 +2355,13 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "За да редактирате групата, трябва да сте й администратор." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "" +#, fuzzy +msgid "No current status." +msgstr "Няма резултати." #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" -msgstr "Няма такава бележка." +msgstr "Ново приложение" #: actions/newapplication.php:64 #, fuzzy @@ -2219,12 +2394,12 @@ msgstr "Използвайте тази бланка за създаване н msgid "New message" msgstr "Ново съобщение" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Не може да изпращате съобщения до този потребител." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Няма съдържание!" @@ -2232,7 +2407,7 @@ msgstr "Няма съдържание!" msgid "No recipient specified." msgstr "Не е указан получател." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2248,7 +2423,7 @@ msgstr "Съобщението е изпратено" msgid "Direct message to %s sent." msgstr "Прякото съобщение до %s е изпратено." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Грешка в Ajax" @@ -2256,7 +2431,7 @@ msgstr "Грешка в Ajax" msgid "New notice" msgstr "Нова бележка" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Бележката е публикувана" @@ -2348,11 +2523,11 @@ msgid "You are not a user of that application." msgstr "Не членувате в тази група." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2361,24 +2536,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "Бележката няма профил" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Бележка на %1$s от %2$s" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "вид съдържание " -#: actions/oembed.php:160 -msgid "Only " -msgstr "Само " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -2400,7 +2581,7 @@ msgstr "Управление на различни други настройки #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr " (безплатна услуга)" #: actions/othersettings.php:116 msgid "Shorten URLs with" @@ -2488,7 +2669,7 @@ msgid "6 or more characters" msgstr "6 или повече знака" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Потвърждаване" @@ -2516,7 +2697,7 @@ msgstr "Грешна стара парола" msgid "Error saving user; invalid." msgstr "Грешка при запазване на потребител — невалидност." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Грешка при запазване на новата парола." @@ -2525,7 +2706,7 @@ msgid "Password saved." msgstr "Паролата е записана." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Пътища" @@ -2535,23 +2716,23 @@ msgstr "Пътища и сървърни настройки за тази инс #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "Страницата не е достъпна във вида медия, който приемате" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Страницата не е достъпна във вида медия, който приемате" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "Директория на фона" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "Страницата не е достъпна във вида медия, който приемате" #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2690,18 +2871,19 @@ msgstr "" msgid "People search" msgstr "Търсене на хора" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, fuzzy, php-format -msgid "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." msgstr "Това не е правилен адрес на е-поща." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Бележки с етикет %s, страница %d" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "Невалидно съдържание на бележка" #: actions/postnotice.php:101 @@ -2727,13 +2909,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Пълно име" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Лична страница" @@ -2755,9 +2938,9 @@ msgid "Bio" msgstr "За мен" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Местоположение" @@ -2771,7 +2954,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Етикети" @@ -2845,7 +3028,7 @@ msgstr "Настройките са запазени." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -2999,7 +3182,7 @@ msgstr "Нова парола" msgid "Recover password" msgstr "Възстановяване на паролата" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Поискано е възстановяване на парола" @@ -3019,19 +3202,19 @@ msgstr "Обновяване" msgid "Enter a nickname or email address." msgstr "Въведете псевдоним или е-поща." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Няма потребител с такава е-поща или потребителско име." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Няма указана е-поща за този потребител." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Грешка при запазване на потвърждение за адрес" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3039,23 +3222,23 @@ msgstr "" "На е-пощата, с която сте регистрирани са изпратени инструкции за " "възстановяване на паролата." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Неочаквано подновяване на паролата." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Паролата трябва да е от поне 6 знака." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Паролата и потвърждението й не съвпадат." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Грешка в настройките на потребителя." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Новата парола е запазена. Влязохте успешно." @@ -3072,7 +3255,7 @@ msgstr "Грешка в кода за потвърждение." msgid "Registration successful" msgstr "Записването е успешно." -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистриране" @@ -3094,7 +3277,7 @@ msgstr "Неправилно име или парола." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3112,8 +3295,9 @@ msgstr "6 или повече знака. Задължително поле." msgid "Same as password above. Required." msgstr "Същото като паролата по-горе. Задължително поле." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Е-поща" @@ -3126,21 +3310,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "По-дълго име, за предпочитане \"истинското\" ви име." #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Текстовете и файловите ми са достъпни под " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Криейтив Комънс Признание 3.0" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3173,7 +3349,7 @@ msgstr "" "Благодарим, че се включихте в сайта и дано ползването на услугата ви носи " "само приятни мигове!" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3218,7 +3394,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Абониране" @@ -3256,7 +3432,7 @@ msgstr "Не можете да повтаряте собствена бележ msgid "You already repeated that notice." msgstr "Вече сте повторили тази бележка." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Повторено" @@ -3342,7 +3518,7 @@ msgstr "Потребителят ви е блокирал." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Сесии" @@ -3373,35 +3549,37 @@ msgid "Save site settings" msgstr "Запазване настройките на сайта" #: actions/showapplication.php:82 -#, fuzzy msgid "You must be logged in to view an application." -msgstr "За напуснете група, трябва да сте влезли." +msgstr "За прегледате приложение, трябва да сте влезли." #: actions/showapplication.php:157 -#, fuzzy msgid "Application profile" -msgstr "Бележката няма профил" +msgstr "Профил на приложението" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Икона" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Име" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Организация" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Описание" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Статистики" @@ -3420,7 +3598,7 @@ msgstr "" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Данни за приложението" #: actions/showapplication.php:263 msgid "Consumer key" @@ -3513,67 +3691,67 @@ msgstr "Група %s" msgid "%1$s group, page %2$d" msgstr "Членове на групата %s, страница %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Профил на групата" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Бележка" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Псевдоними" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Емисия с бележки на %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Емисия с бележки на %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Емисия с бележки на %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Изходяща кутия за %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Членове" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Всички членове" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Създадена на" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3583,7 +3761,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3592,7 +3770,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Администратори" @@ -3721,11 +3899,12 @@ msgid "Unknown language \"%s\"." msgstr "Непознат език \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Минималното ограничение на текста е 140 знака." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3774,9 +3953,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "Часови пояс по подразбиране за сайта (обикновено UTC)." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Език по подразбиране за сайта" +msgstr "Език по подразбиране" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3818,7 +3996,7 @@ msgid "Unable to save site notice." msgstr "Грешка при записване настройките за Twitter" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3835,45 +4013,75 @@ msgstr "" msgid "Save site notice" msgstr "Нова бележка" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Настройки за SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Може да получавате на е-пощата си SMS-съобщения от %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "Страницата не е достъпна във вида медия, който приемате" -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "IM адрес" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Текущ потвърден телефонен номер за SMS-и." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Очаква се потвърждение за този телефонен номер." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Код за потвърждение" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Въведете кода, който получихте по телефона." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Потвърждаване" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Телефонен номер за SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Телефонен номер — с код, без пунктоация и без интервали." -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Настройки" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3881,23 +4089,34 @@ msgstr "" "Получаване на бележки в SMS. Имайте предвид, че може да има допълнителни " "такси от оператора." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "Настройките са запазени." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Не е въведен телефонен номер." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Не е избран оператор." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Това и сега е номерът на телефона ви." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Този телефонен номер вече се използва от друг потребител." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " @@ -3907,23 +4126,42 @@ msgstr "" "Проверете съобщенията (или папката за спам) за кода и указанията за " "използването му." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Този код за потвърждение е грешен." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Потвърждаването е прекъснато." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Това не е вашият телефонен номер." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "Телефонен номер за SMS" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Мобилен оператор" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Изберете оператор" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3932,13 +4170,14 @@ msgstr "" "Мобилен оператор за SMS. Ако знаете оператор, поддържащ SMS от е-поща, който " "не фигурира тук, пишете ни на адрес %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Не е въведен код." #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3960,7 +4199,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4000,8 +4239,7 @@ msgstr "Запазване настройките на сайта" msgid "You are not subscribed to that profile." msgstr "Не сте абонирани за този профил" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Грешка при създаване на нов абонамент." @@ -4011,9 +4249,8 @@ msgid "This action only accepts POST requests." msgstr "" #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "Няма такъв файл." +msgstr "Няма такъв профил." #: actions/subscribe.php:117 #, fuzzy @@ -4031,9 +4268,9 @@ msgid "%s subscribers" msgstr "%s абоната" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "Абонаменти на %s, страница %d" +msgstr "Абонати на %1$s, страница %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -4068,9 +4305,9 @@ msgid "%s subscriptions" msgstr "Абонаменти на %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "Абонаменти на %s, страница %d" +msgstr "Абонаменти на %1$s, страница %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -4096,11 +4333,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s не получава ничии бележки." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4134,12 +4371,12 @@ msgstr "Няма такъв документ." msgid "Tag %s" msgstr "Етикети" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Потребителски профил" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Снимка" @@ -4190,7 +4427,7 @@ msgstr "Потребителят не е заглушен." #: actions/unsubscribe.php:77 #, fuzzy -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Сървърът не е върнал адрес на профила." #: actions/unsubscribe.php:98 @@ -4206,7 +4443,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Потребител" @@ -4228,7 +4464,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" @@ -4395,27 +4632,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "Членове на групата %s, страница %d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Търсене на още групи" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s не членува в никоя група." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." @@ -4463,7 +4706,8 @@ msgstr "" msgid "Plugins" msgstr "Приставки" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Версия" @@ -4471,19 +4715,19 @@ msgstr "Версия" msgid "Author(s)" msgstr "Автор(и)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4526,28 +4770,29 @@ msgstr "Грешка при вмъкване на съобщението." msgid "Could not update message with new URI." msgstr "Грешка при обновяване на бележката с нов URL-адрес." -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" +msgstr "Грешка в базата от данни — отговор при вмъкването: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Грешка при записване на бележката. Непознат потребител." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:256 +#: classes/Notice.php:260 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4556,315 +4801,335 @@ msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Забранено ви е да публикувате бележки в този сайт." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Потребителят е забранил да се абонирате за него." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Потребителят ви е блокирал." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Не сте абонирани!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Грешка при изтриване на абонамента." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Грешка при изтриване на абонамента." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Грешка при изтриване на абонамента." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добре дошли в %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Грешка при създаване на групата." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Грешка при създаване на нов абонамент." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Грешка при създаване на нов абонамент." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Грешка при създаване на нов абонамент." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Промяна настройките на профила" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Качване на аватар" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Смяна на паролата" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Промяна обработката на писмата" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "Потребителски профил" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Друго" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Други настройки" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Друго" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Неозаглавена страница" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 -#, fuzzy +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Лично" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 -#, fuzzy +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Промяна на поща, аватар, парола, профил" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 -#, fuzzy +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Свързване към услуги" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Свързване" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 -#, fuzzy +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Промяна настройките на сайта" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Настройки" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 -#, fuzzy, php-format +#: lib/action.php:455 +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Поканете приятели и колеги да се присъединят към вас в %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Покани" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 -#, fuzzy +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Излизане от сайта" -#: lib/action.php:465 -#, fuzzy +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Изход" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 -#, fuzzy +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Създаване на нова сметка" -#: lib/action.php:473 -#, fuzzy +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Регистриране" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 -#, fuzzy +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Влизане в сайта" -#: lib/action.php:479 -#, fuzzy +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Вход" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Помощ" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "Помощ" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 -#, fuzzy +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Търсене за хора или бележки" -#: lib/action.php:491 -#, fuzzy +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Търсене" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 #, fuzzy msgid "Site notice" msgstr "Нова бележка" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 #, fuzzy msgid "Page notice" msgstr "Нова бележка" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 #, fuzzy msgid "Secondary site navigation" msgstr "Абонаменти" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Помощ" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Относно" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "Въпроси" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "Условия" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Поверителност" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Изходен код" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Контакт" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Табелка" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Лиценз на програмата StatusNet" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** е услуга за микроблогване, предоставена ви от [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** е услуга за микроблогване. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** е услуга за микроблогване." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4875,68 +5140,82 @@ msgstr "" "достъпна под [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Лиценз на съдържанието" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "Всички " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "лиценз." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Страниране" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "След" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Преди" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Не можете да променяте този сайт." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 #, fuzzy msgid "Changes to that panel are not allowed." msgstr "Записването не е позволено." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 #, fuzzy msgid "showForm() not implemented." @@ -4948,164 +5227,201 @@ msgstr "Командата все още не се поддържа." msgid "saveSettings() not implemented." msgstr "Командата все още не се поддържа." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 #, fuzzy msgid "Unable to delete design setting." msgstr "Грешка при записване настройките за Twitter" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Основна настройка на сайта" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 -#, fuzzy +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Сайт" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Настройка на оформлението" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "Версия" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "Настройка на пътищата" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Потребител" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "Настройка на оформлението" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Настройка на пътищата" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "Настройка на оформлението" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "Нова бележка" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "Настройка на пътищата" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Опишете групата или темата в до %d букви" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "Опишете групата или темата" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Изходен код" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "Адрес на страница, блог или профил в друг сайт на групата" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "Изходен код" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "Адрес на страница, блог или профил в друг сайт на групата" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Отказ" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "Премахване" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Автор" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Доставчик" @@ -5127,37 +5443,57 @@ msgstr "Паролата е записана." msgid "Password changing is not allowed" msgstr "Паролата е записана." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Резултат от командата" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Командата е изпълнена" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Грешка при изпълнение на командата" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "За съжаление тази команда все още не се поддържа." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Не е открита бележка с такъв идентификатор." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Потребителят няма последна бележка" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Грешка при обновяване на потребител с потвърден email адрес." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Грешка при обновяване на потребител с потвърден email адрес." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "За съжаление тази команда все още не се поддържа." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Изпратено е побутване на %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5168,198 +5504,203 @@ msgstr "" "Абонати: %2$s\n" "Бележки: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Не е открита бележка с такъв идентификатор." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Потребителят няма последна бележка" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Бележката е отбелязана като любима." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Вече членувате в тази група." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, fuzzy, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "Грешка при проследяване — потребителят не е намерен." -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s се присъедини към групата %s" - -#: lib/command.php:275 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, fuzzy, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "Грешка при проследяване — потребителят не е намерен." -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s напусна групата %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Пълно име: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Местоположение: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Домашна страница: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Относно: %s" -#: lib/command.php:349 -#, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2" +"$d." + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Прякото съобщение до %s е изпратено." -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Грешка при изпращане на прякото съобщение" -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Не можете да повтаряте собствена бележка" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Вече сте повторили тази бележка." -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Бележката от %s е повторена" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Грешка при повтаряне на бележката." -#: lib/command.php:482 +#: lib/command.php:562 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Отговорът до %s е изпратен" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Грешка при записване на бележката." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Уточнете името на потребителя, за когото се абонирате." -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Няма такъв потребител" +#: lib/command.php:628 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Не сте абонирани за този профил" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Абонирани сте за %s." -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Уточнете името на потребителя, от когото се отписвате." -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Отписани сте от %s." -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Командата все още не се поддържа." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Уведомлението е изключено." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Грешка при изключване на уведомлението." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Уведомлението е включено." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Грешка при включване на уведомлението." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Отписани сте от %s." -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Не сте абонирани за никого." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вече сте абонирани за следните потребители:" msgstr[1] "Вече сте абонирани за следните потребители:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Никой не е абониран за вас." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Грешка при абониране на друг потребител за вас." msgstr[1] "Грешка при абониране на друг потребител за вас." -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Не членувате в нито една група." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не членувате в тази група." msgstr[1] "Не членувате в тази група." -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5401,19 +5742,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Не е открит файл с настройки. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Влизане в сайта" @@ -5589,54 +5930,55 @@ msgstr "Групи с най-много бележки" msgid "Tags in %s group's notices" msgstr "Етикети в бележките към групата %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Страницата не е достъпна във вида медия, който приемате" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Форматът на файла с изображението не се поддържа." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Може да качите лого за групата ви." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Частично качване на файла." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системна грешка при качване на файл." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Файлът не е изображение или е повреден." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Форматът на файла с изображението не се поддържа." - #: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Няма такава бележка." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Неподдържан вид файл" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Непознат език \"%s\"" @@ -5657,11 +5999,13 @@ msgstr "Вход с име и парола" msgid "Sign up for a new account" msgstr "Създаване на нова сметка" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Потвърждаване адреса на е-поща" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5678,12 +6022,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s вече получава бележките ви в %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5708,17 +6054,20 @@ msgstr "" "----\n" "Може да смените адреса и настройките за уведомяване по е-поща на %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Биография: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Нов адрес на е-поща за публикщуване в %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5731,21 +6080,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Състояние на %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Потвърждение за SMS" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "Очаква се потвърждение за този телефонен номер." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Побутнати сте от %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5761,12 +6120,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Ново лично съобщение от %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5785,12 +6146,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) отбеляза бележката ви като любима" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5811,12 +6174,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5829,6 +6202,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5841,7 +6226,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "от" @@ -5955,14 +6340,12 @@ msgid "Attach a file" msgstr "Прикрепяне на файл" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "Грешка при запазване етикетите." +msgstr "Споделяне на местоположението ми" #: lib/noticeform.php:215 -#, fuzzy msgid "Do not share my location" -msgstr "Грешка при запазване етикетите." +msgstr "Без споделяне на местоположението ми" #: lib/noticeform.php:216 msgid "" @@ -5970,48 +6353,52 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "С" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "Ю" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "И" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "З" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "в контекст" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Повторено от" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Отговаряне на тази бележка" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Отговор" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Бележката е повторена." @@ -6035,6 +6422,10 @@ msgstr "Грешка при вмъкване на нов профил" msgid "Error inserting avatar" msgstr "Грешка при вмъкване на аватар" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Грешка при обновяване на отдалечен профил" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Грешка при вмъкване на отдалечен профил" @@ -6086,7 +6477,7 @@ msgstr "Етикети в бележките на %s" msgid "Unknown" msgstr "Непознато действие" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Абонаменти" @@ -6094,32 +6485,33 @@ msgstr "Абонаменти" msgid "All subscriptions" msgstr "Всички абонаменти" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Абонати" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Всички абонати" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 #, fuzzy msgid "User ID" msgstr "Потребител" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Участник от" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Всички групи" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Липсват аргументи return-to." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6143,10 +6535,17 @@ msgstr "Избрано" msgid "Popular" msgstr "Популярно" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Липсват аргументи return-to." + #: lib/repeatform.php:107 -#, fuzzy msgid "Repeat this notice?" -msgstr "Повтаряне на тази бележка" +msgstr "Да се повтори ли тази бележка?" + +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Да" #: lib/repeatform.php:132 msgid "Repeat this notice" @@ -6157,7 +6556,7 @@ msgstr "Повтаряне на тази бележка" msgid "Revoke the \"%s\" role from this user" msgstr "Списък с потребителите в тази група." -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6185,9 +6584,8 @@ msgid "Search" msgstr "Търсене" #: lib/searchaction.php:162 -#, fuzzy msgid "Search help" -msgstr "Търсене" +msgstr "Помощ за търсенето" #: lib/searchgroupnav.php:80 msgid "People" @@ -6211,7 +6609,7 @@ msgstr "Неозаглавен раздел" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "Още…" #: lib/silenceform.php:67 msgid "Silence" @@ -6289,91 +6687,108 @@ msgstr "Отписване от този потребител" msgid "Unsubscribe" msgstr "Отписване" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Потребителят няма профил." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Редактиране на аватара" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Потребителски действия" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Редактиране на профила" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Редактиране" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Изпращате на пряко съобщение до този потребител." -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Съобщение" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "Потребителски профил" +msgstr "Потребителска роля" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Администратори" +msgstr "Администратор" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "" +msgstr "Модератор" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "преди няколко секунди" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "преди около час" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "преди около %d часа" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "преди около месец" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "преди около %d месеца" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "преди около година" @@ -6387,8 +6802,9 @@ msgstr "%s не е допустим цвят!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s не е допустим цвят! Използвайте 3 или 6 шестнадесетични знака." -#: lib/xmppmanager.php:402 -#, fuzzy, php-format +#: lib/xmppmanager.php:403 +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" -"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." +"Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2" +"$d." diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 2197b9e743..9e0994529c 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:25+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:12+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -22,14 +22,14 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Moned" #. TRANS: Page notice #: actions/accessadminpanel.php:67 msgid "Site access settings" -msgstr "" +msgstr "Arventennoù moned d'al lec'hienn" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 @@ -39,7 +39,7 @@ msgstr "Enskrivadur" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" +msgstr "Nac'h ouzh an implijerien dizanv (nann-luget) da welet al lec'hienn ?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 @@ -72,7 +72,13 @@ msgstr "Serr" msgid "Save access settings" msgstr "Enrollañ an arventennoù moned" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Enrollañ" @@ -80,8 +86,8 @@ msgstr "Enrollañ" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "N'eus ket eus ar bajenn-se" +msgid "No such page." +msgstr "N'eus ket eus ar bajenn-se." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -91,9 +97,9 @@ msgstr "N'eus ket eus ar bajenn-se" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -101,11 +107,9 @@ msgstr "N'eus ket eus ar bajenn-se" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "N'eus ket eus an implijer-se." @@ -117,8 +121,9 @@ msgstr "%1$s hag e vignoned, pajenn %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -176,8 +181,10 @@ msgstr "" msgid "You and friends" msgstr "C'hwi hag o mignoned" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Hizivadennoù %1$s ha mignoned e %2$s!" @@ -192,18 +199,18 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "N'eo ket bet kavet an hentenn API !" @@ -216,15 +223,15 @@ msgstr "N'eo ket bet kavet an hentenn API !" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Ezhomm en deus an argerzh-mañ eus ur POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -236,7 +243,7 @@ msgstr "Diposubl eo hizivaat an implijer." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "An implijer-mañ n'eus profil ebet dezhañ." @@ -246,9 +253,9 @@ msgid "Could not save profile." msgstr "Diposubl eo enrollañ ar profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -265,7 +272,7 @@ msgstr "" #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." -msgstr "" +msgstr "Dibosupl eo enrollañ an arventennoù empentiñ." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 @@ -274,15 +281,15 @@ msgstr "Diposubl eo hizivat ho design." #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" -msgstr "Ne c'helloc'h ket ho stankañ ho unan !" +msgstr "N'hallit ket en em stankañ hoc'h-unan !" #: actions/apiblockcreate.php:126 msgid "Block user failed." -msgstr "N'eo ket bet stanke an implijer." +msgstr "N'eus ket bet tu da stankañ an implijer." #: actions/apiblockdestroy.php:114 msgid "Unblock user failed." -msgstr "N'eus ket bet tu distankañ an implijer." +msgstr "N'eus ket bet tu da zistankañ an implijer." #: actions/apidirectmessage.php:89 #, php-format @@ -332,7 +339,7 @@ msgstr "N'eo bet kavet statud ebet gant an ID-mañ." msgid "This status is already a favorite." msgstr "Ur pennroll eo dija an ali-mañ." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Diposupl eo krouiñ ar pennroll-mañ." @@ -364,7 +371,7 @@ msgstr "Ne c'hallit ket chom hep ho heuliañ hoc'h-unan." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." -msgstr "" +msgstr "Rankout a reoc'h reiñ daou id pe lesanv." #: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." @@ -423,11 +430,10 @@ msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)." msgid "Too many aliases! Maximum %d." msgstr "Re a aliasoù ! %d d'ar muiañ." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Alias fall : \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Alias fall : \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -443,14 +449,14 @@ msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "N'eo ket bet kavet ar strollad" +msgid "Group not found." +msgstr "N'eo ket bet kavet ar strollad." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Un ezel eus ar strollad-mañ eo dija." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour." @@ -468,17 +474,26 @@ msgstr "N'oc'h ket ezel eus ar strollad-mañ." msgid "Could not remove user %1$s from group %2$s." msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Strollad %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Strolladoù %1s m'eo ezel %2s." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Strolladoù %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "strolladoù war %s" @@ -492,22 +507,22 @@ msgid "Invalid token." msgstr "Fichenn direizh." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." -msgstr "" +msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit." #: actions/apioauthauthorize.php:135 msgid "Invalid nickname / password!" @@ -533,18 +548,21 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." -msgstr "" +msgstr "Kinnig ar furmskrid dic'hortoz." #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" -msgstr "" +msgstr "C'hoant 'zo gant ur poellad kevreañ gant ho kont" #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" @@ -558,20 +576,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Kont" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Lesanv" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Ger-tremen" @@ -616,17 +636,17 @@ msgstr "Statud diverket." msgid "No status with that ID found." msgstr "N'eo ket bet kavet a statud evit an ID-mañ" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "N'eo ket bet kavet" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "N'eo ket bet kavet." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -635,12 +655,12 @@ msgstr "" msgid "Unsupported format." msgstr "Diembreget eo ar furmad-se." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Pennroll %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s statud pennroll da %2$s / %2$s." @@ -650,17 +670,17 @@ msgstr "%1$s statud pennroll da %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Hizivadennoù a veneg %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Oberezhioù publik %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s statud an holl !" @@ -675,19 +695,15 @@ msgstr "Adkemeret evit %s" msgid "Repeats of %s" msgstr "Adkemeret eus %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Alioù merket gant %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "" - -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "N'eo ket bet kavet." +msgstr "Hizivadennoù merket gant %1$s e %2$s !" #: actions/attachment.php:73 msgid "No such attachment." @@ -708,8 +724,9 @@ msgstr "Ment ebet." msgid "Invalid size." msgstr "Ment direizh." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -719,10 +736,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Implijer hep profil klotaus" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -740,7 +757,7 @@ msgid "Preview" msgstr "Rakwelet" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Diverkañ" @@ -752,23 +769,27 @@ msgstr "Enporzhiañ" msgid "Crop" msgstr "Adframmañ" -#: actions/avatarsettings.php:328 -msgid "Pick a square area of the image to be your avatar" -msgstr "" +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "N'eus bet enporzhiet restr ebet." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:332 +msgid "Pick a square area of the image to be your avatar" +msgstr "Diuzit ur zonenn gant ur stumm karrez evit tremeniñ ho avatar" + +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Kollet eo bet roadennoù." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Hizivaet eo bet an avatar." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Dilammet eo bet an Avatar." @@ -776,7 +797,7 @@ msgstr "Dilammet eo bet an Avatar." msgid "You already blocked that user." msgstr "Stanket o peus dija an implijer-mañ." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Stankañ an implijer-mañ" @@ -787,27 +808,42 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" -msgstr "Ket" +msgstr "Nann" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Arabat stankañ an implijer-mañ" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Ya" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Stankañ an implijer-mañ" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Diposubl eo enrollañ an titouroù stankañ." @@ -820,8 +856,8 @@ msgstr "Diposubl eo enrollañ an titouroù stankañ." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "N'eus ket eus ar strollad-se." @@ -850,11 +886,13 @@ msgstr "Distankañ" #: actions/blockedfromgroup.php:320 lib/unblockform.php:80 msgid "Unblock this user" -msgstr "Distankañ an implijer-se" +msgstr "Distankañ an implijer-mañ" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Postañ war " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Postañ war %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -868,33 +906,43 @@ msgstr "N'eo ket bet kavet ar c'hod kadarnaat." msgid "That confirmation code is not for you!" msgstr "N'eo ket ar c'hod-se evidoc'h !" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "N'eo ket bet anavezet seurt ar chomlec'h %s" +msgid "Unrecognized address type %s." +msgstr "Doare chomlec'h dianav %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Diposubl eo hizivaat an implijer." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Diposubl eo dilemel ar postel kadarnadur." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Chomlec'h kadarnaet" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Kadarnaet eo bet ar chomlec'h \"%s\" evit ho kont." @@ -904,7 +952,7 @@ msgid "Conversation" msgstr "Kaozeadenn" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Ali" @@ -923,9 +971,9 @@ msgstr "N'oc'h ket perc'henn ar poellad-se." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." -msgstr "" +msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h." #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 msgid "Delete application" @@ -938,15 +986,17 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Arabat eo dilemel ar poellad-mañ" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Dilemel ar poelad-se" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -975,17 +1025,19 @@ msgstr "Dilemel un ali" msgid "Are you sure you want to delete this notice?" msgstr "Ha sur oc'h ho peus c'hoant dilemel an ali-mañ ?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Arabat dilemel an ali-mañ" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Dilemel an ali-mañ" #: actions/deleteuser.php:67 msgid "You cannot delete users." -msgstr "Ne c'helloc'h ket diverkañ implijerien" +msgstr "N'hallit ket diverkañ implijerien." #: actions/deleteuser.php:74 msgid "You can only delete local users." @@ -1001,125 +1053,129 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" -msgstr "Diverkañ an implijer-se" +msgstr "Diverkañ an implijer-mañ" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Design" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Arventennoù design evit al lec'hienn StatusNet-mañ." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "URL fall evit al logo." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "N'eus ket tu kaout an dodenn : %s" +msgid "Theme not available: %s." +msgstr "N'eus ket eus ar gaoz-se : %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Cheñch al logo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Logo al lec'hienn" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Lakaat un dodenn all" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Dodenn al lec'hienn" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Dodenn evit al lec'hienn." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Kemmañ ar skeudenn foñs" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Background" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Gweredekaet" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Diweredekaet" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Gweredekaat pe diweredekaat ar skeudenn foñs." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" -msgstr "" +msgstr "Adober gant ar skeudenn drekleur" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Kemmañ al livioù" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Endalc'h" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Barenn kostez" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Testenn" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Liammoù" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Implijout an talvoudoù dre ziouer" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Adlakaat an neuz dre ziouer." -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Adlakaat an arventennoù dre ziouer" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Enrollañ" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Enrollañ an design" @@ -1224,11 +1280,16 @@ msgstr "Leunit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad." msgid "description is too long (max %d chars)." msgstr "re hir eo an deskrivadur (%d arouezenn d'ar muiañ)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Alias fall : \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Diposubl eo hizivaat ar strollad." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Diposubl eo krouiñ an aliasoù." @@ -1236,178 +1297,229 @@ msgstr "Diposubl eo krouiñ an aliasoù." msgid "Options saved." msgstr "Enrollet eo bet ho dibarzhioù." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Arventennoù ar postel" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Merañ ar posteloù a fell deoc'h resevout a-berzh %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Chomlec'h" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Chomlec'h postel" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Chomlec'h postel gwiriekaet er mare-mañ." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Dilemel" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Nullañ" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Chomlec'h postel" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Chomlec'h postel, evel \"AnvImplijer@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Ouzhpennañ" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Postel o tont" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Nevez" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Penndibaboù" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Penndibaboù ar posteloù" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Kas din ur postel pa gas unan bennak ur gemennadenn bersonel din." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Kas din ur postel pa gas unan bennak ur \"@-respont\" din." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "C'hoant am eus kas va alioù dre bostel." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Embann ur MicroID evit ma chomlec'h postel." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Penndibaboù enrollet" +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Enrollet eo bet an arventennoù postel." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." -msgstr "N'eus chomlec'h postel ebet." +msgstr "Chomlec'h postel ebet." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "N'eo ket ur chomlec'h postel reizh." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Ho postel eo dija." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." -msgstr "" +msgstr "Dibosupl eo ensoc'hañ ar c'hod gwiriekaat." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "" -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." msgstr "N'eo ket mat ar chomlec'h postelerezh prim." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Nullet eo bet ar gadarnadenn." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Nullet eo bet kadarnadenn ar postel." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "N'eo ket ho postel." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Dilamet eo bet ar chomlec'h." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "Dilamet eo bet ar chomlec'h postel." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." -msgstr "" +msgstr "Chomlec'h postel ebet o tont." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." -msgstr "" +msgstr "Dibosupl eo hizivaat doser an implijer." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" @@ -1417,7 +1529,7 @@ msgstr "Ouzhpennet eo bet an ali-mañ d'ho pennrolloù dija !" #: actions/favor.php:92 lib/disfavorform.php:140 msgid "Disfavor favorite" -msgstr "" +msgstr "Tennañ ar pennroll" #: actions/favorited.php:65 lib/popularnoticesection.php:91 #: lib/publicgroupnav.php:93 @@ -1520,9 +1632,10 @@ msgstr "" msgid "Remote service uses unknown version of OMB protocol." msgstr "" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." +msgstr "Diposubl eo enrollañ ar profil." #: actions/getfile.php:79 msgid "No such file." @@ -1577,11 +1690,11 @@ msgstr "An implijer-mañ a zo stanket dija eus ar strollad." msgid "User is not a member of group." msgstr "N'eo ket an implijer-mañ ezel eus ur strollad." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Stankañ an implijer-mañ eus ar strollad" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1589,15 +1702,17 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Arabat stankañ an implijer-mañ eus ar strollad." -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Stankañ an implijer-mañ eus ar strollad-se" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1638,10 +1753,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1672,34 +1783,38 @@ msgstr "Roll an implijerien enrollet er strollad-mañ." msgid "Admin" msgstr "Merañ" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Stankañ" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Lakaat an implijer da vezañ ur merour eus ar strollad" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Lakaat ur merour" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Lakaat an implijer-mañ da verour" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Oberezhioù %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Hizivadenn izili %1$s e %2$s !" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Strolladoù" @@ -1719,7 +1834,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Krouiñ ur strollad nevez" @@ -1767,90 +1882,146 @@ msgstr "N'eo ket stanket an implijer-mañ eus ar strollad." msgid "Error removing the block." msgstr "Ur fazi a zo bet e-pad nulladenn ar stankadenn." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Arventennoù ar bostelerezh prim" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "Dizimplijadus eo ar bostelerezh prim" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Chomlec'h postelerezh prim" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Chomlec'h Jabber/GTalk kadarnaet er mare-mañ." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "Chomlec'h postelerezh prim" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Penndibaboù ar bostelerezh prim" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Kas din an alioù dre Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Penndibaboù enrollet" + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "ID Jabber ebet." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Diposubl eo implijout an ID Jabber-mañ" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "N'eo ket un ID Jabber reizh." -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Ho ID Jabber eo dija" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Implijet eo an Jabber ID-mañ gant un implijer all." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." msgstr "" -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "N'eo ket mat ar chomlec'h postelerezh prim." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Diposubl eo dilemel ar postel kadarnadur." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "N'eo ket ho ID Jabber." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Dilamet eo bet ar chomlec'h." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1871,8 +2042,8 @@ msgstr "Diweredekaat eo bet ar bedadennoù." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "" +msgid "You must be logged in to invite other users to use %s." +msgstr "Rankout a reoc'h bezañ luget evit pediñ implijerien all e %s." #: actions/invite.php:72 #, php-format @@ -1881,7 +2052,7 @@ msgstr "Fall eo ar postel : %s" #: actions/invite.php:110 msgid "Invitation(s) sent" -msgstr "Kaset eo bet ar bedadenn(où)" +msgstr "Pedadenn(où) kaset" #: actions/invite.php:112 msgid "Invite new users" @@ -1891,7 +2062,9 @@ msgstr "Pediñ implijerien nevez" msgid "You are already subscribed to these users:" msgstr "Koumanantet oc'h dija d'an implijerien-mañ :" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1928,7 +2101,7 @@ msgstr "Chomlec'hioù an implijerien da bediñ (unan dre linenn)" #: actions/invite.php:192 msgid "Personal message" -msgstr "Kemenadenn bersonel" +msgstr "Kemennadenn bersonel" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." @@ -1940,12 +2113,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Kas" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s a bed ac'hanoc'h d'en em enskrivañ war %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -1984,7 +2159,9 @@ msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad." msgid "No nickname or ID." msgstr "Lesanv pe ID ebet." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s a zo bet er strollad %2$s" @@ -1993,11 +2170,13 @@ msgstr "%1$s a zo bet er strollad %2$s" msgid "You must be logged in to leave a group." msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "N'oc'h ket un ezel eus ar strollad-mañ." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s en deus kuitaet ar strollad %2$s" @@ -2047,13 +2226,16 @@ msgstr "" "tremen a-benn enrollañ ho penndibaboù." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Kevreit gant ho anv implijer hag ho ker-tremen." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Kevreit gant ho anv implijer hag ho ker tremen. N'o peus ket a anv implijer " -"evit c'hoazh ? [Krouit](%%action.register%%) ur gont nevez." +"N'o peus ket a anv implijer evit c'hoazh ? [Krouit](%%action.register%%) ur " +"gont nevez." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2075,8 +2257,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Diposubl eo lakaat %1$s da merour ar strollad %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Statud ebet er mare-mañ" +msgid "No current status." +msgstr "Statud ebet er mare-mañ." #: actions/newapplication.php:52 msgid "New Application" @@ -2110,12 +2292,12 @@ msgstr "Implijit ar furmskrid-mañ a-benn krouiñ ur strollad nevez." msgid "New message" msgstr "Kemennadenn nevez" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Goullo eo !" @@ -2123,7 +2305,7 @@ msgstr "Goullo eo !" msgid "No recipient specified." msgstr "N'o peus ket lakaet a resever." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2132,14 +2314,14 @@ msgstr "" #: actions/newmessage.php:181 msgid "Message sent" -msgstr "Kaset eo bet ar gemenadenn" +msgstr "Kemennadenn kaset" #: actions/newmessage.php:185 #, php-format msgid "Direct message to %s sent." msgstr "Kaset eo bet da %s ar gemennadenn war-eeun." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Fazi Ajax" @@ -2147,7 +2329,7 @@ msgstr "Fazi Ajax" msgid "New notice" msgstr "Ali nevez" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Ali embannet" @@ -2160,7 +2342,7 @@ msgstr "" #: actions/noticesearch.php:78 msgid "Text search" -msgstr "Klask un destenn" +msgstr "Klask testennoù" #: actions/noticesearch.php:91 #, php-format @@ -2234,11 +2416,11 @@ msgid "You are not a user of that application." msgstr "N'oc'h ket un implijer eus ar poellad-mañ." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, fuzzy, php-format +msgid "Unable to revoke access for app: %s." msgstr "Dibosupl eo nullañ moned ar poellad : " #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2247,24 +2429,29 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "N'en deus ket an ali a profil" +msgid "Notice has no profile." +msgstr "N'en deus ket an ali a profil." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Statud %1$s war %2$s" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "seurt an danvez " -#: actions/oembed.php:160 -msgid "Only " -msgstr "Hepken " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -2302,7 +2489,7 @@ msgstr "" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "" +msgstr "Diskouez pe kuzhat designoù ar profil." #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." @@ -2348,11 +2535,11 @@ msgstr "Cheñch ger-tremen" #: actions/passwordsettings.php:69 msgid "Change your password." -msgstr "Kemmañ ho ger tremen." +msgstr "Cheñch ger-tremen." #: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" -msgstr "Kemmañ ar ger-tremen" +msgstr "Kemmañ ger-tremen" #: actions/passwordsettings.php:104 msgid "Old password" @@ -2367,7 +2554,7 @@ msgid "6 or more characters" msgstr "6 arouezenn pe muioc'h" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Kadarnaat" @@ -2389,13 +2576,13 @@ msgstr "Ne glot ket ar gerioù-tremen." #: actions/passwordsettings.php:165 msgid "Incorrect old password" -msgstr "ger-termen kozh amreizh" +msgstr "Ger-termen kozh direizh" #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Dibosupl eo enrollañ ar ger-tremen nevez." @@ -2404,7 +2591,7 @@ msgid "Password saved." msgstr "Ger-tremen enrollet." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Hentoù" @@ -2413,23 +2600,23 @@ msgid "Path and server settings for this StatusNet site." msgstr "" #: actions/pathsadminpanel.php:157 -#, php-format -msgid "Theme directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Theme directory not readable: %s." +msgstr "N'eus ket tu kaout an dodenn : %s" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Restroù an avataroù" #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" +msgid "Background directory not writable: %s." msgstr "" #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" +msgid "Locales directory not readable: %s." msgstr "" #: actions/pathsadminpanel.php:183 @@ -2438,7 +2625,7 @@ msgstr "" #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 msgid "Site" -msgstr "Lec'hien" +msgstr "Lec'hienn" #: actions/pathsadminpanel.php:238 msgid "Server" @@ -2446,7 +2633,7 @@ msgstr "Servijer" #: actions/pathsadminpanel.php:238 msgid "Site's server hostname." -msgstr "" +msgstr "Anv ostiz servijer al lec'hienn." #: actions/pathsadminpanel.php:242 msgid "Path" @@ -2454,7 +2641,7 @@ msgstr "Hent" #: actions/pathsadminpanel.php:242 msgid "Site path" -msgstr "Hent al lec'hien" +msgstr "Hent al lec'hienn" #: actions/pathsadminpanel.php:246 msgid "Path to locales" @@ -2498,11 +2685,11 @@ msgstr "Servijer avatar" #: actions/pathsadminpanel.php:288 msgid "Avatar path" -msgstr "" +msgstr "Hent an avataroù" #: actions/pathsadminpanel.php:292 msgid "Avatar directory" -msgstr "" +msgstr "Restroù an avataroù" #: actions/pathsadminpanel.php:301 msgid "Backgrounds" @@ -2538,11 +2725,11 @@ msgstr "Atav" #: actions/pathsadminpanel.php:329 msgid "Use SSL" -msgstr "Implij SSl" +msgstr "Implijout SSL" #: actions/pathsadminpanel.php:330 msgid "When to use SSL" -msgstr "" +msgstr "Peur implijout SSL" #: actions/pathsadminpanel.php:335 msgid "SSL server" @@ -2567,19 +2754,19 @@ msgstr "" msgid "People search" msgstr "Klask tud" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "N'eo ket reizh ar merk-se : %s" +msgid "Not a valid people tag: %s." +msgstr "N'eo ket reizh ar merk-se : %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "" +msgstr "Implijerien bet merket drezo o unan gant %1$s - pajenn %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "" +msgid "Invalid notice content." +msgstr "Danvez direizh an ali." #: actions/postnotice.php:101 #, php-format @@ -2604,13 +2791,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Anv klok" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pajenn degemer" @@ -2625,30 +2813,30 @@ msgstr "" #: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" -msgstr "" +msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h" #: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Buhezskrid" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Lec'hiadur" #: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "" +msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\"" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "Rannañ va lec'hiadur pa bostan un ali." #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Balizennoù" @@ -2702,7 +2890,7 @@ msgstr "" #: actions/profilesettings.php:363 msgid "Couldn't save location prefs." -msgstr "" +msgstr "Dibosupl eo enrollañ an dibaboù lec'hiadur." #: actions/profilesettings.php:375 msgid "Couldn't save profile." @@ -2719,8 +2907,8 @@ msgstr "Enrollet eo bet an arventennoù." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "" +msgid "Beyond the page limit (%s)." +msgstr "Dreist da bevennoù ar bajenn (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2737,15 +2925,15 @@ msgstr "" #: actions/public.php:160 msgid "Public Stream Feed (RSS 1.0)" -msgstr "" +msgstr "Neudenn gwazh foran (RSS 1.0)" #: actions/public.php:164 msgid "Public Stream Feed (RSS 2.0)" -msgstr "" +msgstr "Neudenn gwazh foran (RSS 2.0)" #: actions/public.php:168 msgid "Public Stream Feed (Atom)" -msgstr "" +msgstr "Neudenn gwazh foran (Atom)" #: actions/public.php:188 #, php-format @@ -2788,7 +2976,7 @@ msgstr "" #: actions/publictagcloud.php:63 #, php-format msgid "These are most popular recent tags on %s " -msgstr "" +msgstr "Ar merkoù ziwezhañ evit ar re vrudetañ war %s " #: actions/publictagcloud.php:69 #, php-format @@ -2797,7 +2985,7 @@ msgstr "" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Bezit an hini gentañ oc'h embann unan !" #: actions/publictagcloud.php:75 #, php-format @@ -2824,15 +3012,15 @@ msgstr "N'eo ket ur c'hod adtapout an dra-mañ." #: actions/recoverpassword.php:73 msgid "Recovery code for unknown user." -msgstr "" +msgstr "Kod adtapout evit un implijer dizanv." #: actions/recoverpassword.php:86 msgid "Error with confirmation code." -msgstr "" +msgstr "Ur fazi 'zo bet gant ar c'hod kadarnaat." #: actions/recoverpassword.php:97 msgid "This confirmation code is too old. Please start again." -msgstr "" +msgstr "Re gozh eo ar c'hod gwiriañ. Adkrogit mar plij." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." @@ -2854,7 +3042,7 @@ msgstr "Adtapout ar ger-tremen" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Lesanv pe chomlec'h postel" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -2872,7 +3060,7 @@ msgstr "Adderaouekaat ar ger-tremen" msgid "Recover password" msgstr "Adtapout ar ger-tremen" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Goulennet eo an adtapout gerioù-tremen" @@ -2892,47 +3080,49 @@ msgstr "Adderaouekaat" msgid "Enter a nickname or email address." msgstr "Lakait ul lesanv pe ur chomlec'h postel." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." -msgstr "" +msgstr "N'eus bet kavet implijer ebet gant ar postel-se pe an anv-se." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." -msgstr "" +msgstr "Chomlec'h postel enrollet ebet evit an implijer-mañ." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." -msgstr "" +msgstr "Ur fazi 'zo bet pa voe enrollet kod kadarnaat ar postel." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." -msgstr "" +msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." -msgstr "" +msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." -msgstr "" +msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." -msgstr "" +msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ." #: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" +"Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em " +"enskrivañ." #: actions/register.php:92 msgid "Sorry, invalid invitation code." @@ -2940,19 +3130,21 @@ msgstr "Digarezit, kod pedadenn direizh." #: actions/register.php:112 msgid "Registration successful" -msgstr "" +msgstr "Krouet eo bet ar gont." -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Krouiñ ur gont" #: actions/register.php:135 msgid "Registration not allowed." -msgstr "" +msgstr "N'eo ket aotreet krouiñ kontoù." #: actions/register.php:198 msgid "You can't register if you don't agree to the license." msgstr "" +"Rankout a reoc'h bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur " +"gont." #: actions/register.php:212 msgid "Email address already exists." @@ -2960,11 +3152,11 @@ msgstr "Implijet eo dija ar chomlec'h postel-se." #: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." -msgstr "" +msgstr "Anv implijer pe ger-tremen direizh." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -2980,8 +3172,9 @@ msgstr "6 arouezenn pe muioc'h. Rekis." msgid "Same as password above. Required." msgstr "Memestra hag ar ger-tremen a-us. Rekis." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Postel" @@ -2991,23 +3184,16 @@ msgstr "" #: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" -msgstr "" +msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3026,7 +3212,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3042,36 +3228,36 @@ msgstr "" #: actions/remotesubscribe.php:112 msgid "Remote subscribe" -msgstr "" +msgstr "Koumanant eus a-bell" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "" +msgstr "Koumanantiñ d'un implijer pell" #: actions/remotesubscribe.php:129 msgid "User nickname" -msgstr "" +msgstr "Lesanv an implijer" #: actions/remotesubscribe.php:130 msgid "Nickname of the user you want to follow" -msgstr "" +msgstr "Lesanv an implijer o peus c'hoant heuliañ" #: actions/remotesubscribe.php:133 msgid "Profile URL" -msgstr "" +msgstr "URL ar profil" #: actions/remotesubscribe.php:134 msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "En em enskrivañ" #: actions/remotesubscribe.php:159 msgid "Invalid profile URL (bad format)" -msgstr "" +msgstr "URL direizh evit ar profil (furmad fall)" #: actions/remotesubscribe.php:168 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." @@ -3083,11 +3269,11 @@ msgstr "" #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." -msgstr "" +msgstr "Dibosupl eo kaout ur jedaouer reked." #: actions/repeat.php:57 msgid "Only logged-in users can repeat notices." -msgstr "" +msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù." #: actions/repeat.php:64 actions/repeat.php:71 msgid "No notice specified." @@ -3101,7 +3287,7 @@ msgstr "Ne c'helloc'h ket adkemer ho ali deoc'h." msgid "You already repeated that notice." msgstr "Adkemeret o peus dija an ali-mañ." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Adlavaret" @@ -3123,17 +3309,17 @@ msgstr "Respontoù da %1$s, pajenn %2$d" #: actions/replies.php:145 #, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "" +msgstr "Gwazh respontoù evit %s (RSS 1.0)" #: actions/replies.php:152 #, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "" +msgstr "Gwazh respontoù evit %s (RSS 2.0)" #: actions/replies.php:159 #, php-format msgid "Replies feed for %s (Atom)" -msgstr "" +msgstr "Gwazh respontoù evit %s (Atom)" #: actions/replies.php:199 #, php-format @@ -3159,7 +3345,7 @@ msgstr "" #: actions/repliesrss.php:72 #, php-format msgid "Replies to %1$s on %2$s!" -msgstr "" +msgstr "Respontoù da %1$s war %2$s !" #: actions/revokerole.php:75 #, fuzzy @@ -3168,7 +3354,7 @@ msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ." #: actions/revokerole.php:82 msgid "User doesn't have this role." -msgstr "" +msgstr "n'en deus ket an implijer-mañ ar rol-se." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3180,17 +3366,17 @@ msgstr "" #: actions/sandbox.php:72 msgid "User is already sandboxed." -msgstr "" +msgstr "Er poull-traezh emañ dija an implijer." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Dalc'hoù" #: actions/sessionsadminpanel.php:65 msgid "Session settings for this StatusNet site." -msgstr "" +msgstr "Arventennoù evit al lec'hienn StatusNet-mañ." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" @@ -3198,11 +3384,11 @@ msgstr "Merañ an dalc'hoù" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Ma rankomp merañ an dalc'hoù hon unan." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" -msgstr "" +msgstr "Dizreinadenn an dalc'h" #: actions/sessionsadminpanel.php:183 msgid "Turn on debugging output for sessions." @@ -3211,63 +3397,67 @@ msgstr "" #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 #: actions/useradminpanel.php:294 msgid "Save site settings" -msgstr "" +msgstr "Enrollañ arventennoù al lec'hienn" #: actions/showapplication.php:82 msgid "You must be logged in to view an application." -msgstr "" +msgstr "Rankout a reoc'h bezañ kevreet evit gwelet ur poellad." #: actions/showapplication.php:157 msgid "Application profile" -msgstr "" +msgstr "Profil ar poellad" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" -msgstr "" +msgstr "Arlun" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Anv" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" -msgstr "" +msgstr "Aozadur" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" -msgstr "" +msgstr "Deskrivadur" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Stadegoù" #: actions/showapplication.php:203 #, php-format msgid "Created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "Krouet gant %1$s - moned %2$s dre ziouer - %3$d implijer" #: actions/showapplication.php:213 msgid "Application actions" -msgstr "" +msgstr "Obererezhioù ar poellad" #: actions/showapplication.php:236 msgid "Reset key & secret" -msgstr "" +msgstr "Adderaouekaat an alc'hwez hag ar sekred" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Titouroù ar poelad" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Alc'hwez an implijer" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Sekred an implijer" #: actions/showapplication.php:273 msgid "Request token URL" @@ -3279,7 +3469,7 @@ msgstr "" #: actions/showapplication.php:283 msgid "Authorize URL" -msgstr "" +msgstr "aotren an URL" #: actions/showapplication.php:288 msgid "" @@ -3294,7 +3484,7 @@ msgstr "" #: actions/showfavorites.php:79 #, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "" +msgstr "Alioù karetañ %1$s, pajenn %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3303,17 +3493,17 @@ msgstr "" #: actions/showfavorites.php:171 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "" +msgstr "Gwazh evit mignoned %s (RSS 1.0)" #: actions/showfavorites.php:178 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "" +msgstr "Gwazh evit mignoned %s (RSS 2.0)" #: actions/showfavorites.php:185 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "" +msgstr "Gwazh evit mignoned %s (Atom)" #: actions/showfavorites.php:206 msgid "" @@ -3338,7 +3528,7 @@ msgstr "" #: actions/showfavorites.php:243 msgid "This is a way to share what you like." -msgstr "" +msgstr "Un doare eo evit kevranañ ar pezh a blij deoc'h." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -3348,69 +3538,69 @@ msgstr "strollad %s" #: actions/showgroup.php:84 #, php-format msgid "%1$s group, page %2$d" -msgstr "" +msgstr "Strollad %1$s, pajenn %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Profil ar strollad" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Notenn" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliasoù" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" -msgstr "Oberoù ar strollad" +msgstr "Obererezh ar strollad" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "" +msgstr "Neudenn alioù ar strollad %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "" +msgstr "Neudenn alioù ar strollad %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" -msgstr "" +msgstr "Neudenn alioù ar strollad %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" -msgstr "" +msgstr "Mignon ur mignon evit ar strollad %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Izili" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" -msgstr "(hini ebet)" +msgstr "(Hini ebet)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "An holl izili" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Krouet" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3420,7 +3610,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3429,7 +3619,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Merourien" @@ -3440,20 +3630,22 @@ msgstr "N'eus ket eus ar gemennadenn-se." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." msgstr "" +"Ne c'hell bezañ lennet ar gemenadenn-mañ nemet gant ar c'haser hag ar " +"resever." #: actions/showmessage.php:108 #, php-format msgid "Message to %1$s on %2$s" -msgstr "" +msgstr "Kemanadenn kaset da %1$s d'an %2$s" #: actions/showmessage.php:113 #, php-format msgid "Message from %1$s on %2$s" -msgstr "" +msgstr "Kemenadenn resevet eus %1$s d'an %2$s" #: actions/shownotice.php:90 msgid "Notice deleted." -msgstr "" +msgstr "Ali dilammet." #: actions/showstream.php:73 #, php-format @@ -3463,32 +3655,32 @@ msgstr " merket %s" #: actions/showstream.php:79 #, php-format msgid "%1$s, page %2$d" -msgstr "" +msgstr "%1$s, pajenn %2$d" #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "" +msgstr "Neudenn an alioù evit %1$s merket %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "" +msgstr "Neudenn an alioù evit %s (RSS 1.0)" #: actions/showstream.php:136 #, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "" +msgstr "Neudenn an alioù evit %s (RSS 2.0)" #: actions/showstream.php:143 #, php-format msgid "Notice feed for %s (Atom)" -msgstr "" +msgstr "Gwazh alioù %s (Atom)" #: actions/showstream.php:148 #, php-format msgid "FOAF for %s" -msgstr "" +msgstr "mignon ur mignon evit %s" #: actions/showstream.php:200 #, php-format @@ -3528,7 +3720,7 @@ msgstr "" #: actions/showstream.php:305 #, php-format msgid "Repeat of %s" -msgstr "" +msgstr "Adkemeret eus %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." @@ -3536,16 +3728,15 @@ msgstr "" #: actions/silence.php:72 msgid "User is already silenced." -msgstr "" +msgstr "Lakaet eo bet da mut an implijer-mañ dija." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Arventennoù design evit al lec'hienn StatusNet-mañ." +msgstr "Arventennoù diazez evit al lec'hienn StatusNet-mañ." #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." -msgstr "" +msgstr "Ne c'hell ket bezañ goullo anv al lec'hienn." #: actions/siteadminpanel.php:141 msgid "You must have a valid contact email address." @@ -3554,14 +3745,14 @@ msgstr "" #: actions/siteadminpanel.php:159 #, php-format msgid "Unknown language \"%s\"." -msgstr "" +msgstr "Yezh \"%s\" dizanv." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "" +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Ar vevenn izelañ evit an destenn a zo 0 arouezenn (anvevenn)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3574,7 +3765,7 @@ msgstr "Anv al lec'hienn" #: actions/siteadminpanel.php:225 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "Anv ho lec'hienn, evel \"Microblog ho embregerezh\"" #: actions/siteadminpanel.php:229 msgid "Brought by" @@ -3586,7 +3777,7 @@ msgstr "" #: actions/siteadminpanel.php:234 msgid "Brought by URL" -msgstr "" +msgstr "Degaset dre URL" #: actions/siteadminpanel.php:235 msgid "URL used for credits link in footer of each page" @@ -3594,7 +3785,7 @@ msgstr "" #: actions/siteadminpanel.php:239 msgid "Contact email address for your site" -msgstr "" +msgstr "Chomlec'h postel daremprediñ ho lec'hienn" #: actions/siteadminpanel.php:245 msgid "Local" @@ -3609,9 +3800,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "" #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Yezh d'ober ganti da gentañ" +msgstr "Yezh dre ziouer" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3623,150 +3813,204 @@ msgstr "Bevennoù" #: actions/siteadminpanel.php:274 msgid "Text limit" -msgstr "" +msgstr "Bevenn testenn" #: actions/siteadminpanel.php:274 msgid "Maximum number of characters for notices." -msgstr "" +msgstr "Niver brasañ a arouezennoù evit an alioù." #: actions/siteadminpanel.php:278 msgid "Dupe limit" -msgstr "" +msgstr "Bevenn a doublennoù" #: actions/siteadminpanel.php:278 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Ali" +msgstr "Ali al lec'hienn" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Kemennadenn nevez" +msgstr "Kemmañ ur gemennadenn hag a zo diwar-benn al lec'hienn a-bezh" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Diposubl eo enrollañ an titouroù stankañ." +msgstr "Diposubl eo enrollañ ali al lec'hienn." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Eilañ an ali" +msgstr "Testenn ali al lec'hienn" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" +"Testenn an ali diwar-benn al lec'hienn a-bezh (255 arouezenn d'ar muiañ ; " +"HTML gweredekaet)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Dilemel un ali" +msgstr "Enrollañ ali ul lec'hienn" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Arventennoù SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" +"Gellout a reoc'h resevout kemmadennoù SMS dre postel o tont eus %%site.name%" +"%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "Dizimplijadus eo an SMS." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "Chomlec'h SMS" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." -msgstr "" +msgstr "Niverenn pellgomz bet gwiriekaet evit resevout SMSoù." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." -msgstr "" +msgstr "Niverenn pellgomz o c'hortoz bezañ kadarnaet." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Kod kadarnaat" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." -msgstr "" +msgstr "Lakait ar c'hod o peus resevet war ho pellgomzer hezoug." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Kadarnaat" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Niverenn bellgomz evit an SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "Penndibaboù an SMSoù" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Penndibaboù an SMSoù enrollet." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Niverenn bellgomz ebet." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." -msgstr "" +msgstr "Ho niverenn pellgomz eo dija." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." -msgstr "" +msgstr "D'un implijer all eo an niverenn-mañ dija." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." -msgstr "" +msgstr "Direizh eo ar c'hod gwiriekaat-mañ." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Nullet eo bet ar gadarnadenn SMS." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." -msgstr "" +msgstr "n'eo ket ho niverenn pellgomz." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Dilamet eo bet an niverenn bellgomz evit an SMSoù." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" -msgstr "" +msgstr "Pourvezer pellgomzerezh hezoug" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" -msgstr "" +msgstr "Dibab un douger" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "N'eo bet lakaet kod ebet" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" -msgstr "" +msgstr "Prim" #: actions/snapshotadminpanel.php:65 msgid "Manage snapshot configuration" @@ -3785,7 +4029,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3810,7 +4054,7 @@ msgstr "" #: actions/snapshotadminpanel.php:226 msgid "Report URL" -msgstr "" +msgstr "URL an danevell" #: actions/snapshotadminpanel.php:227 msgid "Snapshots will be sent to this URL" @@ -3825,8 +4069,7 @@ msgstr "Enrollañ an arventennoù moned" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -3836,7 +4079,7 @@ msgstr "" #: actions/subscribe.php:107 msgid "No such profile." -msgstr "" +msgstr "N'eus ket eus ar profil-se." #: actions/subscribe.php:117 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." @@ -3844,17 +4087,17 @@ msgstr "" #: actions/subscribe.php:145 msgid "Subscribed" -msgstr "" +msgstr "Koumanantet" #: actions/subscribers.php:50 #, php-format msgid "%s subscribers" -msgstr "" +msgstr "Koumanantet da %s" #: actions/subscribers.php:52 #, php-format msgid "%1$s subscribers, page %2$d" -msgstr "" +msgstr "Koumanantet da %1$s, pajenn %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3875,6 +4118,7 @@ msgstr "" #, php-format msgid "%s has no subscribers. Want to be the first?" msgstr "" +"n'ez eus den ebet koumanantet da %s. Ha c'hoant o peus bezañ an hini gentañ ?" #: actions/subscribers.php:114 #, php-format @@ -3886,21 +4130,21 @@ msgstr "" #: actions/subscriptions.php:52 #, php-format msgid "%s subscriptions" -msgstr "" +msgstr "Koumanantoù %s" #: actions/subscriptions.php:54 #, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "" +msgstr "Koumanantoù %1$s, pajenn %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "Heuliañ a reoc'h alioù an dud-se." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "Heuliet eo alioù an den-mañ gant %s." #: actions/subscriptions.php:126 #, php-format @@ -3915,63 +4159,65 @@ msgstr "" #: actions/subscriptions.php:128 actions/subscriptions.php:132 #, php-format msgid "%s is not listening to anyone." -msgstr "" +msgstr "Ne heuilh %s den ebet." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" #: actions/tag.php:69 #, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "" +msgstr "Alioù merket gant %1$s, pajenn %2$d" #: actions/tag.php:87 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" +msgstr "Gwazh an alioù evit ar merk %s (RSS 1.0)" #: actions/tag.php:93 #, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "" +msgstr "Gwazh an alioù evit ar merk %s (RSS 2.0)" #: actions/tag.php:99 #, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "" +msgstr "Gwazh an alioù evit ar merk %s (Atom)" #: actions/tagother.php:39 msgid "No ID argument." -msgstr "" +msgstr "Arguzenn ID ebet." #: actions/tagother.php:65 #, php-format msgid "Tag %s" -msgstr "" +msgstr "Merk %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" -msgstr "" +msgstr "Profil an implijer" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Skeudenn" #: actions/tagother.php:141 msgid "Tag user" -msgstr "" +msgstr "Merkañ an implijer" #: actions/tagother.php:151 msgid "" "Tags for this user (letters, numbers, -, ., and _), comma- or space- " "separated" msgstr "" +"Merkoù evit an implijer-mañ (lizherennoù, sifroù, -, ., ha _), dispartiet " +"gant virgulennoù pe gant esaouennoù" #: actions/tagother.php:193 msgid "" @@ -3980,7 +4226,7 @@ msgstr "" #: actions/tagother.php:200 msgid "Could not save tags." -msgstr "" +msgstr "Dibosupl eo enrollañ ar merkoù." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." @@ -3996,7 +4242,7 @@ msgstr "" #: actions/unblock.php:59 msgid "You haven't blocked that user." -msgstr "" +msgstr "N'o peus ket stanket an implijer-mañ." #: actions/unsandbox.php:72 msgid "User is not sandboxed." @@ -4007,12 +4253,12 @@ msgid "User is not silenced." msgstr "" #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "" +msgid "No profile ID in request." +msgstr "N'eus profil ID ebet er reked." #: actions/unsubscribe.php:98 msgid "Unsubscribed" -msgstr "" +msgstr "Digoumanantet" #: actions/updateprofile.php:64 actions/userauthorization.php:337 #, php-format @@ -4024,7 +4270,7 @@ msgstr "" #: actions/useradminpanel.php:59 msgctxt "TITLE" msgid "User" -msgstr "" +msgstr "Implijer" #: actions/useradminpanel.php:70 msgid "User settings for this StatusNet site." @@ -4043,7 +4289,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" @@ -4070,7 +4317,7 @@ msgstr "" #: actions/useradminpanel.php:241 msgid "Default subscription" -msgstr "" +msgstr "Koumanantoù dre ziouer" #: actions/useradminpanel.php:242 msgid "Automatically subscribe new users to this user." @@ -4082,7 +4329,7 @@ msgstr "Pedadennoù" #: actions/useradminpanel.php:256 msgid "Invitations enabled" -msgstr "" +msgstr "Pedadennoù gweredekaet" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." @@ -4090,7 +4337,7 @@ msgstr "" #: actions/userauthorization.php:105 msgid "Authorize subscription" -msgstr "" +msgstr "Aotreañ ar c'houmanant" #: actions/userauthorization.php:110 msgid "" @@ -4110,7 +4357,7 @@ msgstr "Degemer" #: actions/userauthorization.php:218 lib/subscribeform.php:115 #: lib/subscribeform.php:139 msgid "Subscribe to this user" -msgstr "" +msgstr "En em goumanantiñ d'an implijer-mañ" #: actions/userauthorization.php:219 msgid "Reject" @@ -4118,15 +4365,15 @@ msgstr "Disteurel" #: actions/userauthorization.php:220 msgid "Reject this subscription" -msgstr "" +msgstr "Nac'hañ ar c'houmanant" #: actions/userauthorization.php:232 msgid "No authorization request!" -msgstr "" +msgstr "Reked aotreañ ebet !" #: actions/userauthorization.php:254 msgid "Subscription authorized" -msgstr "" +msgstr "Koumanant aotreet" #: actions/userauthorization.php:256 msgid "" @@ -4137,7 +4384,7 @@ msgstr "" #: actions/userauthorization.php:266 msgid "Subscription rejected" -msgstr "" +msgstr "Koumanant bet nac'het" #: actions/userauthorization.php:268 msgid "" @@ -4149,41 +4396,41 @@ msgstr "" #: actions/userauthorization.php:303 #, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "" +msgstr "N'eo ket bet kavet amañ URI ar selaouer \"%s\"." #: actions/userauthorization.php:308 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "Re hir eo an URI \"%s\" ez oc'h koumanantet dezhi." #: actions/userauthorization.php:314 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "An URI \"%s\" ez oc'h koumanantet dezhi a zo un implijer lec'hel." #: actions/userauthorization.php:329 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "URI ar profil \"%s\" a zo evit un implijer lec'hel." #: actions/userauthorization.php:345 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "N'eo ket reizh URL an avatar \"%s\"." #: actions/userauthorization.php:350 #, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "" +msgstr "Dibosupl eo lenn URL an avatar \"%s\"." #: actions/userauthorization.php:355 #, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "" +msgstr "Seurt skeudenn direizh evit URL an avatar \"%s\"." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" -msgstr "" +msgstr "Design ar profil" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" @@ -4193,29 +4440,35 @@ msgstr "" #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" -msgstr "" +msgstr "Bez plijadur gant da hotdog !" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" -msgstr "" +msgstr "Strolladoù %1$s, pajenn %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Klask muioc'h a strolladoù" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." -msgstr "" +msgstr "N'eo ket ezel %s eus ur strollad." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Hizivadennoù eus %1$s e %2$s!" @@ -4263,7 +4516,8 @@ msgstr "" msgid "Plugins" msgstr "Pluginoù" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Stumm" @@ -4271,19 +4525,19 @@ msgstr "Stumm" msgid "Author(s)" msgstr "Aozer(ien)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4319,312 +4573,345 @@ msgstr "Diposubl eo ensoc'hañ ur gemenadenn" #: classes/Message.php:71 msgid "Could not update message with new URI." -msgstr "" +msgstr "Dibosupl eo hizivaat ar gemennadenn gant un URI nevez." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" - -#: classes/Notice.php:241 -msgid "Problem saving notice. Too long." +msgid "Database error inserting hashtag: %s" msgstr "" #: classes/Notice.php:245 +msgid "Problem saving notice. Too long." +msgstr "" + +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." -msgstr "" +msgstr "Ur gudenn 'zo bet pa veze enrollet an ali." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." -msgstr "" +msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." -msgstr "" +msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" -msgstr "" +msgstr "Koumanantet dija !" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." -msgstr "" +msgstr "An implijer-mañ en deus stanket ac'hanoc'h." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" -msgstr "" +msgstr "Nann-koumanantet !" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Diposubl eo dilemel ar postel kadarnadur." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." -msgstr "" +msgstr "Dibosupl eo paouez gant ar c'houmanant." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "" +msgstr "Deuet mat da %1$s, @%2$s !" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." -msgstr "" +msgstr "Dibosupl eo krouiñ ar strollad." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "" +msgstr "Dibosupl eo termeniñ URI ar strollad." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." -msgstr "" +msgstr "Dibosupl eo en em enskrivañ d'ar strollad." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "" +msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" -msgstr "" - -#: lib/accountsettingsaction.php:112 -msgid "Upload an avatar" -msgstr "" +msgstr "Kemmañ arventennoù ho profil" +#. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:116 +msgid "Upload an avatar" +msgstr "Enporzhiañ un avatar" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Cheñch ar ger-tremen" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" -msgstr "" +msgstr "Kemmañ tretadur ar posteloù" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" -msgstr "" +msgstr "Krouit ho profil" -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 +msgid "Other options" +msgstr "Dibarzhioù all" + +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 msgid "Other" msgstr "All" -#: lib/accountsettingsaction.php:128 -msgid "Other options" -msgstr "" - -#: lib/action.php:144 +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" -msgstr "" +msgstr "Pajenn hep anv" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" -msgstr "" +msgstr "Personel" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "" +msgstr "Kemmañ ho chomlec'h postel, hoc'h avatar, ho ger-tremen, ho profil" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "" +msgstr "Liammañ d'ar servijoù" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Kevreañ" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "" +msgstr "Kemmañ arventennoù al lec'hienn" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" -msgstr "" +msgstr "Merañ" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "" +msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" -msgstr "" +msgstr "Pediñ" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" -msgstr "" +msgstr "Digevreañ diouzh al lec'hienn" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" -msgstr "" +msgstr "Digevreañ" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" -msgstr "" +msgstr "Krouiñ ur gont" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" -msgstr "" +msgstr "En em enskrivañ" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" -msgstr "" +msgstr "Kevreañ d'al lec'hienn" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" -msgstr "" +msgstr "Kevreañ" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" -msgstr "" +msgstr "Sikour din !" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" -msgstr "" - -#. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 -msgctxt "TOOLTIP" -msgid "Search for people or text" -msgstr "" - -#: lib/action.php:491 -msgctxt "MENU" -msgid "Search" -msgstr "" - -#. TRANS: DT element for site notice. String is hidden in default CSS. -#. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 -msgid "Site notice" -msgstr "" - -#: lib/action.php:579 -msgid "Local views" -msgstr "" - -#: lib/action.php:645 -msgid "Page notice" -msgstr "" - -#: lib/action.php:747 -msgid "Secondary site navigation" -msgstr "" - -#: lib/action.php:752 -msgid "Help" msgstr "Skoazell" -#: lib/action.php:754 +#. TRANS: Tooltip for main menu option "Search" +#: lib/action.php:490 +msgctxt "TOOLTIP" +msgid "Search for people or text" +msgstr "Klask tud pe un tamm testenn" + +#: lib/action.php:493 +msgctxt "MENU" +msgid "Search" +msgstr "Klask" + +#. TRANS: DT element for site notice. String is hidden in default CSS. +#. TRANS: Menu item for site administration +#: lib/action.php:515 lib/adminpanelaction.php:399 +msgid "Site notice" +msgstr "Ali al lec'hienn" + +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 +msgid "Local views" +msgstr "Selloù lec'hel" + +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 +msgid "Page notice" +msgstr "Ali ar bajenn" + +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 +msgid "Secondary site navigation" +msgstr "" + +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 +msgid "Help" +msgstr "Skoazell" + +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Diwar-benn" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "FAG" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" -msgstr "" +msgstr "AIH" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Prevezded" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Mammenn" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Darempred" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" -msgstr "" +msgstr "Badj" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" -msgstr "" +msgstr "Aotre-implijout ar meziant StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "" -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4632,222 +4919,274 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" -msgstr "" +msgstr "Aotre-implijout diwar-benn danvez al lec'hienn" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "Pep tra " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "aotre implijout." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Pajennadur" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "War-lerc'h" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Kent" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." -msgstr "" +msgstr "N'eo ket aotreet kemmañ ar panell-se" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." -msgstr "" +msgstr "N'eo ket bet emplementet showForm()." #. TRANS: Client error message #: lib/adminpanelaction.php:259 msgid "saveSettings() not implemented." -msgstr "" +msgstr "N'eo ket bet emplementet saveSettings()." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." -msgstr "" +msgstr "Dibosupl eo dilemel an arventennoù krouiñ." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" -msgstr "" +msgstr "Arventennoù diazez al lec'hienn" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" -msgstr "" +msgstr "Lec'hienn" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" -msgstr "" +msgstr "Kefluniadur ar c'hrouiñ" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" -msgstr "" +msgstr "Design" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" -msgstr "" +msgstr "Kefluniadur an implijer" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Implijer" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" -msgstr "" +msgstr "Kefluniadur ar moned" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" -msgstr "" +msgstr "Kefluniadur an hentoù" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" -msgstr "" +msgstr "Kefluniadur an dalc'hoù" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 -#, fuzzy +#: lib/adminpanelaction.php:397 msgid "Edit site notice" -msgstr "Eilañ an ali" +msgstr "Kemmañ ali al lec'hienn" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "" +msgstr "Kefluniadur ar primoù" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Kemmañ an arload" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Arlun evit ar poellad-mañ" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" -msgstr "" +msgstr "Diskrivit ho poellad gant %d arouezenn" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" -msgstr "" +msgstr "Deskrivit ho poellad" -#: lib/applicationeditform.php:216 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 +msgid "URL of the homepage of this application" +msgstr "URL pajenn degemer ar poellad-mañ" + +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 msgid "Source URL" msgstr "Mammenn URL" -#: lib/applicationeditform.php:218 -msgid "URL of the homepage of this application" -msgstr "" - -#: lib/applicationeditform.php:224 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" -msgstr "" +msgstr "An aozadur e karg eus ar poellad-mañ" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" -msgstr "" +msgstr "URL pajenn degemer an aozadur-se" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" -msgstr "" +msgstr "URL davet pehini e o ret adkas goude bezañ kevreet" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Merdeer" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" -msgstr "" - -#: lib/applicationeditform.php:275 -msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Burev" +#. TRANS: Form guide. #: lib/applicationeditform.php:297 +msgid "Type of application, browser or desktop" +msgstr "Seurt ar poellad, merdeer pe burev" + +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" -msgstr "" +msgstr "Lenn hepken" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" -msgstr "" +msgstr "Lenn-skrivañ" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Nullañ" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "lenn-skrivañ" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "lenn hepken" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Aprouet d'an %1$s - moned \"%2$s\"." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +#, fuzzy +msgctxt "BUTTON" msgid "Revoke" -msgstr "" +msgstr "Dilemel" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" -msgstr "" +msgstr "Pezhioù stag" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Aozer" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Pourvezer" @@ -4861,242 +5200,271 @@ msgstr "" #: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 msgid "Password changing failed" -msgstr "" +msgstr "N'eo ket aet betek penn kemmañ ar ger-tremen" #: lib/authenticationplugin.php:235 msgid "Password changing is not allowed" -msgstr "" +msgstr "N'eo ket aotreet kemmañ ar ger-tremen" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" -msgstr "" +msgstr "Disoc'hoù an urzhiad" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" -msgstr "" +msgstr "Urzhiad bet klokaet" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" -msgstr "" +msgstr "C'hwitet en deus an urzhiad" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "N'eus ali ebet gant an id-mañ." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "N'eus ali nevez evit an implijer-mañ" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" -msgstr "" +msgstr "Dibosupl eo kavout un implijer gant al lesanv %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Dibosupl eo kavout un implijer lec'hel gant al lesanv %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" +"N'eus tamm talvoudegezh ebet ober ur blinkadenn deoc'h c'hwi oc'h unan !" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "Blinkadenn kaset da %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Koumanatoù : %1$s\n" +"Tud koumanantet : %2$s\n" +"kemennadennoù : %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." -msgstr "" +msgstr "Ali bet ouzhpennet d'ar pennroll." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" -msgstr "" +msgstr "Ezel oc'h eus ar strollad-mañ dija." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s" +msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %2$s." + +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "Could not join user %s to group %s" -msgstr "" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s" -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s zo emezelet er strollad %s" - -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s {{Gender:.|en|he}} deus kuitaet ar strollad %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Anv klok : %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" -msgstr "" +msgstr "Lec'hiadur : %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" -msgstr "" +msgstr "Lec'hienn Web : %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Diwar-benn : %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d " +"arouezenn o peus lakaet" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" -msgstr "" +msgstr "Kaset eo bet ar gemennadenn war eeun da %s." -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." -msgstr "" +msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" -msgstr "" +msgstr "Ne c'helloc'h ket adkemer ho ali" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" -msgstr "" +msgstr "Ali bet adkemeret dija" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "" -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" -msgstr "" +msgstr "Respont kaset da %s" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "" -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." msgstr "" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." -msgstr "" +msgstr "Kemennoù diweredekaet." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." -msgstr "" +msgstr "Kemennoù gweredekaet" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" -msgstr "" +msgstr "Diweredekaet eo an urzhiad evit digeriñ un dalc'h" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" -msgstr "" +msgstr "Digoumanantet eus %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:711 +#: lib/command.php:780 #, fuzzy msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "You are subscribed to this person:" msgstr[1] "You are subscribed to these people:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:733 +#: lib/command.php:802 #, fuzzy msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "This person is subscribed to you:" msgstr[1] "These people are subscribed to you:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." -msgstr "" +msgstr "N'oc'h ezel eus strollad ebet." -#: lib/command.php:755 +#: lib/command.php:824 #, fuzzy msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "You are a member of this group:" msgstr[1] "You are a member of these groups:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5138,21 +5506,21 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." -msgstr "" +msgstr "Mont d'ar meziant staliañ" #: lib/connectsettingsaction.php:110 msgid "IM" @@ -5168,7 +5536,7 @@ msgstr "" #: lib/connectsettingsaction.php:120 msgid "Connections" -msgstr "" +msgstr "Kevreadennoù" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" @@ -5237,7 +5605,7 @@ msgstr "" #: lib/galleryaction.php:140 msgid "Tag" -msgstr "Merk" +msgstr "Balizenn" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" @@ -5300,7 +5668,7 @@ msgstr "Logo" #: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" -msgstr "" +msgstr "Ouzhpennañ pe kemmañ logo %s" #: lib/groupnav.php:120 #, php-format @@ -5320,53 +5688,54 @@ msgstr "" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 -msgid "Not an image or corrupt file." -msgstr "" - #: lib/imagefile.php:109 -msgid "Unsupported image file format." +msgid "Not an image or corrupt file." msgstr "" #: lib/imagefile.php:122 msgid "Lost our file." -msgstr "" +msgstr "Restr bet kollet." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" -msgstr "" +msgstr "Dizanv eo seurt ar restr" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "Mo" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "Ko" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5377,7 +5746,7 @@ msgstr "Stagañ" #: lib/leaveform.php:114 msgid "Leave" -msgstr "Kuitañ" +msgstr "Kuitaat" #: lib/logingroupnav.php:80 msgid "Login with a username and password" @@ -5385,13 +5754,15 @@ msgstr "" #: lib/logingroupnav.php:86 msgid "Sign up for a new account" -msgstr "" +msgstr "Digeriñ ur gont nevez" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5408,12 +5779,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5428,17 +5801,20 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5451,21 +5827,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Statud %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" +msgstr "Kadarnadur SMS" + +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" msgstr "" -#: lib/mail.php:467 +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5481,12 +5867,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Kemenadenn personel nevez a-berzh %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5505,12 +5893,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5531,12 +5921,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5549,6 +5949,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5561,7 +5973,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "eus" @@ -5571,7 +5983,7 @@ msgstr "" #: lib/mailhandler.php:42 msgid "Not a registered user." -msgstr "" +msgstr "N'eo ket un implijer enrollet." #: lib/mailhandler.php:46 msgid "Sorry, that is not your incoming email address." @@ -5640,7 +6052,7 @@ msgstr "" #: lib/messageform.php:120 msgid "Send a direct notice" -msgstr "" +msgstr "Kas ur gemennadenn war-eeun" #: lib/messageform.php:146 msgid "To" @@ -5653,7 +6065,7 @@ msgstr "" #: lib/messageform.php:178 lib/noticeform.php:236 msgctxt "Send button for sending notice" msgid "Send" -msgstr "" +msgstr "Kas" #: lib/noticeform.php:160 msgid "Send a notice" @@ -5674,11 +6086,11 @@ msgstr "Stagañ ur restr" #: lib/noticeform.php:212 msgid "Share my location" -msgstr "" +msgstr "Rannañ va lec'hiadur." #: lib/noticeform.php:215 msgid "Do not share my location" -msgstr "" +msgstr "Chom hep rannañ va lec'hiadur." #: lib/noticeform.php:216 msgid "" @@ -5686,50 +6098,54 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "S" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "R" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "K" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "e" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" -msgstr "" +msgstr "en amdro" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" -msgstr "" - -#: lib/noticelist.php:628 -msgid "Reply to this notice" -msgstr "" +msgstr "Adkemeret gant" #: lib/noticelist.php:629 +msgid "Reply to this notice" +msgstr "Respont d'an ali-mañ" + +#: lib/noticelist.php:630 msgid "Reply" msgstr "Respont" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" -msgstr "" +msgstr "Ali adkemeret" #: lib/nudgeform.php:116 msgid "Nudge this user" @@ -5751,6 +6167,10 @@ msgstr "" msgid "Error inserting avatar" msgstr "" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "" @@ -5800,39 +6220,40 @@ msgstr "" msgid "Unknown" msgstr "Dianav" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Koumanantoù" #: lib/profileaction.php:126 msgid "All subscriptions" -msgstr "" +msgstr "An holl koumanantoù" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Ar re koumanantet" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "An holl re koumanantet" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ID an implijer" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Ezel abaoe" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Keidenn pemdeziek" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "An holl strolladoù" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "" - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -5856,10 +6277,18 @@ msgstr "" msgid "Popular" msgstr "Poblek" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "" + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Adkregiñ gant an ali-mañ ?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Ya" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Adkregiñ gant an ali-mañ" @@ -5869,7 +6298,7 @@ msgstr "Adkregiñ gant an ali-mañ" msgid "Revoke the \"%s\" role from this user" msgstr "Stankañ an implijer-mañ eus ar strollad-se" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -5915,7 +6344,7 @@ msgstr "Klask strolladoù el lec'hienn-mañ" #: lib/section.php:89 msgid "Untitled section" -msgstr "" +msgstr "Rann hep titl" #: lib/section.php:106 msgid "More..." @@ -5942,7 +6371,7 @@ msgstr "" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "" +msgstr "Ezel eo %s eus ar strolladoù" #: lib/subgroupnav.php:105 msgid "Invite" @@ -5969,7 +6398,7 @@ msgstr "Hini ebet" #: lib/topposterssection.php:74 msgid "Top posters" -msgstr "" +msgstr "An implijerien an efedusañ" #: lib/unsandboxform.php:69 msgid "Unsandbox" @@ -5989,112 +6418,128 @@ msgstr "" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" -msgstr "" +msgstr "En em zigoumanantiñ eus an implijer-mañ" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" -msgstr "" +msgstr "Digoumanantiñ" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "An implijer-mañ n'eus profil ebet dezhañ." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Kemmañ an Avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Obererezh an implijer" -#: lib/userprofile.php:251 -msgid "Edit profile settings" -msgstr "" +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Diverkadenn an implijer o vont war-raok..." -#: lib/userprofile.php:252 +#: lib/userprofile.php:263 +msgid "Edit profile settings" +msgstr "Kemmañ arventennoù ar profil" + +#: lib/userprofile.php:264 msgid "Edit" msgstr "Aozañ" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Kas ur gemennadenn war-eeun d'an implijer-mañ" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Kemennadenn" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Habaskaat" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "Strolladoù implijerien" +msgstr "Rol an implijer" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Merourien" +msgstr "Merour" -#: lib/userprofile.php:355 -#, fuzzy +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "Habaskaat" +msgstr "Habasker" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "un nebeud eilennoù zo" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "1 vunutenn zo well-wazh" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "%d munutenn zo well-wazh" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "1 eurvezh zo well-wazh" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "%d eurvezh zo well-wazh" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "1 devezh zo well-wazh" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "%d devezh zo well-wazh" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "miz zo well-wazh" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "%d miz zo well-wazh" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "bloaz zo well-wazh" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "" +msgstr "n'eo ket %s ul liv reizh !" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index bd7c5cd5a8..7b59c0ef44 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -2,6 +2,7 @@ # # Author@translatewiki.net: Aleator # Author@translatewiki.net: McDutchie +# Author@translatewiki.net: Paucabot # Author@translatewiki.net: Toniher # -- # This file is distributed under the same license as the StatusNet package. @@ -10,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:29+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:15+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -23,19 +24,17 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Accés" #. TRANS: Page notice #: actions/accessadminpanel.php:67 -#, fuzzy msgid "Site access settings" -msgstr "Desa els paràmetres del lloc" +msgstr "Paràmetres d'accés al lloc" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 -#, fuzzy msgid "Registration" msgstr "Registre" @@ -48,7 +47,6 @@ msgstr "" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Privat" @@ -75,20 +73,24 @@ msgstr "Tancat" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "Desa els paràmetres del lloc" +msgstr "Desa els paràmetres d'accés" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" -msgstr "Guardar" +msgstr "Desa" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +msgid "No such page." msgstr "No existeix la pàgina." #: actions/all.php:75 actions/allrss.php:68 @@ -99,9 +101,9 @@ msgstr "No existeix la pàgina." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -109,24 +111,23 @@ msgstr "No existeix la pàgina." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "No existeix aquest usuari." #. TRANS: Page title. %1$s is user nickname, %2$d is page number #: actions/all.php:86 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "%s perfils blocats, pàgina %d" +msgstr "%1$s i amics, pàgina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -186,8 +187,10 @@ msgstr "" msgid "You and friends" msgstr "Un mateix i amics" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualitzacions de %1$s i amics a %2$s!" @@ -202,19 +205,18 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -#, fuzzy +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "No s'ha trobat el mètode API!" @@ -227,15 +229,15 @@ msgstr "No s'ha trobat el mètode API!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Aquest mètode requereix POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -248,7 +250,7 @@ msgstr "No s'ha pogut actualitzar l'usuari." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "L'usuari no té perfil." @@ -259,9 +261,9 @@ msgid "Could not save profile." msgstr "No s'ha pogut guardar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -288,9 +290,8 @@ msgid "Could not update your design." msgstr "No s'ha pogut actualitzar l'usuari." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "No podeu suprimir els usuaris." +msgstr "No podeu bloquejar-vos a vosaltres mateixos!" #: actions/apiblockcreate.php:126 msgid "Block user failed." @@ -345,18 +346,16 @@ msgid "No status found with that ID." msgstr "No s'ha trobat cap estatus amb aquesta ID." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite." -msgstr "Aquest estat ja és un preferit!" +msgstr "Aquest estat ja és un preferit." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "No es pot crear favorit." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite." -msgstr "L'estat no és un preferit!" +msgstr "L'estat no és un preferit." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -373,14 +372,12 @@ msgstr "" "No pots subscriure't de nou a aquest usuari: %s ja està a la teva llista." #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "No pots subscriure't a aquest usuari: L'usuari no existeix." +msgstr "No pots subscriure't a aquest usuari: l'usuari no existeix." #: actions/apifriendshipsdestroy.php:120 -#, fuzzy msgid "You cannot unfollow yourself." -msgstr "No podeu suprimir els usuaris." +msgstr "No podeu deixar de seguir-vos a vosaltres mateixos." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -446,11 +443,10 @@ msgstr "La ubicació és massa llarga (màx. 255 caràcters)." msgid "Too many aliases! Maximum %d." msgstr "Hi ha massa àlies! Màxim %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "L'àlies no és vàlid «%s»" +msgid "Invalid alias: \"%s\"." +msgstr "L'àlies no és vàlid: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -466,42 +462,51 @@ msgstr "L'àlies no pot ser el mateix que el sobrenom." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "No s'ha trobat el grup!" +msgid "Group not found." +msgstr "No s'ha trobat el grup." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Ja sou membre del grup." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "L'administrador us ha blocat del grup." #: actions/apigroupjoin.php:138 actions/joingroup.php:134 -#, fuzzy, php-format +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "No s'ha pogut afegir l'usuari %s al grup %s." +msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "No sou un membre del grup." #: actions/apigroupleave.php:124 actions/leavegroup.php:129 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "No s'ha pogut suprimir l'usuari %s del grup %s." +msgstr "No s'ha pogut suprimir l'usuari %1$s del grup %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Grups de %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%1$s grups dels que %2$s és membre." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s grups" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "grups sobre %s" @@ -516,17 +521,17 @@ msgid "Invalid token." msgstr "Mida invàlida." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -536,19 +541,16 @@ msgstr "" "us plau." #: actions/apioauthauthorize.php:135 -#, fuzzy msgid "Invalid nickname / password!" -msgstr "Nom d'usuari o contrasenya invàlids." +msgstr "Nom d'usuari / contrasenya no vàlid!" #: actions/apioauthauthorize.php:159 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "Error en configurar l'usuari." +msgstr "Error de la base de dades en esborrar l'usuari de l'aplicació OAuth." #: actions/apioauthauthorize.php:185 -#, fuzzy msgid "Database error inserting OAuth application user." -msgstr "Hashtag de l'error de la base de dades:%s" +msgstr "Error de la base de dades en inserir l'usuari de l'aplicació OAuth." #: actions/apioauthauthorize.php:214 #, php-format @@ -562,22 +564,25 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Enviament de formulari inesperat." #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" -msgstr "" +msgstr "Una aplicació voldria connectar-se al vostre compte" #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" -msgstr "" +msgstr "Permet o denega l'accés" #: actions/apioauthauthorize.php:292 #, php-format @@ -587,36 +592,36 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Compte" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Sobrenom" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Contrasenya" #: actions/apioauthauthorize.php:328 -#, fuzzy msgid "Deny" -msgstr "Disseny" +msgstr "Denega" #: actions/apioauthauthorize.php:334 -#, fuzzy msgid "Allow" -msgstr "Tot" +msgstr "Permet" #: actions/apioauthauthorize.php:351 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "Permet o denega l'accés a la informació del vostre compte." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." @@ -632,14 +637,12 @@ msgid "No such notice." msgstr "No existeix aquest avís." #: actions/apistatusesretweet.php:83 -#, fuzzy msgid "Cannot repeat your own notice." -msgstr "No es poden posar en on les notificacions." +msgstr "No podeu repetir els vostres propis avisos." #: actions/apistatusesretweet.php:91 -#, fuzzy msgid "Already repeated that notice." -msgstr "Eliminar aquesta nota" +msgstr "Avís duplicat." #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -649,17 +652,17 @@ msgstr "S'ha suprimit l'estat." msgid "No status with that ID found." msgstr "No s'ha trobat cap estatus amb la ID trobada." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Massa llarg. La longitud màxima és de %d caràcters." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "No s'ha trobat" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "No s'ha trobat." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -668,12 +671,12 @@ msgstr "" msgid "Unsupported format." msgstr "El format no està implementat." -#: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#: actions/apitimelinefavorites.php:109 +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Preferits de %s" +msgstr "%1$s / Preferits de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s actualitzacions favorites per %s / %s." @@ -683,45 +686,41 @@ msgstr "%s actualitzacions favorites per %s / %s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Notificacions contestant a %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s línia temporal pública" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s notificacions de tots!" #: actions/apitimelineretweetedtome.php:111 -#, fuzzy, php-format +#, php-format msgid "Repeated to %s" -msgstr "Respostes a %s" +msgstr "Repetida a %s" #: actions/apitimelineretweetsofme.php:114 #, php-format msgid "Repeats of %s" msgstr "Repeticions de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Aviso etiquetats amb %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualitzacions etiquetades amb %1$s el %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "No s'ha trobat." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "No existeix l'adjunció." @@ -741,8 +740,9 @@ msgstr "Cap mida." msgid "Invalid size." msgstr "Mida invàlida." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -753,10 +753,10 @@ msgstr "" "Podeu pujar el vostre avatar personal. La mida màxima del fitxer és %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Usuari sense perfil coincident" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "L'usuari que no coincideix amb cap perfil" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -774,7 +774,7 @@ msgid "Preview" msgstr "Vista prèvia" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Suprimeix" @@ -786,25 +786,29 @@ msgstr "Puja" msgid "Crop" msgstr "Retalla" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "No s'ha carregat cap fitxer." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu " "avatar." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "S'ha perdut el nostre fitxer de dades." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualitzat." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Error en actualitzar avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "S'ha suprimit l'avatar." @@ -812,7 +816,7 @@ msgstr "S'ha suprimit l'avatar." msgid "You already blocked that user." msgstr "Ja heu blocat l'usuari." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Usuari bloquejat." @@ -823,27 +827,42 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "No" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "No bloquis l'usuari" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Sí" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloquejar aquest usuari" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Error al guardar la informació del block." @@ -856,8 +875,8 @@ msgstr "Error al guardar la informació del block." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "No s'ha trobat el grup." @@ -867,14 +886,13 @@ msgid "%s blocked profiles" msgstr "%s perfils blocats" #: actions/blockedfromgroup.php:100 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s perfils blocats, pàgina %d" +msgstr "%1$s perfils blocats, pàgina %2$d" #: actions/blockedfromgroup.php:115 -#, fuzzy msgid "A list of the users blocked from joining this group." -msgstr "La llista dels usuaris d'aquest grup." +msgstr "Una llista d'usuaris que han estat blocats d'afegir-se a aquest grup." #: actions/blockedfromgroup.php:288 msgid "Unblock user from group" @@ -888,9 +906,11 @@ msgstr "Desbloca" msgid "Unblock this user" msgstr "Desbloca l'usuari" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Envia a " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Publicar a %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -904,34 +924,43 @@ msgstr "Codi de confirmació no trobat. " msgid "That confirmation code is not for you!" msgstr "Aquest codi de confirmació no és per a tu!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Tipus d'adreça %s desconeguda" +msgid "Unrecognized address type %s." +msgstr "Tipus d'adreça desconeguda %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Aquesta adreça ja ha estat confirmada." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "No s'ha pogut actualitzar l'usuari." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "No s'ha pogut eliminar la confirmació de correu electrònic." -#: actions/confirmaddress.php:144 -#, fuzzy +#: actions/confirmaddress.php:146 msgid "Confirm address" -msgstr "Confirmar adreça" +msgstr "Confirmeu l'adreça de correu electrònic" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "L'adreça \"%s\" ha estat confirmada per al teu compte." @@ -941,36 +970,32 @@ msgid "Conversation" msgstr "Conversa" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Avisos" #: actions/deleteapplication.php:63 -#, fuzzy msgid "You must be logged in to delete an application." -msgstr "Heu d'iniciar una sessió per editar un grup." +msgstr "Heu d'haver iniciat una sessió per a suprimir una aplicació." #: actions/deleteapplication.php:71 -#, fuzzy msgid "Application not found." -msgstr "Avís sense perfil" +msgstr "No s'ha trobat l'aplicació." #: actions/deleteapplication.php:78 actions/editapplication.php:77 #: actions/showapplication.php:94 -#, fuzzy msgid "You are not the owner of this application." -msgstr "No sou un membre del grup." +msgstr "No sou el propietari d'aquesta aplicació." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Ha ocorregut algun problema amb la teva sessió." #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 -#, fuzzy msgid "Delete application" -msgstr "No existeix aquest avís." +msgstr "Esborra aplicació" #: actions/deleteapplication.php:149 msgid "" @@ -978,18 +1003,21 @@ msgid "" "about the application from the database, including all existing user " "connections." msgstr "" +"Esteu segur que voler suprimir l'aplicació? Això netejarà totes les dades de " +"l'aplicació de la base de dades, incloent-hi totes les connexions d'usuari " +"existents." -#: actions/deleteapplication.php:156 -#, fuzzy +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" -msgstr "No es pot esborrar la notificació." +msgstr "No suprimeixis l'aplicació" -#: actions/deleteapplication.php:160 -#, fuzzy +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" -msgstr "Eliminar aquesta nota" +msgstr "Elimina aquesta aplicació" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1005,13 +1033,12 @@ msgid "Can't delete this notice." msgstr "No es pot esborrar la notificació." #: actions/deletenotice.php:103 -#, fuzzy msgid "" "You are about to permanently delete a notice. Once this is done, it cannot " "be undone." msgstr "" -"Estàs a punt d'eliminar permanentment una notificació. Una vegada ho facis, " -"no ho podràs desfer." +"Estàs a punt d'eliminar permanentment un avís. Una vegada fet, no es podrà " +"desfer." #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" @@ -1021,12 +1048,13 @@ msgstr "Eliminar nota." msgid "Are you sure you want to delete this notice?" msgstr "N'estàs segur que vols eliminar aquesta notificació?" -#: actions/deletenotice.php:145 -#, fuzzy +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" -msgstr "No es pot esborrar la notificació." +msgstr "No elimineu aquest avís" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Eliminar aquesta nota" @@ -1035,9 +1063,8 @@ msgid "You cannot delete users." msgstr "No podeu suprimir els usuaris." #: actions/deleteuser.php:74 -#, fuzzy msgid "You can only delete local users." -msgstr "No pots eliminar l'estatus d'un altre usuari." +msgstr "Només podeu eliminar usuaris locals." #: actions/deleteuser.php:110 actions/deleteuser.php:133 msgid "Delete user" @@ -1049,125 +1076,130 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Suprimeix l'usuari" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Disseny" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Paràmetres de disseny d'aquest lloc StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "L'URL del logotip no és vàlid." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "El tema no és disponible: %s" +msgid "Theme not available: %s." +msgstr "Tema no disponible: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Canvia el logotip" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Logotip del lloc" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Canvia el tema" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Tema del lloc" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Tema del lloc." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Canvia la imatge de fons" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Fons" -#: actions/designadminpanel.php:427 -#, fuzzy, php-format +#: actions/designadminpanel.php:428 +#, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." -msgstr "Pots pujar una imatge de logo per al grup." +msgstr "" +"Podeu pujar una imatge de fons per al lloc. La mida màxima de fitxer és %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Activada" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Desactivada" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Activa o desactiva la imatge de fons." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Posa en mosaic la imatge de fons" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Canvia els colors" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Contingut" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Barra lateral" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Text" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Enllaços" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" -msgstr "" +msgstr "Utilitza els paràmetres per defecte" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" -msgstr "" +msgstr "Restaura els dissenys per defecte" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" -msgstr "" +msgstr "Torna a restaurar al valor per defecte" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Guardar" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Desa el disseny" @@ -1180,72 +1212,62 @@ msgid "Add to favorites" msgstr "Afegeix als preferits" #: actions/doc.php:158 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "No existeix aquest document." +msgstr "No existeix el document \"%s\"" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" -msgstr "Altres opcions" +msgstr "Editeu l'aplicació" #: actions/editapplication.php:66 -#, fuzzy msgid "You must be logged in to edit an application." -msgstr "Heu d'iniciar una sessió per editar un grup." +msgstr "Heu d'iniciar una sessió per editar una aplicació." #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166 #: actions/showapplication.php:87 -#, fuzzy msgid "No such application." -msgstr "No existeix aquest avís." +msgstr "No hi ha tal aplicació." #: actions/editapplication.php:161 -#, fuzzy msgid "Use this form to edit your application." -msgstr "Utilitza aquest formulari per editar el grup." +msgstr "Utilitza el formulari per a editar la vostra aplicació." #: actions/editapplication.php:177 actions/newapplication.php:159 -#, fuzzy msgid "Name is required." -msgstr "Igual a la contrasenya de dalt. Requerit." +msgstr "Cal un nom." #: actions/editapplication.php:180 actions/newapplication.php:165 -#, fuzzy msgid "Name is too long (max 255 chars)." -msgstr "El teu nom és massa llarg (màx. 255 caràcters)." +msgstr "El nom és massa llarg (màx. 255 caràcters)." #: actions/editapplication.php:183 actions/newapplication.php:162 -#, fuzzy msgid "Name already in use. Try another one." -msgstr "Aquest sobrenom ja existeix. Prova un altre. " +msgstr "El nom ja es troba en ús. Proveu-ne un altre." #: actions/editapplication.php:186 actions/newapplication.php:168 -#, fuzzy msgid "Description is required." -msgstr "Descripció" +msgstr "Cal una descripció." #: actions/editapplication.php:194 msgid "Source URL is too long." -msgstr "" +msgstr "L'URL font és massa llarg." #: actions/editapplication.php:200 actions/newapplication.php:185 -#, fuzzy msgid "Source URL is not valid." -msgstr "La pàgina personal no és un URL vàlid." +msgstr "La URL d'origen no és vàlida." #: actions/editapplication.php:203 actions/newapplication.php:188 msgid "Organization is required." -msgstr "" +msgstr "Cal una organització." #: actions/editapplication.php:206 actions/newapplication.php:191 -#, fuzzy msgid "Organization is too long (max 255 chars)." -msgstr "La ubicació és massa llarga (màx. 255 caràcters)." +msgstr "El camp organització és massa llarg (màx. 255 caràcters)." #: actions/editapplication.php:209 actions/newapplication.php:194 msgid "Organization homepage is required." -msgstr "" +msgstr "Cal una pàgina d'inici de l'organització." #: actions/editapplication.php:218 actions/newapplication.php:206 msgid "Callback is too long." @@ -1284,11 +1306,16 @@ msgstr "Utilitza aquest formulari per editar el grup." msgid "description is too long (max %d chars)." msgstr "la descripció és massa llarga (màx. %d caràcters)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "L'àlies no és vàlid «%s»" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "No s'ha pogut actualitzar el grup." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "No s'han pogut crear els àlies." @@ -1296,32 +1323,42 @@ msgstr "No s'han pogut crear els àlies." msgid "Options saved." msgstr "Configuració guardada." -#: actions/emailsettings.php:60 -#, fuzzy +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" -msgstr "Configuració del correu electrònic" +msgstr "Paràmetres del correu electrònic" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Gestionar com reps correus de %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adreça" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Adreça de correu electrònic" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Adreça electrònica confirmada actualment." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Suprimeix" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1329,112 +1366,140 @@ msgstr "" "Esperant a confirmar aquesta direcció. Revisa la teva safata d'entrada (i la " "carpeta de spam!) per al missatge amb les instruccions." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Cancel·la" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "Direcció de correu electrònic" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Adreça electrònica, com ara «nomusuari@example.org»" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Afegeix" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Correu electrònic entrant" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" "Envia correu electrònic a aquesta adreça per publicar noves notificacions." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Posar un nou correu electrònic per publicar; cancel·lar l'antic." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Nou" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Preferències" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Preferències del correu electrònic" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "" "Envia'm notificacions quan algú nou se'm subscrigui, al meu correu " "electrònic." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "Envia'm un correu electrònic quan algú afegeixi una nota meva com a favorit." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat." -#: actions/emailsettings.php:174 -#, fuzzy +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat." +msgstr "Envia'm un correu electrònic quan algú m'enviï una resposta amb @." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Permetre que els amics em reclamin i m'enviïn un correu electrònic." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Vull publicar notificacions per correu electrònic." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publica una MicroID per al meu correu electrònic." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "S'han desat les preferències." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "S'han desat les preferències del correu electrònic." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "No hi ha cap adreça electrònica." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "No es pot normalitzar l'adreça electrònica." -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Adreça de correu electrònic no vàlida." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Ja és la vostra adreça electrònica." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "L'adreça electrònica ja pertany a un altre usuari." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "No s'ha pogut inserir el codi de confirmació." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1443,43 +1508,53 @@ msgstr "" "Revisa la teva safata d'entrada (i la carpeta de spam!) per veure aquest " "codi i les instruccions per utilitzar-lo." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Cap confirmació pendent per a cancel·lar." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Aquesta adreça de missatgeria instantània és incorrecta." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Aquesta l'adreça de correu electrònic incorrecta." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Confirmació cancel·lada." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "S'ha cancel·lat la confirmació de correu electrònic." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Aquest no és el teu correu electrònic" -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "L'adreça ha estat eliminada." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "S'ha suprimit l'adreça de correu electrònic." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "No hi ha cap direcció de correu electrònic entrant." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "No s'ha pogut actualitzar el registre de l'usuari." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Eliminat el correu electrònic entrant." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Nou correu electrònic entrant afegit." @@ -1508,12 +1583,16 @@ msgstr "Les notificacions més populars en aquest lloc ara mateix." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Els avisos de preferits apareixen en aquesta pàgina però ningú n'ha preferit " +"cap encara." #: actions/favorited.php:153 msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" +"Sigueu el primer en afegir un avís dels vostres preferits fent clic al botó " +"de preferit que es troba al costat dels avisos que us poden agradar." #: actions/favorited.php:156 #, php-format @@ -1521,6 +1600,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Per què no [registreu un compte](%%action.register%%) i sou el primer en " +"afegir un avís als vostres preferits!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1529,9 +1610,9 @@ msgid "%s's favorite notices" msgstr "%s's notes favorites" #: actions/favoritesrss.php:115 -#, fuzzy, php-format +#, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "Actualitzacions de %1$s a %2$s!" +msgstr "Actualitzacions preferides per %1$s a %2$s!" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 @@ -1544,7 +1625,7 @@ msgid "Featured users, page %d" msgstr "Usuaris destacats, pàgina %d" #: actions/featured.php:99 -#, fuzzy, php-format +#, php-format msgid "A selection of some great users on %s" msgstr "Una selecció d'alguns dels millors usuaris a %s" @@ -1594,9 +1675,9 @@ msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés." msgid "Remote service uses unknown version of OMB protocol." msgstr "Versió desconeguda del protocol OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Error en actualitzar el perfil remot" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "S'ha produït un error en actualitzar el perfil remot." #: actions/getfile.php:79 msgid "No such file." @@ -1607,29 +1688,26 @@ msgid "Cannot read file." msgstr "No es pot llegir el fitxer." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Mida invàlida." +msgstr "Rol no vàlid." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Aquest rol està reservat i no pot definir-se." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "No pots enviar un missatge a aquest usuari." +msgstr "No podeu establir rols d'usuari en aquest lloc." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "L'usuari ja està silenciat." +msgstr "L'usuari ja té aquest rol." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 #: lib/profileformaction.php:70 msgid "No profile specified." -msgstr "No s'ha especificat perfil." +msgstr "No s'ha especificat cap perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 @@ -1647,44 +1725,44 @@ msgid "Only an admin can block group members." msgstr "Només un administrador pot blocar membres del grup." #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "Un usuari t'ha bloquejat." +msgstr "L'usuari ja està blocat del grup." #: actions/groupblock.php:100 msgid "User is not a member of group." msgstr "L'usuari no és membre del grup." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Bloca l'usuari del grup" -#: actions/groupblock.php:162 -#, fuzzy, php-format +#: actions/groupblock.php:160 +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"Esteu segur que voleu blocar l'usuari «%s» del grup «%s»? Se suprimiran del " -"grup, i no podran enviar-hi res ni subscriure-s'hi en el futur." +"Esteu segur que voleu blocar l'usuari «%1$s» del grup «%2$s»? Se suprimiran " +"del grup, i no podran enviar-hi res ni subscriure-s'hi en el futur." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "No bloquis l'usuari del grup" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Bloca l'usuari del grup" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup." #: actions/groupbyid.php:74 actions/userbyid.php:70 -#, fuzzy msgid "No ID." -msgstr "No ID" +msgstr "Sense ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1716,15 +1794,12 @@ msgid "Group logo" msgstr "Logo del grup" #: actions/grouplogo.php:153 -#, fuzzy, php-format +#, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." -msgstr "Pots pujar una imatge de logo per al grup." - -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "Usuari sense perfil coincident" +msgstr "" +"Podeu pujar una imatge com a logotip del vostre grup. La mida màxima del " +"fitxer és %s." #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." @@ -1744,9 +1819,9 @@ msgid "%s group members" msgstr "%s membre/s en el grup" #: actions/groupmembers.php:103 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "%s membre/s en el grup, pàgina %d" +msgstr "%1$s membres del grup, pàgina %2$d" #: actions/groupmembers.php:118 msgid "A list of the users in this group." @@ -1756,34 +1831,38 @@ msgstr "La llista dels usuaris d'aquest grup." msgid "Admin" msgstr "Admin" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Bloca" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Fes l'usuari un administrador del grup" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Fes-lo administrador" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Fes l'usuari administrador" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s línia temporal" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Actualitzacions dels membres de %1$s el %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grups" @@ -1803,7 +1882,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Crea un grup nou" @@ -1851,11 +1930,15 @@ msgstr "L'usuari no està blocat del grup." msgid "Error removing the block." msgstr "S'ha produït un error en suprimir el bloc." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Paràmetres de missatgeria instantània" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1864,15 +1947,24 @@ msgstr "" "Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de Jabber/" "GTalk. Configura la teva adreça i opcions a sota." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "La MI no és disponible." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Adreça de missatgeria instantània" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Adreça actual Jabber/Gtalk confirmada." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1882,11 +1974,9 @@ msgstr "" "Jabber/GTalk un missatge amb més instruccions. (Has afegit a %s a la teva " "llista d'amics?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "Adreça de missatgeria instantània" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1896,45 +1986,66 @@ msgstr "" "assegura't d'afegir a %s a la teva llista d'amics en el teu client de " "missatgeria instantània o a GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Preferències de MI" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Envia'm avisos per Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Envia'm un avís quan el meu estat Jabber/GTalk canvii." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Envia'm respostes a través de Jabber/GTalk de la gent a la que no estic " "subscrita." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publica una MicroID per a la meva direcció de Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "S'han desat les preferències." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Cap Jabber ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Impossible normalitzar aquest Jabber ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Jabber ID no vàlid" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Aquest ja és el teu Jabber ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1943,10 +2054,33 @@ msgstr "" "S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que " "has afegit. Has d'acceptar que %s et pugui enviar missatges." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Aquesta adreça de missatgeria instantània és incorrecta." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "No s'ha pogut eliminar la confirmació de correu electrònic." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "S'ha cancel·lat la confirmació de MI." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Aquest no és el teu Jabber ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "S'ha suprimit l'adreça de MI." + #: actions/inbox.php:59 #, fuzzy, php-format msgid "Inbox for %1$s - page %2$d" @@ -1968,8 +2102,8 @@ msgid "Invites have been disabled." msgstr "S'han inhabilitat les invitacions." #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "" "Has d'estar dins del servei per poder convidar altres usuaris a utilitzar-lo " "%s" @@ -1991,7 +2125,9 @@ msgstr "Invitar nous usuaris" msgid "You are already subscribed to these users:" msgstr "Ja estàs subscrit a aquests usuaris:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2039,17 +2175,18 @@ msgstr "Opcionalment pots afegir un missatge a la invitació." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Envia" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, fuzzy, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2111,11 +2248,12 @@ msgid "You must be logged in to join a group." msgstr "Has d'haver entrat per participar en un grup." #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Cap sobrenom." +msgstr "Cap sobrenom o ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s s'ha unit al grup %2$s" @@ -2124,14 +2262,16 @@ msgstr "%1$s s'ha unit al grup %2$s" msgid "You must be logged in to leave a group." msgstr "Has d'haver entrat per a poder marxar d'un grup." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "No ets membre d'aquest grup." -#: actions/leavegroup.php:137 -#, fuzzy, php-format +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s ha abandonat el grup %s" +msgstr "%1$s ha abandonat el grup %2$s" #: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." @@ -2142,9 +2282,10 @@ msgid "Incorrect username or password." msgstr "Nom d'usuari o contrasenya incorrectes." #: actions/login.php:132 actions/otp.php:120 -#, fuzzy msgid "Error setting user. You are probably not authorized." -msgstr "No autoritzat." +msgstr "" +"S'ha produït un error en definir l'usuari. Probablement no hi esteu " +"autoritzat." #: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 msgid "Login" @@ -2177,10 +2318,13 @@ msgstr "" "contrasenya abans de canviar la teva configuració." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Inicieu una sessió amb nom d'usuari i contrasenya" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Inicia una sessió amb el teu nom d'usuari i la teva contrasenya. Encara no " "tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova " @@ -2191,9 +2335,9 @@ msgid "Only an admin can make another user an admin." msgstr "Només un administrador poc fer a un altre usuari administrador." #: actions/makeadmin.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s ja és un administrador del grup «%s»." +msgstr "%1$s ja és un administrador del grup «%2$s»." #: actions/makeadmin.php:133 #, fuzzy, php-format @@ -2206,13 +2350,12 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "No es pot fer %s un administrador del grup %s" #: actions/microsummary.php:69 -msgid "No current status" -msgstr "No té cap estatus ara mateix" +msgid "No current status." +msgstr "No hi ha cap estat actual." #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" -msgstr "No existeix aquest avís." +msgstr "Nova Aplicació" #: actions/newapplication.php:64 #, fuzzy @@ -2220,18 +2363,16 @@ msgid "You must be logged in to register an application." msgstr "Has d'haver entrat per crear un grup." #: actions/newapplication.php:143 -#, fuzzy msgid "Use this form to register a new application." -msgstr "Utilitza aquest formulari per crear un nou grup." +msgstr "Utilitzeu aquest formulari per crear una nova aplicació." #: actions/newapplication.php:176 msgid "Source URL is required." -msgstr "" +msgstr "URL d'origen requerida." #: actions/newapplication.php:258 actions/newapplication.php:267 -#, fuzzy msgid "Could not create application." -msgstr "No s'han pogut crear els àlies." +msgstr "No s'ha pogut crear l'aplicació." #: actions/newgroup.php:53 msgid "New group" @@ -2245,12 +2386,12 @@ msgstr "Utilitza aquest formulari per crear un nou grup." msgid "New message" msgstr "Nou missatge" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "No podeu enviar un misssatge a aquest usuari." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Cap contingut!" @@ -2258,7 +2399,7 @@ msgstr "Cap contingut!" msgid "No recipient specified." msgstr "No has especificat el destinatari." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això." @@ -2272,7 +2413,7 @@ msgstr "S'ha enviat el missatge" msgid "Direct message to %s sent." msgstr "S'ha enviat un missatge directe a %s." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax Error" @@ -2280,7 +2421,7 @@ msgstr "Ajax Error" msgid "New notice" msgstr "Nou avís" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Notificació publicada" @@ -2353,31 +2494,31 @@ msgstr "Aplicacions OAuth" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "Aplicacions que heu registrat" #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "No teniu cap aplicació registrada encara." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" -msgstr "" +msgstr "Aplicacions connectades" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." -msgstr "" +msgstr "Heu permès les aplicacions següents accedir al vostre compte." #: actions/oauthconnectionssettings.php:175 msgid "You are not a user of that application." msgstr "No sou usuari de l'aplicació." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2386,24 +2527,29 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Avís sense perfil" +msgid "Notice has no profile." +msgstr "L'avís no té cap perfil." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "estat de %1$s a %2$s" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "tipus de contingut " -#: actions/oembed.php:160 -msgid "Only " -msgstr "Només " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -2513,7 +2659,7 @@ msgid "6 or more characters" msgstr "6 o més caràcters" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Confirmar" @@ -2541,7 +2687,7 @@ msgstr "Contrasenya antiga incorrecta" msgid "Error saving user; invalid." msgstr "Error en guardar usuari; invàlid." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "No es pot guardar la nova contrasenya." @@ -2550,7 +2696,7 @@ msgid "Password saved." msgstr "Contrasenya guardada." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Camins" @@ -2560,23 +2706,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "Aquesta pàgina no està disponible en " #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "No es pot escriure al directori de fons: %s" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" +#, fuzzy, php-format +msgid "Background directory not writable: %s." msgstr "No es pot escriure al directori de fons: %s" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "Aquesta pàgina no està disponible en " #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2612,11 +2758,11 @@ msgstr "" #: actions/pathsadminpanel.php:250 msgid "Fancy URLs" -msgstr "" +msgstr "URL atractius" #: actions/pathsadminpanel.php:252 msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" +msgstr "Voleu fer servir URL atractius (més fàcils de llegir i de recordar)?" #: actions/pathsadminpanel.php:259 msgid "Theme" @@ -2688,21 +2834,19 @@ msgstr "Utilitza l'SSL" #: actions/pathsadminpanel.php:330 msgid "When to use SSL" -msgstr "" +msgstr "Quan utilitzar l'SSL" #: actions/pathsadminpanel.php:335 -#, fuzzy msgid "SSL server" msgstr "Servidor SSL" #: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" -msgstr "" +msgstr "Servidor on dirigir les sol·licituds SSL" #: actions/pathsadminpanel.php:352 -#, fuzzy msgid "Save paths" -msgstr "Avís del lloc" +msgstr "Desa els camins" #: actions/peoplesearch.php:52 #, php-format @@ -2717,19 +2861,19 @@ msgstr "" msgid "People search" msgstr "Cerca de gent" -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "Etiqueta no vàlida per a la gent: %s" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usuaris que s'han etiquetat %s - pàgina %d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "El contingut de l'avís és invàlid" +msgid "Invalid notice content." +msgstr "El contingut de l'avís no és vàlid." #: actions/postnotice.php:101 #, php-format @@ -2757,13 +2901,14 @@ msgstr "" "1-64 lletres en minúscula o números, sense signes de puntuació o espais" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nom complet" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pàgina personal" @@ -2786,9 +2931,9 @@ msgid "Bio" msgstr "Biografia" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Ubicació" @@ -2798,11 +2943,11 @@ msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\"" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "Comparteix la meva ubicació actual en enviar avisos" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Etiquetes" @@ -2877,7 +3022,7 @@ msgstr "Configuració guardada." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "Més enllà del límit de la pàgina (%s)" #: actions/public.php:92 @@ -3040,7 +3185,7 @@ msgstr "Restablir contrasenya" msgid "Recover password" msgstr "Recuperar contrasenya" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Recuperació de contrasenya sol·licitada" @@ -3060,19 +3205,19 @@ msgstr "Restablir" msgid "Enter a nickname or email address." msgstr "Escriu un sobrenom o una adreça de correu electrònic." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "No hi ha cap usuari amb aquesta direcció o usuari." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Cap adreça de correu electrònic registrada per aquest usuari." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Error en guardar confirmació de l'adreça." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3080,23 +3225,23 @@ msgstr "" "S'han enviat instruccions per a recuperar la teva contrasenya a l'adreça de " "correu electrònic registrada." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Restabliment de contrasenya inesperat." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "La contrasenya ha de tenir 6 o més caràcters." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "La contrasenya i la confirmació no coincideixen." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Error en configurar l'usuari." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió." @@ -3112,7 +3257,7 @@ msgstr "El codi d'invitació no és vàlid." msgid "Registration successful" msgstr "Registre satisfactori" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registre" @@ -3133,8 +3278,9 @@ msgid "Invalid username or password." msgstr "Nom d'usuari o contrasenya invàlids." #: actions/register.php:343 +#, fuzzy msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i " @@ -3153,8 +3299,9 @@ msgstr "6 o més caràcters. Requerit." msgid "Same as password above. Required." msgstr "Igual a la contrasenya de dalt. Requerit." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Correu electrònic" @@ -3168,23 +3315,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nom llarg, preferiblement el teu nom \"real\"" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "El meu text i els meus fitxers estan disponibles sota " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Atribució 3.0" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" "excepte les següents dades privades: contrasenya, adreça de correu " "electrònic, adreça de missatgeria instantània, número de telèfon." -#: actions/register.php:538 +#: actions/register.php:542 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3215,7 +3354,7 @@ msgstr "" "\n" "Gràcies per registrar-te i esperem que gaudeixis d'aquest servei." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3260,7 +3399,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL del teu perfil en un altre servei de microblogging compatible" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Subscriure's" @@ -3274,9 +3413,8 @@ msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "URL de perfil no vàlid (cap document YADIS)." #: actions/remotesubscribe.php:176 -#, fuzzy msgid "That’s a local profile! Login to subscribe." -msgstr "Aquest és un perfil local! Entra per subscriure-t'hi." +msgstr "Aquest és un perfil local! Inicieu una sessió per a subscriure-us-hi." #: actions/remotesubscribe.php:183 #, fuzzy @@ -3299,11 +3437,10 @@ msgid "You can't repeat your own notice." msgstr "No pots registrar-te si no estàs d'acord amb la llicència." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Ja heu blocat l'usuari." +msgstr "Ja havíeu repetit l'avís." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Repetit" @@ -3318,9 +3455,9 @@ msgid "Replies to %s" msgstr "Respostes a %s" #: actions/replies.php:128 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "Respostes a %1$s el %2$s!" +msgstr "Respostes a %1$s, pàgina %2$d" #: actions/replies.php:145 #, fuzzy, php-format @@ -3376,9 +3513,8 @@ msgid "User doesn't have this role." msgstr "Usuari sense perfil coincident" #: actions/rsd.php:146 actions/version.php:157 -#, fuzzy msgid "StatusNet" -msgstr "S'ha suprimit l'estat." +msgstr "StatusNet" #: actions/sandbox.php:65 actions/unsandbox.php:65 #, fuzzy @@ -3392,7 +3528,7 @@ msgstr "Un usuari t'ha bloquejat." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sessions" @@ -3407,7 +3543,7 @@ msgstr "Gestiona les sessions" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Si cal gestionar les sessions nosaltres mateixos." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" @@ -3428,42 +3564,44 @@ msgid "You must be logged in to view an application." msgstr "Has d'haver entrat per a poder marxar d'un grup." #: actions/showapplication.php:157 -#, fuzzy msgid "Application profile" -msgstr "Avís sense perfil" +msgstr "Perfil de l'aplicació" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" -msgstr "" +msgstr "Icona" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Nom" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 -#, fuzzy +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" -msgstr "Paginació" +msgstr "Organització" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descripció" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Estadístiques" #: actions/showapplication.php:203 #, php-format msgid "Created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "Creat per %1$s - %2$s accés per defecte - %3$d usuaris" #: actions/showapplication.php:213 msgid "Application actions" -msgstr "" +msgstr "Accions d'aplicació" #: actions/showapplication.php:236 msgid "Reset key & secret" @@ -3490,9 +3628,8 @@ msgid "Access token URL" msgstr "" #: actions/showapplication.php:283 -#, fuzzy msgid "Authorize URL" -msgstr "Autoria" +msgstr "Autoritza l'URL" #: actions/showapplication.php:288 msgid "" @@ -3517,17 +3654,17 @@ msgstr "No s'han pogut recuperar els avisos preferits." #: actions/showfavorites.php:171 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Feed per a amics de %s" +msgstr "Canal dels preferits de %s (RSS 1.0)" #: actions/showfavorites.php:178 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Feed per a amics de %s" +msgstr "Canal dels preferits de %s (RSS 2.0)" #: actions/showfavorites.php:185 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Feed per a amics de %s" +msgstr "Canal dels preferits de %s (Atom)" #: actions/showfavorites.php:206 msgid "" @@ -3564,67 +3701,67 @@ msgstr "%s grup" msgid "%1$s group, page %2$d" msgstr "%s membre/s en el grup, pàgina %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Perfil del grup" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Avisos" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Àlies" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Accions del grup" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Feed d'avisos del grup %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Feed d'avisos del grup %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Feed d'avisos del grup %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Safata de sortida per %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Membres" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Cap)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Tots els membres" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "S'ha creat" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3634,7 +3771,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3645,7 +3782,7 @@ msgstr "" "**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]" "(http://ca.wikipedia.org/wiki/Microblogging)" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Administradors" @@ -3668,19 +3805,18 @@ msgid "Message from %1$s on %2$s" msgstr "Missatge de %1$s a %2$s" #: actions/shownotice.php:90 -#, fuzzy msgid "Notice deleted." -msgstr "Notificació publicada" +msgstr "S'ha suprimit l'avís." #: actions/showstream.php:73 -#, fuzzy, php-format +#, php-format msgid " tagged %s" -msgstr "Aviso etiquetats amb %s" +msgstr " etiquetats amb %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%s perfils blocats, pàgina %d" +msgstr "%1$s, pàgina %2$d" #: actions/showstream.php:122 #, fuzzy, php-format @@ -3774,17 +3910,17 @@ msgid "You must have a valid contact email address." msgstr "Heu de tenir una adreça electrònica de contacte vàlida" #: actions/siteadminpanel.php:159 -#, fuzzy, php-format +#, php-format msgid "Unknown language \"%s\"." -msgstr "Llengua desconeguda «%s»" +msgstr "Llengua desconeguda «%s»." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "" +msgid "Minimum text limit is 0 (unlimited)." +msgstr "El límit de text mínim és 0 (sense cap límit)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." -msgstr "" +msgid "Dupe limit must be one or more seconds." +msgstr "El límit de duplicats ha de ser d'un o més segons." #: actions/siteadminpanel.php:221 msgid "General" @@ -3831,13 +3967,14 @@ msgid "Default timezone for the site; usually UTC." msgstr "Fus horari per defecte del lloc; normalment UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Llengua per defecte del lloc" +msgstr "Llengua per defecte" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Llengua del lloc quan la detecció automàtica des de la configuració del " +"navegador no està disponible" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3849,7 +3986,7 @@ msgstr "Límits del text" #: actions/siteadminpanel.php:274 msgid "Maximum number of characters for notices." -msgstr "" +msgstr "Nombre màxim de caràcters dels avisos." #: actions/siteadminpanel.php:278 msgid "Dupe limit" @@ -3862,7 +3999,6 @@ msgstr "" "de nou." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" msgstr "Avís del lloc" @@ -3872,68 +4008,94 @@ msgid "Edit site-wide message" msgstr "Nou missatge" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "No s'ha pogut guardar la teva configuració de Twitter!" +msgstr "No s'ha pogut desar l'avís del lloc." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "La mida màxima per a als avisos per a tot el lloc és de 255 caràcters." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Avís del lloc" +msgstr "Text de l'avís per al lloc" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "Text d'avís per a tot el lloc (màxim 255 caràcters, es permet l'HTML)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Avís del lloc" +msgstr "Desa l'avís del lloc" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Paràmetres de l'SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" "Pots rebre missatges SMS a través del teu coreu electrònic des de %%site.name" "%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "L'SMS no és disponible." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "Adreça SMS" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Número de telèfon actualment confirmat i activat per SMS." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Esperant confirmació per aquest número de telèfon." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Codi de confirmació" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Escriu el codi que has rebut en el teu telèfon mòbil." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Confirmar" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Número de telèfon per als SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Preferències" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3941,23 +4103,34 @@ msgstr "" "Enviar-me avisos a través de SMS; puc entendre que això repercutirà en una " "exorbitant càrrega del meu transport." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "S'han desat les preferències." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "No hi ha cap número de telèfon." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "No s'ha sel·leccionat cap transport." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Aquest ja és el teu número de telèfon." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Aquest número de telèfon pertany a un altre usuari." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " @@ -3967,23 +4140,42 @@ msgstr "" "la teva safata d'entrada (i la carpeta de spam!) per veure aquest codi i les " "instruccions per utilitzar-lo." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Aquest és un número de confirmació incorrecte." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Confirmació cancel·lada." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Aquest no és el teu número de telèfon." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "Número de telèfon per als SMS" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Transport mòbil" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Selecciona un transport" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3993,13 +4185,14 @@ msgstr "" "accepti SMS a través del correu electrònic, però no està a la llista, " "envia'ns un correu electrònic per fer-nos-ho saber %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "No hi ha cap codi entrat" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Instantànies" @@ -4021,7 +4214,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4061,8 +4254,7 @@ msgstr "Desa els paràmetres del lloc" msgid "You are not subscribed to that profile." msgstr "No estàs subscrit a aquest perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "No s'ha pogut guardar la subscripció." @@ -4159,11 +4351,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s no escolta a ningú." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4197,12 +4389,12 @@ msgstr "No argument de la id." msgid "Tag %s" msgstr "Etiqueta %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Perfil de l'usuari" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -4257,7 +4449,8 @@ msgid "User is not silenced." msgstr "L'usuari no està silenciat." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +#, fuzzy +msgid "No profile ID in request." msgstr "No id en el perfil sol·licitat." #: actions/unsubscribe.php:98 @@ -4272,29 +4465,30 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Usuari" #: actions/useradminpanel.php:70 msgid "User settings for this StatusNet site." -msgstr "" +msgstr "Paràmetres d'usuari d'aquest lloc StatusNet." #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." -msgstr "" +msgstr "El límit de la biografia no és vàlid. Cal que sigui numèric." #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" +"El text de benvinguda no és vàlid. La longitud màxima és de 255 caràcters." #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "" +msgstr "La subscripció per defecte no és vàlida: «%1$s» no és cap usuari." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" @@ -4317,7 +4511,7 @@ msgstr "Benvinguda als usuaris nous" #: actions/useradminpanel.php:236 msgid "Welcome text for new users (Max 255 chars)." -msgstr "" +msgstr "Text de benvinguda per a nous usuaris (màx. 255 caràcters)." #: actions/useradminpanel.php:241 msgid "Default subscription" @@ -4337,7 +4531,7 @@ msgstr "S'han habilitat les invitacions" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "Si es permet als usuaris invitar-ne de nous." #: actions/userauthorization.php:105 msgid "Authorize subscription" @@ -4459,27 +4653,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Gaudiu de l'entrepà!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "%s membre/s en el grup, pàgina %d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Cerca més grups" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s no és membre de cap grup." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualitzacions de %1$s a %2$s!" @@ -4527,7 +4727,8 @@ msgstr "" msgid "Plugins" msgstr "Connectors" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Sessions" @@ -4537,19 +4738,19 @@ msgstr "Sessions" msgid "Author(s)" msgstr "Autoria" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4591,28 +4792,28 @@ msgstr "No s'ha pogut inserir el missatge." msgid "Could not update message with new URI." msgstr "No s'ha pogut inserir el missatge amb la nova URI." -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" msgstr "Hashtag de l'error de la base de dades:%s" -#: classes/Notice.php:241 -#, fuzzy -msgid "Problem saving notice. Too long." -msgstr "Problema en guardar l'avís." - #: classes/Notice.php:245 +msgid "Problem saving notice. Too long." +msgstr "S'ha produït un problema en desar l'avís. És massa llarg." + +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Problema al guardar la notificació. Usuari desconegut." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:256 +#: classes/Notice.php:260 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4621,311 +4822,334 @@ msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Ha estat bandejat de publicar notificacions en aquest lloc." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:1459 -#, fuzzy, php-format +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 +#, php-format msgid "RT @%1$s %2$s" -msgstr "%1$s (%2$s)" +msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Se us ha banejat la subscripció." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Ja hi esteu subscrit!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Un usuari t'ha bloquejat." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "No estàs subscrit!" -#: classes/Subscription.php:163 -#, fuzzy +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." -msgstr "No s'ha pogut eliminar la subscripció." +msgstr "No s'ha pogut eliminar l'autosubscripció." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "No s'ha pogut eliminar la subscripció." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "No s'ha pogut eliminar la subscripció." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Us donem la benvinguda a %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "No s'ha pogut crear el grup." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "No s'ha pogut establir la pertinença d'aquest grup." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "No s'ha pogut establir la pertinença d'aquest grup." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "No s'ha pogut guardar la subscripció." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Canvieu els paràmetres del vostre perfil" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Puja un avatar" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Canvieu la vostra contrasenya" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Canvieu la gestió del correu" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "Perfil de l'usuari" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Altres" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Altres opcions" -#: lib/action.php:144 -#, fuzzy, php-format -msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Altres" -#: lib/action.php:159 +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Pàgina sense titol" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Navegació primària del lloc" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 -#, fuzzy +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Perfil personal i línia temporal dels amics" -#: lib/action.php:433 -#, fuzzy +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Personal" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 -#, fuzzy +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Canviar correu electrònic, avatar, contrasenya, perfil" +msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "No s'ha pogut redirigir al servidor: %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Connexió" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Canvia la configuració del lloc" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Admin" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Convidar amics i companys perquè participin a %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Convida" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 #, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Finalitza la sessió del lloc" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Finalitza la sessió" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Crea un compte" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "Registre" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 #, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Inicia una sessió al lloc" -#: lib/action.php:479 -#, fuzzy +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Inici de sessió" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 -#, fuzzy +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" -msgstr "Ajuda'm" +msgstr "Ajuda'm!" -#: lib/action.php:485 -#, fuzzy +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Ajuda" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 -#, fuzzy +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Cerca gent o text" -#: lib/action.php:491 -#, fuzzy +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Cerca" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Avís del lloc" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Vistes locals" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Notificació pàgina" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Navegació del lloc secundària" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Ajuda" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Quant a" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "Preguntes més freqüents" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Privadesa" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Font" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Contacte" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Insígnia" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Llicència del programari StatusNet" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%" "site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** és un servei de microblogging." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4936,68 +5160,82 @@ msgstr "" "%s, disponible sota la [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Llicència de contingut del lloc" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "Tot " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "llicència." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Paginació" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Posteriors" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Anteriors" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "No podeu fer canvis al lloc." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 #, fuzzy msgid "Changes to that panel are not allowed." msgstr "Registre no permès." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 #, fuzzy msgid "showForm() not implemented." @@ -5009,164 +5247,202 @@ msgstr "Comanda encara no implementada." msgid "saveSettings() not implemented." msgstr "Comanda encara no implementada." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 #, fuzzy msgid "Unable to delete design setting." msgstr "No s'ha pogut guardar la teva configuració de Twitter!" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Configuració bàsica del lloc" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "Lloc" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Configuració del disseny" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "Disseny" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "Configuració dels camins" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Usuari" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "Configuració del disseny" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Configuració dels camins" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "Configuració del disseny" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "Avís del lloc" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "Configuració dels camins" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Descriu el grup amb 140 caràcters" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "Descriu el grup amb 140 caràcters" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Font" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL del teu web, blog del grup u tema" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "Font" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL del teu web, blog del grup u tema" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Cancel·la" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "Suprimeix" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Adjuncions" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Autoria" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Proveïdor" @@ -5187,37 +5463,57 @@ msgstr "El canvi de contrasenya ha fallat" msgid "Password changing is not allowed" msgstr "Contrasenya canviada." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultats de les comandes" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comanda completada" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Comanda fallida" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Perdona, aquesta comanda no està implementada." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "No hi ha cap perfil amb aquesta id." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "L'usuari no té última nota" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Perdona, aquesta comanda no està implementada." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Reclamació enviada" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5225,202 +5521,206 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "No hi ha cap perfil amb aquesta id." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "L'usuari no té última nota" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Nota marcada com a favorita." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Ja sou membre del grup." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "No s'ha pogut afegir l'usuari %s al grup %s." +msgid "Could not join user %1$s to group %2$s" +msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s." -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s s'ha pogut afegir al grup %s" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" +msgstr "No s'ha pogut suprimir l'usuari %1$s del grup %2$s." -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "No s'ha pogut eliminar l'usuari %s del grup %s" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s ha abandonat el grup %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Nom complet: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Localització: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Pàgina web: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Sobre tu: %s" -#: lib/command.php:349 +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" -#: lib/command.php:367 +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Missatge directe per a %s enviat" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "No es poden posar en on les notificacions." -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "Eliminar aquesta nota" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Notificació publicada" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:482 +#: lib/command.php:562 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Especifica el nom de l'usuari a que vols subscriure't" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "No existeix aquest usuari." +#: lib/command.php:628 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Subscrit a %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Has deixat d'estar subscrit a %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Comanda encara no implementada." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notificacions off." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "No es poden posar en off les notificacions." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notificacions on." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "No es poden posar en on les notificacions." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Has deixat d'estar subscrit a %s" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ja estàs subscrit a aquests usuaris:" msgstr[1] "Ja estàs subscrit a aquests usuaris:" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "No pots subscriure a un altre a tu mateix." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No pots subscriure a un altre a tu mateix." msgstr[1] "No pots subscriure a un altre a tu mateix." -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "No sou membre de cap grup." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sou un membre d'aquest grup:" msgstr[1] "Sou un membre d'aquests grups:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5462,19 +5762,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "No s'ha trobat cap fitxer de configuració. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Podeu voler executar l'instal·lador per a corregir-ho." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Vés a l'instal·lador." @@ -5575,7 +5875,7 @@ msgstr "Vés-hi" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Atorga a l'usuari el rol «%s»" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5646,53 +5946,54 @@ msgstr "Grups amb més entrades" msgid "Tags in %s group's notices" msgstr "Etiquetes en les notificacions del grup %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis." -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Format d'imatge no suportat." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Pots pujar una imatge de logo per al grup." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Càrrega parcial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error del sistema en pujar el fitxer." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "No és una imatge o és un fitxer corrupte." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Format d'imatge no suportat." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Hem perdut el nostre arxiu." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipus de fitxer desconegut" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Llengua desconeguda «%s»" @@ -5713,11 +6014,13 @@ msgstr "Accedir amb el nom d'usuari i contrasenya" msgid "Sign up for a new account" msgstr "Crear nou compte" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Confirmació de l'adreça de correu electrònic" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5734,12 +6037,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s ara està escoltant els teus avisos a %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5760,19 +6065,22 @@ msgstr "" "Atentament,\n" "%4$s.\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Biografia: %s\n" "\n" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Nou correu electrònic per publicar a %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5793,21 +6101,31 @@ msgstr "" "Sincerament teus,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s estat" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Confirmació SMS" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "Esperant confirmació per aquest número de telèfon." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Has estat reclamat per %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5823,12 +6141,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Nou missatge privat de %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5847,12 +6167,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s ha afegit la teva nota com a favorita" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5873,12 +6195,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5891,6 +6223,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5903,7 +6247,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "de" @@ -6032,49 +6376,53 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "en context" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Repetit per" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "respondre a aquesta nota" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Respon" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "Notificació publicada" @@ -6099,6 +6447,10 @@ msgstr "Error en inserir el nou perfil" msgid "Error inserting avatar" msgstr "Error en inserir avatar" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Error en actualitzar el perfil remot" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Error en inserir perfil remot" @@ -6150,7 +6502,7 @@ msgstr "Etiquetes en les notificacions de %s's" msgid "Unknown" msgstr "Acció desconeguda" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscripcions" @@ -6158,32 +6510,32 @@ msgstr "Subscripcions" msgid "All subscriptions" msgstr "Totes les subscripcions" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscriptors" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Tots els subscriptors" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ID de l'usuari" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Membre des de" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Mitjana diària" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Tots els grups" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "No argument de la id." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Mètode no implementat" @@ -6207,11 +6559,20 @@ msgstr "Destacat" msgid "Popular" msgstr "Popular" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "No argument de la id." + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "Repeteix l'avís" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Sí" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Repeteix l'avís" @@ -6221,7 +6582,7 @@ msgstr "Repeteix l'avís" msgid "Revoke the \"%s\" role from this user" msgstr "Bloca l'usuari del grup" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6350,92 +6711,108 @@ msgstr "Deixar d'estar subscrit des d'aquest usuari" msgid "Unsubscribe" msgstr "Cancel·lar subscripció" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "L'usuari no té perfil." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Edita l'avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Accions de l'usuari" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "S'està suprimint l'usuari..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Edita la configuració del perfil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Edita" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Enviar un missatge directe a aquest usuari" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Missatge" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Modera" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "Perfil de l'usuari" +msgstr "Rol de l'usuari" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Administradors" +msgstr "Administrador" -#: lib/userprofile.php:355 -#, fuzzy +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "Modera" +msgstr "Moderador" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "fa un any" @@ -6449,7 +6826,8 @@ msgstr "%s no és un color vàlid!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals." -#: lib/xmppmanager.php:402 -#, fuzzy, php-format +#: lib/xmppmanager.php:403 +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." -msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" +msgstr "" +"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d." diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index a48ec58850..e619430aa9 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:32+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:18+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -22,7 +22,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 #, fuzzy msgid "Access" msgstr "Přijmout" @@ -78,7 +78,13 @@ msgstr "Žádný takový uživatel." msgid "Save access settings" msgstr "Nastavení" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -88,7 +94,7 @@ msgstr "Uložit" #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy -msgid "No such page" +msgid "No such page." msgstr "Žádné takové oznámení." #: actions/all.php:75 actions/allrss.php:68 @@ -99,9 +105,9 @@ msgstr "Žádné takové oznámení." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -109,11 +115,9 @@ msgstr "Žádné takové oznámení." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Žádný takový uživatel." @@ -125,8 +129,9 @@ msgstr "%s a přátelé" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -185,8 +190,10 @@ msgstr "" msgid "You and friends" msgstr "%s a přátelé" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -201,18 +208,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Potvrzující kód nebyl nalezen" @@ -226,15 +233,15 @@ msgstr "Potvrzující kód nebyl nalezen" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -247,7 +254,7 @@ msgstr "Nelze aktualizovat uživatele" #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Uživatel nemá profil." @@ -258,9 +265,9 @@ msgid "Could not save profile." msgstr "Nelze uložit profil" #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -345,7 +352,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "Toto je již vaše Jabber" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" @@ -439,10 +446,9 @@ msgstr "Umístění příliš dlouhé (maximálně 255 znaků)" msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, fuzzy, php-format -msgid "Invalid alias: \"%s\"" +msgid "Invalid alias: \"%s\"." msgstr "Neplatná adresa '%s'" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -460,7 +466,7 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy -msgid "Group not found!" +msgid "Group not found." msgstr "Žádný požadavek nebyl nalezen!" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 @@ -468,7 +474,7 @@ msgstr "Žádný požadavek nebyl nalezen!" msgid "You are already a member of that group." msgstr "Již jste přihlášen" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -487,17 +493,26 @@ msgstr "Neodeslal jste nám profil" msgid "Could not remove user %1$s from group %2$s." msgstr "Nelze vytvořit OpenID z: %s" -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, fuzzy, php-format msgid "%s's groups" msgstr "Profil" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Neodeslal jste nám profil" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "" @@ -512,17 +527,17 @@ msgid "Invalid token." msgstr "Neplatná velikost" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -556,12 +571,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Nečekaná forma submission." @@ -581,21 +599,23 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 #, fuzzy msgid "Account" msgstr "O nás" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Přezdívka" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Heslo" @@ -644,17 +664,18 @@ msgstr "Obrázek nahrán" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#, fuzzy +msgid "Not found." +msgstr "Žádný požadavek nebyl nalezen!" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -664,12 +685,12 @@ msgstr "" msgid "Unsupported format." msgstr "Nepodporovaný formát obrázku." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1 statusů na %2" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Mikroblog od %s" @@ -679,17 +700,17 @@ msgstr "Mikroblog od %s" msgid "%1$s / Updates mentioning %2$s" msgstr "%1 statusů na %2" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -704,21 +725,16 @@ msgstr "Odpovědi na %s" msgid "Repeats of %s" msgstr "Odpovědi na %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mikroblog od %s" -#: actions/apiusershow.php:96 -#, fuzzy -msgid "Not found." -msgstr "Žádný požadavek nebyl nalezen!" - #: actions/attachment.php:73 #, fuzzy msgid "No such attachment." @@ -739,8 +755,9 @@ msgstr "Žádná velikost" msgid "Invalid size." msgstr "Neplatná velikost" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Obrázek" @@ -750,10 +767,11 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." +msgstr "Uživatel nemá profil." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -772,7 +790,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Odstranit" @@ -784,23 +802,28 @@ msgstr "Upload" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Částečné náhrání." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Obrázek nahrán" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Nahrávání obrázku selhalo." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar smazán." @@ -809,7 +832,7 @@ msgstr "Avatar smazán." msgid "You already blocked that user." msgstr "Již jste přihlášen" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "Žádný takový uživatel." @@ -821,28 +844,45 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "Ne" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Žádný takový uživatel." -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "Ano" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Zablokovat tohoto uživatele" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "" @@ -855,8 +895,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 #, fuzzy msgid "No such group." msgstr "Žádné takové oznámení." @@ -889,9 +929,11 @@ msgstr "" msgid "Unblock this user" msgstr "Žádný takový uživatel." -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "" +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" +msgstr "Odpovědi na %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -905,34 +947,44 @@ msgstr "Potvrzující kód nebyl nalezen" msgid "That confirmation code is not for you!" msgstr "Tento potvrzující kód vám nepatří!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "Neznámý typ adresy %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Adresa již byla potvrzena" -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Nelze aktualizovat uživatele" -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Nelze smazat potvrzení emailu" -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "Potvrď adresu" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Adresa \"%s\" byla potvrzena pro váš účet" @@ -943,7 +995,7 @@ msgid "Conversation" msgstr "Umístění" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Sdělení" @@ -965,7 +1017,7 @@ msgstr "Neodeslal jste nám profil" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -981,17 +1033,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "Žádné takové oznámení." -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "Odstranit toto oznámení" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1020,12 +1074,14 @@ msgstr "" msgid "Are you sure you want to delete this notice?" msgstr "" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 #, fuzzy msgid "Do not delete this notice" msgstr "Žádné takové oznámení." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Odstranit toto oznámení" @@ -1049,131 +1105,135 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Odstranit tohoto uživatele" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Vzhled" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "Neplatná velikost" -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "Tato stránka není k dispozici v typu média která přijímáte." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "Změnit heslo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 #, fuzzy msgid "Site logo" msgstr "Nové sdělení" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "Změnit" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "Nové sdělení" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Pozadí" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Změnit barvy" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Obsah" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Hledat" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Odkazy" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Uložit" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1286,12 +1346,17 @@ msgstr "" msgid "description is too long (max %d chars)." msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Neplatná adresa '%s'" + #: actions/editgroup.php:258 #, fuzzy msgid "Could not update group." msgstr "Nelze aktualizovat uživatele" -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Nelze uložin informace o obrázku" @@ -1300,180 +1365,240 @@ msgstr "Nelze uložin informace o obrázku" msgid "Options saved." msgstr "Nastavení uloženo." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "Nastavení E-mailu" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adresa" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "Potvrzení emailové adresy" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "Odstranit" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "Zrušit" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "Potvrzení emailové adresy" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "Přidat" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "Nový" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "Nastavení" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "" -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." msgstr "Nastavení uloženo" -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Není platnou mailovou adresou." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Nelze vložit potvrzující kód" -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Nečeká žádné potvrzení na zrušení." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "Toto je špatná IM adresa" -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "Potvrď zrušení" -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "" -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "Adresa byla odstraněna" -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" @@ -1595,8 +1720,9 @@ msgstr "Nelze konvertovat řetězec požadavku na přístupový řetězec." msgid "Remote service uses unknown version of OMB protocol." msgstr "Neznámá verze OMB protokolu." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "Chyba při aktualizaci vzdáleného profilu" #: actions/getfile.php:79 @@ -1659,12 +1785,12 @@ msgstr "Uživatel nemá profil." msgid "User is not a member of group." msgstr "Neodeslal jste nám profil" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 #, fuzzy msgid "Block user from group" msgstr "Žádný takový uživatel." -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1672,17 +1798,19 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 #, fuzzy msgid "Do not block this user from this group" msgstr "Nelze přesměrovat na server: %s" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 #, fuzzy msgid "Block this user from this group" msgstr "Žádný takový uživatel." -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1726,11 +1854,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "Uživatel nemá profil." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1763,34 +1886,38 @@ msgstr "" msgid "Admin" msgstr "" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Mikroblog od %s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Skupiny" @@ -1810,7 +1937,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 #, fuzzy msgid "Create a new group" msgstr "Vytvořit nový účet" @@ -1863,12 +1990,16 @@ msgstr "Uživatel nemá profil." msgid "Error removing the block." msgstr "Chyba při ukládaní uživatele" -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "IM nastavení" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1877,16 +2008,26 @@ msgstr "" "Můžete odesílat nebo přijámat sdělení pomocí Jabber/GTalk [zpráv](%%doc.im%" "%).Zadejte svou adresu níže." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 #, fuzzy msgid "IM is not available." msgstr "Tato stránka není k dispozici v typu média která přijímáte." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "IM adresa" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Potvrzené Jabber/GTalk adresy" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1895,12 +2036,9 @@ msgstr "" "Čakám na potvrzení této adresy. Zkontrolujte zprávy na vašem Jabber/GTalk " "účtu. (Přidal jste si %s do vašich kontaktů?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "IM adresa" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1909,43 +2047,65 @@ msgstr "" "Jabber nebo GTalk adresy, například \"jmeno@example.org\". Neprve se " "ujistěte že jste přidal %s do vašeho seznamu kontaktů." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Nastavení" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Zasílat oznámení pomocí Jabber/GTalk" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Nastavení uloženo" + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Žádné Jabber ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Nelze normalizovat JabberID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Není platným Jabber ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Toto je již vaše Jabber" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber ID již patří jinému uživateli" -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1954,10 +2114,35 @@ msgstr "" "Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro " "posílání zpráv." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Toto je špatná IM adresa" + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Nelze smazat potvrzení emailu" + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "Potvrď zrušení" + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Toto není váš Jabber" +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Adresa byla odstraněna" + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1977,9 +2162,9 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." +msgstr "Nelze aktualizovat uživatele" #: actions/invite.php:72 #, php-format @@ -1998,7 +2183,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2046,12 +2233,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Odeslat" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2091,7 +2280,9 @@ msgstr "" msgid "No nickname or ID." msgstr "Žádná přezdívka." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -2100,12 +2291,14 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 #, fuzzy msgid "You are not a member of that group." msgstr "Neodeslal jste nám profil" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%1 statusů na %2" @@ -2150,10 +2343,14 @@ msgid "" msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Neplatné jméno nebo heslo" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste zaregistrován? " "[Registrovat](%%action.register%%) nový účet, nebo vyzkoušejte [OpenID](%%" @@ -2179,8 +2376,9 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Uživatel nemá profil." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "" +#, fuzzy +msgid "No current status." +msgstr "Žádné výsledky." #: actions/newapplication.php:52 #, fuzzy @@ -2216,12 +2414,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Žádný obsah!" @@ -2229,7 +2427,7 @@ msgstr "Žádný obsah!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2243,7 +2441,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2251,7 +2449,7 @@ msgstr "" msgid "New notice" msgstr "Nové sdělení" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 #, fuzzy msgid "Notice posted" msgstr "Sdělení" @@ -2342,11 +2540,11 @@ msgid "You are not a user of that application." msgstr "Neodeslal jste nám profil" #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2355,25 +2553,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "Sdělení nemá profil" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1 statusů na %2" -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "Připojit" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -2485,7 +2688,7 @@ msgid "6 or more characters" msgstr "6 a více znaků" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Heslo znovu" @@ -2513,7 +2716,7 @@ msgstr "Neplatné heslo" msgid "Error saving user; invalid." msgstr "Chyba při ukládaní uživatele; neplatný" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Nelze uložit nové heslo" @@ -2522,7 +2725,7 @@ msgid "Password saved." msgstr "Heslo uloženo" #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2532,23 +2735,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "Tato stránka není k dispozici v typu média která přijímáte." #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Tato stránka není k dispozici v typu média která přijímáte." #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "Tato stránka není k dispozici v typu média která přijímáte." #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "Tato stránka není k dispozici v typu média která přijímáte." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2697,18 +2900,19 @@ msgstr "" msgid "People search" msgstr "Hledání lidí" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, fuzzy, php-format -msgid "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." msgstr "Není platnou mailovou adresou." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Mikroblog od %s" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "Neplatný obsah sdělení" #: actions/postnotice.php:101 @@ -2737,13 +2941,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Celé jméno" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Moje stránky" @@ -2765,9 +2970,9 @@ msgid "Bio" msgstr "O mě" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Umístění" @@ -2781,7 +2986,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -2854,7 +3059,7 @@ msgstr "Nastavení uloženo" #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -3011,7 +3216,7 @@ msgstr "Resetovat heslo" msgid "Recover password" msgstr "Obnovit" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Žádost o obnovu hesla" @@ -3031,19 +3236,19 @@ msgstr "Reset" msgid "Enter a nickname or email address." msgstr "Zadej přezdívku nebo emailovou adresu" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Žádný registrovaný email pro tohoto uživatele." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Chyba při ukládání potvrzení adresy" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3051,23 +3256,23 @@ msgstr "" "Návod jak obnovit heslo byl odeslát na vaší emailovou adresu zaregistrovanou " "u vašeho účtu." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Nečekané resetování hesla." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Heslo musí být alespoň 6 znaků dlouhé" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Heslo a potvrzení nesouhlasí" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Chyba nastavení uživatele" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen." @@ -3084,7 +3289,7 @@ msgstr "Chyba v ověřovacím kódu" msgid "Registration successful" msgstr "Registrace úspěšná" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrovat" @@ -3106,7 +3311,7 @@ msgstr "Neplatné jméno nebo heslo" #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3122,8 +3327,9 @@ msgstr "" msgid "Same as password above. Required." msgstr "" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Email" @@ -3136,23 +3342,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Mé texty a soubory jsou k dispozici pod" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" " až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní " "číslo." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3171,7 +3369,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3214,7 +3412,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "Adresa profilu na jiných kompatibilních mikroblozích." #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Odebírat" @@ -3255,7 +3453,7 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." msgid "You already repeated that notice." msgstr "Již jste přihlášen" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "Vytvořit" @@ -3344,7 +3542,7 @@ msgstr "Uživatel nemá profil." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3383,29 +3581,33 @@ msgstr "" msgid "Application profile" msgstr "Sdělení nemá profil" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "Přezdívka" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "Umístění" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "Odběry" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statistiky" @@ -3515,70 +3717,70 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "Všechny odběry" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "Žádné takové oznámení." -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Poznámka" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Feed sdělení pro %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Feed sdělení pro %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Feed sdělení pro %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "Feed sdělení pro %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Členem od" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 #, fuzzy msgid "Created" msgstr "Vytvořit" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3588,7 +3790,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3597,7 +3799,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "" @@ -3727,11 +3929,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3824,7 +4026,7 @@ msgid "Unable to save site notice." msgstr "Problém při ukládání sdělení" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3841,105 +4043,166 @@ msgstr "" msgid "Save site notice" msgstr "Nové sdělení" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "IM nastavení" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "Tato stránka není k dispozici v typu média která přijímáte." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "IM adresa" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "" -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Heslo znovu" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 #, fuzzy msgid "SMS phone number" msgstr "Žádné telefonní číslo." -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Nastavení" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "Nastavení uloženo" + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Žádné telefonní číslo." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "" -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "Tento potvrzující kód vám nepatří!" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "" -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Potvrď zrušení" + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "" -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "Žádné telefonní číslo." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3961,7 +4224,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4002,8 +4265,7 @@ msgstr "Nastavení" msgid "You are not subscribed to that profile." msgstr "Neodeslal jste nám profil" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Nelze vytvořit odebírat" @@ -4098,12 +4360,12 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%1 od teď naslouchá tvým sdělením v %2" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 #, fuzzy msgid "Jabber" msgstr "Žádné Jabber ID." -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "" @@ -4137,13 +4399,13 @@ msgstr "Žádný takový dokument." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "Uživatel nemá profil." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -4197,7 +4459,7 @@ msgstr "Uživatel nemá profil." #: actions/unsubscribe.php:77 #, fuzzy -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Nebylo vráceno žádné URL profilu od servu." #: actions/unsubscribe.php:98 @@ -4234,7 +4496,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" @@ -4403,27 +4666,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "Všechny odběry" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, fuzzy, php-format msgid "%s is not a member of any group." msgstr "Neodeslal jste nám profil" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4471,7 +4740,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Osobní" @@ -4480,19 +4750,19 @@ msgstr "Osobní" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4534,262 +4804,281 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" +msgstr "Chyba v DB při vkládání odpovědi: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:245 +#: classes/Notice.php:249 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "Uživatel nemá profil." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Nepřihlášen!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Nelze smazat odebírání" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Nelze smazat odebírání" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Nelze smazat odebírání" -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "Nelze uložin informace o obrázku" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Nelze vytvořit odebírat" -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Nelze vytvořit odebírat" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Nelze vytvořit odebírat" -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 #, fuzzy msgid "Upload an avatar" msgstr "Nahrávání obrázku selhalo." -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "Uživatel nemá profil." -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%1 statusů na %2" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Osobní" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Změnit heslo" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Nelze přesměrovat na server: %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Připojit" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Odběry" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Neplatná velikost" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Odhlásit" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Vytvořit nový účet" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "Registrovat" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "Přihlásit" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Pomoci mi!" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "Nápověda" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4797,76 +5086,90 @@ msgstr "Hledat" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 #, fuzzy msgid "Site notice" msgstr "Nové sdělení" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 #, fuzzy msgid "Page notice" msgstr "Nové sdělení" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 #, fuzzy msgid "Secondary site navigation" msgstr "Odběry" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Nápověda" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "O nás" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Soukromí" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Zdroj" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** je služba mikroblogů." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4877,70 +5180,84 @@ msgstr "" "dostupná pod [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "Nové sdělení" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 #, fuzzy msgid "After" msgstr "« Novější" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 #, fuzzy msgid "Before" msgstr "Starší »" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4950,166 +5267,204 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "Potvrzení emailové adresy" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "Nové sdělení" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "Potvrzení emailové adresy" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "Vzhled" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "Potvrzení emailové adresy" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "Potvrzení emailové adresy" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "Potvrzení emailové adresy" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "Potvrzení emailové adresy" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "Nové sdělení" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "Potvrzení emailové adresy" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Popiš sebe a své zájmy ve 140 znacích" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "Popiš sebe a své zájmy ve 140 znacích" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Zdroj" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách." -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "Zdroj" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách." -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Zrušit" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "Odstranit" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Poskytovatel" @@ -5131,37 +5486,58 @@ msgstr "Heslo uloženo" msgid "Password changing is not allowed" msgstr "Heslo uloženo" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Vzdálený profil s nesouhlasícím profilem" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +#, fuzzy +msgid "User has no last notice" +msgstr "Uživatel nemá profil." + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Nelze aktualizovat uživatele" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Nelze aktualizovat uživatele" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Odpovědi na %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5169,209 +5545,211 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Vzdálený profil s nesouhlasícím profilem" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "Uživatel nemá profil." - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 #, fuzzy msgid "You are already a member of that group" msgstr "Již jste přihlášen" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, fuzzy, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "Nelze přesměrovat na server: %s" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, fuzzy, php-format -msgid "%s joined group %s" -msgstr "%1 statusů na %2" - -#: lib/command.php:275 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "Nelze vytvořit OpenID z: %s" -#: lib/command.php:280 -#, fuzzy, php-format -msgid "%s left group %s" -msgstr "%1 statusů na %2" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Celé jméno" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "Odstranit toto oznámení" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Sdělení" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "Problém při ukládání sdělení" -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Odpovědi na %s" -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "Problém při ukládání sdělení" -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:628 #, fuzzy -msgid "No such user" -msgstr "Žádný takový uživatel." +msgid "Can't subscribe to OMB profiles by command." +msgstr "Neodeslal jste nám profil" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Odhlásit" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Neodeslal jste nám profil" -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "Vzdálený odběr" -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Vzdálený odběr" msgstr[1] "Vzdálený odběr" msgstr[2] "" -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "Neodeslal jste nám profil" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5413,20 +5791,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Žádný potvrzující kód." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5604,54 +5982,55 @@ msgstr "" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Tato stránka není k dispozici v typu média která přijímáte." -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Nepodporovaný formát obrázku." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Částečné náhrání." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Chyba systému při nahrávání souboru" -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Není obrázkem, nebo jde o poškozený soubor." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Nepodporovaný formát obrázku." - #: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Žádné takové oznámení." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5675,11 +6054,13 @@ msgstr "Neplatné jméno nebo heslo" msgid "Sign up for a new account" msgstr "Vytvořit nový účet" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Potvrzení emailové adresy" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5696,12 +6077,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1 od teď naslouchá tvým sdělením v %2" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5722,17 +6105,20 @@ msgstr "" "S úctou váš,\n" "%4$s.\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "O mě" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5745,21 +6131,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5775,12 +6171,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5799,12 +6197,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%1 od teď naslouchá tvým sdělením v %2" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5825,12 +6225,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5843,6 +6253,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5855,7 +6277,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 #, fuzzy msgid "from" msgstr " od " @@ -5987,51 +6409,55 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 #, fuzzy msgid "in context" msgstr "Žádný obsah!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "Vytvořit" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 #, fuzzy msgid "Reply" msgstr "odpověď" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "Sdělení" @@ -6056,6 +6482,10 @@ msgstr "Chyba při vkládání nového profilu" msgid "Error inserting avatar" msgstr "Chyba při kládání obrázku" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Chyba při aktualizaci vzdáleného profilu" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Chyba při vkládaní vzdáleného profilu" @@ -6106,7 +6536,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Odběry" @@ -6114,32 +6544,32 @@ msgstr "Odběry" msgid "All subscriptions" msgstr "Všechny odběry" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Odběratelé" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Všichni odběratelé" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Členem od" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "Žádný takový dokument." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6164,11 +6594,20 @@ msgstr "" msgid "Popular" msgstr "Hledání lidí" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "Žádný takový dokument." + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "Odstranit toto oznámení" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Ano" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6179,7 +6618,7 @@ msgstr "Odstranit toto oznámení" msgid "Revoke the \"%s\" role from this user" msgstr "Žádný takový uživatel." -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6312,91 +6751,110 @@ msgstr "" msgid "Unsubscribe" msgstr "Odhlásit" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Uživatel nemá profil." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Upravit avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Akce uživatele" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 #, fuzzy msgid "Edit profile settings" msgstr "Nastavené Profilu" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Zpráva" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "Uživatel nemá profil." -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "před pár sekundami" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "asi před minutou" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "asi před %d minutami" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "asi před hodinou" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "asi před %d hodinami" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "asi přede dnem" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "před %d dny" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "asi před měsícem" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "asi před %d mesíci" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "asi před rokem" @@ -6410,7 +6868,7 @@ msgstr "Stránka není platnou URL." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 4bad95b9ed..f0225630f4 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-08 21:10:39+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:22+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63415); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -28,7 +28,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Zugang" @@ -79,7 +79,13 @@ msgstr "Geschlossen" msgid "Save access settings" msgstr "Zugangs-Einstellungen speichern" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Speichern" @@ -87,7 +93,7 @@ msgstr "Speichern" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +msgid "No such page." msgstr "Seite nicht vorhanden" #: actions/all.php:75 actions/allrss.php:68 @@ -98,9 +104,9 @@ msgstr "Seite nicht vorhanden" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -108,11 +114,9 @@ msgstr "Seite nicht vorhanden" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Unbekannter Benutzer." @@ -124,8 +128,9 @@ msgstr "%1$s und Freunde, Seite% 2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -193,8 +198,10 @@ msgstr "" msgid "You and friends" msgstr "Du und Freunde" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" @@ -209,18 +216,18 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-Methode nicht gefunden." @@ -233,16 +240,18 @@ msgstr "API-Methode nicht gefunden." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Diese Methode benötigt ein POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" +"Du musst einen Parameter mit Namen 'device' übergeben. Mögliche Werte sind: " +"sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -253,7 +262,7 @@ msgstr "Konnte Benutzerdaten nicht aktualisieren." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Benutzer hat kein Profil." @@ -263,9 +272,9 @@ msgid "Could not save profile." msgstr "Konnte Profil nicht speichern." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -352,7 +361,7 @@ msgstr "Keine Nachricht mit dieser ID gefunden." msgid "This status is already a favorite." msgstr "Diese Nachricht ist bereits ein Favorit!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Konnte keinen Favoriten erstellen." @@ -445,11 +454,10 @@ msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)." msgid "Too many aliases! Maximum %d." msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Ungültiges Stichwort: „%s“" +msgid "Invalid alias: \"%s\"." +msgstr "Ungültiges Alias: „%s“" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -465,14 +473,14 @@ msgstr "Alias kann nicht das gleiche wie der Spitznamen sein." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" +msgid "Group not found." msgstr "Gruppe nicht gefunden!" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Du bist bereits Mitglied dieser Gruppe" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Der Admin dieser Gruppe hat dich gesperrt." @@ -490,17 +498,26 @@ msgstr "Du bist kein Mitglied dieser Gruppe." msgid "Could not remove user %1$s from group %2$s." msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "%s’s Gruppen" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Gruppen in denen %s Mitglied ist" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s Gruppen" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "Gruppen von %s" @@ -510,22 +527,21 @@ msgid "No oauth_token parameter provided." msgstr "Kein oauth_token Parameter angegeben." #: actions/apioauthauthorize.php:106 -#, fuzzy msgid "Invalid token." -msgstr "Ungültige Größe." +msgstr "Ungültiges Token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -537,9 +553,8 @@ msgid "Invalid nickname / password!" msgstr "Benutzername oder Passwort falsch." #: actions/apioauthauthorize.php:159 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "Fehler bei den Nutzereinstellungen." +msgstr "Datenbank Fehler beim Löschen des OAuth Anwendungs Nutzers." #: actions/apioauthauthorize.php:185 msgid "Database error inserting OAuth application user." @@ -559,12 +574,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "Die Anfrage %s wurde gesperrt und widerrufen." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Unerwartete Formulareingabe." @@ -583,21 +601,26 @@ msgid "" "the ability to %3$s your %4$s account data. You should only " "give access to your %4$s account to third parties you trust." msgstr "" +"Das Programm %1$s von %2$s würde gerne " +"%3$s bei deinem %4$s Zugang. Du solltest nur " +"vertrauenswürdigen Quellen Erlaubnis zu deinem %4$s Zugang geben." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" -msgstr "Konto" +msgstr "Profil" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Nutzername" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Passwort" @@ -642,18 +665,18 @@ msgstr "Status gelöscht." msgid "No status with that ID found." msgstr "Keine Nachricht mit dieser ID gefunden." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Nicht gefunden" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Nicht gefunden." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -664,12 +687,12 @@ msgstr "" msgid "Unsupported format." msgstr "Bildformat wird nicht unterstützt." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoriten von %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s Aktualisierung in den Favoriten von %2$s / %2$s." @@ -679,17 +702,17 @@ msgstr "%1$s Aktualisierung in den Favoriten von %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Aktualisierungen erwähnen %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s öffentliche Zeitleiste" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s Nachrichten von allen!" @@ -704,20 +727,16 @@ msgstr "Antworten an %s" msgid "Repeats of %s" msgstr "Antworten von %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Nachrichten, die mit %s getagt sind" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aktualisierungen mit %1$s getagt auf %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Nicht gefunden." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Kein solcher Anhang." @@ -737,8 +756,9 @@ msgstr "Keine Größe." msgid "Invalid size." msgstr "Ungültige Größe." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -749,9 +769,9 @@ msgstr "" "Du kannst dein persönliches Avatar hochladen. Die maximale Dateigröße ist %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." msgstr "Benutzer ohne passendes Profil" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -770,7 +790,7 @@ msgid "Preview" msgstr "Vorschau" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Löschen" @@ -782,24 +802,28 @@ msgstr "Hochladen" msgid "Crop" msgstr "Zuschneiden" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Keine Datei hoch geladen." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Daten verloren." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar aktualisiert." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Aktualisierung des Avatars fehlgeschlagen." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar gelöscht." @@ -807,7 +831,7 @@ msgstr "Avatar gelöscht." msgid "You already blocked that user." msgstr "Du hast diesen Benutzer bereits blockiert." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Benutzer blockieren" @@ -821,27 +845,42 @@ msgstr "" "Benutzer wird gelöscht, dieser kann dich in Zukunft nicht mehr abonnieren " "und bekommt keine @-Antworten." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Nein" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Diesen Benutzer freigeben" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Ja" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Diesen Benutzer blockieren" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Konnte Blockierungsdaten nicht speichern." @@ -854,8 +893,8 @@ msgstr "Konnte Blockierungsdaten nicht speichern." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Keine derartige Gruppe." @@ -885,9 +924,11 @@ msgstr "Freigeben" msgid "Unblock this user" msgstr "Diesen Benutzer freigeben" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Versenden an " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Versenden an %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -901,33 +942,43 @@ msgstr "Bestätigungscode nicht gefunden." msgid "That confirmation code is not for you!" msgstr "Dieser Bestätigungscode ist nicht für dich!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" +msgid "Unrecognized address type %s." msgstr "Nicht erkannter Adresstyp %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Diese Adresse wurde bereits bestätigt." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Konnte Benutzerdaten nicht aktualisieren." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Konnte E-Mail-Bestätigung nicht löschen." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Adresse bestätigen" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Die Adresse „%s“ wurde für dein Konto bestätigt." @@ -937,7 +988,7 @@ msgid "Conversation" msgstr "Unterhaltung" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Nachrichten" @@ -956,7 +1007,7 @@ msgstr "Du bist Besitzer dieses Programms" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Es gab ein Problem mit deinem Sessiontoken." @@ -973,15 +1024,17 @@ msgstr "" "Bist du sicher, dass du dieses Programm löschen willst? Es werden alle Daten " "aus der Datenbank entfernt, auch alle bestehenden Benutzer-Verbindungen." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Dieses Programm nicht löschen" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Programm löschen" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1012,11 +1065,13 @@ msgstr "Notiz löschen" msgid "Are you sure you want to delete this notice?" msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Diese Nachricht nicht löschen" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Nachricht löschen" @@ -1040,58 +1095,61 @@ msgstr "" "Bist du sicher, dass du den Benutzer löschen wisst? Alle Daten des Benutzers " "werden aus der Datenbank gelöscht (ohne ein Backup)." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Diesen Benutzer löschen" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Design" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Design-Einstellungen für diese StatusNet-Website." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "Ungültige URL für das Logo" -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "Theme nicht verfügbar: %s" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Logo ändern" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Seitenlogo" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Theme ändern" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Seitentheme" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Theme dieser Seite." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Hintergrundbild ändern" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Hintergrund" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1100,67 +1158,68 @@ msgstr "" "Du kannst ein Hintergrundbild für Deine Gruppe hochladen. Die maximale " "Dateigröße beträgt %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "An" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Aus" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Hintergrundbild ein- oder ausschalten." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Hintergrundbild kacheln" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Farben ändern" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Inhalt" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Seitenleiste" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Text" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Links" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Standardeinstellungen benutzen" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Standard-Design wiederherstellen" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Standard wiederherstellen" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Speichern" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Design speichern" @@ -1266,11 +1325,16 @@ msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten." msgid "description is too long (max %d chars)." msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Ungültiges Stichwort: „%s“" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Konnte Gruppe nicht aktualisieren." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Konnte keinen Favoriten erstellen." @@ -1278,31 +1342,42 @@ msgstr "Konnte keinen Favoriten erstellen." msgid "Options saved." msgstr "Einstellungen gespeichert." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "E-Mail-Einstellungen" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Einstellen, wie und wann du E-Mails von %%site.name%% bekommst." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adresse" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "E-Mail-Adresse" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Aktuelle bestätigte E-Mail-Adresse." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Entfernen" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1310,110 +1385,140 @@ msgstr "" "Warte auf die Bestätigung dieser Adresse. Prüfe Deinen Nachrichteneingang " "(auch den Spam-Ordner) auf eine Nachricht mit weiteren Instruktionen." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Abbrechen" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "E-Mail-Adresse" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "E-Mail-Adresse, beispielsweise „Benutzername@example.org“" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Hinzufügen" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Eingehende E-Mail" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Schicke ein E-Mail an diese Adresse um eine Nachricht zu posten." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" "Neue E-Mail-Adresse für Postings aktivieren; die alte wird automatisch " "deaktiviert." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Neu" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Einstellungen" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "E-Mail Einstellungen" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Informiere mich über neues Abonnements per E-Mail." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "Mir eine E-Mail schicken, wenn jemand meine Nachricht als Favorit speichert." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" "Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Schick mir eine E-Mail, wenn mir jemand eine @Nachricht schickt." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Ich möchte Einträge per E-Mail veröffentlichen." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "MicroID für meine E-Mail-Adresse veröffentlichen." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Einstellungen gesichert." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "E-Mail Einstellungen gespeichert." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Keine E-Mail-Adresse." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Konnte diese E-Mail-Adresse nicht normalisieren" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Ungültige E-Mail-Adresse." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Dies ist bereits deine E-Mail-Adresse." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Diese E-Mail-Adresse gehört einem anderen Nutzer." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Konnte keinen Bestätigungscode einfügen." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1422,43 +1527,53 @@ msgstr "" "Überprüfe deinen Posteingang (auch den Spamordner!) für den Code und " "Anweisungen, wie dieser benutzt wird." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Das ist die falsche IM-Adresse." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Dies ist die falsche E-Mail Adresse" -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Bestätigung abgebrochen." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "E-Mail Bestätigung abgebrochen." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Dies ist nicht deine E-Mail-Adresse." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Die Adresse wurde entfernt." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "Die E-Mail Adresse wurde entfernt." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Keine Eingangs-E-Mail-Adresse." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Konnte Nutzereintrag nicht schreiben" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Eingehende E-Mail-Adresse entfernt" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt." @@ -1577,9 +1692,9 @@ msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln." msgid "Remote service uses unknown version of OMB protocol." msgstr "Service nutzt unbekannte OMB-Protokollversion." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Fehler beim Aktualisieren des entfernten Profils" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Fehler beim Aktualisieren des entfernten Profils." #: actions/getfile.php:79 msgid "No such file." @@ -1598,9 +1713,8 @@ msgid "This role is reserved and cannot be set." msgstr "Diese Aufgabe ist reserviert und kann nicht gesetzt werden" #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Du kannst diesem Benutzer keine Nachricht schicken." +msgstr "Auf dieser Seite können keine Benutzerrollen gewährt werden." #: actions/grantrole.php:82 msgid "User already has this role." @@ -1635,11 +1749,11 @@ msgstr "Dieser Nutzer ist bereits von der Gruppe gesperrt" msgid "User is not a member of group." msgstr "Nutzer ist kein Mitglied dieser Gruppe." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Benutzerzugang zu der Gruppe blockieren" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1651,15 +1765,17 @@ msgstr "" "abschicken und wird auch in Zukunft dieser Gruppe nicht mehr beitreten " "können." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Diesen Benutzerzugang nicht für diese Gruppe blockieren." -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Diesen Nutzer von der Gruppe sperren" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "Datenbank Fehler beim Versuch den Nutzer aus der Gruppe zu blockieren." @@ -1704,10 +1820,6 @@ msgstr "" "Du kannst ein Logo für Deine Gruppe hochladen. Die maximale Dateigröße ist %" "s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Benutzer ohne passendes Profil" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Wähle eine quadratische Fläche aus dem Bild, um das Logo zu speichern." @@ -1738,34 +1850,38 @@ msgstr "Liste der Benutzer in dieser Gruppe." msgid "Admin" msgstr "Admin" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Blockieren" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Benutzer zu einem Admin dieser Gruppe ernennen" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Zum Admin ernennen" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Diesen Benutzer zu einem Admin ernennen" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s Zeitleiste" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Aktualisierungen von %1$s auf %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Gruppen" @@ -1790,7 +1906,7 @@ msgstr "" "suchen](%%%%action.groupsearch%%%%) oder deine eigene [Gruppe aufmachen!](%%%" "%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Neue Gruppe erstellen" @@ -1843,11 +1959,15 @@ msgstr "Dieser Nutzer ist nicht von der Gruppe gesperrt." msgid "Error removing the block." msgstr "Fehler beim Freigeben des Benutzers." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "IM-Einstellungen" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1856,15 +1976,24 @@ msgstr "" "Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und " "senden. Stelle deine Adresse und Einstellungen unten ein." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "IM ist nicht verfügbar." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "IM-Adresse" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1874,11 +2003,9 @@ msgstr "" "sollte in deinem Jabber/GTalk-Konto eingehen. (Hast du %s zu deiner " "Freundesliste hinzugefügt?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "IM-Adresse" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1888,45 +2015,66 @@ msgstr "" "Aber versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM-" "Programm oder GTalk aufgenommen hast." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "IM Einstellungen" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Schicke mir Nachrichten mittels Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk-Status verändert." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Schicke mir Antworten von Leuten, die ich nicht abonniert habe, mit Jabber/" "GTalk." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Einstellungen gesichert." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Keine Jabber-ID" -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Konnte diese Jabber ID nicht normalisieren" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Ungültige Jabber-ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Diese JabberID hast du schon angegeben." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1935,10 +2083,32 @@ msgstr "" "Ein Bestätigungscode wurde an die IM-Adresse geschickt, die du hinzugefügt " "hast. Du musst zulassen, dass %s dir Nachrichten schicken darf." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Das ist die falsche IM-Adresse." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Konnte die IM Bestätigung nicht löschen." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "IM Bestätigung abgebrochen." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Dies ist nicht deine JabberID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "Die IM Adresse wurde entfernt." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1961,7 +2131,7 @@ msgstr "Einladungen wurden deaktiviert." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" +msgid "You must be logged in to invite other users to use %s." msgstr "Du musst angemeldet sein, um andere Benutzer zu %s einzuladen" #: actions/invite.php:72 @@ -1981,7 +2151,9 @@ msgstr "Lade neue Leute ein" msgid "You are already subscribed to these users:" msgstr "Du hast diese Benutzer bereits abonniert:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2037,12 +2209,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Senden" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s hat Dich eingeladen, auch bei %2$s mitzumachen." -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2106,7 +2280,9 @@ msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden." msgid "No nickname or ID." msgstr "Kein Benutzername oder ID" -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s ist der Gruppe %2$s beigetreten" @@ -2115,11 +2291,13 @@ msgstr "%1$s ist der Gruppe %2$s beigetreten" msgid "You must be logged in to leave a group." msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Du bist kein Mitglied dieser Gruppe." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s hat die Gruppe %2$s verlassen" @@ -2166,13 +2344,16 @@ msgstr "" "ein, bevor die Änderungen an deinen Einstellungen übernommen werden." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Mit Nutzernamen und Passwort anmelden." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? " -"[Registriere](%%action.register%%) ein neues Konto." +"Du hast noch keinen Nutzernamen? [Registriere](%%action.register%%) ein " +"neues Konto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2184,9 +2365,9 @@ msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%1$s ist bereits Administrator der Gruppe \"%2$s\"." #: actions/makeadmin.php:133 -#, fuzzy, php-format +#, php-format msgid "Can't get membership record for %1$s in group %2$s." -msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" +msgstr "Konnte keinen Mitgliedseintrag für %1$s aus Gruppe %2$s empfangen." #: actions/makeadmin.php:146 #, php-format @@ -2194,8 +2375,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Konnte %1$s nicht zum Administrator der Gruppe %2$s machen" #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Kein aktueller Status" +msgid "No current status." +msgstr "Kein aktueller Status." #: actions/newapplication.php:52 msgid "New Application" @@ -2229,12 +2410,12 @@ msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen." msgid "New message" msgstr "Neue Nachricht" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Du kannst diesem Benutzer keine Nachricht schicken." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Kein Inhalt!" @@ -2242,7 +2423,7 @@ msgstr "Kein Inhalt!" msgid "No recipient specified." msgstr "Kein Empfänger angegeben." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2257,7 +2438,7 @@ msgstr "Nachricht gesendet" msgid "Direct message to %s sent." msgstr "Direkte Nachricht an %s abgeschickt" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax-Fehler" @@ -2265,7 +2446,7 @@ msgstr "Ajax-Fehler" msgid "New notice" msgstr "Neue Nachricht" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Nachricht hinzugefügt" @@ -2364,11 +2545,11 @@ msgid "You are not a user of that application." msgstr "Du bist kein Benutzer dieses Programms." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "Kann Zugang dieses Programm nicht entfernen: " +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Kann Zugang dieses Programm nicht entfernen: %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" "Du hast noch kein Programm die Erlaubnis gegeben dein Profil zu benutzen." @@ -2379,24 +2560,29 @@ msgstr "" "Entwickler können die Registrierungseinstellungen ihrer Programme ändern " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +msgid "Notice has no profile." msgstr "Nachricht hat kein Profil" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s Status auf %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "Content-Typ " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Content-Typ %s wird nicht untersützt." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Nur " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Bitte nur %s URLs über einfaches HTTP." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -2449,14 +2635,12 @@ msgid "No login token specified." msgstr "Kein Zugangstoken angegeben." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "Keine Profil-ID in der Anfrage." +msgstr "Kein Login-Token angefordert." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "Token ungültig oder abgelaufen." +msgstr "Login-Token ungültig oder abgelaufen." #: actions/otp.php:104 msgid "Login token expired." @@ -2502,7 +2686,7 @@ msgid "6 or more characters" msgstr "6 oder mehr Zeichen" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Bestätigen" @@ -2530,7 +2714,7 @@ msgstr "Altes Passwort falsch" msgid "Error saving user; invalid." msgstr "Fehler beim Speichern des Nutzers, ungültig." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Konnte neues Passwort nicht speichern" @@ -2539,7 +2723,7 @@ msgid "Password saved." msgstr "Passwort gespeichert." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Pfad" @@ -2549,23 +2733,23 @@ msgstr "Pfad- und Serverangaben für diese StatusNet Seite." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Theme-Verzeichnis nicht lesbar: %s" +msgid "Theme directory not readable: %s." +msgstr "Theme-Verzeichnis nicht lesbar: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s" +msgid "Avatar directory not writable: %s." +msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Hintergrund Verzeichnis ist nicht beschreibbar: %s" +msgid "Background directory not writable: %s." +msgstr "Hintergrund-Verzeichnis ist nicht beschreibbar: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Sprachverzeichnis nicht lesbar: %s" +msgid "Locales directory not readable: %s." +msgstr "Sprachverzeichnis nicht lesbar: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2705,19 +2889,19 @@ msgstr "" msgid "People search" msgstr "Suche nach anderen Nutzern" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Ungültiger Personen-Tag: %s" +msgid "Not a valid people tag: %s." +msgstr "Ungültiger Personen-Tag: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Benutzer die sich selbst mit %1$s getagged haben - Seite %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Ungültiger Nachrichteninhalt" +msgid "Invalid notice content." +msgstr "Ungültiger Nachrichteninhalt." #: actions/postnotice.php:101 #, php-format @@ -2746,13 +2930,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Vollständiger Name" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Homepage" @@ -2775,9 +2960,9 @@ msgid "Bio" msgstr "Biografie" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Aufenthaltsort" @@ -2791,7 +2976,7 @@ msgstr "Teile meine aktuelle Position wenn ich Nachrichten sende" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Stichwörter" @@ -2866,8 +3051,8 @@ msgstr "Einstellungen gespeichert." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Jenseits des Seitenlimits (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Jenseits des Seitenlimits (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3037,7 +3222,7 @@ msgstr "Passwort zurücksetzen" msgid "Recover password" msgstr "Stelle Passwort wieder her" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Wiederherstellung des Passworts angefordert" @@ -3057,19 +3242,19 @@ msgstr "Zurücksetzen" msgid "Enter a nickname or email address." msgstr "Gib einen Spitznamen oder eine E-Mail-Adresse ein." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Kein Benutzer mit dieser E-Mail-Adresse oder mit diesem Nutzernamen." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Der Nutzer hat keine registrierte E-Mail-Adresse." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Fehler beim Speichern der Adressbestätigung." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3077,23 +3262,23 @@ msgstr "" "Anweisungen für die Wiederherstellung deines Passworts wurden an deine " "hinterlegte E-Mail-Adresse geschickt." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Unerwarteter Passwortreset." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Passwort muss mehr als 6 Zeichen enthalten" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Passwort und seine Bestätigung stimmen nicht überein." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Fehler bei den Nutzereinstellungen." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet." @@ -3109,7 +3294,7 @@ msgstr "Entschuldigung, ungültiger Bestätigungscode." msgid "Registration successful" msgstr "Registrierung erfolgreich" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrieren" @@ -3131,8 +3316,9 @@ msgid "Invalid username or password." msgstr "Benutzername oder Passwort falsch." #: actions/register.php:343 +#, fuzzy msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Hier kannst du einen neuen Zugang einrichten. Danach kannst du Nachrichten " @@ -3152,8 +3338,9 @@ msgstr "6 oder mehr Buchstaben. Pflicht." msgid "Same as password above. Required." msgstr "Gleiches Passwort wie zuvor. Pflichteingabe." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-Mail" @@ -3168,22 +3355,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Längerer Name, bevorzugt dein „echter“ Name" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Meine Texte und Daten sind verfügbar unter" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Namensnennung 3.0" - -#: actions/register.php:497 +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" "außer folgende private Daten: Passwort, E-Mail-Adresse, IM-Adresse und " "Telefonnummer." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3216,7 +3396,7 @@ msgstr "" "\n" "Danke für deine Anmeldung, wir hoffen das dir der Service gefällt." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3261,7 +3441,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Abonnieren" @@ -3298,7 +3478,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen." msgid "You already repeated that notice." msgstr "Nachricht bereits wiederholt" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Wiederholt" @@ -3347,6 +3527,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Du kannst andere Nutzer ansprechen, mehr Leuten folgen oder [Gruppen " +"beitreten](%%action.groups%%)." #: actions/replies.php:206 #, php-format @@ -3376,9 +3558,8 @@ msgid "StatusNet" msgstr "StatusNet" #: actions/sandbox.php:65 actions/unsandbox.php:65 -#, fuzzy msgid "You cannot sandbox users on this site." -msgstr "Du kannst diesem Benutzer keine Nachricht schicken." +msgstr "Du kannst Benutzer auf dieser Seite nicht auf den Spielplaz schicken." #: actions/sandbox.php:72 msgid "User is already sandboxed." @@ -3386,7 +3567,7 @@ msgstr "Benutzer ist schon blockiert." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sitzung" @@ -3420,30 +3601,33 @@ msgid "You must be logged in to view an application." msgstr "Du musst angemeldet sein, um aus dieses Programm zu betrachten." #: actions/showapplication.php:157 -#, fuzzy msgid "Application profile" -msgstr "Nachricht hat kein Profil" +msgstr "Anwendungsprofil" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Symbol" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Name" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organisation" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beschreibung" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statistiken" @@ -3466,11 +3650,11 @@ msgstr "Programminformation" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Anwender Schlüssel" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Anwender Geheimnis" #: actions/showapplication.php:273 msgid "Request token URL" @@ -3525,6 +3709,9 @@ msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"Du hast noch keine Lieblingsnachrichten gewählt. Klicke den Favorisieren-" +"Button bei einer Nachricht, die dir gefällt um die Aufmerksamkeit auf sie zu " +"richten und sie in deine Lesezeichen aufzunehmen." #: actions/showfavorites.php:208 #, php-format @@ -3532,6 +3719,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s hat noch keine Nachricht zu den Favoriten hinzugefügt. Sende du doch " +"einfach eine interessante Nachricht, damit sich daran etwas ändert :)" #: actions/showfavorites.php:212 #, php-format @@ -3540,6 +3729,9 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s hat noch keine Nachrichten zu seinen Favoriten hinzugefügt. Warum meldest " +"du dich nicht an ( [anmelden](%%%%action.register%%%%) ) und schreibst " +"etwas, was %s hinzufügen kann!" #: actions/showfavorites.php:243 msgid "This is a way to share what you like." @@ -3555,67 +3747,67 @@ msgstr "%s Gruppe" msgid "%1$s group, page %2$d" msgstr "%1$s Gruppe, Seite %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Gruppenprofil" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Nachricht" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Pseudonyme" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Gruppenaktionen" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Nachrichtenfeed der Gruppe %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Nachrichtenfeed der Gruppe %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Nachrichtenfeed der Gruppe %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Postausgang von %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Mitglieder" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Kein)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Alle Mitglieder" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Erstellt" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3624,8 +3816,13 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** ist eine Gruppe auf %%%%site.name%%%%, einem [micro-blogging](http://" +"en.wikipedia.org/wiki/Micro-blogging) Dienst auf Basis der freien Software " +"[StatusNet](http://status.net/). [Werde Mitglied](%%%%action.register%%%%) " +"und werde Teil der Gruppe und vielen anderen! ([Mehr Informationen](%%%%doc." +"help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3638,7 +3835,7 @@ msgstr "" "Freien Software [StatusNet](http://status.net/). Seine Mitglieder erstellen " "kurze Nachrichten über Ihr Leben und Interessen. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Administratoren" @@ -3731,6 +3928,11 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** ist Mitglied bei %%%%site.name%%%%, einem [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) Dienst auf Basis der freien Software " +"[StatusNet](http://status.net/). [Werde Mitglied](%%%%action.register%%%%) " +"um **%s**'s und vielen anderen zu folgen! ([Mehr Informationen](%%%%doc.help%" +"%%%))" #: actions/showstream.php:248 #, php-format @@ -3774,11 +3976,11 @@ msgid "Unknown language \"%s\"." msgstr "Unbekannte Sprache „%s“" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "Minimale Textlänge ist 140 Zeichen." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Minimale Textlänge ist 0 Zeichen (unbegrenzt)" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "Duplikatlimit muss mehr als 1 Sekunde sein" #: actions/siteadminpanel.php:221 @@ -3816,9 +4018,8 @@ msgid "Contact email address for your site" msgstr "Kontakt-E-Mail-Adresse für Deine Site." #: actions/siteadminpanel.php:245 -#, fuzzy msgid "Local" -msgstr "Lokale Ansichten" +msgstr "Lokal" #: actions/siteadminpanel.php:256 msgid "Default timezone" @@ -3835,6 +4036,8 @@ msgstr "Bevorzugte Sprache" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Sprache der Seite für den Fall, dass die automatische Erkennung anhand der " +"Browser-Einstellungen nicht verfügbar ist." #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3871,8 +4074,8 @@ msgid "Unable to save site notice." msgstr "Konnte Seitenbenachrichtigung nicht speichern" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "Maximale Länge von Systembenachrichtigungen ist 255 Zeichen" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "Maximale Länge von Systembenachrichtigungen ist 255 Zeichen." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -3886,44 +4089,71 @@ msgstr "Systembenachrichtigung (max. 255 Zeichen; HTML erlaubt)" msgid "Save site notice" msgstr "Systemnachricht speichern" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "SMS-Einstellungen" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Du kannst SMS per E-Mail empfangen von %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "SMS ist nicht verfügbar." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "SMS Adresse" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Aktuelle für den SMS-Dienst bestätigte Telefonnummer." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Warte auf die Bestätigung dieser Telefonnummer." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Bestätigungscode" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Bestätigen" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "SMS-Telefonnummer" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "SMS Einstellungen" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3931,23 +4161,33 @@ msgstr "" "Schicke mir Nachrichten per SMS; ich weiss, dass mir dadurch hohe Kosten bei " "meinem Netzbetreiber entstehen können." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "SMS Einstellungen gesichert." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Keine Telefonnummer." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Kein Netzanbieter ausgewählt." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Dies ist bereits deine Telefonnummer." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Diese Telefonnummer wird bereits von einem anderen Benutzer verwendet." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3956,23 +4196,40 @@ msgstr "" "gesandt. Überprüfen Sie bitte Ihren Posteingang (auch den Spamordner!) auf " "den Code und die Anweisungen, um ihn zu benutzen." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Die Bestätigungsnummer ist falsch." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "SMS Bestätigung abgebrochen." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Dies ist nicht deine Telefonnummer." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "SMS Telefonnummer wurde entfernt." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Netzanbieter" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Wähle einen Netzanbieter" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3982,20 +4239,20 @@ msgstr "" "Email beherrscht, aber noch in der Liste fehlt, schicke uns eine Mail unter %" "s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Kein Code eingegeben" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" -msgstr "" +msgstr "Snapshots" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Hauptnavigation" +msgstr "Verwalten Snapshot-Konfiguration" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -4003,23 +4260,23 @@ msgstr "" #: actions/snapshotadminpanel.php:133 msgid "Snapshot frequency must be a number." -msgstr "" +msgstr "Die Snapshot-Frequenz muss eine Zahl sein." #: actions/snapshotadminpanel.php:144 msgid "Invalid snapshot report URL." -msgstr "" +msgstr "Ungültige Snapshot-Berichts-URL." #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" -msgstr "" +msgid "Randomly during web hit" +msgstr "Zufällig während Webseitenbesuchen" #: actions/snapshotadminpanel.php:201 msgid "In a scheduled job" -msgstr "" +msgstr "Als zeitlich geplanten Auftrag" #: actions/snapshotadminpanel.php:206 msgid "Data snapshots" -msgstr "" +msgstr "Daten-Snapshot" #: actions/snapshotadminpanel.php:208 msgid "When to send statistical data to status.net servers" @@ -4031,7 +4288,7 @@ msgstr "Frequenz" #: actions/snapshotadminpanel.php:218 msgid "Snapshots will be sent once every N web hits" -msgstr "" +msgstr "Snapshots werden all N Webseitenbesuche gesendet" #: actions/snapshotadminpanel.php:226 msgid "Report URL" @@ -4039,19 +4296,17 @@ msgstr "URL melden" #: actions/snapshotadminpanel.php:227 msgid "Snapshots will be sent to this URL" -msgstr "" +msgstr "An diese Adresse werden Snapshots gesendet" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Site-Einstellungen speichern" +msgstr "Snapshot-Einstellungen speichern" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." msgstr "Du hast dieses Profil nicht abonniert." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Konnte Abonnement nicht erstellen." @@ -4140,17 +4395,22 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"Du hast momentan noch niemanden abonniert. Benutze die [Personensuche](%%" +"action.peoplesearch%%) um nach Freunden zu suchen oder besuche die [Beliebte " +"Benutzer](%%action.featured%%) Seite. Wenn du ein [Twitter Benutzer](%%" +"action.twittersettings%%) bist kannst du auch automatisch deine Twitter " +"Freunde abonnieren." #: actions/subscriptions.php:128 actions/subscriptions.php:132 #, php-format msgid "%s is not listening to anyone." msgstr "%s hat niemanden abonniert." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4183,12 +4443,12 @@ msgstr "Kein ID Argument." msgid "Tag %s" msgstr "Tag %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Benutzerprofil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -4242,7 +4502,7 @@ msgid "User is not silenced." msgstr "Der Benutzer ist nicht ruhig gestellt." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Keine Profil-ID in der Anfrage." #: actions/unsubscribe.php:98 @@ -4280,7 +4540,8 @@ msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen." msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Ungültiges Abonnement: '%1$s' ist kein Benutzer" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" @@ -4415,7 +4676,7 @@ msgstr "Profiladresse '%s' ist für einen lokalen Benutzer." #: actions/userauthorization.php:345 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "Avatar Adresse '%s' ist nicht gültig." #: actions/userauthorization.php:350 #, php-format @@ -4443,28 +4704,34 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Hab Spaß!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "%1$s Gruppen, Seite %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Suche nach weiteren Gruppen" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s ist in keiner Gruppe Mitglied." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Versuche [Gruppen zu finden](%%action.groupsearch%%) und diesen beizutreten." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Aktualisierungen von %1$s auf %2$s!" @@ -4506,6 +4773,10 @@ msgid "" "FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " "for more details. " msgstr "" +"Dieses Programm wird in der Hoffnung vertrieben, dass es nützlich sein wird, " +"aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der " +"MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. Lesen Sie die GNU " +"Affero General Public License für weitere Details. " #: actions/version.php:180 #, php-format @@ -4520,7 +4791,8 @@ msgstr "" msgid "Plugins" msgstr "Erweiterungen" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Version" @@ -4528,7 +4800,7 @@ msgstr "Version" msgid "Author(s)" msgstr "Autor(en)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4537,12 +4809,12 @@ msgstr "" "Keine Datei darf größer als %d Bytes sein und die Datei die du verschicken " "wolltest ist %d Bytes groß. Bitte eine kleinere Datei hoch laden." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Eine Datei dieser Größe überschreitet deine User Quota von %d Byte." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4566,9 +4838,9 @@ msgid "Could not update local group." msgstr "Konnte Gruppe nicht aktualisieren." #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Konnte keinen Favoriten erstellen." +msgstr "Konnte keinen Login-Token für %s erstellen" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4582,27 +4854,28 @@ msgstr "Konnte Nachricht nicht einfügen." msgid "Could not update message with new URI." msgstr "Konnte Nachricht nicht mit neuer URI versehen." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4610,291 +4883,321 @@ msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Bereits abonniert!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Dieser Benutzer hat dich blockiert." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Nicht abonniert!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Konnte Abonnement nicht löschen." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Konnte OMB-Abonnement nicht löschen." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Konnte Abonnement nicht löschen." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Herzlich willkommen bei %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Konnte Gruppe nicht erstellen." -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "Konnte Gruppenmitgliedschaft nicht setzen." +msgstr "Konnte die Gruppen URI nicht setzen." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Konnte Gruppenmitgliedschaft nicht setzen." -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "Konnte Abonnement nicht erstellen." +msgstr "Konnte die lokale Gruppen Information nicht speichern." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Ändern der Profileinstellungen" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Avatar hochladen" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Ändere dein Passwort" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Ändere die E-Mail-Verarbeitung" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Passe dein Profil an" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Sonstige" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Sonstige Optionen" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Sonstige" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Seite ohne Titel" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Hauptnavigation" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Persönliches Profil und Freundes-Zeitleiste" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Eigene" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Ändere deine E-Mail, Avatar, Passwort und Profil" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Zum Dienst verbinden" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Verbinden" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Seiteneinstellung ändern" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Administrator" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Einladen" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Von der Seite abmelden" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Abmelden" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Neues Konto erstellen" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Registrieren" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Auf der Seite anmelden" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Anmelden" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Hilf mir!" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Hilfe" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Suche nach Leuten oder Text" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Suchen" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Seitennachricht" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Lokale Ansichten" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Neue Nachricht" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Unternavigation" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Hilfe" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Über" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "AGB" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Privatsphäre" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Quellcode" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Plakette" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "StatusNet-Software-Lizenz" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%" "site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** ist ein Microbloggingdienst." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4905,69 +5208,85 @@ msgstr "" "(Version %s) betrieben, die unter der [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "StatusNet-Software-Lizenz" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "Inhalte und Daten von %1$s sind privat und vertraulich." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Inhalt und Daten urheberrechtlich geschützt durch %1$s. Alle Rechte " "vorbehalten." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte " +"vorbehalten." -#: lib/action.php:847 -msgid "All " -msgstr "Alle " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfügbar." -#: lib/action.php:853 -msgid "license." -msgstr "Lizenz." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Seitenerstellung" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Später" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Vorher" -#: lib/activity.php:453 -msgid "Can't handle remote content yet." -msgstr "" +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten." -#: lib/activity.php:481 +#: lib/activityutils.php:208 +msgid "Can't handle remote content yet." +msgstr "Fremdinhalt kann noch nicht eingebunden werden." + +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." -msgstr "" +msgstr "Eingebundener Base64 Inhalt kann noch nicht verarbeitet werden." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Du kannst keine Änderungen an dieser Seite vornehmen." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Änderungen an dieser Seite sind nicht erlaubt." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() noch nicht implementiert." @@ -4977,154 +5296,191 @@ msgstr "showForm() noch nicht implementiert." msgid "saveSettings() not implemented." msgstr "saveSettings() noch nicht implementiert." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Konnte die Design Einstellungen nicht löschen." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Basis Seiteneinstellungen" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Seite" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Motiv-Konfiguration" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Design" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Benutzereinstellung" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Benutzer" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Zugangskonfiguration" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Pfadkonfiguration" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Sitzungseinstellungen" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 msgid "Edit site notice" msgstr "Seitennachricht bearbeiten" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 -#, fuzzy +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "SMS-Konfiguration" +msgstr "Snapshot Konfiguration" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." -msgstr "" +msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Programm bearbeiten" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Programmsymbol" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Beschreibe dein Programm in %d Zeichen" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Beschreibe dein Programm" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "Quelladresse" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "Adresse der Homepage dieses Programms" -#: lib/applicationeditform.php:224 -msgid "Organization responsible for this application" -msgstr "" +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "Quelladresse" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 +msgid "Organization responsible for this application" +msgstr "Für diese Anwendung verantwortliche Organisation" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "Homepage der Gruppe oder des Themas" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" -msgstr "" +msgstr "aufzurufende Adresse nach der Authentifizierung" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Browser" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Arbeitsfläche" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Typ der Anwendung, Browser oder Arbeitsfläche" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Schreibgeschützt" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Lese/Schreibzugriff" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Standardeinstellung dieses Programms: Schreibgeschützt oder Lese/" "Schreibzugriff" -#: lib/applicationlist.php:154 -msgid "Revoke" -msgstr "Entfernen" +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Abbrechen" -#: lib/attachmentlist.php:87 +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "Lese/Schreibzugriff" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "Schreibgeschützt" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Genehmigte %1$s - \"%2$s\" Zugriff." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" +msgid "Revoke" +msgstr "Widerrufen" + +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Anhänge" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Anbieter" @@ -5144,37 +5500,56 @@ msgstr "Passwort konnte nicht geändert werden" msgid "Password changing is not allowed" msgstr "Passwort kann nicht geändert werden" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Befehl-Ergebnisse" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Befehl ausgeführt" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Befehl fehlgeschlagen" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Leider ist dieser Befehl noch nicht implementiert." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Nachricht mit dieser ID existiert nicht" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Benutzer hat keine letzte Nachricht" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Konnte keinen lokalen Nutzer mit dem Nick %s finden" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Leider ist dieser Befehl noch nicht implementiert." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Es macht keinen Sinn dich selbst anzustupsen!" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Stups an %s geschickt" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5185,195 +5560,202 @@ msgstr "" "Abonnenten: %2$s\n" "Mitteilungen: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Nachricht mit dieser ID existiert nicht" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Benutzer hat keine letzte Nachricht" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Nachricht als Favorit markiert." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Du bist bereits Mitglied dieser Gruppe" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen" +msgid "Could not join user %1$s to group %2$s" +msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%s ist der Gruppe %s beigetreten" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen." -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s hat die Gruppe %s verlassen" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Vollständiger Name: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Standort: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Über: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" +"%s ist ein entferntes Profil; man kann direkte Nachrichten nur an Nutzer auf " +"dem selben Server senden." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet." + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Direkte Nachricht an %s abgeschickt" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Fehler beim Senden der Nachricht" -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen." -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Nachricht bereits wiederholt" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Nachricht von %s wiederholt" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Fehler beim Wiederholen der Nachricht" -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nachricht zu lange - maximal %d Zeichen erlaubt, du hast %d gesendet" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Antwort an %s gesendet" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Problem beim Speichern der Nachricht." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Unbekannter Benutzer." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "OMB Profile können nicht mit einem Kommando abonniert werden." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "%s abonniert" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "%s nicht mehr abonniert" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Befehl noch nicht implementiert." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Benachrichtigung deaktiviert." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Konnte Benachrichtigung nicht deaktivieren." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Benachrichtigung aktiviert." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Konnte Benachrichtigung nicht aktivieren." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "Anmeldung ist abgeschaltet" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "Der Link ist nur einmal benutzbar und für eine Dauer von 2 Minuten: %s" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "%s nicht mehr abonniert" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Du hast niemanden abonniert." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du hast diese Benutzer bereits abonniert:" msgstr[1] "Du hast diese Benutzer bereits abonniert:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Niemand hat Dich abonniert." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren." msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Du bist in keiner Gruppe Mitglied." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du bist Mitglied dieser Gruppe:" msgstr[1] "Du bist Mitglied dieser Gruppen:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5414,20 +5796,58 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Befehle:\n" +"on - Benachrichtigung einschalten\n" +"off - Benachrichtigung ausschalten\n" +"help - diese Hilfe anzeigen\n" +"follow - einem Nutzer folgen\n" +"groups - Gruppen auflisten in denen du Mitglied bist\n" +"subscriptions - Leute auflisten denen du folgst\n" +"subscribers - Leute auflisten die dir folgen\n" +"leave - einem Nutzer nicht mehr folgen\n" +"d - Direkte Nachricht an einen Nutzer schicken\n" +"get - letzte Nachricht eines Nutzers abrufen\n" +"whois - Profil eines Nutzers abrufen\n" +"lose - Nutzer zwingen dir nicht mehr zu folgen\n" +"fav - letzte Nachricht eines Nutzers als Favorit markieren\n" +"fav # - Nachricht mit bestimmter ID als Favorit markieren\n" +"repeat # - Nachricht mit bestimmter ID wiederholen\n" +"repeat - letzte Nachricht eines Nutzers wiederholen\n" +"reply # - Nachricht mit bestimmter ID beantworten\n" +"reply - letzte Nachricht eines Nutzers beantworten\n" +"join - Gruppe beitreten\n" +"login - Link zum Anmelden auf der Webseite anfordern\n" +"drop - Gruppe verlassen\n" +"stats - deine Statistik abrufen\n" +"stop - Äquivalent zu 'off'\n" +"quit - Äquivalent zu 'off'\n" +"sub - same as 'follow'\n" +"unsub - same as 'leave'\n" +"last - same as 'get'\n" +"on - not yet implemented.\n" +"off - not yet implemented.\n" +"nudge - remind a user to update.\n" +"invite - not yet implemented.\n" +"track - not yet implemented.\n" +"untrack - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Keine Konfigurationsdatei gefunden." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Bitte die Installation erneut starten um das Problem zu beheben." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Zur Installation gehen." @@ -5554,6 +5974,8 @@ msgstr "" #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +"Zusätzliche Spitznamen für die Gruppe, Komma oder Leerzeichen getrennt, max %" +"d" #: lib/groupnav.php:85 msgid "Group" @@ -5600,56 +6022,57 @@ msgstr "Gruppen mit den meisten Beiträgen" msgid "Tags in %s group's notices" msgstr "Stichworte in den Nachrichten der Gruppe %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor." -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Bildformat wird nicht unterstützt." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Du kannst ein Logo für Deine Gruppe hochladen." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Unvollständiges Hochladen." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfehler beim hochladen der Datei." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Kein Bild oder defekte Datei." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Bildformat wird nicht unterstützt." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Daten verloren." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Unbekannter Dateityp" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 -#, fuzzy, php-format +#: lib/jabber.php:567 +#, php-format msgid "Unknown inbox source %d." -msgstr "Unbekannte Sprache „%s“" +msgstr "Unbekannte inbox Quelle %d." #: lib/joinform.php:114 msgid "Join" @@ -5667,11 +6090,13 @@ msgstr "Mit Nutzernamen und Passwort anmelden" msgid "Sign up for a new account" msgstr "Registriere ein neues Nutzerkonto" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Bestätigung der E-Mail-Adresse" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5701,12 +6126,14 @@ msgstr "" "Vielen Dank!\n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s hat deine Nachrichten auf %2$s abonniert." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5732,17 +6159,20 @@ msgstr "" "Du kannst Deine E-Mail-Adresse und die Benachrichtigungseinstellungen auf %8" "$s ändern.\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Biografie: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Neue E-Mail-Adresse um auf %s zu schreiben" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5763,21 +6193,33 @@ msgstr "" "Viele Grüße,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s Status" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS-Konfiguration" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" +"%s: bestätige mit folgendem Code, dass es sich um deine Telefonnummer " +"handelt:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Du wurdest von %s angestupst" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5804,12 +6246,14 @@ msgstr "" "Mit freundlichen Grüßen,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Neue private Nachricht von %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5842,12 +6286,14 @@ msgstr "" "Mit freundlichen Grüßen,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) hat deine Nachricht als Favorit gespeichert" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5867,14 +6313,37 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) hat gerade deine Mitteilung von %2$s als Favorit hinzugefügt.\n" +"Die Adresse der Nachricht ist:\n" +"%3$s\n" +"Der Text der Nachricht ist:\n" +"%4$s\n" +"Die Favoritenliste von %1$s ist hier:\n" +"%5$s\n" +"\n" +"Gruß,\n" +"%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"Die komplette Unterhaltung kann hier gelesen werden:\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" "%s (@%s) hat dir eine Nachricht gesendet um deine Aufmerksamkeit zu erlangen" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5887,7 +6356,42 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" +"%1$s (@%9$s) hat dir gerade eine Nachricht (eine '@-Antwort') auf %2$s " +"gesendet.\n" +"\n" +"Die Nachricht findest du hier:\n" +"\n" +"%3$s\n" +"\n" +"Sie lautet:\n" +"\n" +"%4$s\n" +"\n" +"%5$sHier kannst du auf die Nachricht antworten:\n" +"\n" +"%6$s\n" +"\n" +"Eine Liste aller @-Antworten an dich findest du hier:\n" +"\n" +"%7$s\n" +"\n" +"Hochachtungsvoll dein,\n" +"%2$s\n" +"\n" +"P.S. Diese E-Mail Benachrichtigung kannst du hier deaktivieren: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5902,7 +6406,7 @@ msgstr "" "schicken, um sie in eine Konversation zu verwickeln. Andere Leute können Dir " "Nachrichten schicken, die nur Du sehen kannst." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "von" @@ -5972,9 +6476,8 @@ msgid "File could not be moved to destination directory." msgstr "Datei konnte nicht in das Zielverzeichnis verschoben werden." #: lib/mediafile.php:201 lib/mediafile.php:237 -#, fuzzy msgid "Could not determine file's MIME type." -msgstr "Konnte öffentlichen Stream nicht abrufen." +msgstr "Konnte den MIME-Typ nicht feststellen." #: lib/mediafile.php:270 #, php-format @@ -6036,48 +6539,52 @@ msgstr "" "Es tut uns Leid, aber die Abfrage deiner GPS Position hat zu lange gedauert. " "Bitte versuche es später wieder." -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "S" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "O" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "W" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "in" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "im Zusammenhang" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Wiederholt von" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Auf diese Nachricht antworten" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Antworten" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Nachricht wiederholt" @@ -6101,6 +6608,10 @@ msgstr "Neues Profil konnte nicht angelegt werden" msgid "Error inserting avatar" msgstr "Fehler beim Einfügen des Avatars" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Fehler beim Aktualisieren des entfernten Profils" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Fehler beim Einfügen des entfernten Profils" @@ -6115,7 +6626,7 @@ msgstr "Konnte neues Abonnement nicht eintragen." #: lib/personalgroupnav.php:99 msgid "Personal" -msgstr "Eigene" +msgstr "Meine Zeitleiste" #: lib/personalgroupnav.php:104 msgid "Replies" @@ -6150,7 +6661,7 @@ msgstr "Stichworte in %ss Nachrichten" msgid "Unknown" msgstr "Unbekannter Befehl" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnements" @@ -6158,38 +6669,38 @@ msgstr "Abonnements" msgid "All subscriptions" msgstr "Alle Abonnements" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnenten" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Alle Abonnenten" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "Nutzer ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Mitglied seit" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Tagesdurchschnitt" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Alle Gruppen" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "Kein id Argument." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Nicht unterstützte Methode." #: lib/publicgroupnav.php:78 msgid "Public" -msgstr "Öffentlich" +msgstr "Zeitleiste" #: lib/publicgroupnav.php:82 msgid "User groups" @@ -6207,10 +6718,18 @@ msgstr "Beliebte Benutzer" msgid "Popular" msgstr "Beliebte Beiträge" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Kein Rückkehr Argument." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Diese Nachricht wiederholen?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Ja" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Diese Nachricht wiederholen" @@ -6220,9 +6739,9 @@ msgstr "Diese Nachricht wiederholen" msgid "Revoke the \"%s\" role from this user" msgstr "Widerrufe die \"%s\" Rolle von diesem Benutzer" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." -msgstr "" +msgstr "Kein einzelner Nutzer für den Ein-Benutzer-Modus ausgewählt." #: lib/sandboxform.php:67 msgid "Sandbox" @@ -6238,7 +6757,7 @@ msgstr "Site durchsuchen" #: lib/searchaction.php:126 msgid "Keyword(s)" -msgstr "Stichwort/Stichwörter" +msgstr "Suchbegriff" #: lib/searchaction.php:127 msgid "Search" @@ -6307,12 +6826,12 @@ msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 msgid "People Tagcloud as self-tagged" -msgstr "" +msgstr "Personen-Tagwolke, wie man sich selbst markiert hat." #: lib/subscriberspeopletagcloudsection.php:48 #: lib/subscriptionspeopletagcloudsection.php:48 msgid "People Tagcloud as tagged" -msgstr "" +msgstr "Personen-Tag, wie markiert wurde" #: lib/tagcloudsection.php:56 msgid "None" @@ -6346,89 +6865,108 @@ msgstr "Lösche dein Abonnement von diesem Benutzer" msgid "Unsubscribe" msgstr "Abbestellen" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "Benutzer %s (%d) hat kein Profil." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Avatar bearbeiten" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Benutzeraktionen" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Löschung des Nutzers in Arbeit..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Profil Einstellungen ändern" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Bearbeiten" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Direkte Nachricht an Benutzer verschickt" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Nachricht" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Moderieren" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 msgid "User role" msgstr "Benutzerrolle" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "Moderator" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "vor einem Jahr" @@ -6442,7 +6980,7 @@ msgstr "%s ist keine gültige Farbe!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s ist keine gültige Farbe! Verwenden Sie 3 oder 6 Hex-Zeichen." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 0ebe84fe7f..8fa761ae81 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -1,6 +1,7 @@ # Translation of StatusNet to Greek # # Author@translatewiki.net: Crazymadlover +# Author@translatewiki.net: Dead3y3 # Author@translatewiki.net: Omnipaedista # -- # This file is distributed under the same license as the StatusNet package. @@ -9,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:37+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:29+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -22,69 +23,73 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Πρόσβαση" #. TRANS: Page notice #: actions/accessadminpanel.php:67 -#, fuzzy msgid "Site access settings" -msgstr "Ρυθμίσεις OpenID" +msgstr "Ρυθμίσεις πρόσβασης ιστοτόπου" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 -#, fuzzy msgid "Registration" -msgstr "Περιγραφή" +msgstr "Εγγραφή" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 msgid "Prohibit anonymous users (not logged in) from viewing site?" msgstr "" +"Απαγόρευση ανωνύμων χρηστών (μη συνδεδεμένων) από το να βλέπουν τον ιστότοπο;" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 msgctxt "LABEL" msgid "Private" -msgstr "" +msgstr "Ιδιωτικό" #. TRANS: Checkbox instructions for admin setting "Invite only" #: actions/accessadminpanel.php:174 msgid "Make registration invitation only." -msgstr "" +msgstr "Κάντε την εγγραφή να είναι με πρόσκληση μόνο." #. TRANS: Checkbox label for configuring site as invite only. #: actions/accessadminpanel.php:176 msgid "Invite only" -msgstr "" +msgstr "Μόνο με πρόσκληση" #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations) #: actions/accessadminpanel.php:183 msgid "Disable new registrations." -msgstr "" +msgstr "Απενεργοποίηση των νέων εγγραφών" #. TRANS: Checkbox label for disabling new user registrations. #: actions/accessadminpanel.php:185 msgid "Closed" -msgstr "" +msgstr "Κλειστό" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "Ρυθμίσεις OpenID" +msgstr "Αποθήκευση ρυθμίσεων πρόσβασης" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" -msgstr "Αποχώρηση" +msgstr "Αποθήκευση" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +#, fuzzy +msgid "No such page." msgstr "Δεν υπάρχει τέτοια σελίδα" #: actions/all.php:75 actions/allrss.php:68 @@ -95,9 +100,9 @@ msgstr "Δεν υπάρχει τέτοια σελίδα" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -105,24 +110,23 @@ msgstr "Δεν υπάρχει τέτοια σελίδα" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Κανένας τέτοιος χρήστης." #. TRANS: Page title. %1$s is user nickname, %2$d is page number #: actions/all.php:86 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "%s και οι φίλοι του/της" +msgstr "%1$s και φίλοι, σελίδα 2%$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -152,6 +156,8 @@ msgstr "Ροή φίλων του/της %s (Atom)" msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" +"Αυτό είναι το χρονοδιάγραμμα για %s και φίλους, αλλά κανείς δεν έχει κάνει " +"καμία αποστολή ακόμα." #: actions/all.php:139 #, php-format @@ -159,6 +165,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Δοκιμάστε την εγγραφή σε περισσότερους ανθρώπους, [ενταχθείτε σε μια ομάδα] " +"(%%action.groups%%) ή αποστείλετε κάτι ο ίδιος." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" #: actions/all.php:142 @@ -180,8 +188,10 @@ msgstr "" msgid "You and friends" msgstr "Εσείς και οι φίλοι σας" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -196,18 +206,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" @@ -221,15 +231,15 @@ msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -242,7 +252,7 @@ msgstr "Απέτυχε η ενημέρωση του χρήστη." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "" @@ -253,9 +263,9 @@ msgid "Could not save profile." msgstr "Απέτυχε η αποθήκευση του προφίλ." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -338,7 +348,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" @@ -433,11 +443,10 @@ msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 2 msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 -#, php-format -msgid "Invalid alias: \"%s\"" -msgstr "" +#: actions/apigroupcreate.php:266 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"." +msgstr "Μήνυμα" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -453,14 +462,15 @@ msgstr "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" +#, fuzzy +msgid "Group not found." msgstr "Η ομάδα δεν βρέθηκε!" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -478,17 +488,26 @@ msgstr "" msgid "Could not remove user %1$s from group %2$s." msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "ομάδες των χρηστών %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Δεν είστε μέλος καμίας ομάδας." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "ομάδες του χρήστη %s" @@ -503,17 +522,17 @@ msgid "Invalid token." msgstr "Μήνυμα" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -546,12 +565,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" @@ -571,20 +593,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Λογαριασμός" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Ψευδώνυμο" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Κωδικός" @@ -594,7 +618,7 @@ msgstr "" #: actions/apioauthauthorize.php:334 msgid "Allow" -msgstr "" +msgstr "Να επιτραπεί" #: actions/apioauthauthorize.php:351 msgid "Allow or deny access to your account information." @@ -631,17 +655,17 @@ msgstr "Η κατάσταση διεγράφη." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:202 -msgid "Not found" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." msgstr "" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -650,12 +674,12 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" @@ -665,17 +689,17 @@ msgstr "" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -690,20 +714,16 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "" - #: actions/attachment.php:73 msgid "No such attachment." msgstr "" @@ -723,8 +743,9 @@ msgstr "" msgid "Invalid size." msgstr "" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "" @@ -734,9 +755,9 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." msgstr "" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -755,7 +776,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Διαγραφή" @@ -767,23 +788,27 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Ρυθμίσεις OpenID" @@ -793,7 +818,7 @@ msgstr "Ρυθμίσεις OpenID" msgid "You already blocked that user." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "" @@ -804,28 +829,45 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "Όχι" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "Ναι" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "" @@ -838,8 +880,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 #, fuzzy msgid "No such group." msgstr "Αδύνατη η αποθήκευση του προφίλ." @@ -870,9 +912,11 @@ msgstr "" msgid "Unblock this user" msgstr "" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "" +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" +msgstr "ομάδες του χρήστη %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -886,34 +930,44 @@ msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε." msgid "That confirmation code is not for you!" msgstr "" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" +msgid "Unrecognized address type %s." msgstr "" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "" -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Απέτυχε η ενημέρωση του χρήστη." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Απέτυχε η διαγραφή email επιβεβαίωσης." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "Επιβεβαίωση διεύθυνσης" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "" @@ -923,7 +977,7 @@ msgid "Conversation" msgstr "Συζήτηση" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "" @@ -945,7 +999,7 @@ msgstr "Ομάδες με τα περισσότερα μέλη" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -961,17 +1015,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "Περιγράψτε την ομάδα ή το θέμα" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1001,12 +1057,14 @@ msgstr "Διαγραφή μηνύματος" msgid "Are you sure you want to delete this notice?" msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυτό το μήνυμα;" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 #, fuzzy msgid "Do not delete this notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "" @@ -1029,128 +1087,132 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Διαγράψτε αυτόν τον χρήστη" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "" -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "Αλλάξτε τον κωδικό σας" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "Αλλαγή" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "Αλλαγή" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Αλλαγή χρωμάτων" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Περιεχόμενο" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Σύνδεσμοι" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1263,12 +1325,17 @@ msgstr "" msgid "description is too long (max %d chars)." msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "" + #: actions/editgroup.php:258 #, fuzzy msgid "Could not update group." msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Αδύνατη η αποθήκευση του προφίλ." @@ -1277,32 +1344,44 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ." msgid "Options saved." msgstr "" -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "Ρυθμίσεις Email" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Διεύθυνση" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "Διευθύνσεις email" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Τρέχουσα επιβεβαιωμένη email διεύθυνση." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 #, fuzzy msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " @@ -1311,107 +1390,140 @@ msgstr "" "Αναμένωντας επιβεβαίωση σε αυτή τη διεύθυνση. Έλεγξε το mail σου (και το " "φάκελο spam!) για μήνυμα με περαιτέρω οδηγίες. " -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "Ακύρωση" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "Διευθύνσεις email" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Διεύθυνση email, π.χ: \"UserName@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "Προσθήκη" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Εισερχόμενο email" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "Προτιμήσεις" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Θέλω να δημοσιεύω ενημερώσεις μέσω email" -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." msgstr "Οι προτιμήσεις αποθηκεύτηκαν" -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "" -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Απέτυχε η εισαγωγή κωδικού επιβεβαίωσης." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1420,43 +1532,56 @@ msgstr "" "προσθέσατε. Ελέγξτε τα εισερχόμενα (και τον φάκελο ανεπιθύμητης " "αλληλογραφίας) για τον κωδικό και για το πως να τον χρησιμοποιήσετε." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "" -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "" +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." +msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "Η επιβεβαίωση ακυρώθηκε." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "" -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "" +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." +msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Απέτυχε η ενημέρωση εγγραφής του χρήστη." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" @@ -1572,9 +1697,10 @@ msgstr "Απέτυχε η μετατροπή αιτούμενων tokens σε to msgid "Remote service uses unknown version of OMB protocol." msgstr "" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." +msgstr "Απέτυχε η αποθήκευση του προφίλ." #: actions/getfile.php:79 #, fuzzy @@ -1633,11 +1759,11 @@ msgstr "" msgid "User is not a member of group." msgstr "" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1645,15 +1771,17 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1696,10 +1824,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1731,35 +1855,39 @@ msgstr "" msgid "Admin" msgstr "Διαχειριστής" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 #, fuzzy msgid "Make Admin" msgstr "Διαχειριστής" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "χρονοδιάγραμμα του χρήστη %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -1779,7 +1907,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 #, fuzzy msgid "Create a new group" msgstr "Δημιουργία νέου λογαριασμού" @@ -1826,28 +1954,42 @@ msgstr "" msgid "Error removing the block." msgstr "" -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "Ρυθμίσεις ΙΜ" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 #, fuzzy msgid "IM is not available." msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "Διεύθυνση ΙΜ" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Τρέχουσα επιβεβαιωμένη Jabber/GTalk διεύθυνση." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, fuzzy, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1857,55 +1999,74 @@ msgstr "" "λογαριασμό σου για μήνυμα με περαιτέρω οδηγίες. (Πρόσθεσες το χρήστη %s στη " "λίστα φίλων?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "Διεύθυνση ΙΜ" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Προτιμήσεις" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Οι προτιμήσεις αποθηκεύτηκαν" + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "" -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Αδυναμία κανονικοποίησης του Jabber ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "" -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1914,10 +2075,35 @@ msgstr "" "Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στην διεύθυνση IM που προσθέσατε. " "Πρέπει να αποδεχτείτε τον/την %s για αποστολή μηνυμάτων προς εσας. " -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "" + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Απέτυχε η διαγραφή email επιβεβαίωσης." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "Η επιβεβαίωση ακυρώθηκε." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "" +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1937,9 +2123,9 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." +msgstr "Αδύνατη η αποθήκευση του προφίλ." #: actions/invite.php:72 #, php-format @@ -1958,7 +2144,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2005,12 +2193,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2050,7 +2240,9 @@ msgstr "" msgid "No nickname or ID." msgstr "Μήνυμα" -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -2059,11 +2251,13 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "" @@ -2109,10 +2303,14 @@ msgstr "" "σας, πριν αλλάξετε τις ρυθμίσεις σας." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Σύνδεση με όνομα χρήστη και κωδικό" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Συνδεθείτε με το όνομα χρήστη και τον κωδικό σας. Δεν έχετε όνομα χρήστη " "ακόμα; Κάντε [εγγραφή](%%action.register%%) για ένα νέο λογαριασμό ή " @@ -2138,7 +2336,7 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Αδύνατη η αποθήκευση του προφίλ." #: actions/microsummary.php:69 -msgid "No current status" +msgid "No current status." msgstr "" #: actions/newapplication.php:52 @@ -2175,12 +2373,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "" @@ -2188,7 +2386,7 @@ msgstr "" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2202,7 +2400,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2210,7 +2408,7 @@ msgstr "" msgid "New notice" msgstr "" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "" @@ -2298,11 +2496,11 @@ msgid "You are not a user of that application." msgstr "Δεν είστε μέλος καμίας ομάδας." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2311,25 +2509,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "" +#, fuzzy +msgid "Notice has no profile." +msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "" -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "Σύνδεση" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -2439,7 +2642,7 @@ msgid "6 or more characters" msgstr "6 ή περισσότεροι χαρακτήρες" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Επιβεβαίωση" @@ -2467,7 +2670,7 @@ msgstr "Λάθος παλιός κωδικός" msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Αδύνατη η αποθήκευση του νέου κωδικού" @@ -2476,7 +2679,7 @@ msgid "Password saved." msgstr "Ο κωδικός αποθηκεύτηκε." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2486,23 +2689,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2646,19 +2849,20 @@ msgstr "" msgid "People search" msgstr "" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." msgstr "" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "" +#, fuzzy +msgid "Invalid notice content." +msgstr "Μήνυμα" #: actions/postnotice.php:101 #, php-format @@ -2683,13 +2887,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Ονοματεπώνυμο" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Αρχική σελίδα" @@ -2712,9 +2917,9 @@ msgid "Bio" msgstr "Βιογραφικό" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Τοποθεσία" @@ -2728,7 +2933,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -2804,7 +3009,7 @@ msgstr "" #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -2958,7 +3163,7 @@ msgstr "" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2978,19 +3183,19 @@ msgstr "" msgid "Enter a nickname or email address." msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -2998,23 +3203,23 @@ msgstr "" "Οδηγίες για την ανάκτηση του κωδικού σας έχουν σταλεί στην διεύθυνση email " "που έχετε καταχωρίσει στον λογαριασμό σας." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Ο κωδικός πρέπει να είναι 6 χαρακτήρες ή περισσότεροι." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -3030,7 +3235,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -3052,7 +3257,7 @@ msgstr "" #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3068,8 +3273,9 @@ msgstr "6 ή περισσότεροι χαρακτήρες. Απαραίτητο msgid "Same as password above. Required." msgstr "" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Email" @@ -3082,23 +3288,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" "εκτός από τα εξής προσωπικά δεδομένα: κωδικός πρόσβασης, διεύθυνση email, " "διεύθυνση IM, τηλεφωνικό νούμερο." -#: actions/register.php:538 +#: actions/register.php:542 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3132,7 +3330,7 @@ msgstr "" "Ευχαριστούμε που εγγράφηκες και ευχόμαστε να περάσεις καλά με την υπηρεσία " "μας." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3174,7 +3372,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "" @@ -3213,7 +3411,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "Δημιουργία" @@ -3299,7 +3497,7 @@ msgstr "" #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3337,28 +3535,32 @@ msgstr "" msgid "Application profile" msgstr "" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "Ψευδώνυμο" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "Προσκλήσεις" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Περιγραφή" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "" @@ -3469,68 +3671,68 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Μέλη" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Δημιουργημένος" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3540,7 +3742,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3549,7 +3751,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Διαχειριστές" @@ -3678,11 +3880,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3772,7 +3974,7 @@ msgid "Unable to save site notice." msgstr "" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3789,68 +3991,109 @@ msgstr "" msgid "Save site notice" msgstr "Ρυθμίσεις OpenID" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "Ρυθμίσεις ΙΜ" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "Διεύθυνση ΙΜ" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Τρέχων επιβεβαιωμένο, μέσω SMS, νούμερο κινητού τηλεφώνου." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νούμερο τηλεφώνου." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Επιβεβαίωση" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Προτιμήσεις" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "Οι προτιμήσεις αποθηκεύτηκαν" + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "" -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "" -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " @@ -3860,36 +4103,55 @@ msgstr "" "προσθέσατε. Ελέγξτε τα εισερχόμενα (και τον φάκελο ανεπιθύμητης " "αλληλογραφίας) για τον κωδικό και για το πως να τον χρησιμοποιήσετε." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "" -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Η επιβεβαίωση ακυρώθηκε." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "" -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3911,7 +4173,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3951,8 +4213,7 @@ msgstr "Ρυθμίσεις OpenID" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" @@ -4045,11 +4306,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "" @@ -4082,12 +4343,12 @@ msgstr "" msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Προφίλ χρήστη" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -4137,7 +4398,7 @@ msgid "User is not silenced." msgstr "" #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "" #: actions/unsubscribe.php:98 @@ -4173,7 +4434,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "" @@ -4330,27 +4592,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4398,7 +4666,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Προσωπικά" @@ -4407,19 +4676,19 @@ msgstr "Προσωπικά" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4461,330 +4730,363 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Απέτυχε η συνδρομή." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Αλλάξτε τον κωδικό σας" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Σχεδιάστε το προφίλ σας" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Προσωπικά" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Αλλάξτε τον κωδικό σας" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Αδυναμία ανακατεύθηνσης στο διακομιστή: %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Σύνδεση" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Επιβεβαίωση διεύθυνσης email" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Διαχειριστής" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Προσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Μήνυμα" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Αποσύνδεση" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Δημιουργία ενός λογαριασμού" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "Περιγραφή" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "Σύνδεση" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Βοηθήστε με!" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "Βοήθεια" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Βοήθεια" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Περί" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "Συχνές ερωτήσεις" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Επικοινωνία" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που " "έφερε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 -#, fuzzy, php-format -msgid "**%%site.name%%** is a microblogging service. " +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 +#, php-format +msgid "**%%site.name%%** is a microblogging service." msgstr "" -"Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου). " +"Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου)." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4792,67 +5094,81 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4862,161 +5178,199 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "Επιβεβαίωση διεύθυνσης email" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "Επιβεβαίωση διεύθυνσης email" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "Προσωπικά" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "Επιβεβαίωση διεύθυνσης email" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "Επιβεβαίωση διεύθυνσης email" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "Επιβεβαίωση διεύθυνσης email" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "Επιβεβαίωση διεύθυνσης email" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "Διαγραφή μηνύματος" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "Επιβεβαίωση διεύθυνσης email" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Περιγράψτε την ομάδα ή το θέμα μέχρι %d χαρακτήρες" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "Περιγράψτε την ομάδα ή το θέμα" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Ακύρωση" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "" @@ -5038,37 +5392,56 @@ msgstr "Ο κωδικός αποθηκεύτηκε." msgid "Password changing is not allowed" msgstr "Ο κωδικός αποθηκεύτηκε." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5076,201 +5449,204 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 #, fuzzy msgid "You are already a member of that group" msgstr "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, fuzzy, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, fuzzy, php-format -msgid "%s joined group %s" -msgstr "ομάδες των χρηστών %s" - -#: lib/command.php:275 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/command.php:280 -#, fuzzy, php-format -msgid "%s left group %s" -msgstr "ομάδες των χρηστών %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Ονοματεπώνυμο" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Ρυθμίσεις OpenID" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "" -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "" -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -#, fuzzy -msgid "No such user" -msgstr "Κανένας τέτοιος χρήστης." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Απέτυχε η συνδρομή." -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Δεν είστε μέλος καμίας ομάδας." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ομάδες με τα περισσότερα μέλη" msgstr[1] "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5312,20 +5688,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5497,29 +5873,30 @@ msgstr "Ομάδες με τις περισσότερες δημοσιεύσει msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 -msgid "Not an image or corrupt file." -msgstr "" - #: lib/imagefile.php:109 -msgid "Unsupported image file format." +msgid "Not an image or corrupt file." msgstr "" #: lib/imagefile.php:122 @@ -5527,24 +5904,24 @@ msgstr "" msgid "Lost our file." msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5565,11 +5942,13 @@ msgstr "Σύνδεση με όνομα χρήστη και κωδικό" msgid "Sign up for a new account" msgstr "Εγγραφή για ένα νέο λογαριασμό" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Επιβεβαίωση διεύθυνσης email" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5586,12 +5965,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5606,19 +5987,22 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Βιογραφικό: %s\n" "\n" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5631,21 +6015,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Κατάσταση του/της %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νούμερο τηλεφώνου." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5661,12 +6055,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5685,12 +6081,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5711,12 +6109,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5729,6 +6137,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5741,7 +6161,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "από" @@ -5869,48 +6289,52 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Επαναλαμβάνεται από" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "Ρυθμίσεις OpenID" @@ -5935,6 +6359,10 @@ msgstr "" msgid "Error inserting avatar" msgstr "" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "" @@ -5985,7 +6413,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -5993,31 +6421,32 @@ msgstr "" msgid "All subscriptions" msgstr "Όλες οι συνδρομές" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Μέλος από" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "" - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6041,11 +6470,19 @@ msgstr "Προτεινόμενα" msgid "Popular" msgstr "Δημοφιλή" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "" + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Ναι" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6056,7 +6493,7 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6186,91 +6623,109 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "" + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Επεξεργασία ρυθμίσεων προφίλ" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Επεξεργασία" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Μήνυμα" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "Προφίλ χρήστη" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Διαχειριστές" +msgstr "Διαχειριστής" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "" +msgstr "Συντονιστής" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "" @@ -6284,7 +6739,7 @@ msgstr "Το %s δεν είναι ένα έγκυρο χρώμα!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 8d846c4e21..a52c4b5701 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:40+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:33+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -23,7 +23,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Access" @@ -44,7 +44,6 @@ msgstr "Prohibit anonymous users (not logged in) from viewing site?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Private" @@ -74,8 +73,13 @@ msgstr "Closed" msgid "Save access settings" msgstr "Save access settings" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Save" @@ -83,8 +87,8 @@ msgstr "Save" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "No such page" +msgid "No such page." +msgstr "No such page." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -94,9 +98,9 @@ msgstr "No such page" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -104,11 +108,9 @@ msgstr "No such page" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "No such user." @@ -120,8 +122,9 @@ msgstr "%1$s and friends, page %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -186,8 +189,10 @@ msgstr "" msgid "You and friends" msgstr "You and friends" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates from %1$s and friends on %2$s!" @@ -202,18 +207,18 @@ msgstr "Updates from %1$s and friends on %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API method not found." @@ -226,18 +231,18 @@ msgstr "API method not found." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "This method requires a POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." #: actions/apiaccountupdatedeliverydevice.php:132 #, fuzzy @@ -249,7 +254,7 @@ msgstr "Couldn't update user." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "User has no profile." @@ -260,9 +265,9 @@ msgid "Could not save profile." msgstr "Couldn't save profile." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -346,7 +351,7 @@ msgstr "No status found with that ID." msgid "This status is already a favorite." msgstr "This status is already a favourite." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Could not create favourite." @@ -436,11 +441,10 @@ msgstr "Location is too long (max 255 chars)." msgid "Too many aliases! Maximum %d." msgstr "Too many aliases! Maximum %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Invalid alias: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Invalid alias: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -456,14 +460,14 @@ msgstr "Alias can't be the same as nickname." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Group not found!" +msgid "Group not found." +msgstr "Group not found." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "You are already a member of that group." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "You have been blocked from that group by the admin." @@ -481,17 +485,26 @@ msgstr "You are not a member of this group." msgid "Could not remove user %1$s from group %2$s." msgstr "Could not remove user %1$s to group %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "%s's groups" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%1$s groups %2$s is a member of." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s groups" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "groups on %s" @@ -505,17 +518,17 @@ msgid "Invalid token." msgstr "Invalid token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -548,12 +561,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "The request token %s has been denied and revoked." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Unexpected form submission." @@ -576,20 +592,22 @@ msgstr "" "the ability to %3$s your %4$s account data. You should only " "give access to your %4$s account to third parties you trust." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Account" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Nickname" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Password" @@ -634,17 +652,17 @@ msgstr "Status deleted." msgid "No status with that ID found." msgstr "No status with that ID found." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "That's too long. Max notice size is %d chars." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Not found" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Not found." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Max notice size is %d chars, including attachment URL." @@ -653,12 +671,12 @@ msgstr "Max notice size is %d chars, including attachment URL." msgid "Unsupported format." msgstr "Unsupported format." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favourites from %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s updates favourited by %2$s / %2$s." @@ -668,17 +686,17 @@ msgstr "%1$s updates favourited by %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Updates mentioning %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s updates that reply to updates from %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s public timeline" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s updates from everyone!" @@ -693,20 +711,16 @@ msgstr "Repeated to %s" msgid "Repeats of %s" msgstr "Repeats of %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notices tagged with %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Updates tagged with %1$s on %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Not found." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "No such attachment." @@ -726,8 +740,9 @@ msgstr "No size." msgid "Invalid size." msgstr "Invalid size." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -737,10 +752,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "You can upload your personal avatar. The maximum file size is %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "User without matching profile." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -758,7 +773,7 @@ msgid "Preview" msgstr "Preview" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Delete" @@ -770,23 +785,27 @@ msgstr "Upload" msgid "Crop" msgstr "Crop" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "No file uploaded." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Pick a square area of the image to be your avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Lost our file data." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar updated." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Failed updating avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar deleted." @@ -794,7 +813,7 @@ msgstr "Avatar deleted." msgid "You already blocked that user." msgstr "You already blocked that user." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Block user" @@ -808,27 +827,42 @@ msgstr "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "No" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Do not block this user" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Yes" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Block this user" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Failed to save block information." @@ -841,8 +875,8 @@ msgstr "Failed to save block information." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "No such group." @@ -872,9 +906,11 @@ msgstr "Unblock" msgid "Unblock this user" msgstr "Unblock this user" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Post to %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -888,33 +924,43 @@ msgstr "Confirmation code not found." msgid "That confirmation code is not for you!" msgstr "That confirmation code is not for you!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Unrecognised address type %s" +msgid "Unrecognized address type %s." +msgstr "Unrecognized address type %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "That address has already been confirmed." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Couldn't update user." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Couldn't delete e-mail confirmation." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Confirm address" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "The address \"%s\" has been confirmed for your account." @@ -924,7 +970,7 @@ msgid "Conversation" msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notices" @@ -943,7 +989,7 @@ msgstr "You are not the owner of this application." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "There was a problem with your session token." @@ -961,15 +1007,17 @@ msgstr "" "about the application from the database, including all existing user " "connections." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Do not delete this application" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Delete this application" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1000,11 +1048,13 @@ msgstr "Delete notice" msgid "Are you sure you want to delete this notice?" msgstr "Are you sure you want to delete this notice?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Do not delete this notice" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Delete this notice" @@ -1028,58 +1078,61 @@ msgstr "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Delete this user" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Design" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Design settings for this StausNet site." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "nvalid logo URL." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Theme not available: %s" +msgid "Theme not available: %s." +msgstr "Theme not available: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Change logo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Site logo" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Change theme" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Site theme" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Theme for the site." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Change background image" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Background" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1088,67 +1141,68 @@ msgstr "" "You can upload a background image for the site. The maximum file size is %1" "$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "On" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Off" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Turn background image on or off." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Tile background image" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Change colours" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Content" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Sidebar" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Text" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Links" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Use defaults" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Restore default designs" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Reset back to default" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Save" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Save design" @@ -1253,11 +1307,16 @@ msgstr "Use this form to edit the group." msgid "description is too long (max %d chars)." msgstr "description is too long (max %d chars)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Invalid alias: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Could not update group." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Could not create aliases" @@ -1265,31 +1324,42 @@ msgstr "Could not create aliases" msgid "Options saved." msgstr "Options saved." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "E-mail settings" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Manage how you get e-mail from %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Address" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "E-mail address" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Current confirmed e-mail address." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Remove" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1297,106 +1367,136 @@ msgstr "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Cancel" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "E-mail address" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "E-mail address, like \"UserName@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Add" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Incoming e-mail" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Send e-mail to this address to post new notices." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Make a new e-mail address for posting to - cancels the old one." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "New" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Email preferences" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Send me notices of new subscriptions through e-mail." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Send me e-mail when someone adds my notice as a favourite." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Send me e-mail when someone sends me a private message." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Send me e-mail when someone sends me an \"@-reply\"." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Allow friends to nudge me and send me an e-mail." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "I want to post notices by e-mail." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publish a MicroID for my e-mail address." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Email preferences saved." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "No e-mail address." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Cannot normalise that e-mail address" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Not a valid e-mail address." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "That is already your e-mail address." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "That e-mail address already belongs to another user." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Couldn't insert confirmation code." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1404,43 +1504,53 @@ msgstr "" "A confirmation code was sent to the e-mail address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "No pending confirmation to cancel." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "That is the wrong email address." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Email confirmation cancelled." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "That is not your e-mail address." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "The email address was removed." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "No incoming e-mail address." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Couldn't update user record." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Incoming e-mail address removed." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "New incoming e-mail address added." @@ -1558,8 +1668,8 @@ msgstr "Couldn't convert request tokens to access tokens." msgid "Remote service uses unknown version of OMB protocol." msgstr "Remote service uses unknown version of OMB protocol." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." msgstr "Error updating remote profile." #: actions/getfile.php:79 @@ -1571,23 +1681,20 @@ msgid "Cannot read file." msgstr "Cannot read file." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Invalid token." +msgstr "Invalid role." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." msgstr "" #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "You cannot sandbox users on this site." +msgstr "You cannot grant user roles on this site." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "User is already silenced." +msgstr "User already has this role." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1618,11 +1725,11 @@ msgstr "User is already blocked from group." msgid "User is not a member of group." msgstr "User is not a member of group." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Block user from group" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1633,15 +1740,17 @@ msgstr "" "will be removed from the group, unable to post and unable to subscribe to " "the group in the future." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Do not block this user from this group" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Block this user from this group" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "Database error blocking user from group." @@ -1685,10 +1794,6 @@ msgid "" msgstr "" "You can upload a logo image for your group. The maximum file size is %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "User without matching profile." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Pick a square area of the image to be the logo." @@ -1719,34 +1824,38 @@ msgstr "A list of the users in this group." msgid "Admin" msgstr "Admin" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Block" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Make user an admin of the group" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Make admin" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Make this user an admin" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s timeline" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Updates from members of %1$s on %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Groups" @@ -1771,7 +1880,7 @@ msgstr "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Create a new group" @@ -1819,11 +1928,15 @@ msgstr "User is not blocked from group." msgid "Error removing the block." msgstr "Error removing the block." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "IM settings" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1832,28 +1945,35 @@ msgstr "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "IM is not available." -#: actions/imsettings.php:106 -msgid "Current confirmed Jabber/GTalk address." -msgstr "Current confirmed Jabber/GTalk address." - -#: actions/imsettings.php:114 -#, php-format -msgid "" -"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " -"message with further instructions. (Did you add %s to your buddy list?)" -msgstr "" -"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " -"message with further instructions. (Did you add %s to your buddy list?)" - -#: actions/imsettings.php:124 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 msgid "IM address" msgstr "IM address" -#: actions/imsettings.php:126 +#: actions/imsettings.php:113 +msgid "Current confirmed Jabber/GTalk address." +msgstr "Current confirmed Jabber/GTalk address." + +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 +#, php-format +msgid "" +"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " +"message with further instructions. (Did you add %s to your buddy list?)" +msgstr "" +"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " +"message with further instructions. (Did you add %s to your buddy list?)" + +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1862,44 +1982,65 @@ msgstr "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "IM preferences" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Send me notices through Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Post a notice when my Jabber/GTalk status changes." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Send me replies through Jabber/GTalk from people I'm not subscribed to." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publish a MicroID for my Jabber/GTalk address." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Preferences saved." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "No Jabber ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Cannot normalise Jabber ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Not a valid Jabber ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "That is already your Jabber ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber ID already belongs to another user." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1908,10 +2049,32 @@ msgstr "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "That is the wrong IM address." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Couldn't delete IM confirmation." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "IM confirmation cancelled." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "That is not your Jabber ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "The IM address was removed." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1932,8 +2095,8 @@ msgstr "" #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "You must be logged in to invite other users to use %s" +msgid "You must be logged in to invite other users to use %s." +msgstr "You must be logged in to invite other users to use %s." #: actions/invite.php:72 #, php-format @@ -1952,7 +2115,9 @@ msgstr "Invite new users" msgid "You are already subscribed to these users:" msgstr "You are already subscribed to these users:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1999,17 +2164,18 @@ msgstr "Optionally add a personal message to the invitation." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Send" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s has invited you to join them on %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2074,7 +2240,9 @@ msgstr "You must be logged in to join a group." msgid "No nickname or ID." msgstr "No nickname or ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s joined group %2$s" @@ -2083,11 +2251,13 @@ msgstr "%1$s joined group %2$s" msgid "You must be logged in to leave a group." msgstr "You must be logged in to leave a group." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "You are not a member of that group." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s left group %2$s" @@ -2133,10 +2303,14 @@ msgstr "" "changing your settings." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Login with a username and password" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." @@ -2161,8 +2335,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Can't make %1$s an admin for group %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "No current status" +msgid "No current status." +msgstr "No current status." #: actions/newapplication.php:52 msgid "New Application" @@ -2196,12 +2370,12 @@ msgstr "Use this form to create a new group." msgid "New message" msgstr "New message" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "You can't send a message to this user." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "No content!" @@ -2209,7 +2383,7 @@ msgstr "No content!" msgid "No recipient specified." msgstr "No recipient specified." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2224,7 +2398,7 @@ msgstr "Message sent" msgid "Direct message to %s sent." msgstr "Could not create application." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax Error" @@ -2232,7 +2406,7 @@ msgstr "Ajax Error" msgid "New notice" msgstr "New notice" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Notice posted" @@ -2326,11 +2500,11 @@ msgid "You are not a user of that application." msgstr "You are not a user of that application." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "You have not authorised any applications to use your account." @@ -2339,24 +2513,29 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Notice has no profile" +msgid "Notice has no profile." +msgstr "Notice has no profile." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s's status on %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Content type %s not supported." -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -2459,7 +2638,7 @@ msgid "6 or more characters" msgstr "6 or more characters" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Confirm" @@ -2487,7 +2666,7 @@ msgstr "Incorrect old password" msgid "Error saving user; invalid." msgstr "Error saving user; invalid." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Can't save new password." @@ -2496,7 +2675,7 @@ msgid "Password saved." msgstr "Password saved." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2506,23 +2685,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." +msgstr "Theme directory not readable: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +msgid "Avatar directory not writable: %s." +msgstr "Avatar directory not writable: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "" +msgid "Background directory not writable: %s." +msgstr "Background directory not writable: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "" +msgid "Locales directory not readable: %s." +msgstr "Locales directory not readable: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2661,19 +2840,19 @@ msgstr "" msgid "People search" msgstr "People Search" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." +msgstr "Not a valid people tag: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Users self-tagged with %1$s - page %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Invalid notice content" +msgid "Invalid notice content." +msgstr "Invalid notice content." #: actions/postnotice.php:101 #, php-format @@ -2699,13 +2878,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 lowercase letters or numbers, no punctuation or spaces" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Full name" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Homepage" @@ -2727,9 +2907,9 @@ msgid "Bio" msgstr "Bio" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Location" @@ -2743,7 +2923,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Tags" @@ -2816,7 +2996,7 @@ msgstr "Settings saved." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -2978,7 +3158,7 @@ msgstr "Reset password" msgid "Recover password" msgstr "Recover password" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Password recovery requested" @@ -2998,19 +3178,19 @@ msgstr "Reset" msgid "Enter a nickname or email address." msgstr "Enter a nickname or e-mail address." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "No user with that e-mail address or username." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "No registered e-mail address for that user." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Error saving address confirmation." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3018,23 +3198,23 @@ msgstr "" "Instructions for recovering your password have been sent to the e-mail " "address registered to your account." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Unexpected password reset." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Password must be 6 chars or more." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Password and confirmation do not match." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Error setting user." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "New password successfully saved. You are now logged in." @@ -3050,7 +3230,7 @@ msgstr "Sorry, invalid invitation code." msgid "Registration successful" msgstr "Registration successful" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Register" @@ -3072,7 +3252,7 @@ msgstr "Invalid username or password." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3088,8 +3268,9 @@ msgstr "6 or more characters. Required." msgid "Same as password above. Required." msgstr "Same as password above. Required." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mail" @@ -3102,22 +3283,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Longer name, preferably your \"real\" name" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "My text and files are available under " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3150,7 +3324,7 @@ msgstr "" "\n" "Thanks for signing up and we hope you enjoy using this service." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3194,7 +3368,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL of your profile on another compatible microblogging service" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Subscribe" @@ -3230,7 +3404,7 @@ msgstr "You can't repeat your own notice." msgid "You already repeated that notice." msgstr "You already repeated that notice." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Repeated" @@ -3295,14 +3469,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Replies to %1$s on %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "You cannot silence users on this site." +msgstr "You cannot revoke user roles on this site." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "User without matching profile." +msgstr "User doesn't have this role." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3318,7 +3490,7 @@ msgstr "User is already sandboxed." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3355,26 +3527,30 @@ msgstr "You must be logged in to view an application." msgid "Application profile" msgstr "Application profile" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Name" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organization" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Description" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statistics" @@ -3491,87 +3667,87 @@ msgstr "%s group" msgid "%1$s group, page %2$d" msgstr "%1$s group, page %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Group profile" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Note" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Group actions" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Notice feed for %s group (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Notice feed for %s group (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Notice feed for %s group (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Outbox for %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Members" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(None)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "All members" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Created" -#: actions/showgroup.php:457 -#, php-format -msgid "" -"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." -"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " -"[StatusNet](http://status.net/) tool. Its members share short messages about " -"their life and interests. [Join now](%%%%action.register%%%%) to become part " -"of this group and many more! ([Read more](%%%%doc.help%%%%))" -msgstr "" -"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." -"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " -"[StatusNet](http://status.net/) tool. Its members share short messages about " -"their life and interests. [Join now](%%%%action.register%%%%) to become part " -"of this group and many more! ([Read more](%%%%doc.help%%%%))" - #: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. [Join now](%%%%action.register%%%%) to become part " +"of this group and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. [Join now](%%%%action.register%%%%) to become part " +"of this group and many more! ([Read more](%%%%doc.help%%%%))" + +#: actions/showgroup.php:469 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3579,7 +3755,7 @@ msgstr "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Admins" @@ -3694,9 +3870,8 @@ msgid "User is already silenced." msgstr "User is already silenced." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Design settings for this StausNet site." +msgstr "Basic settings for this StatusNet site" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." @@ -3712,11 +3887,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Minimum text limit is 0 (unlimited)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3764,9 +3939,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "" #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Default site language" +msgstr "Default language" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3793,77 +3967,98 @@ msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Site notice" +msgstr "Site Notice" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "New message" +msgstr "Edit site-wide message" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Unable to save your design settings!" +msgstr "Unable to save site notice." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Site notice" +msgstr "Site notice text" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Site notice" +msgstr "Save site notice" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "SMS settings" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "You can receive SMS messages through e-mail from %%site.name%%." -#: actions/smssettings.php:91 -#, fuzzy +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." -msgstr "This page is not available in a " +msgstr "SMS is not available." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "SMS address" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Current confirmed SMS-enabled phone number." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Awaiting confirmation on this phone number." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Confirmation code" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Enter the code you received on your phone." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Confirm" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "SMS phone number" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Phone number, no punctuation or spaces, with area code" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "SMS preferences" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3871,23 +4066,33 @@ msgstr "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "SMS preferences saved." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "No phone number." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "No carrier selected." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "That is already your phone number." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "That phone number already belongs to another user." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3895,23 +4100,40 @@ msgstr "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "That is the wrong confirmation number." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "SMS confirmation cancelled." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "That is not your phone number." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "The SMS phone number was removed." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Mobile carrier" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Select a carrier" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3920,20 +4142,20 @@ msgstr "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "No code entered" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Change site configuration" +msgstr "Manage snapshot configuration" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -3948,7 +4170,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3980,16 +4202,14 @@ msgid "Snapshots will be sent to this URL" msgstr "" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Save site settings" +msgstr "Save snapshot settings" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." msgstr "You are not subscribed to that profile." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Could not save subscription." @@ -4080,11 +4300,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s is not listening to anyone." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4117,12 +4337,12 @@ msgstr "No ID argument." msgid "Tag %s" msgstr "Tag %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "User profile" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Photo" @@ -4173,8 +4393,8 @@ msgid "User is not silenced." msgstr "User is not silenced." #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "No profile id in request." +msgid "No profile ID in request." +msgstr "No profile ID in request." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4189,7 +4409,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "User" @@ -4211,7 +4430,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profile" @@ -4374,27 +4594,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "%1$s groups, page %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Search for more groups" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s is not a member of any group." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Updates from %1$s on %2$s!" @@ -4452,7 +4678,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Version" @@ -4460,19 +4687,19 @@ msgstr "Version" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4510,26 +4737,27 @@ msgstr "Could not insert message." msgid "Could not update message with new URI." msgstr "Could not update message with new URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" -msgstr "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" +msgstr "Database error inserting hashtag: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Problem saving notice. Too long." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Problem saving notice. Unknown user." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4537,306 +4765,320 @@ msgstr "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "You are banned from posting notices on this site." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problem saving notice." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problem saving group inbox." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "You have been banned from subscribing." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "User has blocked you." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Not subscribed!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Couldn't delete self-subscription." -#: classes/Subscription.php:190 -#, fuzzy +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "Couldn't delete subscription." +msgstr "Couldn't delete subscription OMB token." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Couldn't delete subscription." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welcome to %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Could not create group." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Could not set group URI." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Could not set group membership." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Could not save local group info." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Change your profile settings" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Upload an avatar" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Change your password" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Change e-mail handling" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Design your profile" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Other" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Other options" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Other" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Untitled page" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Primary site navigation" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 -#, fuzzy +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" -msgstr "Personal profile and friends timeline" +msgstr "ersonal profile and friends timeline" -#: lib/action.php:433 -#, fuzzy +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Personal" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 -#, fuzzy +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Change your e-mail, avatar, password, profile" +msgstr "Change your email, avatar, password, profile" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 -#, fuzzy +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Connect to services" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Connect" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 -#, fuzzy +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Change site configuration" -#: lib/action.php:449 -#, fuzzy +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Admin" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 -#, fuzzy, php-format +#: lib/action.php:455 +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Invite friends and colleagues to join you on %s" -#: lib/action.php:456 -#, fuzzy +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Invite" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 -#, fuzzy +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Logout from the site" -#: lib/action.php:465 -#, fuzzy +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Logout" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 -#, fuzzy +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Create an account" -#: lib/action.php:473 -#, fuzzy +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Register" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 -#, fuzzy +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Login to the site" -#: lib/action.php:479 -#, fuzzy +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Login" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 -#, fuzzy +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Help me!" -#: lib/action.php:485 -#, fuzzy +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Help" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 -#, fuzzy +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Search for people or text" -#: lib/action.php:491 -#, fuzzy +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Search" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Site notice" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Local views" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Page notice" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Secondary site navigation" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Help" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "About" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "F.A.Q." -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Privacy" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Source" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Contact" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Badge" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "StatusNet software licence" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** is a microblogging service." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4847,67 +5089,81 @@ msgstr "" "s, available under the [GNU Affero General Public Licence](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Site content license" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "licence." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "After" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Before" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "You cannot make changes to this site." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Changes to that panel are not allowed." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() not implemented." @@ -4917,155 +5173,189 @@ msgstr "showForm() not implemented." msgid "saveSettings() not implemented." msgstr "saveSettings() not implemented." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Unable to delete design setting." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Basic site configuration" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 -#, fuzzy +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Site" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Design configuration" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 -#, fuzzy +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Design" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "User configuration" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "User" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Access configuration" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Paths configuration" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Sessions configuration" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 -#, fuzzy +#: lib/adminpanelaction.php:397 msgid "Edit site notice" -msgstr "Site notice" +msgstr "Edit site notice" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 -#, fuzzy +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "Paths configuration" +msgstr "Snapshots configuration" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Describe your application in %d characters" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Describe your application" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "Source URL" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "URL of the homepage of this application" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "Source URL" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Organisation responsible for this application" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "URL for the homepage of the organisation" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Cancel" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Revoke" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Provider" @@ -5085,37 +5375,56 @@ msgstr "Password changing failed" msgid "Password changing is not allowed" msgstr "Password changing is not allowed" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Command results" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Command complete" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Command failed" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Notice with that id does not exist" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "User has no last notice" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Could not find a user with nickname %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Could not find a local user with nickname %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Sorry, this command is not yet implemented." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Nudge sent to %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5123,195 +5432,199 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Notice with that id does not exist" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "User has no last notice" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Notice marked as fave." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "You are already a member of that group." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s" +msgstr "Could not join user %1$s to group %2$s." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%s joined group %s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Could not remove user %1$s to group %2$s" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Could not remove user %s to group %s" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s left group %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Fullname: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Location: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "About: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "Message too long - maximum is %1$d characters, you sent %2$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Direct message to %s sent" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Error sending direct message." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Cannot repeat your own notice." -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Already repeated that notice." -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Notice from %s repeated" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Error repeating notice." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notice too long - maximum is %d characters, you sent %d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Reply to %s sent" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Error saving notice." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Specify the name of the user to subscribe to" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "No such user." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Can't subscribe to OMB profiles by command." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Subscribed to %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Specify the name of the user to unsubscribe from" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Unsubscribed from %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Command not yet implemented." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notification off." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Can't turn off notification." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notification on." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Can't turn on notification." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "Unsubscribed %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "You are not subscribed to anyone." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "You are already subscribed to these users:" msgstr[1] "You are already subscribed to these users:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "No one is subscribed to you." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Could not subscribe other to you." msgstr[1] "Could not subscribe other to you." -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "You are not a member of any groups." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "You are not a member of that group." msgstr[1] "You are not a member of that group." -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5353,19 +5666,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "No configuration file found" -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Go to the installer." @@ -5537,53 +5850,54 @@ msgstr "Groups with most posts" msgid "Tags in %s group's notices" msgstr "Tags in %s group's notices" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "This page is not available in a media type you accept" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Unsupported image file format." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "That file is too big. The maximum file size is %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Partial upload." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "System error uploading file." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Not an image or corrupt file." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Unsupported image file format." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Lost our file." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Unknown file type" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5604,11 +5918,13 @@ msgstr "Login with a username and password" msgid "Sign up for a new account" msgstr "Sign up for a new account" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "E-mail address confirmation" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5625,12 +5941,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s is now listening to your notices on %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5655,17 +5973,20 @@ msgstr "" "----\n" "Change your email address or notification options at %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Bio: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "New e-mail address for posting to %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5686,21 +6007,31 @@ msgstr "" "Faithfully yours,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s status" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS confirmation" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "%s: confirm you own this phone number with this code:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "You've been nudged by %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5716,12 +6047,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "New private message from %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5740,12 +6073,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) added your notice as a favorite" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5766,12 +6101,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5784,6 +6129,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5796,7 +6153,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "from" @@ -5921,48 +6278,52 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "in context" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Repeated by" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Reply to this notice" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Reply" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Notice repeated" @@ -5986,6 +6347,10 @@ msgstr "Error inserting new profile." msgid "Error inserting avatar" msgstr "Error inserting avatar." +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Error updating remote profile." + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Error inserting remote profile." @@ -6035,7 +6400,7 @@ msgstr "Tags in %s's notices" msgid "Unknown" msgstr "Unknown" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscriptions" @@ -6043,31 +6408,32 @@ msgstr "Subscriptions" msgid "All subscriptions" msgstr "All subscriptions" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscribers" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "All subscribers" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "User ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Member since" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "All groups" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "No return-to arguments." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6091,20 +6457,28 @@ msgstr "Featured" msgid "Popular" msgstr "Popular" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "No return-to arguments." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Repeat this notice?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Yes" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Repeat this notice" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Block this user from this group" +msgstr "Revoke the \"%s\" role from this user" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6230,91 +6604,108 @@ msgstr "Unsubscribe from this user" msgid "Unsubscribe" msgstr "Unsubscribe" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "User %s (%d) has no profile record." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Edit Avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "User actions" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Edit profile settings" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Send a direct message to this user" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Message" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "User profile" +msgstr "User role" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Admins" +msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "about a year ago" @@ -6328,7 +6719,7 @@ msgstr "%s is not a valid colour!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s is not a valid colour! Use 3 or 6 hex chars." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Message too long - maximum is %1$d characters, you sent %2$d." diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index cdc0184e43..4e4d4bf06d 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -1,9 +1,10 @@ # Translation of StatusNet to Spanish # -# Author@translatewiki.net: Brion # Author@translatewiki.net: Crazymadlover +# Author@translatewiki.net: Locos epraix # Author@translatewiki.net: McDutchie # Author@translatewiki.net: PerroVerd +# Author@translatewiki.net: Pertile # Author@translatewiki.net: Peter17 # Author@translatewiki.net: Translationista # -- @@ -13,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:43+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:36+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -26,7 +27,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Acceder" @@ -47,7 +48,6 @@ msgstr "¿Prohibir a los usuarios anónimos (no conectados) ver el sitio?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Privado" @@ -77,8 +77,13 @@ msgstr "Cerrado" msgid "Save access settings" msgstr "Guardar la configuración de acceso" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Guardar" @@ -86,8 +91,8 @@ msgstr "Guardar" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "No existe tal página" +msgid "No such page." +msgstr "No existe tal página." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -97,9 +102,9 @@ msgstr "No existe tal página" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -107,11 +112,9 @@ msgstr "No existe tal página" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "No existe ese usuario." @@ -119,16 +122,17 @@ msgstr "No existe ese usuario." #: actions/all.php:86 #, php-format msgid "%1$s and friends, page %2$d" -msgstr "%1$s y amigos, página %2$d" +msgstr "%1$s y sus amistades, página %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" -msgstr "%s y amigos" +msgstr "%s y sus amistades" #. TRANS: %1$s is user nickname #: actions/all.php:103 @@ -173,8 +177,8 @@ msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Trata de suscribirte a más personas, [unirte a un grupo] (%%action.groups%%) " -"o publicar algo." +"Puedes intentar [darle un toque a %1$s](../%2$s) desde su perfil o [publicar " +"algo a su atención](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 #, php-format @@ -182,19 +186,21 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" -"Puede intentar [guiñar a %1$s](../%2$s) desde su perfil o [publicar algo a " -"su atención ](%%%%action.newnotice%%%%?status_textarea=%3$s)." +"¿Por qué no [registrar una cuenta](%%%%action.register%%%%) y luego darle un " +"toque a %s o publicar algo a su atención?" #. TRANS: H1 text #: actions/all.php:178 msgid "You and friends" -msgstr "Tú y amigos" +msgstr "Tú y tus amistades" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" -msgstr "¡Actualizaciones de %1$s y amigos en %2$s!" +msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 @@ -206,18 +212,18 @@ msgstr "¡Actualizaciones de %1$s y amigos en %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Método de API no encontrado." @@ -230,18 +236,18 @@ msgstr "Método de API no encontrado." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Este método requiere un POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" "Tienes que especificar un parámetro llamdao 'dispositivo' con un valor a " -"elegir entre: sms, im, ninguno" +"elegir entre: sms, im, ninguno." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -252,7 +258,7 @@ msgstr "No se pudo actualizar el usuario." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "El usuario no tiene un perfil." @@ -262,9 +268,9 @@ msgid "Could not save profile." msgstr "No se pudo guardar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -348,7 +354,7 @@ msgstr "No se encontró estado para ese ID" msgid "This status is already a favorite." msgstr "Este status ya está en favoritos." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "No se pudo crear favorito." @@ -440,11 +446,10 @@ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)." msgid "Too many aliases! Maximum %d." msgstr "¡Muchos seudónimos! El máximo es %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Alias inválido: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Alias inválido: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -460,14 +465,14 @@ msgstr "El alias no puede ser el mismo que el usuario." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "¡No se ha encontrado el grupo!" +msgid "Group not found." +msgstr "Grupo no encontrado." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Ya eres miembro de ese grupo" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Has sido bloqueado de ese grupo por el administrador." @@ -485,17 +490,26 @@ msgstr "No eres miembro de este grupo." msgid "Could not remove user %1$s from group %2$s." msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Grupos de %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%1$s grupos %2$s es un miembro de." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Grupos %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "Grupos en %s" @@ -509,17 +523,17 @@ msgid "Invalid token." msgstr "Token inválido." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -529,7 +543,7 @@ msgstr "" #: actions/apioauthauthorize.php:135 msgid "Invalid nickname / password!" -msgstr "¡Apodo o contraseña inválidos!" +msgstr "¡Usuario o contraseña inválidos!" #: actions/apioauthauthorize.php:159 msgid "Database error deleting OAuth application user." @@ -555,12 +569,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "El token de solicitud %2 ha sido denegado y revocado." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Envío de formulario inesperado." @@ -583,20 +600,22 @@ msgstr "" "permiso para %3$s la información de tu cuenta %4$s. Sólo " "debes dar acceso a tu cuenta %4$s a terceras partes en las que confíes." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Cuenta" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" -msgstr "Apodo" +msgstr "Usuario" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Contraseña" @@ -641,17 +660,17 @@ msgstr "Status borrado." msgid "No status with that ID found." msgstr "No hay estado para ese ID" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "La entrada es muy larga. El tamaño máximo es de %d caracteres." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "No encontrado" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "No encontrado." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -662,12 +681,12 @@ msgstr "" msgid "Unsupported format." msgstr "Formato no soportado." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritos de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualizaciones favoritas de %2$s / %2$s." @@ -677,17 +696,17 @@ msgstr "%1$s actualizaciones favoritas de %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualizaciones que mencionan %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "línea temporal pública de %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "¡Actualizaciones de todos en %s!" @@ -702,20 +721,16 @@ msgstr "Repetido a %s" msgid "Repeats of %s" msgstr "Repeticiones de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" -msgstr "Avisos marcados con %s" +msgstr "Avisos etiquetados con %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizaciones etiquetadas con %1$s en %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "No encontrado." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "No existe tal archivo adjunto." @@ -725,7 +740,7 @@ msgstr "No existe tal archivo adjunto." #: actions/grouplogo.php:86 actions/groupmembers.php:76 #: actions/grouprss.php:91 actions/showgroup.php:121 msgid "No nickname." -msgstr "Ningún apodo." +msgstr "Ningún nombre de usuario." #: actions/avatarbynickname.php:64 msgid "No size." @@ -735,10 +750,11 @@ msgstr "Ningún tamaño." msgid "Invalid size." msgstr "Tamaño inválido." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" -msgstr "Avatar" +msgstr "Imagen" #: actions/avatarsettings.php:78 #, php-format @@ -746,15 +762,15 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Puedes subir tu imagen personal. El tamaño máximo de archivo es %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Usuario sin perfil equivalente" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Usuario sin perfil coincidente." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 msgid "Avatar settings" -msgstr "Configuración de Avatar" +msgstr "Configuración de imagen" #: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:202 actions/grouplogo.php:262 @@ -767,43 +783,47 @@ msgid "Preview" msgstr "Vista previa" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Borrar" #: actions/avatarsettings.php:166 actions/grouplogo.php:236 msgid "Upload" -msgstr "Cargar" +msgstr "Subir" #: actions/avatarsettings.php:231 actions/grouplogo.php:289 msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:328 -msgid "Pick a square area of the image to be your avatar" -msgstr "Elige un área cuadrada de la imagen para que sea tu avatar" +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Ningún archivo fue subido." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:332 +msgid "Pick a square area of the image to be your avatar" +msgstr "Elige un área cuadrada para que sea tu imagen" + +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Se perdió nuestros datos de archivo." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." -msgstr "Avatar actualizado" +msgstr "Imagen actualizada" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." -msgstr "Error al actualizar avatar." +msgstr "Error al actualizar la imagen." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." -msgstr "Avatar borrado." +msgstr "Imagen borrada." #: actions/block.php:69 msgid "You already blocked that user." msgstr "Ya has bloqueado a este usuario." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquear usuario." @@ -817,27 +837,42 @@ msgstr "" "desuscribirá de tu cuenta, no podrá suscribirse a ella en el futuro y no se " "te notificará de ninguna de sus respuestas @." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "No" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "No bloquear a este usuario" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Sí" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloquear este usuario." -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "No se guardó información de bloqueo." @@ -850,8 +885,8 @@ msgstr "No se guardó información de bloqueo." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "No existe ese grupo." @@ -882,9 +917,11 @@ msgstr "Desbloquear" msgid "Unblock this user" msgstr "Desbloquear este usuario" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Mensaje a " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Postear a %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -898,33 +935,43 @@ msgstr "Código de confirmación no encontrado." msgid "That confirmation code is not for you!" msgstr "¡Ese código de confirmación no es para ti!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Tipo de dirección %s desconocida" +msgid "Unrecognized address type %s." +msgstr "Tipo de dirección %s desconocida." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Esa dirección ya fue confirmada." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "No se pudo actualizar el usuario." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "No se pudo eliminar la confirmación de correo electrónico." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Confirmar la dirección" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "La dirección \"%s\" fue confirmada para tu cuenta." @@ -934,7 +981,7 @@ msgid "Conversation" msgstr "Conversación" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Avisos" @@ -953,7 +1000,7 @@ msgstr "No eres el propietario de esta aplicación." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Hubo problemas con tu clave de sesión." @@ -971,15 +1018,17 @@ msgstr "" "los datos acerca de la aplicación de la base de datos, incluyendo todas las " "conexiones de usuario existente." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "No eliminar esta aplicación" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Borrar esta aplicación" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1010,11 +1059,13 @@ msgstr "Borrar aviso" msgid "Are you sure you want to delete this notice?" msgstr "¿Estás seguro de que quieres eliminar este aviso?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "No eliminar este mensaje" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Borrar este aviso" @@ -1038,58 +1089,61 @@ msgstr "" "¿Realmente deseas eliminar este usuario? Esto borrará de la base de datos " "todos los datos sobre el usuario, sin dejar una copia de seguridad." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Borrar este usuario" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Diseño" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Configuración de diseño de este sitio StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "URL de logotipo inválido." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Tema no disponible" +msgid "Theme not available: %s." +msgstr "Tema no disponible: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Cambiar logo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Logo del sitio" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Cambiar el tema" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Tema del sitio" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Tema para el sitio." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Cambiar la imagen de fondo" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Fondo" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1098,67 +1152,68 @@ msgstr "" "Puedes subir una imagen de fondo para el sitio. El tamaño máximo de archivo " "es %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" -msgstr "Activado" +msgstr "Activar" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" -msgstr "Desactivado" +msgstr "Desactivar" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Activar o desactivar la imagen de fondo." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Imagen de fondo en mosaico" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Cambiar colores" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Contenido" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Barra lateral" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Texto" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Vínculos" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Utilizar los valores predeterminados" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Restaurar los diseños predeterminados" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Volver a los valores predeterminados" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Guardar" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Guardar el diseño" @@ -1214,7 +1269,7 @@ msgstr "El URL fuente es muy largo." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Source URL is not valid." -msgstr "La URL fuente es inválida." +msgstr "El URL fuente es inválido." #: actions/editapplication.php:203 actions/newapplication.php:188 msgid "Organization is required." @@ -1263,11 +1318,16 @@ msgstr "Usa este formulario para editar el grupo." msgid "description is too long (max %d chars)." msgstr "La descripción es muy larga (máx. %d caracteres)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Alias inválido: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "No se pudo actualizar el grupo." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "No fue posible crear alias." @@ -1275,31 +1335,42 @@ msgstr "No fue posible crear alias." msgid "Options saved." msgstr "Se guardó Opciones." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Configuración del correo electrónico" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Gestiona la forma en que recibes correo desde %%site.name%%" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Dirección" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Dirección de correo electrónico" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Actual dirección de correo electrónico confirmada" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Eliminar" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1307,109 +1378,139 @@ msgstr "" "Esperando confirmación de esta dirección. Revisa tu bandeja de entrada (¡y " "la de spam!) por un mensaje con las instrucciones." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Cancelar" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Dirección de correo electrónico" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Correo electrónico, como \"NombredeUsuario@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Añadir" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Correo entrante" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Envie emails a esta dirección para ingresar nuevos avisos" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Hace una nueva dirección de correo para postear; cancela la anterior." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Nuevo" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Preferencias" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Preferencias de correo electrónico" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Enviarme avisos de suscripciones nuevas por correo." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "Enviarme un correo electrónico cuando alguien agrega mi aviso a favoritos." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" "Enviarme un correo electrónico cuando alguien me envía un mensaje privado." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" "Enviarme un correo electrónico cuando alguien me envíe una \"@-respuesta\"." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Permitir que amigos me contacten y envién un correo." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Deseo enviar estados por email" -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publicar un MicroID para mi dirección de correo." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Preferencias guardadas." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Preferencias de correo electrónico guardadas." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Sin dirección de correo electrónico" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "No se puede normalizar esta dirección de correo electrónico." -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Correo electrónico no válido" -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Esa ya es tu dirección de correo electrónico" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Esa dirección de correo pertenece a otro usuario." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "No se pudo insertar el código de confirmación." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1418,43 +1519,53 @@ msgstr "" "Revisa tu bandeja de entrada (¡y la de spam!) para encontrar el código y las " "instrucciones sobre cómo usarlo." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Ninguna confirmación pendiente para cancelar." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Esa dirección de mensajería instantánea es incorrecta." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Esa es la dirección de correo electrónico incorrecta." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Confirmación cancelada." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Confirmación de correo electrónico cancelada." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Esa no es tu dirección de correo electrónico" -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "La dirección fue eliminada." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "La dirección de correo electrónico ha sido eliminada." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "No hay dirección de correo entrante." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "No se pudo actualizar información de usuario." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Dirección de correo entrante removida." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Nueva dirección de correo entrante agregada." @@ -1543,7 +1654,7 @@ msgstr "Sin archivo adjunto" #: actions/file.php:51 msgid "No uploaded attachments." -msgstr "No hay archivos adjuntos cargados." +msgstr "No hay archivos adjuntos subidos." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1573,9 +1684,9 @@ msgstr "No se pudo convertir el token de solicitud en token de acceso." msgid "Remote service uses unknown version of OMB protocol." msgstr "El servicio remoto utiliza una versión desconocida del protocolo OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Error al actualizar el perfil remoto" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Error al actualizar el perfil remoto." #: actions/getfile.php:79 msgid "No such file." @@ -1586,23 +1697,20 @@ msgid "Cannot read file." msgstr "No se puede leer archivo." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Token inválido." +msgstr "Función no válida." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Esta función es reservada y no puede asignarse." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "No puedes enviar mensaje a este usuario." +msgstr "No puedes conceder funciones de usuario en este sitio." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "El usuario te ha bloqueado." +msgstr "El usuario ya tiene esta función." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1633,11 +1741,11 @@ msgstr "Usuario ya está bloqueado del grupo." msgid "User is not a member of group." msgstr "Usuario no es miembro del grupo" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Bloquear usuario de grupo" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1648,15 +1756,17 @@ msgstr "" "eliminará del grupo y no podrá publicar ni suscribirse al grupo en lo " "sucesivo." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "No bloquear este usuario de este grupo" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Bloquear este usuario de este grupo" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" "Se ha producido un error en la base de datos al bloquear el usuario del " @@ -1703,10 +1813,6 @@ msgstr "" "Puedes subir una imagen de logo para tu grupo. El tamaño máximo del archivo " "debe ser %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Usuario sin perfil coincidente." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Elige un área cuadrada de la imagen para que sea tu logo." @@ -1737,34 +1843,38 @@ msgstr "Lista de los usuarios en este grupo." msgid "Admin" msgstr "Admin" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Convertir al usuario en administrador del grupo" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Convertir en administrador" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Convertir a este usuario en administrador" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "línea temporal de %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "¡Actualizaciones de miembros de %1$s en %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupos" @@ -1789,7 +1899,7 @@ msgstr "" "encuentras un grupo que te guste? ¡Intenta [buscar otro](%%%%action." "groupsearch%%%%) o [crea tú uno!](%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Crear un nuevo grupo" @@ -1841,11 +1951,15 @@ msgstr "El usuario no está bloqueado del grupo." msgid "Error removing the block." msgstr "Se ha producido un error al eliminar el bloque." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Configuración de mensajería instantánea" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1854,15 +1968,24 @@ msgstr "" "Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de " "Jabber/GTalk. Configura tu dirección y opciones abajo." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "La mensajería instantánea no está disponible." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Dirección de mensajería instantánea" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Dirección actual Jabber/Gtalk confirmada." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1872,11 +1995,9 @@ msgstr "" "Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista " "de amigos?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "Dirección de mensajería instantánea" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1886,44 +2007,65 @@ msgstr "" "Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de " "mensajería instantánea o en GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Preferencias de mensajería instantánea" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Enviarme avisos por Jabber/GTalk" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Envirame respuestas por medio de Jabber/GTalk de gente a la cual no sigo." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Preferencias guardadas." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Ningún Jabber ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "No se puede normalizar este Jabber ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Jabber ID no válido" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Ese ya es tu Jabber ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "El Jabber ID ya pertenece a otro usuario." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1933,10 +2075,32 @@ msgstr "" "instantánea que agregaste. Debes aprobar a %s para que pueda enviarte " "mensajes." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Esa dirección de mensajería instantánea es incorrecta." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "No se pudo eliminar la confirmación de mensajería instantánea." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Confirmación de mensajería instantánea cancelada." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Ese no es tu Jabber ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "La dirección de mensajería instantánea ha sido eliminada." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1958,8 +2122,8 @@ msgstr "Se han inhabilitado las invitaciones." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "Debes estar conectado para invitar otros usuarios a usar %s" +msgid "You must be logged in to invite other users to use %s." +msgstr "Debes estar conectado para invitar otros usuarios a usar %s." #: actions/invite.php:72 #, php-format @@ -1978,7 +2142,9 @@ msgstr "Invitar nuevos usuarios:" msgid "You are already subscribed to these users:" msgstr "Ya estás suscrito a estos usuarios:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2025,17 +2191,18 @@ msgstr "Opcionalmente añada un mensaje personalizado a su invitación." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Enviar" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s te ha invitado a que te unas con el/ellos en %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2097,11 +2264,12 @@ msgid "You must be logged in to join a group." msgstr "Debes estar conectado para unirte a un grupo." #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Ningún apodo." +msgstr "Ningún nombre de usuario o ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s se ha unido al grupo %2$" @@ -2110,11 +2278,13 @@ msgstr "%1$s se ha unido al grupo %2$" msgid "You must be logged in to leave a group." msgstr "Debes estar conectado para dejar un grupo." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "No eres miembro de este grupo." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s ha dejado el grupo %2$s" @@ -2162,13 +2332,16 @@ msgstr "" "contraseña antes de cambiar tu configuración." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Ingresar con tu nombre de usuario y contraseña." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Inicia sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea](%%" -"action.register%%) una cuenta." +"Aún no tienes nombre de usuario? [Registrar](%%action.register%%) una nueva " +"cuenta." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2191,8 +2364,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "No es posible convertir a %1$s en administrador del grupo %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "No existe estado actual" +msgid "No current status." +msgstr "No existe estado actual." #: actions/newapplication.php:52 msgid "New Application" @@ -2208,7 +2381,7 @@ msgstr "Utiliza este formulario para registrar una nueva aplicación." #: actions/newapplication.php:176 msgid "Source URL is required." -msgstr "Se requiere la URL fuente." +msgstr "Se requiere el URL fuente." #: actions/newapplication.php:258 actions/newapplication.php:267 msgid "Could not create application." @@ -2226,12 +2399,12 @@ msgstr "Usa este formulario para crear un grupo nuevo." msgid "New message" msgstr "Nuevo Mensaje " -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "No puedes enviar mensaje a este usuario." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "¡Ningún contenido!" @@ -2239,7 +2412,7 @@ msgstr "¡Ningún contenido!" msgid "No recipient specified." msgstr "No se especificó receptor." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "No te auto envíes un mensaje; dícetelo a ti mismo." @@ -2253,7 +2426,7 @@ msgstr "Mensaje enviado" msgid "Direct message to %s sent." msgstr "Se ha enviado un mensaje directo a %s." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Error de Ajax" @@ -2261,7 +2434,7 @@ msgstr "Error de Ajax" msgid "New notice" msgstr "Nuevo aviso" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Mensaje publicado" @@ -2317,16 +2490,16 @@ msgstr "" msgid "" "This user doesn't allow nudges or hasn't confirmed or set his email yet." msgstr "" -"Este usuario no permite zumbidos o todavía no confirma o configura su correo " +"Este usuario no permite toques o todavía no confirma o configura su correo " "electrónico." #: actions/nudge.php:94 msgid "Nudge sent" -msgstr "Se envió zumbido" +msgstr "Toque enviado" #: actions/nudge.php:97 msgid "Nudge sent!" -msgstr "¡Codazo enviado!" +msgstr "¡Toque enviado!" #: actions/oauthappssettings.php:59 msgid "You must be logged in to list your applications." @@ -2358,11 +2531,11 @@ msgid "You are not a user of that application." msgstr "No eres un usuario de esa aplicación." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "No se puede revocar el acceso para la aplicación: " +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "No se puede revocar el acceso para la aplicación: %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "No has autorizado a ninguna aplicación utilizar tu cuenta." @@ -2373,24 +2546,29 @@ msgstr "" "aplicaciones " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Aviso sin perfil" +msgid "Notice has no profile." +msgstr "Aviso no tiene perfil." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "estado de %1$s en %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "tipo de contenido " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Tipo de contenido %s no soportado." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Sólo " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Solamente %s URLs sobre HTTP simples por favor." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -2416,7 +2594,7 @@ msgstr "  (servicio gratuito)" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "Acortar las URL con" +msgstr "Acortar los URL con" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." @@ -2494,7 +2672,7 @@ msgid "6 or more characters" msgstr "6 o más caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Confirmar" @@ -2522,7 +2700,7 @@ msgstr "Contraseña antigua incorrecta." msgid "Error saving user; invalid." msgstr "Error al guardar el usuario; inválido." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "No se puede guardar la nueva contraseña." @@ -2531,33 +2709,34 @@ msgid "Password saved." msgstr "Se guardó Contraseña." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Rutas" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." msgstr "" +"Configuración de la ruta de acceso y del servidor de este sitio StatusNet." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Directorio de temas ilegible: %s" +msgid "Theme directory not readable: %s." +msgstr "Directorio de temas ilegible: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +msgid "Avatar directory not writable: %s." +msgstr "Directorio de avatares no escribible: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Directorio de fondo ilegible: %s" +msgid "Background directory not writable: %s." +msgstr "Directorio de fondo no escribible: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "" +msgid "Locales directory not readable: %s." +msgstr "Directorio de configuración regional ilegible: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2573,32 +2752,31 @@ msgstr "Servidor" #: actions/pathsadminpanel.php:238 msgid "Site's server hostname." -msgstr "" +msgstr "Nombre del host del servidor del sitio." #: actions/pathsadminpanel.php:242 msgid "Path" msgstr "Ruta" #: actions/pathsadminpanel.php:242 -#, fuzzy msgid "Site path" -msgstr "Aviso de sitio" +msgstr "Ruta del sitio" #: actions/pathsadminpanel.php:246 msgid "Path to locales" -msgstr "" +msgstr "Ruta de las configuraciones locales" #: actions/pathsadminpanel.php:246 msgid "Directory path to locales" -msgstr "" +msgstr "Ruta del directorio de las configuraciones locales" #: actions/pathsadminpanel.php:250 msgid "Fancy URLs" -msgstr "" +msgstr "URL agradables" #: actions/pathsadminpanel.php:252 msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" +msgstr "¿Usar URL agradables (más legibles y memorizables)?" #: actions/pathsadminpanel.php:259 msgid "Theme" @@ -2610,7 +2788,7 @@ msgstr "Servidor de los temas" #: actions/pathsadminpanel.php:268 msgid "Theme path" -msgstr "" +msgstr "Ruta del tema" #: actions/pathsadminpanel.php:272 msgid "Theme directory" @@ -2618,20 +2796,19 @@ msgstr "Directorio de temas" #: actions/pathsadminpanel.php:279 msgid "Avatars" -msgstr "Avatares" +msgstr "Imágenes" #: actions/pathsadminpanel.php:284 msgid "Avatar server" -msgstr "Servidor del avatar" +msgstr "Servidor de la imagen" #: actions/pathsadminpanel.php:288 -#, fuzzy msgid "Avatar path" -msgstr "Avatar actualizado" +msgstr "Ruta de la imagen" #: actions/pathsadminpanel.php:292 msgid "Avatar directory" -msgstr "Directorio del avatar" +msgstr "Directorio de la imagen" #: actions/pathsadminpanel.php:301 msgid "Backgrounds" @@ -2643,7 +2820,7 @@ msgstr "Servidor de fondo" #: actions/pathsadminpanel.php:309 msgid "Background path" -msgstr "" +msgstr "Ruta del fondo" #: actions/pathsadminpanel.php:313 msgid "Background directory" @@ -2682,9 +2859,8 @@ msgid "Server to direct SSL requests to" msgstr "Servidor hacia el cual dirigir las solicitudes SSL" #: actions/pathsadminpanel.php:352 -#, fuzzy msgid "Save paths" -msgstr "Aviso de sitio" +msgstr "Guardar rutas" #: actions/peoplesearch.php:52 #, php-format @@ -2699,24 +2875,25 @@ msgstr "" msgid "People search" msgstr "Buscador de gente" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "No es una etiqueta válida para personas: %s" +msgid "Not a valid people tag: %s." +msgstr "No es una etiqueta válida para personas: %s." -#: actions/peopletag.php:144 -#, fuzzy, php-format +#: actions/peopletag.php:142 +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Usuarios auto marcados con %s - página %d" +msgstr "Usuarios auto etiquetados con %1$s - página %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "El contenido del aviso es inválido" +msgid "Invalid notice content." +msgstr "Contenido de aviso inválido." #: actions/postnotice.php:101 #, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"La licencia del aviso %1$s’ es incompatible con la licencia del sitio ‘%2$s’." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2739,13 +2916,14 @@ msgstr "" "1-64 letras en minúscula o números, sin signos de puntuación o espacios" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nombre completo" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Página de inicio" @@ -2767,9 +2945,9 @@ msgid "Bio" msgstr "Biografía" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Ubicación" @@ -2783,14 +2961,16 @@ msgstr "Compartir mi ubicación actual al publicar los mensajes" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" -msgstr "Tags" +msgstr "Etiquetas" #: actions/profilesettings.php:147 msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" -msgstr "Tags para ti (letras, números, -, ., y _), coma - o espacio - separado" +msgstr "" +"Etiquetas para ti (letras, números, -, ., y _), separadas por comas o " +"espacios" #: actions/profilesettings.php:151 msgid "Language" @@ -2856,8 +3036,8 @@ msgstr "Se guardó configuración." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Más allá del límite de páginas (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Más allá del límite de páginas (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2873,19 +3053,16 @@ msgid "Public timeline" msgstr "Línea temporal pública" #: actions/public.php:160 -#, fuzzy msgid "Public Stream Feed (RSS 1.0)" -msgstr "Feed del flujo público" +msgstr "Canal público (RSS 1.0)" #: actions/public.php:164 -#, fuzzy msgid "Public Stream Feed (RSS 2.0)" -msgstr "Feed del flujo público" +msgstr "Canal público (RSS 2.0)" #: actions/public.php:168 -#, fuzzy msgid "Public Stream Feed (Atom)" -msgstr "Feed del flujo público" +msgstr "Canal público (Atom)" #: actions/public.php:188 #, php-format @@ -2905,6 +3082,8 @@ msgstr "¡Sé la primera persona en publicar algo!" msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" +"¿Por qué no [registras una cuenta](%%action.register%%) y te conviertes en " +"la primera persona en publicar?" #: actions/public.php:242 #, php-format @@ -2914,16 +3093,22 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Este es %%site.name%%, un servicio de [microblogueo](http://es.wikipedia." +"org/wiki/Microblogging) basada en la herramienta de software libre " +"[StatusNet](http://status.net/) tool. ¡[Regístrate](%%action.register%%) " +"para compartir notas acerca de tí con tus amistades, familiares y " +"compañeros!! ([Más información](%%doc.help%%))" #: actions/public.php:247 -#, fuzzy, php-format +#, php-format msgid "" "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" -"Es un %%site.name%%, un servicio [micro-blogging](http://en.wikipedia.org/" -"wiki/Micro-blogging) " +"Este es %%site.name%%, un servicio de [microblogueo](http://es.wikipedia." +"org/wiki/Microblogging) basada en la herramienta de software libre " +"[StatusNet](http://status.net/) tool." #: actions/publictagcloud.php:57 msgid "Public tag cloud" @@ -2932,12 +3117,13 @@ msgstr "Nube de etiquetas pública" #: actions/publictagcloud.php:63 #, php-format msgid "These are most popular recent tags on %s " -msgstr "Éstos son los tags recientes más populares en %s" +msgstr "Estas son las etiquetas recientes más populares en %s " #: actions/publictagcloud.php:69 #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." msgstr "" +"Aún nadie ha publicado un aviso con una [etiqueta clave] (%%doc.tags%%)" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" @@ -2954,7 +3140,7 @@ msgstr "" #: actions/publictagcloud.php:134 msgid "Tag cloud" -msgstr "Nube de tags" +msgstr "Nube de etiquetas" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2991,6 +3177,8 @@ msgid "" "If you have forgotten or lost your password, you can get a new one sent to " "the email address you have stored in your account." msgstr "" +"Si has olvidado tu contraseña, podemos enviarte una nueva a la dirección de " +"correo electrónico que has registrado en tu cuenta." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " @@ -3024,7 +3212,7 @@ msgstr "Restablecer contraseña" msgid "Recover password" msgstr "Recuperar contraseña" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Recuperación de contraseña solicitada" @@ -3042,21 +3230,21 @@ msgstr "Restablecer" #: actions/recoverpassword.php:252 msgid "Enter a nickname or email address." -msgstr "Ingresa un apodo o correo electronico" +msgstr "Ingresa un nombre de usuario o correo electronico" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "No hay ningún usuario con esa dirección de correo o nombre de usuario." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Ninguna dirección de correo electrónico registrada por este usuario." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Error al guardar confirmación de la dirección." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3064,23 +3252,23 @@ msgstr "" "Se enviaron instrucciones para recuperar tu contraseña a la dirección de " "correo registrada." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Restablecimiento de contraseña inesperado." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "La contraseña debe tener 6 o más caracteres." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "La contraseña y la confirmación no coinciden." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Error al configurar el usuario." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión." @@ -3096,7 +3284,7 @@ msgstr "El código de invitación no es válido." msgid "Registration successful" msgstr "Registro exitoso." -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrarse" @@ -3118,9 +3306,11 @@ msgstr "Usuario o contraseña inválidos." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" +"Con este formulario puedes crear una nueva cuenta. Después podrás publicar " +"avisos y enviar vínculos de ellos a tus amigos y colegas. " #: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -3136,8 +3326,9 @@ msgstr "6 o más caracters. Requerido." msgid "Same as password above. Required." msgstr "Igual a la contraseña de arriba. Requerida" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Correo electrónico" @@ -3151,22 +3342,16 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nombre más largo, preferiblemente tu nombre \"real\"" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Mi texto y archivos están disponibles bajo" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -"con excepción de esta información privada: contraseña, dirección de correo " -"electrónico, dirección de mensajería instantánea y número de teléfono." +"Mi texto y archivos están disponibles bajo %s con excepción de esta " +"información privada: contraseña, dirección de correo electrónico, dirección " +"de mensajería instantánea y número de teléfono." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3199,7 +3384,7 @@ msgstr "" "\n" "¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3244,7 +3429,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "El URL de tu perfil en otro servicio de microblogueo compatible" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Suscribirse" @@ -3282,7 +3467,7 @@ msgstr "No puedes repetir tus propios mensajes." msgid "You already repeated that notice." msgstr "Ya has repetido este mensaje." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Repetido" @@ -3302,14 +3487,14 @@ msgid "Replies to %1$s, page %2$d" msgstr "Respuestas a %1$s, página %2$d" #: actions/replies.php:145 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "Feed de avisos de %s" +msgstr "Canal de respuestas a %s (RSS 1.0)" #: actions/replies.php:152 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Feed de avisos de %s" +msgstr "Canal de respuestas a %s (RSS 2.0)" #: actions/replies.php:159 #, php-format @@ -3322,6 +3507,8 @@ msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" +"Esta es la línea temporal que muestra las respuestas a a %1$s, pero %2$s aún " +"no ha recibido ningún aviso a su atención." #: actions/replies.php:204 #, php-format @@ -3329,6 +3516,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Puedes introducir a otros usuarios en conversaciones, suscribir a más gente " +"o [unirte a grupos](%%action.groups%%)." #: actions/replies.php:206 #, php-format @@ -3336,6 +3525,8 @@ msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"Puedes intentar [darle un toque a %1$s](../%2$s) o [publicar algo en su " +"atención](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -3343,32 +3534,28 @@ msgid "Replies to %1$s on %2$s!" msgstr "Respuestas a %1$s en %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "No puedes enviar mensaje a este usuario." +msgstr "No puedes revocar funciones de usuario en este sitio." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Usuario sin perfil coincidente." +msgstr "El usuario no tiene esta función." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" msgstr "StatusNet" #: actions/sandbox.php:65 actions/unsandbox.php:65 -#, fuzzy msgid "You cannot sandbox users on this site." -msgstr "No puedes enviar mensaje a este usuario." +msgstr "No puedes imponer restricciones a los usuarios en este sitio." #: actions/sandbox.php:72 -#, fuzzy msgid "User is already sandboxed." -msgstr "El usuario te ha bloqueado." +msgstr "Al usuario ya se le ha impuesto restricciones." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sesiones" @@ -3382,15 +3569,15 @@ msgstr "Gestionar sesiones" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Si manejamos las sesiones nosotros mismos." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" -msgstr "" +msgstr "Depuración de sesión" #: actions/sessionsadminpanel.php:183 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "Activar la salida de depuración para sesiones." #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 #: actions/useradminpanel.php:294 @@ -3398,41 +3585,44 @@ msgid "Save site settings" msgstr "Guardar la configuración del sitio" #: actions/showapplication.php:82 -#, fuzzy msgid "You must be logged in to view an application." -msgstr "Debes estar conectado para dejar un grupo." +msgstr "Tienes que haber iniciado sesión para poder ver aplicaciones." #: actions/showapplication.php:157 msgid "Application profile" msgstr "Perfil de la aplicación" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Icono" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Nombre" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organización" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descripción" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Estadísticas" #: actions/showapplication.php:203 #, php-format msgid "Created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "Creado por %1$s - acceso predeterminado %2$s - %3$d usuarios" #: actions/showapplication.php:213 msgid "Application actions" @@ -3440,7 +3630,7 @@ msgstr "Acciones de la aplicación" #: actions/showapplication.php:236 msgid "Reset key & secret" -msgstr "" +msgstr "Reiniciar clave y secreto" #: actions/showapplication.php:261 msgid "Application info" @@ -3448,11 +3638,11 @@ msgstr "Información de la aplicación" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Clave del consumidor" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Secreto del consumidor" #: actions/showapplication.php:273 msgid "Request token URL" @@ -3471,16 +3661,17 @@ msgid "" "Note: We support HMAC-SHA1 signatures. We do not support the plaintext " "signature method." msgstr "" +"Nota: Nuestro sistema sólo es compatible con firmas HMAC-SHA1. No son " +"compatibles las firmas de texto sin formato." #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "¿Estás seguro de que quieres eliminar este aviso?" +msgstr "¿realmente deseas reiniciar tu clave y secreto de consumidor?" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "Avisos favoritos de %s" +msgstr "Avisos favoritos de %1$s, página %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3489,23 +3680,25 @@ msgstr "No se pudo recibir avisos favoritos." #: actions/showfavorites.php:171 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Feed de los amigos de %s" +msgstr "Canal de las amistades de %s (RSS 1.0)" #: actions/showfavorites.php:178 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Feed de los amigos de %s" +msgstr "Canal de las amistades de %s (RSS 2.0)" #: actions/showfavorites.php:185 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Feed de los amigos de %s" +msgstr "Canal de las amistades de %s (Atom)" #: actions/showfavorites.php:206 msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"Aún no has elegido ningún aviso. Haz click sobre el botón \"favoritos\" en " +"los avisos que quieras para ponerles un marcador o resaltarlos." #: actions/showfavorites.php:208 #, php-format @@ -3513,6 +3706,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s aún no ha añadido ningún aviso a sus favoritos. ¡Publica algo interesante " +"que pueda añadir a sus favoritos! :)" #: actions/showfavorites.php:212 #, php-format @@ -3521,10 +3716,13 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s aún no ha añadido ningún aviso a sus favoritos. ¿Por qué no [registras " +"una cuenta] (%%%%action.register%%%%) y publicas algo interesante que pueda " +"añadir a sus favoritos? :)" #: actions/showfavorites.php:243 msgid "This is a way to share what you like." -msgstr "" +msgstr "Esta es una manera de compartir lo que te gusta." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -3532,72 +3730,71 @@ msgid "%s group" msgstr "Grupo %s" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "Miembros del grupo %s, página %d" +msgstr "grupo %1$s, página %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Perfil del grupo" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Nota" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Alias" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Acciones del grupo" -#: actions/showgroup.php:337 -#, fuzzy, php-format +#: actions/showgroup.php:338 +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Feed de avisos de grupo %s" +msgstr "Canal de avisos del grupo %s (RSS 1.0)" -#: actions/showgroup.php:343 -#, fuzzy, php-format +#: actions/showgroup.php:344 +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Feed de avisos de grupo %s" +msgstr "Canal de avisos del grupo %s (RSS 2.0)" -#: actions/showgroup.php:349 -#, fuzzy, php-format +#: actions/showgroup.php:350 +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Feed de avisos de grupo %s" +msgstr "Canal de avisos del grupo %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" -msgstr "Bandeja de salida para %s" +msgstr "Amistades de amistades del grupo %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 -#, fuzzy +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Miembros" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ninguno)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Todos los miembros" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Creado" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3606,19 +3803,27 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio de " +"[microblogueo](http://es.wikipedia.org/wiki/Microblogging) basado en la " +"herramienta de software libre [StatusNet](http://status.net/). Sus miembros " +"comparten mensajes cortos acerca de sus vida e intereses. ¡[Regístrate](%%%%" +"action.register%%%%) para formar parte de este y muchos más grupos! ([Más " +"información](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 -#, fuzzy, php-format +#: actions/showgroup.php:469 +#, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" -"**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio [micro-" -"blogging](http://en.wikipedia.org/wiki/Micro-blogging) " +"**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio de " +"[microblogueo](http://es.wikipedia.org/wiki/Microblogging) basado en la " +"herramienta de software libre [StatusNet](http://status.net/). Sus miembros " +"comparten mensajes cortos acerca de su vida e intereses. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Administradores" @@ -3655,40 +3860,42 @@ msgid "%1$s, page %2$d" msgstr "%1$s, página %2$d" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Feed de avisos de grupo %s" +msgstr "Canal de avisos de %1$s etiquetados %2$s (RSS 1.0)" #: actions/showstream.php:129 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "Feed de avisos de %s" +msgstr "Canal de mensajes para %s (RSS 1.0)" #: actions/showstream.php:136 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "Feed de avisos de %s" +msgstr "Canal de mensajes para %s (RSS 2.0)" #: actions/showstream.php:143 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (Atom)" -msgstr "Feed de avisos de %s" +msgstr "Canal de mensajes para %s (Atom)" #: actions/showstream.php:148 -#, fuzzy, php-format +#, php-format msgid "FOAF for %s" -msgstr "Bandeja de salida para %s" +msgstr "Amistades de amistades de %s" #: actions/showstream.php:200 #, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "" +msgstr "Esta es la línea temporal de %1$s, pero %2$s aún no ha publicado nada." #: actions/showstream.php:205 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"¿Has visto algo interesante recientemente? Aún no has hecho ninguna " +"publicación, así que este puede ser un buen momento para empezar :)" #: actions/showstream.php:207 #, php-format @@ -3696,6 +3903,8 @@ msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" +"Puedes intentar darle un toque a %1$s o [publicar algo a su atención](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:243 #, php-format @@ -3705,6 +3914,11 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** tiene una cuenta en %%%%site.name%%%%, un servicio de [microblogueo]" +"(http://es.wikipedia.org/wiki/Microblogging) basado en la herramienta de " +"software libre [StatusNet](http://status.net/). ¡[Regístrate](%%%%action." +"register%%%%) para seguir los avisos de **%s** y de muchas personas más! " +"([Más información](%%%%doc.help%%%%))" #: actions/showstream.php:248 #, php-format @@ -3723,28 +3937,24 @@ msgid "Repeat of %s" msgstr "Repetición de %s" #: actions/silence.php:65 actions/unsilence.php:65 -#, fuzzy msgid "You cannot silence users on this site." -msgstr "No puedes enviar mensaje a este usuario." +msgstr "No puedes silenciar a otros usuarios en este sitio." #: actions/silence.php:72 -#, fuzzy msgid "User is already silenced." -msgstr "El usuario te ha bloqueado." +msgstr "El usuario ya ha sido silenciado." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" msgstr "Configuración básica de este sitio StatusNet." #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." -msgstr "" +msgstr "El nombre del sitio debe tener longitud diferente de cero." #: actions/siteadminpanel.php:141 -#, fuzzy msgid "You must have a valid contact email address." -msgstr "No es una dirección de correo electrónico válida" +msgstr "Debes tener una dirección de correo electrónico válida." #: actions/siteadminpanel.php:159 #, php-format @@ -3752,12 +3962,12 @@ msgid "Unknown language \"%s\"." msgstr "Idioma desconocido \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "" +msgid "Minimum text limit is 0 (unlimited)." +msgstr "El límite mínimo de texto es 0 (sin límite)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." -msgstr "" +msgid "Dupe limit must be one or more seconds." +msgstr "El límite de duplicación debe ser de 1 o más segundos." #: actions/siteadminpanel.php:221 msgid "General" @@ -3769,33 +3979,31 @@ msgstr "Nombre del sitio" #: actions/siteadminpanel.php:225 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "El nombre de tu sitio, por ejemplo, \"Microblog tucompañía\"" #: actions/siteadminpanel.php:229 msgid "Brought by" -msgstr "" +msgstr "Traído por" #: actions/siteadminpanel.php:230 msgid "Text used for credits link in footer of each page" -msgstr "" +msgstr "Texto utilizado para los vínculos a créditos en el pie de cada página" #: actions/siteadminpanel.php:234 msgid "Brought by URL" -msgstr "" +msgstr "Traído por URL" #: actions/siteadminpanel.php:235 msgid "URL used for credits link in footer of each page" -msgstr "" +msgstr "URL utilizado para el vínculo a los créditos en el pie de cada página" #: actions/siteadminpanel.php:239 -#, fuzzy msgid "Contact email address for your site" -msgstr "Nueva dirección de correo para postear a %s" +msgstr "Correo electrónico de contacto para tu sitio" #: actions/siteadminpanel.php:245 -#, fuzzy msgid "Local" -msgstr "Vistas locales" +msgstr "Configuraciones regionales" #: actions/siteadminpanel.php:256 msgid "Default timezone" @@ -3806,13 +4014,14 @@ msgid "Default timezone for the site; usually UTC." msgstr "Zona horaria predeterminada del sitio; generalmente UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Idioma predeterminado del sitio" +msgstr "!Idioma predeterminado" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Idioma del sitio cuando la autodetección de la configuración del navegador " +"no está disponible" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3828,84 +4037,110 @@ msgstr "Cantidad máxima de caracteres para los mensajes." #: actions/siteadminpanel.php:278 msgid "Dupe limit" -msgstr "" +msgstr "Límite de duplicados" #: actions/siteadminpanel.php:278 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "Cuántos segundos es necesario esperar para publicar lo mismo de nuevo." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Aviso de sitio" +msgstr "Aviso del sitio" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nuevo Mensaje " +msgstr "Editar el mensaje que va a lo ancho del sitio" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "No se pudo grabar tu configuración de diseño." +msgstr "No se pudo guarda el aviso del sitio." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" +"La longitud máxima para el aviso que va a lo ancho del sitio es de 255 " +"caracteres." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Aviso de sitio" +msgstr "Texto del aviso del sitio" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" +"Texto del aviso que va a lo ancho del sitio (máximo 255 caracteres; se " +"acepta HTML)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Aviso de sitio" +msgstr "Guardar el aviso del sitio" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Configuración de SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" "Puedes recibir mensajes SMS por correo electrónico desde %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "SMS no está disponible." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "Dirección de SMS" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Actual número telefónico para SMS confirmado." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Esperando confirmación de este número de teléfono." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Código de confirmación" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Ingrese el código recibido en su teléfono" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Confirmar" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Número de teléfono de SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Número telefónico, sin puntuación ni espacios, incluya código de área" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "Preferencias de SMS" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3913,49 +4148,75 @@ msgstr "" "Enviarme avisos por SMS; Yo acepto que puede incurrir en grandes cobros por " "mi operador móvil" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Preferencias de SMS guardadas." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Sin número telefónico" -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "No se seleccionó un operador móvil." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Ese ya es tu número telefónico" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Ese número telefónico ya pertenece a otro usuario" -#: actions/smssettings.php:347 -#, fuzzy +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -"Un código de confirmación fue enviado al número de teléfono que agregaste. " -"Revisa tu bandeja de entrada (¡y la de spam!) para encontrar el código y las " -"instrucciones sobre cómo usarlo." +"Se ha enviado un código de confirmación al número de teléfono que agregaste. " +"Revisa tu teléfono para encontrar el código y las instrucciones acerca de " +"cómo usarlo." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Ese no es el número de confirmación" -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Confirmación de SMS cancelada." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Ese no es tu número telefónico" -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "El número de teléfono para SMS ha sido eliminado." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Operador de telefonía móvil" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Seleccione un operador móvil" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3965,24 +4226,24 @@ msgstr "" "sobre correo electrónico pero no está listado aquí, envíanos un correo para " "informarnos al %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "No ingresó código" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Capturas" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Cambiar la configuración del sitio" +msgstr "Administrar la configuración de instantáneas" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." -msgstr "" +msgstr "Valor de ejecución de instantánea inválido" #: actions/snapshotadminpanel.php:133 msgid "Snapshot frequency must be a number." @@ -3990,11 +4251,11 @@ msgstr "La frecuencia de captura debe ser un número." #: actions/snapshotadminpanel.php:144 msgid "Invalid snapshot report URL." -msgstr "" +msgstr "URL de instantánea de reporte inválido" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" -msgstr "" +msgid "Randomly during web hit" +msgstr "Aleatoriamente durante visita Web" #: actions/snapshotadminpanel.php:201 msgid "In a scheduled job" @@ -4006,7 +4267,7 @@ msgstr "Capturas de datos" #: actions/snapshotadminpanel.php:208 msgid "When to send statistical data to status.net servers" -msgstr "" +msgstr "Cuándo enviar datos estadísticos a los servidores status.net" #: actions/snapshotadminpanel.php:217 msgid "Frequency" @@ -4014,43 +4275,39 @@ msgstr "Frecuencia" #: actions/snapshotadminpanel.php:218 msgid "Snapshots will be sent once every N web hits" -msgstr "" +msgstr "Las instantáneas se enviarán una vez cada N visitas Web" #: actions/snapshotadminpanel.php:226 msgid "Report URL" -msgstr "" +msgstr "Reportar URL" #: actions/snapshotadminpanel.php:227 msgid "Snapshots will be sent to this URL" msgstr "Las capturas se enviarán a este URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Guardar la configuración del sitio" +msgstr "Guardar la configuración de instantáneas" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." msgstr "No te has suscrito a ese perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "No se ha podido guardar la suscripción." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "Esta acción sólo acepta solicitudes POST." #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "No existe tal archivo." +msgstr "No existe tal perfil." #: actions/subscribe.php:117 -#, fuzzy msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "No te has suscrito a ese perfil." +msgstr "No puedes suscribirte a un perfil remoto 0.1 de OMB con esta acción." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4062,9 +4319,9 @@ msgid "%s subscribers" msgstr "%s suscriptores" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "Suscriptores, página %d" +msgstr "%1$s suscriptores, página %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -4080,11 +4337,14 @@ msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" msgstr "" +"No tienes suscriptores. Intenta suscribirte a gente que conozcas y puede que " +"te devuelvan el favor" #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" msgstr "" +"%s no tiene suscriptores. ¿Quieres se la primera persona que se suscriba?" #: actions/subscribers.php:114 #, php-format @@ -4092,6 +4352,8 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%s no tiene suscriptores. ¿Por qué no [registrar una cuenta](%%%%action." +"register%%%%) y ser la primera persona?" #: actions/subscriptions.php:52 #, php-format @@ -4099,9 +4361,9 @@ msgid "%s subscriptions" msgstr "Suscripciones %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "%s suscripciones, página %d" +msgstr "%1$s suscrippciones, página %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -4121,69 +4383,74 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"Ahora mismo no estás escuchando los avisos de nadie. Intenta suscribirte a " +"gente que conozcas. Puedes [buscar gente](%%action.peoplesearch%%); busca " +"miembros de grupos que te intereses y entre nuestros [usuarios especiales](%%" +"action.featured%%). Si eres [usuario de Twitter](%%action.twittersettings%" +"%), puedes suscribirte automáticamente a las personas que ya sigues allí." #: actions/subscriptions.php:128 actions/subscriptions.php:132 #, php-format msgid "%s is not listening to anyone." msgstr "%s no está escuchando a nadie." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" #: actions/tag.php:69 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "Usuarios auto marcados con %s - página %d" +msgstr "Avisos etiquetados con %1$s, página %2$d" #: actions/tag.php:87 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Feed de avisos de %s" +msgstr "Canal de avisos con etiqueta %s (RSS 1.0)" #: actions/tag.php:93 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed de avisos de %s" +msgstr "Canal de avisos con etiqueta %s (RSS 2.0)" #: actions/tag.php:99 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Feed de avisos de %s" +msgstr "Canal de avisos con etiqueta %s (Atom)" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." msgstr "No existe argumento de ID." #: actions/tagother.php:65 #, php-format msgid "Tag %s" -msgstr "%s tag" +msgstr "%s etiqueta" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Perfil de usuario" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" #: actions/tagother.php:141 msgid "Tag user" -msgstr "Usuario de tag" +msgstr "Etiquetar usuario" #: actions/tagother.php:151 msgid "" "Tags for this user (letters, numbers, -, ., and _), comma- or space- " "separated" msgstr "" -"Tags de este usuario (letras, números, -, ., y _), coma- o espacio- separado" +"Etiquetas para este usuario (letras, números, -, ., y _), separadas por " +"comas o espacios" #: actions/tagother.php:193 msgid "" @@ -4199,11 +4466,12 @@ msgstr "No se han podido guardar las etiquetas." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -"Usar este formulario para agregar tags a tus suscriptores o suscripciones." +"Usa este formulario para agregar etiquetas a tus suscriptores o " +"suscripciones." #: actions/tagrss.php:35 msgid "No such tag." -msgstr "No existe ese tag." +msgstr "No existe tal etiqueta." #: actions/twitapitrends.php:85 msgid "API method under construction." @@ -4214,18 +4482,16 @@ msgid "You haven't blocked that user." msgstr "No has bloqueado ese usuario." #: actions/unsandbox.php:72 -#, fuzzy msgid "User is not sandboxed." -msgstr "El usuario te ha bloqueado." +msgstr "Al usuario no se le ha impuesto restricciones." #: actions/unsilence.php:72 -#, fuzzy msgid "User is not silenced." -msgstr "El usuario no tiene un perfil." +msgstr "El usuario no ha sido silenciado." #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "No hay id de perfil solicitado." +msgid "No profile ID in request." +msgstr "No hay id de perfil en solicitud." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4236,10 +4502,11 @@ msgstr "Desuscrito" msgid "" "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"Licencia de flujo del emisor ‘%1$s’ es incompatible con la licencia del " +"sitio ‘%2$s’." #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Usuario" @@ -4261,7 +4528,8 @@ msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres." msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Suscripción predeterminada inválida : '%1$s' no es un usuario" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" @@ -4304,7 +4572,7 @@ msgstr "Invitaciones habilitadas" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "Si permitir a los usuarios invitar nuevos usuarios." #: actions/userauthorization.php:105 msgid "Authorize subscription" @@ -4350,65 +4618,63 @@ msgid "Subscription authorized" msgstr "Suscripción autorizada" #: actions/userauthorization.php:256 -#, fuzzy msgid "" "The subscription has been authorized, but no callback URL was passed. Check " "with the site’s instructions for details on how to authorize the " "subscription. Your subscription token is:" msgstr "" -"Se ha autorizado la suscripción, pero no se ha enviado un URL de retorno. " -"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. Tu " -"identificador de suscripción es:" +"La suscripción ha sido autorizada, pero no se ha pasado un URL de retorno. " +"Consulte con las instrucciones del sitio para obtener detalles acerca de " +"cómo autorizar la suscripción. Tu token de suscripción es:" #: actions/userauthorization.php:266 msgid "Subscription rejected" msgstr "Suscripción rechazada" #: actions/userauthorization.php:268 -#, fuzzy msgid "" "The subscription has been rejected, but no callback URL was passed. Check " "with the site’s instructions for details on how to fully reject the " "subscription." msgstr "" -"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. Lee " +"!Se ha rechazado la suscripción, pero no se ha pasado un URL de retorno. Lee " "de nuevo las instrucciones para saber cómo rechazar la suscripción " "completamente." #: actions/userauthorization.php:303 #, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "" +msgstr "No se ha encontrado aquí el URI del oyente ‘%s’." #: actions/userauthorization.php:308 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "El URI ‘%s’ del receptor es muy largo." #: actions/userauthorization.php:314 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "El URI ‘%s’ del receptor es un usuario local." #: actions/userauthorization.php:329 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "El URL ‘%s’ de perfil es para un usuario local." #: actions/userauthorization.php:345 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "La URL ‘%s’ de la imagen no es válida." #: actions/userauthorization.php:350 -#, fuzzy, php-format +#, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "No se puede leer el URL del avatar '%s'" +msgstr "No se puede leer la URL de la imagen ‘%s’." #: actions/userauthorization.php:355 -#, fuzzy, php-format +#, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "Tipo de imagen incorrecto para '%s'" +msgstr "Tipo de imagen incorrecto para la URL de imagen ‘%s’." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4419,40 +4685,48 @@ msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"Personaliza la vista de tu perfil con una imagen de fondo y la paelta de " +"colores que quieras." #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" -msgstr "" +msgstr "¡Disfruta de tu perrito caliente!" -#: actions/usergroups.php:64 -#, fuzzy, php-format +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 +#, php-format msgid "%1$s groups, page %2$d" -msgstr "Miembros del grupo %s, página %d" +msgstr "%1$s grupos, página %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Buscar más grupos" -#: actions/usergroups.php:157 -#, fuzzy, php-format +#: actions/usergroups.php:159 +#, php-format msgid "%s is not a member of any group." -msgstr "No eres miembro de ese grupo" +msgstr "%s no es miembro de ningún grupo." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." -msgstr "" +msgstr "Intenta [buscar gupos](%%action.groupsearch%%) y unirte a ellos." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "¡Actualizaciones de %1$s en %2$s!" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Estadísticas" +msgstr "%s StatusNet" #: actions/version.php:153 #, php-format @@ -4474,6 +4748,10 @@ msgid "" "Software Foundation, either version 3 of the License, or (at your option) " "any later version. " msgstr "" +"Freecol es software libre: Puedes redistribuirlo y/o modificarlo bajo los " +"términos de la Licencia Pública General de Affero AGPL tal y como se ha " +"publicado por la Fundación del Software Libre, bien por la versión 3 de la " +"Licencia, o cualquier versión posterior (la de tu elección). " #: actions/version.php:174 msgid "" @@ -4482,6 +4760,10 @@ msgid "" "FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " "for more details. " msgstr "" +"Este programa se distribuye con la esperanza de que sea útil, pero SIN " +"NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o " +"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la Licencia Pública General " +"de Affero AGPL para más detalles. " #: actions/version.php:180 #, php-format @@ -4489,60 +4771,62 @@ msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" +"Debes haber recibido una copia de la Licencia Pública General de Affero GNU " +"con este programa. Si no la recibiste, visita %s." #: actions/version.php:189 msgid "Plugins" msgstr "Complementos" -#: actions/version.php:196 lib/action.php:767 -#, fuzzy +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" -msgstr "Sesiones" +msgstr "Versión" #: actions/version.php:197 msgid "Author(s)" msgstr "Autor(es)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"No puede haber un archivo de tamaño mayor a %d bytes y el archivo subido es " +"de %d bytes. Por favor, intenta subir una versión más ligera." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" +"Un archivo tan grande podría sobrepasar tu cuota de usuario de %d bytes." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." -msgstr "" +msgstr "Un archivo tan grande podría sobrepasar tu cuota mensual de %d bytes." #: classes/Group_member.php:41 -#, fuzzy msgid "Group join failed." -msgstr "Perfil de grupo" +msgstr "Ha fallado la acción de unirse el grupo" #: classes/Group_member.php:53 msgid "Not part of group." msgstr "No es parte del grupo." #: classes/Group_member.php:60 -#, fuzzy msgid "Group leave failed." -msgstr "Perfil de grupo" +msgstr "Ha fallado la acción de abandonar el grupo" #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "No se pudo actualizar el grupo." +msgstr "No se pudo actualizar el grupo local." #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "No se pudo crear favorito." +msgstr "No se pudo crear el token de acceso para %s" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4556,340 +4840,349 @@ msgstr "No se pudo insertar mensaje." msgid "Could not update message with new URI." msgstr "No se pudo actualizar mensaje con nuevo URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" msgstr "Error de la BD al insertar la etiqueta clave: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Ha habido un problema al guardar el mensaje. Es muy largo." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:256 -#, fuzzy +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " -"minutos." +"Muchos mensajes, enviados muy rápido; espera un poco e intenta publicar " +"pasados unos minutos." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Tienes prohibido publicar avisos en este sitio." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:927 -#, fuzzy +#: classes/Notice.php:967 msgid "Problem saving group inbox." -msgstr "Hubo un problema al guardar el aviso." +msgstr "Hubo un problema al guarda la bandeja de entrada del grupo." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Se te ha prohibido la suscripción." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" -msgstr "" +msgstr "¡Ya te has suscrito!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "El usuario te ha bloqueado." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "¡No estás suscrito!" -#: classes/Subscription.php:163 -#, fuzzy +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." -msgstr "No se pudo eliminar la suscripción." +msgstr "No se pudo eliminar la auto-suscripción." -#: classes/Subscription.php:190 -#, fuzzy +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "No se pudo eliminar la suscripción." +msgstr "No se pudo eliminar el token OMB de suscripción." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "No se pudo eliminar la suscripción." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenido a %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "No se pudo crear grupo." -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "No se pudo configurar miembros de grupo." +msgstr "No se pudo configurar el URI del grupo." -#: classes/User_group.php:507 -#, fuzzy +#: classes/User_group.php:510 msgid "Could not set group membership." -msgstr "No se pudo configurar miembros de grupo." +msgstr "No se pudo configurar la membresía del grupo." -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "No se ha podido guardar la suscripción." +msgstr "No se ha podido guardar la información del grupo local." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Cambia tus opciones de perfil" -#: lib/accountsettingsaction.php:112 -msgid "Upload an avatar" -msgstr "Cargar un avatar." - +#. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:116 +msgid "Upload an avatar" +msgstr "Subir una imagen." + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Cambia tu contraseña" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Cambiar el manejo del correo." -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Diseñar tu perfil" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Otro" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Otras opciones" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Otro" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Página sin título" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Navegación de sitio primario" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 -#, fuzzy +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" -msgstr "Perfil personal y línea de tiempo de amigos" +msgstr "Perfil personal y línea temporal de amistades" -#: lib/action.php:433 -#, fuzzy +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Personal" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 -#, fuzzy +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil" +msgstr "Cambia tu correo electrónico, imagen, contraseña, perfil" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 -#, fuzzy +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Conectar a los servicios" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Conectarse" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 -#, fuzzy +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Cambiar la configuración del sitio" -#: lib/action.php:449 -#, fuzzy +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Admin" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 -#, fuzzy, php-format +#: lib/action.php:455 +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "Invita a amigos y colegas a unirse a %s" +msgstr "Invita a amistades y compañeros a unirse a tí en %s" -#: lib/action.php:456 -#, fuzzy +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Invitar" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 -#, fuzzy +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" -msgstr "Salir de sitio" +msgstr "Cerrar sesión en el sitio" -#: lib/action.php:465 -#, fuzzy +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" -msgstr "Salir" +msgstr "Cerrar Sesión" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 -#, fuzzy +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Crear una cuenta" -#: lib/action.php:473 -#, fuzzy +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Registrarse" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 -#, fuzzy +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" -msgstr "Ingresar a sitio" +msgstr "Iniciar sesión en el sitio" -#: lib/action.php:479 -#, fuzzy +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Inicio de sesión" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 -#, fuzzy +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" -msgstr "Ayúdame!" +msgstr "¡Ayúdame!" -#: lib/action.php:485 -#, fuzzy +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Ayuda" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 -#, fuzzy +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Buscar personas o texto" -#: lib/action.php:491 -#, fuzzy +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Buscar" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Aviso de sitio" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Vistas locales" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Aviso de página" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Navegación de sitio secundario" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Ayuda" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Acerca de" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "Preguntas Frecuentes" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" -msgstr "" +msgstr "TOS" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Privacidad" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Fuente" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Ponerse en contacto" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Insignia" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Licencia de software de StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" -"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%" -"site.broughtbyurl%%)." +"**%%site.name%%** es un servicio de microblogueo traido a ti por cortesía de " +"[%%site.broughtby%%**](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** es un servicio de microblogueo." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4900,235 +5193,283 @@ msgstr "" "disponible bajo la [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Licencia de contenido del sitio" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "El contenido y datos de %1$s son privados y confidenciales." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" +"Copyright del contenido y los datos de%1$s. Todos los derechos reservados." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Derechos de autor de contenido y datos por los colaboradores. Todos los " "derechos reservados." -#: lib/action.php:847 -msgid "All " -msgstr "Todo" +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" +"Todo el contenido%1$s y la información están disponibles bajo la licencia 2%" +"$s." -#: lib/action.php:853 -msgid "license." -msgstr "Licencia." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Paginación" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Después" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Antes" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" +"A espera de un elemento de alimentación de raíz, pero se obtuvo un documento " +"XML entero." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." -msgstr "" +msgstr "Aún no se puede manejar contenido remoto." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." -msgstr "" +msgstr "Aún no se puede manejar contenido XML incrustado." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." -msgstr "" +msgstr "Aún no se puede manejar contenido incrustado Base64." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "No puedes hacer cambios a este sitio." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "Registro de usuario no permitido." +msgstr "No se permite realizar cambios a ese panel." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 -#, fuzzy msgid "showForm() not implemented." -msgstr "Todavía no se implementa comando." +msgstr "showForm() no implementada." #. TRANS: Client error message #: lib/adminpanelaction.php:259 -#, fuzzy msgid "saveSettings() not implemented." -msgstr "Todavía no se implementa comando." +msgstr "saveSettings() no implementada." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 -#, fuzzy +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." -msgstr "¡No se pudo guardar tu configuración de Twitter!" +msgstr "No se puede eliminar la configuración de diseño." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Configuración básica del sitio" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 -#, fuzzy +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Sitio" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Configuración del diseño" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 -#, fuzzy +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Diseño" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Configuración de usuario" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Usuario" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Configuración de acceso" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 -#, fuzzy +#: lib/adminpanelaction.php:381 msgid "Paths configuration" -msgstr "SMS confirmación" +msgstr "Configuración de rutas" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Configuración de sesiones" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 -#, fuzzy +#: lib/adminpanelaction.php:397 msgid "Edit site notice" -msgstr "Aviso de sitio" +msgstr "Editar el aviso del sitio" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 -#, fuzzy +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "SMS confirmación" +msgstr "Configuración de instantáneas" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" +"API requiere acceso de lectura y escritura, pero sólo tienes acceso de " +"lectura." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Editar aplicación" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Icono para esta aplicación" -#: lib/applicationeditform.php:204 -#, fuzzy, php-format +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 +#, php-format msgid "Describe your application in %d characters" -msgstr "Describir al grupo o tema en %d caracteres" +msgstr "Describe tu aplicación en %d caracteres" -#: lib/applicationeditform.php:207 -#, fuzzy +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" -msgstr "Describir al grupo o tema" +msgstr "Describe tu aplicación" -#: lib/applicationeditform.php:216 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 +msgid "URL of the homepage of this application" +msgstr "URL de la página principal de esta aplicación" + +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 msgid "Source URL" msgstr "La URL de origen" -#: lib/applicationeditform.php:218 -#, fuzzy -msgid "URL of the homepage of this application" -msgstr "El URL de página de inicio o blog del grupo or tema" - -#: lib/applicationeditform.php:224 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Organización responsable de esta aplicación" -#: lib/applicationeditform.php:230 -#, fuzzy +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" -msgstr "El URL de página de inicio o blog del grupo or tema" +msgstr "URL de la página principal de la organización" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" -msgstr "" +msgstr "URL al que se redirigirá después de la autenticación" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Navegador" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Escritorio" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Tipo de aplicación, de navegador o de escritorio" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" -msgstr "" +msgstr "Solo lectura" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" -msgstr "" +msgstr "Solo escritura" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" +"Acceso predeterminado para esta aplicación: sólo lectura o lectura-escritura" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Cancelar" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "lectura y escritura" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "sólo lectura" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Aprobado el %1$s - acceso \"%2$s\"." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Revocar" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" -msgstr "" +msgstr "Adjuntos" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Proveedor" @@ -5145,242 +5486,268 @@ msgid "Password changing failed" msgstr "El cambio de contraseña ha fallado" #: lib/authenticationplugin.php:235 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Cambio de contraseña " +msgstr "No está permitido cambiar la contraseña" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultados de comando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando completo" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Comando falló" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Disculpa, todavía no se implementa este comando." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "No existe ningún mensaje con ese id" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Usuario no tiene último aviso" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "No se pudo encontrar a nadie con el nombre de usuario %s" -#: lib/command.php:92 -msgid "It does not make a lot of sense to nudge yourself!" +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" msgstr "" +"No se pudo encontrar a ningún usuario local con el nombre de usuario %s" -#: lib/command.php:99 +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Disculpa, todavía no se implementa este comando." + +#: lib/command.php:225 +msgid "It does not make a lot of sense to nudge yourself!" +msgstr "¡No tiene sentido darte un toque a ti mismo!" + +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" -msgstr "zumbido enviado a %s" +msgstr "Toque enviado a %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Suscripciones: %1$s\n" +"Suscriptores: %2$s\n" +"Avisos: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "No existe ningún mensaje con ese id" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Usuario no tiene último aviso" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Aviso marcado como favorito." -#: lib/command.php:217 -#, fuzzy +#: lib/command.php:323 msgid "You are already a member of that group" -msgstr "Ya eres miembro de ese grupo" +msgstr "Ya eres parte de ese grupo" -#: lib/command.php:231 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "No se puede unir usuario %s a grupo %s" - -#: lib/command.php:236 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "%s joined group %s" -msgstr "%s se unió a grupo %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "No se pudo unir el usuario %s al grupo %s" -#: lib/command.php:275 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "No se pudo eliminar a usuario %s de grupo %s" - -#: lib/command.php:280 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s left group %s" -msgstr "%s dejó grupo %s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s" -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Nombre completo: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Lugar: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Página de inicio: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:349 -#, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" +"%s es un perfil remoto: sólo puedes enviarle mensajes directos a usuarios en " +"el mismo servidor." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"Mensaje muy largo - la cantidad máxima es de %1$d caracteres y has enviado %2" +"$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Se envió mensaje directo a %s" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Error al enviar mensaje directo." -#: lib/command.php:413 -#, fuzzy +#: lib/command.php:514 msgid "Cannot repeat your own notice" -msgstr "No se puede activar notificación." +msgstr "No puedes repetir tu propio aviso" -#: lib/command.php:418 -#, fuzzy +#: lib/command.php:519 msgid "Already repeated that notice" -msgstr "Borrar este aviso" +msgstr "Ya has repetido este aviso" -#: lib/command.php:426 -#, fuzzy, php-format +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 +#, php-format msgid "Notice from %s repeated" -msgstr "Aviso publicado" +msgstr "Aviso de %s repetido" -#: lib/command.php:428 -#, fuzzy +#: lib/command.php:531 msgid "Error repeating notice." -msgstr "Hubo un problema al guardar el aviso." +msgstr "Ha habido un error al repetir el aviso." -#: lib/command.php:482 -#, fuzzy, php-format +#: lib/command.php:562 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" +msgstr "Mensaje muy largo - el máximo es de %d caracteres. Has enviado %d" -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:571 +#, php-format msgid "Reply to %s sent" -msgstr "Responder este aviso." +msgstr "Responder a %s enviados" -#: lib/command.php:493 -#, fuzzy +#: lib/command.php:573 msgid "Error saving notice." -msgstr "Hubo un problema al guardar el aviso." +msgstr "Error al guardar el aviso." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Especificar el nombre del usuario a suscribir" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "No existe ese usuario." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "No te puedes suscribir a perfiles de OMB por orden." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Especificar el nombre del usuario para desuscribirse de" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscrito de %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Todavía no se implementa comando." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notificación no activa." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "No se puede desactivar notificación." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notificación activada." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "No se puede activar notificación." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" -msgstr "" +msgstr "El comando de inicio de sesión está desactivado" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Este enlace es utilizable solamente una vez y sólo válido por 2 minutos: %s" -#: lib/command.php:692 -#, fuzzy, php-format +#: lib/command.php:761 +#, php-format msgid "Unsubscribed %s" msgstr "Desuscrito de %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "No estás suscrito a nadie." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ya estás suscrito a estos usuarios:" msgstr[1] "Ya estás suscrito a estos usuarios:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Nadie está suscrito a ti." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No se pudo suscribir otro a ti." msgstr[1] "No se pudo suscribir otro a ti." -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "No eres miembro de ningún grupo" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Eres miembro de este grupo:" msgstr[1] "Eres miembro de estos grupos:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5421,20 +5788,58 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"comandos:\n" +"activar - activar notificaciones\n" +"desactivar - desactivar notificaciones\n" +"ayuda - mostrar esta ayuda\n" +"seguir - suscribirse al usuario\n" +"grupos - listar los grupos que sigues\n" +"suscripciones - listar las personas que sigues\n" +"suscriptores - listar los grupos que te siguen\n" +"abandonar - cancelar la suscripción al usuario\n" +"d - dirigir mensaje al usuario\n" +"obtener - obtener último aviso del usuario\n" +"quienes - obtener información del perfil del usuario\n" +"bloquear - obligar al usuario a que deje de seguirte\n" +"fav - añadir el último aviso del usario a tus favoritos\n" +"fav # - añadir el aviso con el ID dado a tus favoritos\n" +"repetir # - repetir el aviso con el ID dado\n" +"repetir - repetir el último aviso del usuario\n" +"responder # - responder al aviso del ID dado\n" +"responder - responder al último aviso del usuario\n" +"unirse - unirse a un grupo\n" +"entrar - obtener un vínculo para iniciar sesión en la interfaz Web\n" +"abandonar - abandonar el grupo\n" +"estadísticas - obtener tus estadísticas\n" +"detener - igual que 'desactivar'\n" +"parar - igual que 'desactivar'\n" +"sus - igual que 'seguir'\n" +"desus - igual que 'abandonar'\n" +"último - igual que 'obtener'\n" +"activado - aún sin implementar.\n" +"desactivado - aún sin implementar.\n" +"toque - recordarle a un ausuario que actualice.\n" +"invitar - aún sin implementar.\n" +"rastrear - aún sin implementar.\n" +"no rastrear - aún sin implementar.\n" +"dejar de rastrear - aún sin implementar.\n" +"dejar de rastrear todos - aún sin implementar.\n" +"rastrear - aún sin implementar.\n" +"rastreando - aún sin implementar.\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Ningún archivo de configuración encontrado. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "He buscado archivos de configuración en los siguientes lugares: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." -msgstr "" +msgstr "Quizá desees ejecutar el instalador para solucionar este problema." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir al instalador." @@ -5451,40 +5856,39 @@ msgid "Updates by SMS" msgstr "Actualizaciones por sms" #: lib/connectsettingsaction.php:120 -#, fuzzy msgid "Connections" -msgstr "Conectarse" +msgstr "Conecciones" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "Aplicaciones conectadas autorizadas" #: lib/dberroraction.php:60 msgid "Database error" -msgstr "" +msgstr "Error de la base de datos" #: lib/designsettings.php:105 msgid "Upload file" -msgstr "Cargar archivo" +msgstr "Subir archivo" #: lib/designsettings.php:109 -#, fuzzy msgid "" "You can upload your personal background image. The maximum file size is 2MB." -msgstr "Puedes cargar tu avatar personal." +msgstr "" +"Puedes subir tu imagen de fondo personal. El tamaño de archivo máximo " +"permitido es 2 MB." #: lib/designsettings.php:418 msgid "Design defaults restored." -msgstr "" +msgstr "Diseño predeterminado restaurado." #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" msgstr "Sacar este aviso" #: lib/favorform.php:114 lib/favorform.php:140 -#, fuzzy msgid "Favor this notice" -msgstr "Aceptar este aviso" +msgstr "Incluir este aviso en tus favoritos" #: lib/favorform.php:140 msgid "Favor" @@ -5500,11 +5904,11 @@ msgstr "RSS 2.0" #: lib/feed.php:89 msgid "Atom" -msgstr "" +msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "Amistad de amistad" #: lib/feedlist.php:64 msgid "Export data" @@ -5512,7 +5916,7 @@ msgstr "Exportar datos" #: lib/galleryaction.php:121 msgid "Filter tags" -msgstr "Filtrar tags" +msgstr "Filtrar etiquetas" #: lib/galleryaction.php:131 msgid "All" @@ -5524,11 +5928,11 @@ msgstr "Seleccione una etiqueta a filtrar" #: lib/galleryaction.php:140 msgid "Tag" -msgstr "Tag" +msgstr "Etiqueta" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" -msgstr "Elegir tag para reducir lista" +msgstr "Elegir una etiqueta para reducir la lista" #: lib/galleryaction.php:143 msgid "Go" @@ -5537,12 +5941,11 @@ msgstr "Ir" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Otorgar al usuario el papel de \"%$\"" #: lib/groupeditform.php:163 -#, fuzzy msgid "URL of the homepage or blog of the group or topic" -msgstr "El URL de página de inicio o blog del grupo or tema" +msgstr "URL de página de inicio o blog del grupo o tema" #: lib/groupeditform.php:168 msgid "Describe the group or topic" @@ -5564,6 +5967,7 @@ msgstr "" #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +"Nombres adicionales para el grupo, separados por comas o espacios. Máximo: %d" #: lib/groupnav.php:85 msgid "Group" @@ -5608,58 +6012,59 @@ msgstr "Grupos con más publicaciones" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "Tags en avisos del grupo %s" +msgstr "Etiquetas en avisos del grupo %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Esta página no está disponible en el tipo de medio que aceptas." -#: lib/imagefile.php:75 -#, fuzzy, php-format -msgid "That file is too big. The maximum file size is %s." -msgstr "Puedes cargar una imagen de logo para tu grupo." - -#: lib/imagefile.php:80 -msgid "Partial upload." -msgstr "Carga parcial." - -#: lib/imagefile.php:88 lib/mediafile.php:170 -msgid "System error uploading file." -msgstr "Error del sistema al cargar el archivo." - -#: lib/imagefile.php:96 -msgid "Not an image or corrupt file." -msgstr "No es una imagen o es un fichero corrupto." - -#: lib/imagefile.php:109 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato de imagen no soportado." +#: lib/imagefile.php:88 +#, php-format +msgid "That file is too big. The maximum file size is %s." +msgstr "El archivo es muy grande. El tamaño máximo permitido es %s." + +#: lib/imagefile.php:93 +msgid "Partial upload." +msgstr "Subida parcial" + +#: lib/imagefile.php:101 lib/mediafile.php:170 +msgid "System error uploading file." +msgstr "Error del sistema subir el archivo" + +#: lib/imagefile.php:109 +msgid "Not an image or corrupt file." +msgstr "No es una imagen o es un fichero corrupto." + #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Se perdió nuestro archivo." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo de archivo desconocido" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." -msgstr "" +msgstr "Origen de bandeja de entrada %d desconocido." #: lib/joinform.php:114 msgid "Join" @@ -5667,7 +6072,7 @@ msgstr "Unirse" #: lib/leaveform.php:114 msgid "Leave" -msgstr "Salir" +msgstr "Abandonar" #: lib/logingroupnav.php:80 msgid "Login with a username and password" @@ -5677,11 +6082,13 @@ msgstr "Ingresar con un nombre de usuario y contraseña." msgid "Sign up for a new account" msgstr "Registrarse para una nueva cuenta" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Confirmación de correo electrónico" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5697,14 +6104,29 @@ msgid "" "Thanks for your time, \n" "%s\n" msgstr "" +"¡Hola, %s!\n" +"\n" +"Hace un momento, alguien introdujo esta dirección de correo electrónico en %" +"s.\n" +"\n" +"Si has sido tú y deseas confirmarlo, haz clic en el vínculo de abajo:\n" +"\n" +"%s\n" +"\n" +"Si no, simplemente ignora este mensaje.\n" +"\n" +"Gracias por tu tiempo, \n" +"%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s ahora está escuchando tus avisos en %2$s" -#: lib/mail.php:245 -#, fuzzy, php-format +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 +#, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" "\n" @@ -5717,26 +6139,33 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" -"\t%1$s ahora está escuchando tus avisos en %2$s.\n" +"%1$s ahora está escuchando tus avisos en %2$s.\n" "\n" -"\t%3$s\n" +"%3$s\n" +"\n" +"%4$s%5$s%6$s\n" "\n" "Atentamente,\n" -"%4$s.\n" - -#: lib/mail.php:262 -#, fuzzy, php-format -msgid "Bio: %s" -msgstr "" -"Bio: %s\n" "\n" +"%7$s.\n" +"\n" +"----\n" +"Cambia tus preferencias de notificaciones a tu correo electrónico en %8$s\n" -#: lib/mail.php:290 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 +#, php-format +msgid "Bio: %s" +msgstr "Bio: %s" + +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Nueva dirección de correo para postear a %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5757,21 +6186,31 @@ msgstr "" "Attentamente, \n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "estado de %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS confirmación" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "%s: Confirma que este es tu número de teléfono mediante este código:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" -msgstr "%s te mandó un zumbido " +msgstr "%s te ha dado un toque" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5786,13 +6225,26 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) se pregunta que será de tí durante estos días y te invita a " +"publicar algunas noticias.\n" +"\n" +"Así que, ¡vamos! queremos escuchar de tí:)\n" +"\n" +"%3$s\n" +"\n" +"No respondas a este correo electrónico. No llegará a ninguna parte.\n" +"\n" +"Un cordial saludo,\n" +"%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Nuevo mensaje privado de %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5810,13 +6262,29 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) Te ha enviado un mensaje privado:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Puedes responder a este mensaje aquí:\n" +"\n" +"%4$s\n" +"\n" +"No respondas a este correo electrónico. No llegará a ningún sitio.\n" +"\n" +"Saludos cordiales,\n" +"%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) agregó tu aviso como un favorito" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5836,13 +6304,42 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) acaba de añadir un aviso de %2$s a su listado de favoritos.\n" +"\n" +"El URL de tu aviso es:\n" +"\n" +"%3$s\n" +"\n" +"El texto de tu aviso es:\n" +"\n" +"%4$s\n" +"\n" +"Puedes ver el listado de los favoritos de %1$s aquí:\n" +"\n" +"%5$s\n" +"\n" +"Saludos,\n" +"%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"La conversación completa puede leerse aquí:\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) ha enviado un aviso a tu atención" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5855,7 +6352,42 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" +"%1$s (@%9$s) ha enviado un aviso a tu atención (una '@-respuesta') en %2$s.\n" +"\n" +"El anuncio está aquí:\n" +"\n" +"%3$s\n" +"\n" +"El anuncio dice:\n" +"\n" +"%4$s\n" +"\n" +"%5$sPuedes responder aquí:\n" +"\n" +"%6$s\n" +"\n" +"Aquí encontrarás un listado de todas las @-respuestas dirigidas a ti:\n" +"\n" +"%7$s\n" +"\n" +"Saludos,\n" +"%2$s\n" +"\n" +"P.D. Puedes desactivar las notificaciones que recibes en tu correo " +"electrónico aquí: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5866,8 +6398,11 @@ msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" +"No tienes mensajes privados. Puede enviar mensajes privados para hacer a " +"otros usuarios partícipes de la conversación. La gente puede enviarte " +"mensajes que sólo puedas leer tú." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "desde" @@ -5888,62 +6423,66 @@ msgid "Sorry, no incoming email allowed." msgstr "Lo sentimos, pero no se permite correos entrantes" #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Formato de imagen no soportado." +msgstr "Tipo de mensaje no compatible: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" +"Hubo un error en la base de datos mientras subías tu archivo. Por favor, " +"inténtalo de nuevo." #: lib/mediafile.php:142 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." msgstr "" +"El archivo subido sobrepasa la directiva upload_max_filesize en php.ini" #: lib/mediafile.php:147 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"El archivo subido sobrepasa la directiva MAX_FILE_SIZE que se especificó en " +"el formulario HTML." #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "El archivo subido sólo fue parcialmente subido." #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "Falta una carpeta temporal." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "No se pudo escribir el archivo en el disco." #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "La subida de archivos se detuvo por extensión." #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota." -msgstr "" +msgstr "Archivo sobrepasa la cuota del usuario." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "El archivo no se pudo mover al directorio de destino." #: lib/mediafile.php:201 lib/mediafile.php:237 -#, fuzzy msgid "Could not determine file's MIME type." -msgstr "No se pudo acceder a corriente pública." +msgstr "No se pudo determinar tipo MIME del archivo" #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr "Pruebe a usar otro formato %s." #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported file type on this server." -msgstr "" +msgstr "%s no es un tipo de archivo soportado en este servidor." #: lib/messageform.php:120 msgid "Send a direct notice" @@ -5954,18 +6493,15 @@ msgid "To" msgstr "Para" #: lib/messageform.php:159 lib/noticeform.php:185 -#, fuzzy msgid "Available characters" msgstr "Caracteres disponibles" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Enviar" #: lib/noticeform.php:160 -#, fuzzy msgid "Send a notice" msgstr "Enviar un aviso" @@ -5976,86 +6512,88 @@ msgstr "¿Qué tal, %s?" #: lib/noticeform.php:192 msgid "Attach" -msgstr "" +msgstr "Adjuntar" #: lib/noticeform.php:196 msgid "Attach a file" -msgstr "" +msgstr "Adjuntar un archivo" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "No se pudo guardar tags." +msgstr "Compartir mi ubicación" #: lib/noticeform.php:215 -#, fuzzy msgid "Do not share my location" -msgstr "No se pudo guardar tags." +msgstr "No compartir mi ubicación" #: lib/noticeform.php:216 msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"Lo sentimos, pero geolocalizarte está tardando más de lo esperado. Por " +"favor, inténtalo más tarde." -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "S" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "E" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" -msgstr "" +msgstr "W" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "en" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "en contexto" -#: lib/noticelist.php:601 -#, fuzzy +#: lib/noticelist.php:602 msgid "Repeated by" -msgstr "Crear" +msgstr "Repetido por" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Responder este aviso." -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:673 -#, fuzzy +#: lib/noticelist.php:674 msgid "Notice repeated" -msgstr "Aviso borrado" +msgstr "Aviso repetido" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "Enviar zumbido a este usuario" +msgstr "Dar un toque a este usuario" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "Zumbido " +msgstr "Dar un toque a " #: lib/nudgeform.php:128 msgid "Send a nudge to this user" -msgstr "Enviar zumbido a este usuario" +msgstr "Dar un toque a este usuario" #: lib/oauthstore.php:283 msgid "Error inserting new profile" @@ -6063,7 +6601,11 @@ msgstr "Error al insertar el nuevo perfil" #: lib/oauthstore.php:291 msgid "Error inserting avatar" -msgstr "Error al insertar el avatar" +msgstr "Error al insertar la imagen" + +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Error al actualizar el perfil remoto" #: lib/oauthstore.php:311 msgid "Error inserting remote profile" @@ -6108,14 +6650,13 @@ msgstr "Mensajes enviados" #: lib/personaltagcloudsection.php:56 #, php-format msgid "Tags in %s's notices" -msgstr "Tags en avisos de %s" +msgstr "Etiquetas en avisos de %s" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "Acción desconocida" +msgstr "Desconocido" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Suscripciones" @@ -6123,35 +6664,34 @@ msgstr "Suscripciones" msgid "All subscriptions" msgstr "Todas las suscripciones" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Suscriptores" -#: lib/profileaction.php:159 -#, fuzzy +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Todos los suscriptores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ID de usuario" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Miembro desde" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Promedio diario" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Todos los grupos" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "No existe argumento de ID." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." -msgstr "" +msgstr "Método no implementado." #: lib/publicgroupnav.php:78 msgid "Public" @@ -6163,7 +6703,7 @@ msgstr "Grupos de usuario" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" -msgstr "Tags recientes" +msgstr "Etiquetas recientes" #: lib/publicgroupnav.php:88 msgid "Featured" @@ -6173,43 +6713,46 @@ msgstr "Destacado" msgid "Popular" msgstr "Popular" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "No hay respuesta a los argumentos." + #: lib/repeatform.php:107 -#, fuzzy msgid "Repeat this notice?" -msgstr "Responder este aviso." +msgstr "Responder este aviso?" + +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Sí" #: lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" msgstr "Responder este aviso." #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Bloquear este usuario de este grupo" +msgstr "Revocar el rol \"%s\" de este usuario" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." -msgstr "" +msgstr "Ningún usuario sólo definido para modo monousuario." #: lib/sandboxform.php:67 -#, fuzzy msgid "Sandbox" -msgstr "Bandeja de Entrada" +msgstr "Restringir" #: lib/sandboxform.php:78 -#, fuzzy msgid "Sandbox this user" -msgstr "Desbloquear este usuario" +msgstr "Imponer restricciones a este usuario" #: lib/searchaction.php:120 -#, fuzzy msgid "Search site" -msgstr "Buscar" +msgstr "Buscar sitio" #: lib/searchaction.php:126 msgid "Keyword(s)" -msgstr "" +msgstr "Palabra(s) clave" #: lib/searchaction.php:127 msgid "Search" @@ -6241,20 +6784,18 @@ msgstr "Sección sin título" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "Más..." #: lib/silenceform.php:67 -#, fuzzy msgid "Silence" -msgstr "Aviso de sitio" +msgstr "Silenciar" #: lib/silenceform.php:78 -#, fuzzy msgid "Silence this user" -msgstr "Bloquear este usuario." +msgstr "Silenciar a este usuario" #: lib/subgroupnav.php:83 -#, fuzzy, php-format +#, php-format msgid "People %s subscribes to" msgstr "Personas a las que %s está suscrito" @@ -6280,12 +6821,12 @@ msgstr "Invita a amigos y colegas a unirse a %s" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 msgid "People Tagcloud as self-tagged" -msgstr "" +msgstr "Nube de etiquetas de personas auto-etiquetadas" #: lib/subscriberspeopletagcloudsection.php:48 #: lib/subscriptionspeopletagcloudsection.php:48 msgid "People Tagcloud as tagged" -msgstr "" +msgstr "Nube de etiquetas de personas etiquetadas" #: lib/tagcloudsection.php:56 msgid "None" @@ -6297,21 +6838,19 @@ msgstr "Principales posteadores" #: lib/unsandboxform.php:69 msgid "Unsandbox" -msgstr "" +msgstr "Eliminar restricciones" #: lib/unsandboxform.php:80 -#, fuzzy msgid "Unsandbox this user" -msgstr "Desbloquear este usuario" +msgstr "Eliminar restricciones impuestas a este usuario" #: lib/unsilenceform.php:67 msgid "Unsilence" -msgstr "" +msgstr "Dejar de silenciar" #: lib/unsilenceform.php:78 -#, fuzzy msgid "Unsilence this user" -msgstr "Desbloquear este usuario" +msgstr "Dejar de silenciar este usuario" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" @@ -6321,106 +6860,122 @@ msgstr "Desuscribirse de este usuario" msgid "Unsubscribe" msgstr "Cancelar suscripción" -#: lib/userprofile.php:116 -msgid "Edit Avatar" -msgstr "editar avatar" +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "El usuario %s (%d) no tiene un registro de su perfil." -#: lib/userprofile.php:236 +#: lib/userprofile.php:117 +msgid "Edit Avatar" +msgstr "Editar imagen" + +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Acciones de usuario" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Eliminación de usuario en curso..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Editar configuración del perfil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Editar" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Enviar un mensaje directo a este usuario" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Mensaje" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Moderar" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "Perfil de usuario" +msgstr "Rol de usuario" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Administradores" +msgstr "Administrador" -#: lib/userprofile.php:355 -#, fuzzy +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "Moderar" +msgstr "Moderador" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "hace un día" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "hace %d días" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "hace un año" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "" +msgstr "¡%s no es un color válido!" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "" +msgstr "%s no es un color válido! Usar 3 o 6 caracteres hexagesimales" -#: lib/xmppmanager.php:402 -#, fuzzy, php-format +#: lib/xmppmanager.php:403 +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." -msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" +msgstr "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 955efd243b..76e68fda7c 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:48+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:48+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,26 +20,24 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "دسترسی" #. TRANS: Page notice #: actions/accessadminpanel.php:67 -#, fuzzy msgid "Site access settings" -msgstr "تنظیمات دیگر" +msgstr "تنظیمات دسترسی" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 -#, fuzzy msgid "Registration" -msgstr "ثبت نام" +msgstr "ثبت‌نام" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -48,7 +46,6 @@ msgstr "" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "خصوصی" @@ -75,20 +72,25 @@ msgstr "مسدود" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "تنظیمات چهره" +msgstr "ذخیره‌ی تنظیمات دسترسی" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" -msgstr "ذخیره‌کردن" +msgstr "ذخیره" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +#, fuzzy +msgid "No such page." msgstr "چنین صفحه‌ای وجود ندارد" #: actions/all.php:75 actions/allrss.php:68 @@ -99,9 +101,9 @@ msgstr "چنین صفحه‌ای وجود ندارد" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -109,11 +111,9 @@ msgstr "چنین صفحه‌ای وجود ندارد" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "چنین کاربری وجود ندارد." @@ -125,8 +125,9 @@ msgstr "%s کاربران مسدود شده، صفحه‌ی %d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -168,13 +169,13 @@ msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" #: actions/all.php:142 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%" -"s) پیام می‌فرستد." +"می‌توانید از صفحه‌ی شخصی‌اش به او [سقلمه](../%2$s) بزنید یا [چیزی بنویسید](%%%%" +"action.newnotice%%%%?status_textarea=%3$s) تا توجه او را جذب کنید." #: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 #, php-format @@ -190,8 +191,10 @@ msgstr "" msgid "You and friends" msgstr "شما و دوستان" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "به روز رسانی از %1$ و دوستان در %2$" @@ -206,18 +209,18 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "رابط مورد نظر پیدا نشد." @@ -230,15 +233,16 @@ msgstr "رابط مورد نظر پیدا نشد." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "برای استفاده از این روش باید اطلاعات را به صورت پست بفرستید" #: actions/apiaccountupdatedeliverydevice.php:105 +#, fuzzy msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "شما باید یک پارامتر با نام device و مقدار sms، im یا none مشخص کنید." #: actions/apiaccountupdatedeliverydevice.php:132 @@ -250,7 +254,7 @@ msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "کاربر هیچ شناس‌نامه‌ای ندارد." @@ -260,9 +264,9 @@ msgid "Could not save profile." msgstr "نمی‌توان شناس‌نامه را ذخیره کرد." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -342,18 +346,16 @@ msgid "No status found with that ID." msgstr "هیچ وضعیتی با آن شناسه پیدا نشد." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite." -msgstr "این وضعیت درحال حاضر یک وضعیت مورد علاقه است!" +msgstr "این پیغام را پیش‌تر به علایق خود اضافه کرده‌اید" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "نمی‌توان وضعیت را موردعلاقه کرد." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite." -msgstr "این وضعیت یک وضعیت موردعلاقه نیست!" +msgstr "این پیغام جزو علایق شما نیست" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -373,9 +375,8 @@ msgid "Could not unfollow user: User not found." msgstr "نمی‌توان کاربر را دنبال نکرد: کاربر یافت نشد." #: actions/apifriendshipsdestroy.php:120 -#, fuzzy msgid "You cannot unfollow yourself." -msgstr "نمی‌توانید خودتان را دنبال نکنید!" +msgstr "نمی‌توانید خودتان را دنبال کنید." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -438,10 +439,9 @@ msgstr "مکان طولانی است (حداکثر ۲۵۵ حرف)" msgid "Too many aliases! Maximum %d." msgstr "نام‌های مستعار بسیار زیاد هستند! حداکثر %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 -#, php-format -msgid "Invalid alias: \"%s\"" +#: actions/apigroupcreate.php:266 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"." msgstr "نام‌مستعار غیر مجاز: «%s»" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -458,19 +458,20 @@ msgstr "نام و نام مستعار شما نمی تواند یکی باشد . #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" +#, fuzzy +msgid "Group not found." msgstr "گروه یافت نشد!" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "شما از پیش یک عضو این گروه هستید." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است." #: actions/apigroupjoin.php:138 actions/joingroup.php:134 -#, fuzzy, php-format +#, php-format msgid "Could not join user %1$s to group %2$s." msgstr "عضویت %s در گروه %s نا موفق بود." @@ -479,21 +480,30 @@ msgid "You are not a member of this group." msgstr "شما یک عضو این گروه نیستید." #: actions/apigroupleave.php:124 actions/leavegroup.php:129 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "خارج شدن %s از گروه %s نا موفق بود" -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "گروه‌های %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "هست عضو %s گروه" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s گروه" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "گروه‌ها در %s" @@ -508,17 +518,17 @@ msgid "Invalid token." msgstr "اندازه‌ی نادرست" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -550,12 +560,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "ارسال غیر قابل انتظار فرم." @@ -575,20 +588,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "حساب کاربری" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "نام کاربری" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "گذرواژه" @@ -635,17 +650,17 @@ msgstr "وضعیت حذف شد." msgid "No status with that ID found." msgstr "هیچ وضعیتی با آن شناسه یافت نشد." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "خیلی طولانی است. حداکثر طول مجاز پیام %d حرف است." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "یافت نشد" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "یافت نشد." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "حداکثر طول پیام %d حرف است که شامل ضمیمه نیز می‌باشد" @@ -654,12 +669,12 @@ msgstr "حداکثر طول پیام %d حرف است که شامل ضمیمه msgid "Unsupported format." msgstr "قالب پشتیبانی نشده." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / دوست داشتنی از %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s به روز رسانی های دوست داشتنی %s / %s" @@ -669,17 +684,17 @@ msgstr "%s به روز رسانی های دوست داشتنی %s / %s" msgid "%1$s / Updates mentioning %2$s" msgstr "%$1s / به روز رسانی های شامل %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s خط‌زمانی عمومی" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s به روز رسانی های عموم" @@ -694,20 +709,16 @@ msgstr "" msgid "Repeats of %s" msgstr "تکرار %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "پیام‌هایی که با %s نشانه گزاری شده اند." -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "پیام‌های نشانه گزاری شده با %1$s در %2$s" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "یافت نشد." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "چنین پیوستی وجود ندارد." @@ -727,8 +738,9 @@ msgstr "بدون اندازه." msgid "Invalid size." msgstr "اندازه‌ی نادرست" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "چهره" @@ -739,9 +751,10 @@ msgstr "" "شما می‌توانید چهرهٔ شخصی خود را بارگذاری کنید. حداکثر اندازه پرونده %s است." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." msgstr "کاربر بدون مشخصات" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -760,7 +773,7 @@ msgid "Preview" msgstr "پیش‌نمایش" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "حذف" @@ -772,23 +785,28 @@ msgstr "پایین‌گذاری" msgid "Crop" msgstr "برش" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "کاربری مشخص نشده است." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "یک مربع از عکس خود را انتخاب کنید تا چهره‌ی شما باشد." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "فایل اطلاعات خود را گم کرده ایم." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "چهره به روز رسانی شد." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "به روز رسانی چهره موفقیت آمیر نبود." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "چهره پاک شد." @@ -796,7 +814,7 @@ msgstr "چهره پاک شد." msgid "You already blocked that user." msgstr "شما هم اکنون آن کاربر را مسدود کرده اید." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "مسدود کردن کاربر" @@ -811,27 +829,44 @@ msgstr "" "دنبال کند. همچنین دیگر شما از پیام‌هایی که در آن از شما یاد می‌کند با خبر " "نخواهید شد" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "خیر" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "کاربر را مسدود نکن" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "بله" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "کاربر را مسدود کن" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "" @@ -844,8 +879,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "چنین گروهی وجود ندارد." @@ -875,8 +910,10 @@ msgstr "آزاد سازی" msgid "Unblock this user" msgstr "آزاد سازی کاربر" -#: actions/bookmarklet.php:50 -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" msgstr "ارسال به " #: actions/confirmaddress.php:75 @@ -891,34 +928,44 @@ msgstr "کد تصدیق پیدا نشد." msgid "That confirmation code is not for you!" msgstr "آن کد تصدیق برای شما نیست!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "نوع نشانی نامشخص است %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "آن نشانی در حال حاضر تصدیق شده است." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "نمی‌توان کاربر را به روز کرد." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "تایید نشانی" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "نشانی «%s« برای شما تصدیق شد." @@ -928,7 +975,7 @@ msgid "Conversation" msgstr "مکالمه" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "پیام‌ها" @@ -950,7 +997,7 @@ msgstr "شما یک عضو این گروه نیستید." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -969,17 +1016,19 @@ msgstr "" "آیا مطمئن هستید که می‌خواهید این کاربر را پاک کنید؟ با این کار تمام اطلاعات " "پاک و بدون برگشت خواهند بود." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "این پیام را پاک نکن" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "این پیام را پاک کن" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1010,11 +1059,13 @@ msgstr "پیام را پاک کن" msgid "Are you sure you want to delete this notice?" msgstr "آیا اطمینان دارید که می‌خواهید این پیام را پاک کنید؟" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "این پیام را پاک نکن" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "این پیام را پاک کن" @@ -1038,58 +1089,61 @@ msgstr "" "آیا مطمئن هستید که می‌خواهید این کاربر را پاک کنید؟ با این کار تمام اطلاعات " "پاک و بدون برگشت خواهند بود." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "حذف این کاربر" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "طرح" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "تنظیمات ظاهری برای این سایت." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "نشانی اینترنتی نشان نامعتبر است." -#: actions/designadminpanel.php:279 -#, php-format -msgid "Theme not available: %s" +#: actions/designadminpanel.php:280 +#, fuzzy, php-format +msgid "Theme not available: %s." msgstr "پوسته در دسترس نمی‌باشد: %s" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "تغییر نشان" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "نشان وب‌گاه" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "تغییر پوسته" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "پوستهٔ وب‌گاه" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "پوسته برای وب‌گاه" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "تغییر تصویر پیش‌زمینه" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "پیش‌زمینه" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1098,67 +1152,68 @@ msgstr "" "شما می‌توانید یک تصویر پیش‌زمینه را برای وب‌گاه بارگذاری کنید. بیشینهٔ اندازهٔ " "پرونده %1 $s است." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "روشن" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "خاموش" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "تصویر پیش‌زمینه را فعال یا غیرفعال کنید." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "تصویر پیش‌زمینهٔ موزاییکی" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "عوض‌کردن رنگ‌ها" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "محتوا" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "ستون کناری" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "متن" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "پیوندها" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "استفاده‌کردن از پیش‌فرض‌ها" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "بازگرداندن طرح‌های پیش‌فرض" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "برگشت به حالت پیش گزیده" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "ذخیره‌کردن" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "ذخیره‌کردن طرح" @@ -1273,11 +1328,16 @@ msgstr "از این روش برای ویرایش گروه استفاده کنی msgid "description is too long (max %d chars)." msgstr "توصیف بسیار زیاد است (حداکثر %d حرف)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "نام‌مستعار غیر مجاز: «%s»" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "نمی‌توان نام‌های مستعار را ساخت." @@ -1285,139 +1345,186 @@ msgstr "نمی‌توان نام‌های مستعار را ساخت." msgid "Options saved." msgstr "گزینه‌ها ذخیره شدند." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "تنظیمات پست الکترونیک" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "چگونگی دریافت نامه از %%site.name%% را اداره کنید." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "نشانی" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "نشانی‌های پست الکترونیکی" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "حذف" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "انصراف" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "نشانی‌های پست الکترونیکی" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "نشانی پست الکترونیکی، مانند «UserName@example.org»" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "افزودن" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "پست الکترونیک ورودی" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "برای ارسال پیام با استفاده از پست الکترونیک به این نشانی نامه بفرستید." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "نشانی جدید برای ارسال پیام ایجاد کن؛ نشانی قبلی فسخ می‌شود." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "جدید" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "ترجیحات" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "پیام‌های کسانی را که به تازگی دنبال می‌کنم با پست الکترونیک برایم بفرست." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "هر وقت کسی پیام های مرا دوست داشتنی کرد، مرا با پست اکترونیک با خبر کن." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "هر وقت کسی برای من پیام خصوصی فرستاد، مرا با پست الکترونیک با خبر کن." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "هر وقت کسی از من در پیام خود یاد کرد، مرا با پست الکترونیک با خبر کن." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "اجازه بده دوستان توجه مرا جذب کنند و به من نامه بفرستند." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "می‌خواهم با نامه پیام ارسال کنم." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "یک شناسه برای پست الکترونیک من منتشر کن." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "تنظیمات ذخیره شد." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." +msgstr "ترجیحات طرح ذخیره شد." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "پست الکترونیک وجود ندارد." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "نمی‌توان نشانی را قانونی کرد" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "یک آدرس ایمیل معتبر نیست." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "هم اکنون نشانی شما همین است." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "این نشانی در حال حاضر متعلق به فرد دیگری است." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "نمی‌توان کد تایید را اضافه کرد." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1425,43 +1532,56 @@ msgstr "" "کد تایید به نشانی شما ارسال شد. نامه های خود را بررسی کنید برای کد تایید و " "راه استفاده." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "هیچ تاییدی برای فسخ کردن وجود ندارد." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "نشانی پیام رسان اشتباه است." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "تایید فسخ شد." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "آن نشانی شما نیست." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "نشانی پاک شده است." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "هیچ نشانی ورودی وجود ندارد." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "نمی‌توان اطلاعات کاربر را به روز کرد." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "نشانی ورودی پاک شد." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "نشانی ورودی جدید اضافه شد." @@ -1578,8 +1698,9 @@ msgstr "نمی‌توان نشانه‌ی درخواست شما را به نشا msgid "Remote service uses unknown version of OMB protocol." msgstr "خدمات مورد نظر از نسخه‌ی نا مفهومی از قرارداد OMB استفاده می‌کند." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "اشکال در به روز کردن کاربر دوردست." #: actions/getfile.php:79 @@ -1638,11 +1759,11 @@ msgstr "هم اکنون دسترسی کاربر به گروه مسدود شده msgid "User is not a member of group." msgstr "کاربر عضو گروه نیست." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "دسترسی کاربر به گروه را مسدود کن" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, fuzzy, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1650,15 +1771,17 @@ msgid "" "the group in the future." msgstr "آیا مطمئن هستید می‌خواهید دسترسی »%s« را به گروه »%s« مسدود کنید؟" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "دسترسی کاربر به گروه را مسدود نکن" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "دسترسی کاربر را به گروه مسدود کن" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "اشکال پایگاه داده در مسدود کردن کاربر" @@ -1699,11 +1822,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "شما می‌توانید یک نشان برای گروه خود با بیشینه حجم %s بفرستید." -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "کاربر بدون مشخصات" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "یک ناحیه‌ی مربع از تصویر را انتخاب کنید تا به عنوان نشان باشد." @@ -1734,34 +1852,38 @@ msgstr "یک فهرست از کاربران در این گروه" msgid "Admin" msgstr "مدیر" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "بازداشتن" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "کاربر یک مدیر گروه شود" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "مدیر شود" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "این کاربر یک مدیر شود" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "خط زمانی %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "به روز رسانی کابران %1$s در %2$s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "گروه‌ها" @@ -1786,7 +1908,7 @@ msgstr "" "برای یافتن آن [بگردید](%%%action.groupsearch%%%) یا آن را خودتان [ایجاد](%%%" "action.newgroup%%%) کنید." -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "یک گروه جدید بساز" @@ -1836,12 +1958,16 @@ msgstr "کاربر از گروه منع نشده است." msgid "Error removing the block." msgstr "اشکال در پاکسازی" -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "تنظیمات پیام‌رسان فوری" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1850,15 +1976,25 @@ msgstr "" "شما می‌توانید پیام‌های خود را با استفاده از [پیام‌رسان‌های](%%doc.im%%) Jabber " "یا Gtalk ارسال/دریافت کنید. نشانی خود را در این قسمت تنظیم کنید" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "پیام‌رسان فوری در دسترس نیست." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "نشانی پیام‌رسان فوری" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "نشانی Jabber/GTalk تایید شده کنونی" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1867,12 +2003,9 @@ msgstr "" "منتظر تایید این نشانی هستیم. لطفا Jabber/Gtalk خود را برای دریافت توضیحات " "بیش‌تر بررسی کنید. (آیا %s را به فهرست خود اضافه کرده اید؟) " -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "نشانی پیام‌رسان فوری" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1881,44 +2014,66 @@ msgstr "" "نشانی Jabber یا GTalk، مانند «UserName@example.org». ابتدا از اضافه کردن %s " "به فهرست دوستان خود در کارگیر پیام‌رسان فوری‌تان یا در GTalk مطمئن شوید." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "ترجیحات" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "آگهی‌ها را از راه Jabber/GTalk برای من بفرست." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "هر وقت که وضعیت Jabber/Gtalk من فرق کرد، یک پیام ارسال کن." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "جواب کسانی که من آن ها را دنبال نمی‌کنم را با Jabber/Gtalk برایم ارسال کن." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "یک شناسه‌ی کوچک برای Jabber/Gtalk من منتشر کن." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "تنظیمات ذخیره شد." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "هیچ شناسهٔ Jabber ای وجود ندارد." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "نمی‌توان شناسه‌ی Jabber را تایید کرد" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "شناسه‌ی Jabber درست نیست" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "این شناسه Jabber کنونی شماست." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "شناسه Jabber به یک کاربر دیگر مربوط است." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1927,10 +2082,35 @@ msgstr "" "کد تایید به پیام‌رسان شما ارسال شد. شما باید %s را تایید کنید تا پیام‌ها به " "شما ارسال شود." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "نشانی پیام رسان اشتباه است." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "تایید فسخ شد." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "این شناسه‌ی Jabber شما نیست." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "نشانی پاک شده است." + #: actions/inbox.php:59 #, fuzzy, php-format msgid "Inbox for %1$s - page %2$d" @@ -1950,8 +2130,8 @@ msgid "Invites have been disabled." msgstr "دعوت‌کردن از کار انداخته شده‌است." #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "شما برای دعوت دیگران برای استفاده از %s باید وارد شودید." #: actions/invite.php:72 @@ -1971,7 +2151,9 @@ msgstr "دعوت کردن کاربران تازه" msgid "You are already subscribed to these users:" msgstr "هم اکنون شما این کاربران را دنبال می‌کنید: " -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2022,12 +2204,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "فرستادن" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s شما را دعوت کرده است که در %2$s به آن‌ها بپیوندید." -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2067,7 +2251,9 @@ msgstr "برای پیوستن به یک گروه، باید وارد شده با msgid "No nickname or ID." msgstr "بدون لقب." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "ملحق شدن به گروه" @@ -2076,11 +2262,13 @@ msgstr "ملحق شدن به گروه" msgid "You must be logged in to leave a group." msgstr "برای ترک یک گروه، شما باید وارد شده باشید." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "شما یک کاربر این گروه نیستید." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s گروه %s را ترک کرد." @@ -2126,10 +2314,14 @@ msgstr "" "دوباره وارد نمایید." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "وارد شدن با یک نام کاربری و کلمه ی عبور" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "با نام‌کاربری و گذزواژه‌ی خود وارد شوید. نام‌کاربری ندارید؟ یک نام‌کاربری [ثبت ]" "(%%action.register%%) کنید." @@ -2154,7 +2346,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "نمی‌توان %s را مدیر گروه %s کرد." #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "بدون وضعیت فعلی" #: actions/newapplication.php:52 @@ -2193,12 +2386,12 @@ msgstr "از این فرم برای ساختن یک گروه جدید استفا msgid "New message" msgstr "پیام جدید" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "شما نمی توانید به این کاربر پیام بفرستید." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "بدون محتوا!" @@ -2206,7 +2399,7 @@ msgstr "بدون محتوا!" msgid "No recipient specified." msgstr "هیچ گیرنده ای مشخص نشده" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن را آهسته برای خود بگویید." @@ -2220,7 +2413,7 @@ msgstr "پیام فرستاده‌شد" msgid "Direct message to %s sent." msgstr "پیام مستقیم به %s فرستاده شد." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "اشکال آژاکسی" @@ -2228,7 +2421,7 @@ msgstr "اشکال آژاکسی" msgid "New notice" msgstr "آگهی جدید" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "آگهی فرستاده‌شد." @@ -2326,11 +2519,11 @@ msgid "You are not a user of that application." msgstr "شما یک کاربر این گروه نیستید." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2339,24 +2532,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "ابن خبر ذخیره ای ندارد ." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "وضعیت %1$s در %2$s" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "نوع محتوا " -#: actions/oembed.php:160 -msgid "Only " -msgstr " فقط" +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست." @@ -2466,7 +2665,7 @@ msgid "6 or more characters" msgstr "۶ نویسه یا بیش‌تر" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "تایید" @@ -2494,7 +2693,7 @@ msgstr "گذرواژه قدیمی اشتباه است" msgid "Error saving user; invalid." msgstr "خطا هنگام ذخیره ی کاربر؛ نا معتبر." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "نمی‌توان گذرواژه جدید را ذخیره کرد." @@ -2503,7 +2702,7 @@ msgid "Password saved." msgstr "گذرواژه ذخیره شد." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "مسیر ها" @@ -2512,23 +2711,23 @@ msgid "Path and server settings for this StatusNet site." msgstr "تنظیمات و نشانی محلی این سایت استاتوس‌نتی" #: actions/pathsadminpanel.php:157 -#, php-format -msgid "Theme directory not readable: %s" +#, fuzzy, php-format +msgid "Theme directory not readable: %s." msgstr "شاخه‌ی پوسته‌ها خواندنی نیست: %s" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." msgstr "شاخه‌ی چهره‌ها نوشتنی نیست: %s" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" +#, fuzzy, php-format +msgid "Background directory not writable: %s." msgstr "شاخه‌ی پس زمینه‌ها نوشتنی نیست: %s" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." msgstr "پوشه‌ی تنظیمات محلی خواندنی نیست: %s" #: actions/pathsadminpanel.php:183 @@ -2669,18 +2868,19 @@ msgstr "" msgid "People search" msgstr "جست‌وجوی کاربران" -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "یک برچسب کاربری معتبر نیست: %s" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "کاربران خود برچسب‌گذاری شده با %s - صفحهٔ %d" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "محتوای آگهی نامعتبر" #: actions/postnotice.php:101 @@ -2708,13 +2908,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "نام‌کامل" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "صفحهٔ خانگی" @@ -2736,9 +2937,9 @@ msgid "Bio" msgstr "شرح‌حال" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "موقعیت" @@ -2752,7 +2953,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "برچسب‌ها" @@ -2823,7 +3024,7 @@ msgstr "تنظیمات ذخیره شد." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -2978,7 +3179,7 @@ msgstr "ریست کردن کلمه ی عبور" msgid "Recover password" msgstr "بازیابی کلمه ی عبور" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "بازیابی کلمه ی عبور درخواست شد" @@ -2998,19 +3199,19 @@ msgstr "ریست( راه انداری مجدد )" msgid "Enter a nickname or email address." msgstr "یک نام کاربری یا آدرس ایمیل وارد کنید." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "هیچ کاربری با آن آدرس ایمیل یا نام کاربری وجود ندارد." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "برای آن کاربر آدرس ایمیل ثبت شده وجود ندارد." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "خطا هنگام ذخیره ی تاییدیه ی آدرس." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3018,23 +3219,23 @@ msgstr "" "دستورالعمل چگونگی بازیابی کلمه ی عبور به آدرس ایمیل ثبت شده در حساب شما " "ارسال شده است." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "کلمه ی عبور به طور غیر منتظره ریست شد." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "کلمه ی عبور باید ۶ کاراکتر یا بیشتر باشد." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "کلمه ی عبور و تاییدیه ی آن با هم تطابق ندارند." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "کلمه ی عبور جدید با موفقیت ذخیره شد. شما الان وارد شده اید." @@ -3050,7 +3251,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است." msgid "Registration successful" msgstr "ثبت نام با موفقیت انجام شد." -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "ثبت نام" @@ -3072,7 +3273,7 @@ msgstr "نام کاربری یا کلمه ی عبور نا معتبر." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3088,8 +3289,9 @@ msgstr "۶ کاراکتر یا بیشتر نیاز است." msgid "Same as password above. Required." msgstr "" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "پست الکترونیکی" @@ -3102,22 +3304,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "نام بلند تر، به طور بهتر نام واقعیتان" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" "به استثنای این داده ی محرمانه : کلمه ی عبور، آدرس ایمیل، آدرس IM، و شماره " "تلفن." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3136,7 +3331,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3177,7 +3372,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "" @@ -3213,7 +3408,7 @@ msgstr "شما نمی توانید آگهی خودتان را تکرار کنی msgid "You already repeated that notice." msgstr "شما قبلا آن آگهی را تکرار کردید." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "" @@ -3300,7 +3495,7 @@ msgstr "" #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3340,28 +3535,32 @@ msgstr "برای ترک یک گروه، شما باید وارد شده باشی msgid "Application profile" msgstr "ابن خبر ذخیره ای ندارد ." -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "نام کاربری" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "صفحه بندى" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "آمار" @@ -3473,67 +3672,67 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "اعضای گروه %s، صفحهٔ %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "نام های مستعار" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "اعضا" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "هیچ" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "همه ی اعضا" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "ساخته شد" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3543,7 +3742,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3552,7 +3751,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "" @@ -3685,11 +3884,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3783,7 +3982,7 @@ msgid "Unable to save site notice." msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3800,68 +3999,109 @@ msgstr "" msgid "Save site notice" msgstr "خبر سایت" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "تنظیمات پیام‌رسان فوری" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "" -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "نشانی پیام‌رسان فوری" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "منتظر تاییدیه برای این شماره تلفن." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "کد تاییدیه" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "کدی را که در گوشیتان گرفتید وارد کنید." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "تایید" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 #, fuzzy msgid "SMS phone number" msgstr "شماره تماس پیامک" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "شماره تلفن، بدون نشانه گذاری یا فاصله، با کد منطقه" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "ترجیحات" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "تنظیمات ذخیره شد." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "بدون شماره تلفن." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "آن قبلا شماره تلفن شما بوده است." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "أن شماره تلفن پیش از این به کاربر دیگری تعلق داشته است." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3869,36 +4109,56 @@ msgstr "" "یک کد تاییدیه به شماره تلفنی که شما وارد کردید ارسال شد. گوشیتان را بررسی " "کنید برای کد و دستورالعمل چگونگی استفاده از آن." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "آن کد تاییدیه ی نادرست است." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "تایید فسخ شد." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "آن شماره تلفن شما نیست." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "شماره تماس پیامک" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "امواج موبایل" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "کدی وارد نشد" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3920,7 +4180,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3960,8 +4220,7 @@ msgstr "تنظیمات چهره" msgid "You are not subscribed to that profile." msgstr "شما به این پروفيل متعهد نشدید" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -4054,11 +4313,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "" @@ -4091,12 +4350,12 @@ msgstr "" msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "پروفایل کاربر" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -4144,8 +4403,9 @@ msgid "User is not silenced." msgstr "کاربر ساکت نشده است." #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "" +#, fuzzy +msgid "No profile ID in request." +msgstr "کاربری با چنین شناسه‌ای وجود ندارد." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4181,7 +4441,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "" @@ -4333,27 +4594,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "از هات داگ خود لذت ببرید!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "اعضای گروه %s، صفحهٔ %d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "جستجو برای گروه های بیشتر" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "به روز رسانی‌های %1$s در %2$s" @@ -4401,7 +4668,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "شخصی" @@ -4411,19 +4679,19 @@ msgstr "شخصی" msgid "Author(s)" msgstr "مؤلف" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4463,27 +4731,28 @@ msgstr "پیغام نمی تواند درج گردد" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "تعداد خیلی زیاد آگهی و بسیار سریع؛ استراحت کنید و مجددا دقایقی دیگر ارسال " "کنید." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4491,233 +4760,251 @@ msgstr "" "تعداد زیاد پیام های دو نسخه ای و بسرعت؛ استراحت کنید و دقایقی دیگر مجددا " "ارسال کنید." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "شما از فرستادن پست در این سایت مردود شدید ." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "مشکل در ذخیره کردن آگهی." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "مشکل در ذخیره کردن آگهی." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "قبلا تایید شده !" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "تایید نشده!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "خوش امدید به %1$s , @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "نمیتوان گروه را تشکیل داد" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "نمیتوان گروه را تشکیل داد" -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "نمی‌توان شناس‌نامه را ذخیره کرد." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "تنضبمات پروفيلتان را تغیر دهید" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "یک آواتار ارسال کنید" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "کلمه ی عبور خود را تغییر دهید" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "تغیر تنظیمات ایمل ." -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "پروفایل خود را طراحی کنید" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "دیگر" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "انتخابات دیگر" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "دیگر" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%s گروه %s را ترک کرد." -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "صفحه ی بدون عنوان" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "شخصی" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "آدرس ایمیل، آواتار، کلمه ی عبور، پروفایل خود را تغییر دهید" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "متصل شدن به خدمات" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "وصل‌شدن" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "تغییر پیکربندی سایت" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "مدیر" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr " به شما ملحق شوند %s دوستان و همکاران را دعوت کنید تا در" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "دعوت‌کردن" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 #, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "خارج شدن از سایت ." -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "خروج" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "یک حساب کاربری بسازید" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "ثبت نام" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 #, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "ورود به وب‌گاه" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "ورود" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "به من کمک کنید!" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "کمک" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 #, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "جستجو برای شخص با متن" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4725,71 +5012,85 @@ msgstr "جست‌وجو" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "خبر سایت" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "دید محلی" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "خبر صفحه" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "کمک" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "دربارهٔ" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "سوال‌های رایج" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "خصوصی" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "منبع" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "تماس" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "StatusNet مجوز نرم افزار" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "" -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4797,68 +5098,82 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "مجوز محتویات سایت" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "همه " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "مجوز." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "صفحه بندى" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "بعد از" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "قبل از" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "شما نمی توانید در این سایت تغیری ایجاد کنید" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 #, fuzzy msgid "Changes to that panel are not allowed." msgstr "اجازه‌ی ثبت نام داده نشده است." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4868,160 +5183,198 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "نمی توان تنظیمات طراحی شده را پاک کرد ." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "پیکره بندی اصلی سایت" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "سایت" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "طرح" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "پیکره بندی اصلی سایت" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "کاربر" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "پیکره بندی اصلی سایت" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "پیکره بندی اصلی سایت" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "خبر سایت" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "پیکره بندی اصلی سایت" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "" -#: lib/applicationeditform.php:216 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 +msgid "URL of the homepage of this application" +msgstr "" + +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 #, fuzzy msgid "Source URL" msgstr "منبع" -#: lib/applicationeditform.php:218 -msgid "URL of the homepage of this application" -msgstr "" - -#: lib/applicationeditform.php:224 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "انصراف" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "حذف" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "ضمائم" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "مؤلف" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "مهیا کننده" @@ -5043,37 +5396,56 @@ msgstr "تغییر گذرواژه" msgid "Password changing is not allowed" msgstr "تغییر گذرواژه" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "نتیجه دستور" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "دستور انجام شد" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "فرمان شکست خورد" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "متاسفانه این دستور هنوز اجرا نشده." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "خبری با این مشخصه ایجاد نشد" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "کاربر آگهی آخر ندارد" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "پیدا نشد %s کاریری یا نام مستعار" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "پیدا نشد %s کاریری یا نام مستعار" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "متاسفانه این دستور هنوز اجرا نشده." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "فرتادن اژیر" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5084,197 +5456,201 @@ msgstr "" "مشترک : %2$s\n" "خبر : %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "خبری با این مشخصه ایجاد نشد" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "کاربر آگهی آخر ندارد" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "شما از پیش یک عضو این گروه هستید." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "عضویت %s در گروه %s نا موفق بود." -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "ملحق شدن به گروه" - -#: lib/command.php:275 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, fuzzy, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "خارج شدن %s از گروه %s نا موفق بود" -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s گروه %s را ترک کرد." - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "نام کامل : %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "موقعیت : %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "صفحه خانگی : %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "درباره ی : %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "" "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " "تا فرستادید" -#: lib/command.php:367 +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "پیام مستقیم به %s فرستاده شد." -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "خطا در فرستادن پیام مستقیم." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "نمی توان آگهی خودتان را تکرار کرد" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "آن آگهی قبلا تکرار شده است." -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "آگهی تکرار شد" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "خطا هنگام تکرار آگهی." -#: lib/command.php:482 +#: lib/command.php:562 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " "تا فرستادید" -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "به این آگهی جواب دهید" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "خطا هنگام ذخیره ی آگهی" -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:628 #, fuzzy -msgid "No such user" -msgstr "چنین کاربری وجود ندارد." +msgid "Can't subscribe to OMB profiles by command." +msgstr "شما به این پروفيل متعهد نشدید" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "دستور هنوز اجرا نشده" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "ناتوان در خاموش کردن آگاه سازی." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "آگاه سازی فعال است." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "ناتوان در روشن کردن آگاه سازی." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "فرمان ورود از کار افتاده است" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "مشترک‌ها" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "شما توسط هیچ کس تصویب نشده اید ." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: " -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "هیچکس شما را تایید نکرده ." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "هیچکس شما را تایید نکرده ." -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "شما در هیچ گروهی عضو نیستید ." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "شما یک عضو این گروه نیستید." -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5316,19 +5692,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "برو به نصاب." @@ -5499,54 +5875,55 @@ msgstr "گروه های با پست های بیشتر" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "فرمت(فایل) عکس پشتیبانی نشده." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "است . این فایل بسیار یزرگ است %s بیشترین مقدار قابل قبول برای اندازه ی فایل." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "خطای سیستم ارسال فایل." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "تصویر یا فایل خرابی نیست" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "فرمت(فایل) عکس پشتیبانی نشده." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "فایلمان گم شده" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "نوع فایل پشتیبانی نشده" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "مگابایت" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "کیلوبایت" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5567,11 +5944,13 @@ msgstr "وارد شدن با یک نام کاربری و کلمه ی عبور" msgid "Sign up for a new account" msgstr "عضویت برای حساب کاربری جدید" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "تاییدیه ی آدرس ایمیل" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5588,12 +5967,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%2$s از حالا به خبر های شما گوش میده %1$s" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5608,17 +5989,20 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "موقعیت : %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "%s ادرس ایمیل جدید برای" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5637,21 +6021,31 @@ msgstr "" ", ازروی وفاداری خود شما \n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "وضعیت %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "تایید پیامک" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "منتظر تاییدیه برای این شماره تلفن." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5667,12 +6061,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5691,12 +6087,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr " خبر شما را به علایق خود اضافه کرد %s (@%s)" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5717,12 +6115,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "به توجه شما یک خبر فرستاده شده %s (@%s)" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5735,6 +6143,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5747,7 +6167,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "از" @@ -5877,48 +6297,52 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "در" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "در زمینه" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "تکرار از" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "به این آگهی جواب دهید" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "جواب دادن" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "آگهی تکرار شد" @@ -5942,6 +6366,10 @@ msgstr "خطا در درج مشخصات جدید" msgid "Error inserting avatar" msgstr "" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "اشکال در به روز کردن کاربر دوردست." + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "" @@ -5991,7 +6419,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "اشتراک‌ها" @@ -5999,31 +6427,32 @@ msgstr "اشتراک‌ها" msgid "All subscriptions" msgstr "تمام اشتراک‌ها" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "مشترک‌ها" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "تمام مشترک‌ها" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "شناسه کاربر" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "عضو شده از" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "تمام گروه‌ها" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "" - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6047,11 +6476,19 @@ msgstr "خصوصیت" msgid "Popular" msgstr "محبوب" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "" + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "به این آگهی جواب دهید" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "بله" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "" @@ -6061,7 +6498,7 @@ msgstr "" msgid "Revoke the \"%s\" role from this user" msgstr "دسترسی کاربر را به گروه مسدود کن" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6187,90 +6624,109 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "کاربر هیچ شناس‌نامه‌ای ندارد." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "ویرایش اواتور" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "ویرایش تنظیمات پروفيل" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "ویرایش" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "پیام مستقیم به این کاربر بفرستید" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "پیام" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "پروفایل کاربر" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "چند ثانیه پیش" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "حدود یک دقیقه پیش" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "حدود %d دقیقه پیش" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "حدود یک ساعت پیش" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "حدود %d ساعت پیش" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "حدود یک روز پیش" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "حدود %d روز پیش" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "حدود یک ماه پیش" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "حدود %d ماه پیش" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "حدود یک سال پیش" @@ -6284,7 +6740,7 @@ msgstr "%s یک رنگ صحیح نیست!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s یک رنگ صحیح نیست! از ۳ یا ۶ حرف مبنای شانزده استفاده کنید" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 68a63537b0..b015ccdbe7 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:46+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:45+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -23,7 +23,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 #, fuzzy msgid "Access" msgstr "Hyväksy" @@ -80,7 +80,13 @@ msgstr "Estä" msgid "Save access settings" msgstr "Profiilikuva-asetukset" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -89,7 +95,8 @@ msgstr "Tallenna" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +#, fuzzy +msgid "No such page." msgstr "Sivua ei ole." #: actions/all.php:75 actions/allrss.php:68 @@ -100,9 +107,9 @@ msgstr "Sivua ei ole." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -110,11 +117,9 @@ msgstr "Sivua ei ole." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Käyttäjää ei ole." @@ -126,8 +131,9 @@ msgstr "%s ja kaverit, sivu %d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -191,8 +197,10 @@ msgstr "" msgid "You and friends" msgstr "Sinä ja kaverit" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" @@ -207,18 +215,18 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API-metodia ei löytynyt!" @@ -232,15 +240,15 @@ msgstr "API-metodia ei löytynyt!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Tämä metodi edellyttää POST sanoman." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -253,7 +261,7 @@ msgstr "Ei voitu päivittää käyttäjää." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Käyttäjällä ei ole profiilia." @@ -264,9 +272,9 @@ msgid "Could not save profile." msgstr "Ei voitu tallentaa profiilia." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -353,7 +361,7 @@ msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." msgid "This status is already a favorite." msgstr "Tämä päivitys on jo suosikki!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Ei voitu lisätä suosikiksi." @@ -449,10 +457,9 @@ msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)." msgid "Too many aliases! Maximum %d." msgstr "Liikaa aliaksia. Maksimimäärä on %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 -#, php-format -msgid "Invalid alias: \"%s\"" +#: actions/apigroupcreate.php:266 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"." msgstr "Virheellinen alias: \"%s\"" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -469,14 +476,15 @@ msgstr "Alias ei voi olla sama kuin ryhmätunnus." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" +#, fuzzy +msgid "Group not found." msgstr "Ryhmää ei löytynyt!" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Sinä kuulut jo tähän ryhmään." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta." @@ -494,17 +502,26 @@ msgstr "Sinä et kuulu tähän ryhmään." msgid "Could not remove user %1$s from group %2$s." msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Käyttäjän %s ryhmät" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Ryhmät, joiden jäsen %s on" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Käyttäjän %s ryhmät" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, fuzzy, php-format msgid "groups on %s" msgstr "Ryhmän toiminnot" @@ -519,17 +536,17 @@ msgid "Invalid token." msgstr "Koko ei kelpaa." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -565,12 +582,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Odottamaton lomakkeen lähetys." @@ -590,20 +610,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Käyttäjätili" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Tunnus" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Salasana" @@ -652,17 +674,17 @@ msgstr "Päivitys poistettu." msgid "No status with that ID found." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Ei löytynyt" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Ei löytynyt." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." @@ -671,12 +693,12 @@ msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." msgid "Unsupported format." msgstr "Formaattia ei ole tuettu." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Käyttäjän %s suosikit" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen." @@ -686,18 +708,18 @@ msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Vastaukset päivitykseen %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" "%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s julkinen aikajana" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s päivitykset kaikilta!" @@ -712,20 +734,16 @@ msgstr "Vastaukset käyttäjälle %s" msgid "Repeats of %s" msgstr "Vastaukset käyttäjälle %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Päivitykset joilla on tagi %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Ei löytynyt." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Liitettä ei ole." @@ -745,8 +763,9 @@ msgstr "Kokoa ei ole." msgid "Invalid size." msgstr "Koko ei kelpaa." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Kuva" @@ -756,9 +775,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." msgstr "Käyttäjälle ei löydy profiilia" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -777,7 +797,7 @@ msgid "Preview" msgstr "Esikatselu" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Poista" @@ -789,23 +809,28 @@ msgstr "Lataa" msgid "Crop" msgstr "Rajaa" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Profiilia ei ole määritelty." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Tiedoston data hävisi." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Kuva päivitetty." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Profiilikuvan päivittäminen epäonnistui." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Kuva poistettu." @@ -814,7 +839,7 @@ msgstr "Kuva poistettu." msgid "You already blocked that user." msgstr "Sinä olet jo estänyt tämän käyttäjän." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Estä käyttäjä" @@ -825,27 +850,44 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "Ei" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Älä estä tätä käyttäjää" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "Kyllä" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Estä tämä käyttäjä" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Käyttäjän estotiedon tallennus epäonnistui." @@ -858,8 +900,8 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Tuota ryhmää ei ole." @@ -889,9 +931,10 @@ msgstr "Poista esto" msgid "Unblock this user" msgstr "Poista esto tältä käyttäjältä" -#: actions/bookmarklet.php:50 -#, fuzzy -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" msgstr "Kuva" #: actions/confirmaddress.php:75 @@ -906,34 +949,44 @@ msgstr "Vahvistuskoodia ei löytynyt." msgid "That confirmation code is not for you!" msgstr "Tämä vahvistuskoodi ei ole sinun!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "Tuntematon osoitetyyppi %s " -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Tämä osoite on jo vahvistettu." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Ei voitu päivittää käyttäjää." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Ei voitu poistaa sähköpostivahvistusta." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "Vahvista osoite" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Osoite \"%s\" on vahvistettu sinun käyttäjätunnuksellesi." @@ -943,7 +996,7 @@ msgid "Conversation" msgstr "Keskustelu" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Päivitykset" @@ -966,7 +1019,7 @@ msgstr "Sinä et kuulu tähän ryhmään." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Istuntoavaimesi kanssa oli ongelma." @@ -982,17 +1035,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "Älä poista tätä päivitystä" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "Poista tämä päivitys" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1023,11 +1078,13 @@ msgstr "Poista päivitys" msgid "Are you sure you want to delete this notice?" msgstr "Oletko varma että haluat poistaa tämän päivityksen?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Älä poista tätä päivitystä" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Poista tämä päivitys" @@ -1050,133 +1107,137 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 #, fuzzy msgid "Delete this user" msgstr "Poista tämä päivitys" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Ulkoasu" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Ulkoasuasetukset tälle StatusNet palvelulle." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "Koko ei kelpaa." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "Pikaviestin ei ole käytettävissä." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "Vaihda salasanasi" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 #, fuzzy msgid "Site logo" msgstr "Kutsu" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "Vaihda" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "Palvelun ilmoitus" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 #, fuzzy msgid "Theme for the site." msgstr "Kirjaudu ulos palvelusta" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Vaihda tautakuva" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Tausta" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "On" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Off" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Vaihda väriä" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Sisältö" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Haku" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Teksti" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Linkit" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Käytä oletusasetuksia" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Tallenna" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1294,11 +1355,16 @@ msgstr "Käytä tätä lomaketta muokataksesi ryhmää." msgid "description is too long (max %d chars)." msgstr "kuvaus on liian pitkä (max %d merkkiä)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Virheellinen alias: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Ei voitu päivittää ryhmää." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Ei voitu lisätä aliasta." @@ -1306,32 +1372,45 @@ msgstr "Ei voitu lisätä aliasta." msgid "Options saved." msgstr "Asetukset tallennettu." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "Sähköpostiasetukset" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Määritä miten saat sähköpostin palvelusta %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Osoite" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "Sähköpostiosoitteet" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Tämän hetken vahvistettu sähköpostiosoite." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "Poista" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1340,109 +1419,143 @@ msgstr "" "sähköpostilaatikostasi (ja roskapostikansiosta!) viesti, jossa on " "lisäohjeita. " -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "Peruuta" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "Sähköpostiosoitteet" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Sähköpostiosoite, esimerkiksi \"käyttäjätunnus@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "Lisää" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Saapuva sähköposti" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Lähetä sähköpostia tähän osoitteeseen tehdäksesi päivityksiä." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" "Tee uusi sähköpostiosoite johon lähettää päivityksiä; tämä poistaa vanhan " "osoitteen" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "Uusi" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "Asetukset" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Lähetä sähköpostilla tieto uusista tilaajista." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Lähetä sähköpostia, jos joku lähettää minulle yksityisviestin." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Lähetä sähköpostia, jos joku lähettää minulle \"@-vastauksen\"." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Salli kavereiden tönäistä minua ja lähetä sähköpostilla ilmoitus." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Haluan lähettää päivityksiä sähköpostilla." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Julkaise MicroID sähköpostiosoitteelleni." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Asetukset tallennettu." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." +msgstr "Ulkoasuasetukset tallennettu." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Sähköpostiosoitetta ei ole." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Ei voida normalisoida sähköpostiosoitetta" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Tuo ei ole kelvollinen sähköpostiosoite." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Tämä on jo sähköpostiosoitteesi." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Ei voitu asettaa vahvistuskoodia." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1451,43 +1564,56 @@ msgstr "" "sähköpostilaatikostasi (ja roskapostilaatikostasi!) vahvistuskoodisi ja " "miten sitä käytetään. " -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Avoimia vahvistuksia ei ole peruutettavana." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "Tämä on väärä pikaviestiosoite." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "Vahvistus peruttu." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Tämä ei ole sähköpostiosoitteesi." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "Osoite on poistettu." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Saapuvan sähköpostin osoitetta ei ole." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Ei voitu päivittää käyttäjätietoja." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Saapuvan sähköpostin osoite poistettu." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Uusi saapuvan sähköpostin osoite lisätty." @@ -1607,8 +1733,9 @@ msgstr "Ei voitu muuttaa request tokeneita access tokeneiksi." msgid "Remote service uses unknown version of OMB protocol." msgstr "Tuntematon OMB-protokollan versio." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "Virhe tapahtui etäprofiilin päivittämisessä" #: actions/getfile.php:79 @@ -1668,11 +1795,11 @@ msgstr "Käyttäjä on asettanut eston sinulle." msgid "User is not a member of group." msgstr "Käyttäjä ei kuulu tähän ryhmään." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Estä käyttäjä ryhmästä" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1680,15 +1807,17 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Älä estä tätä käyttäjää tästä ryhmästä" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1731,11 +1860,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s." -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "Käyttäjälle ei löydy profiilia" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Valitse neliön muotoinen alue kuvasta logokuvaksi" @@ -1766,34 +1890,38 @@ msgstr "Lista ryhmän käyttäjistä." msgid "Admin" msgstr "Ylläpito" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Estä" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Tee tästä käyttäjästä ylläpitäjä" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Tee ylläpitäjäksi" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Tee tästä käyttäjästä ylläpitäjä" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s aikajana" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Ryhmän %1$s käyttäjien päivitykset palvelussa %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Ryhmät" @@ -1813,7 +1941,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Luo uusi ryhmä" @@ -1862,12 +1990,16 @@ msgstr "Käyttäjää ei ole estetty ryhmästä." msgid "Error removing the block." msgstr "Tapahtui virhe, kun estoa poistettiin." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "Pikaviestiasetukset" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1876,15 +2008,25 @@ msgstr "" "Voit lähettää ja vastaanottaa päivityksiä Jabber/GTalk-[pikaviestintä](%%doc." "im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. " -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "Pikaviestin ei ole käytettävissä." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "Pikaviestiosoite" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Tämän hetken vahvistettu Jabber/GTalk -osoite." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1894,12 +2036,9 @@ msgstr "" "käyttäjätililtäsi viesti, jossa on lisäohjeet. (Lisäsitkö %s:n " "ystävälistaasi?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "Pikaviestiosoite" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1909,45 +2048,67 @@ msgstr "" "Varmista että olet lisännyt %s kaverilistaasi pikaviestiohjelmassasi tai " "GTalkissa." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Asetukset" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Lähetä minulle päivityksiä Jabberilla/GTalkilla." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Lähetä päivitys kun Jabber/GTalk -tilatietoni vaihtuu." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Lähetä Jabberilla/GTalkilla sellaistenkin ihmisten vastaukset, joita en ole " "tilannut. " -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Asetukset tallennettu." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Ei Jabber ID -osoitetta" -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Ei voida normalisoida Jabber ID -tunnusta" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Tuo ei ole kelvollinen Jabber ID." -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Tämä on jo Jabber ID -tunnuksesi." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber ID kuuluu jo toiselle käyttäjälle." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1956,10 +2117,35 @@ msgstr "" "Vahvistuskoodi lähetettiin antamaasi pikaviestinosoitteeseen. Sinun täytyy " "antaa osoitteelle %s oikeus lähettää viestejä sinulle." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Tämä on väärä pikaviestiosoite." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Ei voitu poistaa sähköpostivahvistusta." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "Vahvistus peruttu." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Tämä ei ole Jabber ID-tunnuksesi." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Osoite on poistettu." + #: actions/inbox.php:59 #, fuzzy, php-format msgid "Inbox for %1$s - page %2$d" @@ -1979,8 +2165,8 @@ msgid "Invites have been disabled." msgstr "Kutsut ovat pois käytöstä." #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "" "Sinun täytyy olla kirjautuneena sisään kutsuaksesi uusia käyttäjiä palveluun " "%s" @@ -2002,7 +2188,9 @@ msgstr "Kutsu uusia käyttäjiä" msgid "You are already subscribed to these users:" msgstr "Olet jos tilannut seuraavien käyttäjien päivitykset:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2056,12 +2244,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Lähetä" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s on kutsunut sinut liittymään palveluun %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2126,7 +2316,9 @@ msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään." msgid "No nickname or ID." msgstr "Tunnusta ei ole." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s liittyi ryhmään %s" @@ -2135,11 +2327,13 @@ msgstr "%s liittyi ryhmään %s" msgid "You must be logged in to leave a group." msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Sinä et kuulu tähän ryhmään." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s erosi ryhmästä %s" @@ -2188,10 +2382,14 @@ msgstr "" "asetuksiesi muuttamista." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Kirjaud sisään käyttäjätunnuksella ja salasanalla. Ei vielä " "käyttäjätunnusta? [Rekisteröi](%%action.register%%) käyttäjätunnus tai " @@ -2217,7 +2415,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Ei voitu tehdä käyttäjästä %s ylläpitäjää ryhmään %s" #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "Ei nykyistä tilatietoa" #: actions/newapplication.php:52 @@ -2256,12 +2455,12 @@ msgstr "Käytä tätä lomaketta luodaksesi ryhmän." msgid "New message" msgstr "Uusi viesti" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Et voi lähettää viestiä tälle käyttäjälle." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Ei sisältöä!" @@ -2269,7 +2468,7 @@ msgstr "Ei sisältöä!" msgid "No recipient specified." msgstr "Vastaanottajaa ei ole määritelty." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi." @@ -2283,7 +2482,7 @@ msgstr "Viesti lähetetty" msgid "Direct message to %s sent." msgstr "Suora viesti käyttäjälle %s lähetetty" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax-virhe" @@ -2291,7 +2490,7 @@ msgstr "Ajax-virhe" msgid "New notice" msgstr "Uusi päivitys" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Päivitys lähetetty" @@ -2388,11 +2587,11 @@ msgid "You are not a user of that application." msgstr "Sinä et kuulu tähän ryhmään." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2401,25 +2600,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "Päivitykselle ei ole profiilia" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Käyttäjän %1$s päivitys %2$s" -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "Yhdistä" -#: actions/oembed.php:160 -msgid "Only " -msgstr "Vain " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -2529,7 +2733,7 @@ msgid "6 or more characters" msgstr "6 tai useampia merkkejä" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Vahvista" @@ -2557,7 +2761,7 @@ msgstr "Väärä vanha salasana" msgid "Error saving user; invalid." msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Uutta salasanaa ei voida tallentaa." @@ -2566,7 +2770,7 @@ msgid "Password saved." msgstr "Salasana tallennettu." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Polut" @@ -2576,23 +2780,23 @@ msgstr "Polut ja palvelin asetukset tälle StatusNet palvelulle." #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "Pikaviestin ei ole käytettävissä." #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Pikaviestin ei ole käytettävissä." #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "Taustakuvan hakemisto" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "Pikaviestin ei ole käytettävissä." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2745,18 +2949,19 @@ msgstr "" msgid "People search" msgstr "Etsi ihmisiä" -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "Ei sallittu henkilötagi: %s" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Käyttäjät joilla henkilötagi %s - sivu %d" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "Päivityksen sisältö ei kelpaa" #: actions/postnotice.php:101 @@ -2786,13 +2991,14 @@ msgstr "" "välilyöntejä" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Koko nimi" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Kotisivu" @@ -2814,9 +3020,9 @@ msgid "Bio" msgstr "Tietoja" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Kotipaikka" @@ -2830,7 +3036,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Tagit" @@ -2906,7 +3112,7 @@ msgstr "Asetukset tallennettu." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -3064,7 +3270,7 @@ msgstr "Vaihda salasana" msgid "Recover password" msgstr "Salasanan palautus" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Salasanan palautuspyyntö lähetetty." @@ -3084,19 +3290,19 @@ msgstr "Vaihda" msgid "Enter a nickname or email address." msgstr "Syötä käyttäjätunnus tai sähköpostiosoite" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Käyttäjää tuolla sähköpostilla tai käyttäjätunnuksella ei ole." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Rekisteröityä sähköpostiosoitetta ei ole tälle käyttäjälle." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3104,23 +3310,23 @@ msgstr "" "Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, " "joka on rekisteröity käyttäjätunnuksellesi." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Odottamaton salasanan uudelleenasetus." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Salasanassa pitää olla 6 tai useampia merkkejä." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Salasana ja salasanan vahvistus eivät täsmää." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Virhe tapahtui käyttäjän asettamisessa." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" "Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään." @@ -3137,7 +3343,7 @@ msgstr "Virheellinen kutsukoodin." msgid "Registration successful" msgstr "Rekisteröityminen onnistui" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Rekisteröidy" @@ -3159,7 +3365,7 @@ msgstr "Käyttäjätunnus tai salasana ei kelpaa." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3177,8 +3383,9 @@ msgstr "6 tai useampia merkkejä. Pakollinen." msgid "Same as password above. Required." msgstr "Sama kuin ylläoleva salasana. Pakollinen." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Sähköposti" @@ -3193,24 +3400,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Pitempi nimi, mieluiten oikea nimesi" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "" -"Minun tekstini ja tiedostoni ovat käytettävissä seuraavan lisenssin " -"mukaisesti " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, " "puhelinnumero." -#: actions/register.php:538 +#: actions/register.php:542 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3243,7 +3441,7 @@ msgstr "" "\n" "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3288,7 +3486,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Tilaa" @@ -3332,7 +3530,7 @@ msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja." msgid "You already repeated that notice." msgstr "Sinä olet jo estänyt tämän käyttäjän." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "Luotu" @@ -3425,7 +3623,7 @@ msgstr "Käyttäjä on asettanut eston sinulle." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3466,28 +3664,32 @@ msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä." msgid "Application profile" msgstr "Päivitykselle ei ole profiilia" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "Tunnus" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "Sivutus" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Kuvaus" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Tilastot" @@ -3598,67 +3800,67 @@ msgstr "Ryhmä %s" msgid "%1$s group, page %2$d" msgstr "Ryhmän %s jäsenet, sivu %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Ryhmän profiili" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Huomaa" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliakset" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Ryhmän toiminnot" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Syöte ryhmän %s päivityksille (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Käyttäjän %s lähetetyt viestit" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Jäsenet" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Tyhjä)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Kaikki jäsenet" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Luotu" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3668,7 +3870,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3679,7 +3881,7 @@ msgstr "" "**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]" "(http://en.wikipedia.org/wiki/Micro-blogging)" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Ylläpitäjät" @@ -3816,11 +4018,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3915,7 +4117,7 @@ msgid "Unable to save site notice." msgstr "Twitter-asetuksia ei voitu tallentaa!" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3932,47 +4134,77 @@ msgstr "" msgid "Save site notice" msgstr "Palvelun ilmoitus" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "SMS-asetukset" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" "Voit saada SMS viestit sähköpostin välityksellä %%site.name%% -palvelusta." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "SMS ei ole käytettävissä." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "Pikaviestiosoite" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Tämän hetken vahvistettu SMS puhelinnumero." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Odotetaan vahvistusta tälle puhelinnumerolle." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Vahvistuskoodi" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Syötä koodi jonka sait puhelimeesi." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Vahvista" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 #, fuzzy msgid "SMS phone number" msgstr "SMS puhelinnumero" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Puhelinnumero, ei välimerkkejä tai välilyöntejä, suuntanumerollinen" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Asetukset" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3980,23 +4212,34 @@ msgstr "" "Lähetä päivityksiä SMS:llä; Ymmärrän, että voin saada kohtuuttomia laskuja " "tästä matkapuhelinoperaattoriltani." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "Asetukset tallennettu." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Puhelinnumeroa ei ole." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Operaattoria ei ole valittu." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Tämä on jo puhelinnumerosi." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Tämä puhelinnumero kuuluu jo toiselle käyttäjälle." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -4004,23 +4247,42 @@ msgstr "" "Vahvistuskoodi on lähetetty puhelinnumeroosi. Katso tekstiviesteistäsi " "vahvistuskoodisi ja ohjeet miten sitä käytetään." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Tämä on väärä vahvistukoodi." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Vahvistus peruttu." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Tämä ei ole puhelinnumerosi." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "SMS puhelinnumero" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Matkapuhelinoperaattori" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Valitse operaattori" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -4030,13 +4292,14 @@ msgstr "" "viestilähetyksiä sähköpostilla, mutta ei ole listattu tänne, lähetä " "sähköpostia meille osoitteeseen %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Koodia ei ole syötetty." #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -4058,7 +4321,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4098,8 +4361,7 @@ msgstr "Profiilikuva-asetukset" msgid "You are not subscribed to that profile." msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Tilausta ei onnistuttu tallentamaan." @@ -4192,11 +4454,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s ei seuraa ketään käyttäjää." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4230,12 +4492,12 @@ msgstr "Ei id parametria." msgid "Tag %s" msgstr "Tagi %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Käyttäjän profiili" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Kuva" @@ -4292,7 +4554,8 @@ msgid "User is not silenced." msgstr "Käyttäjällä ei ole profiilia." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +#, fuzzy +msgid "No profile ID in request." msgstr "Ei profiili id:tä kyselyssä." #: actions/unsubscribe.php:98 @@ -4329,7 +4592,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiili" @@ -4501,27 +4765,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "Ryhmän %s jäsenet, sivu %d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Hae lisää ryhmiä" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, fuzzy, php-format msgid "%s is not a member of any group." msgstr "Sinä et kuulu tähän ryhmään." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" @@ -4569,7 +4839,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Omat" @@ -4578,19 +4849,19 @@ msgstr "Omat" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4633,28 +4904,29 @@ msgstr "Viestin tallennus ei onnistunut." msgid "Could not update message with new URI." msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut." -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" msgstr "Tietokantavirhe tallennettaessa risutagiä: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4662,238 +4934,256 @@ msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Päivityksesi tähän palveluun on estetty." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Käyttäjä on asettanut eston sinulle." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Ei ole tilattu!." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Ei voitu poistaa tilausta." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Ei voitu poistaa tilausta." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Ei voitu poistaa tilausta." -#: classes/User.php:373 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Viesti käyttäjälle %1$s, %2$s" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Ryhmän luonti ei onnistunut." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Ryhmän jäsenyystietoja ei voitu asettaa." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Ryhmän jäsenyystietoja ei voitu asettaa." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Tilausta ei onnistuttu tallentamaan." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Vaihda profiiliasetuksesi" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Lataa kuva" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Vaihda salasanasi" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Muuta sähköpostin käsittelyasetuksia." -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "Käyttäjän profiili" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Muut" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Muita asetuksia" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Muut" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%1$s (%2$s)" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Nimetön sivu" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Ensisijainen sivunavigointi" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 #, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Henkilökohtainen profiili ja kavereiden aikajana" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Omat" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Ei voitu uudelleenohjata palvelimelle: %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Yhdistä" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Ensisijainen sivunavigointi" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Ylläpito" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Kutsu" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 #, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Kirjaudu ulos palvelusta" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Kirjaudu ulos" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Luo uusi käyttäjätili" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "Rekisteröidy" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 #, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Kirjaudu sisään palveluun" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "Kirjaudu sisään" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Auta minua!" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "Ohjeet" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 #, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Hae ihmisiä tai tekstiä" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4901,74 +5191,88 @@ msgstr "Haku" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Palvelun ilmoitus" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Paikalliset näkymät" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Sivuilmoitus" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Toissijainen sivunavigointi" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Ohjeet" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Tietoa" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "UKK" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Yksityisyys" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Lähdekoodi" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Ota yhteyttä" -#: lib/action.php:771 +#: lib/action.php:784 #, fuzzy msgid "Badge" msgstr "Tönäise" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "StatusNet-ohjelmiston lisenssi" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%" "site.broughtbyurl%%). " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** on mikroblogipalvelu. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** on mikroblogipalvelu." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4979,70 +5283,84 @@ msgstr "" "versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://" "www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "StatusNet-ohjelmiston lisenssi" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "Kaikki " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "lisenssi." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Sivutus" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Myöhemmin" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Aiemmin" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 #, fuzzy msgid "You cannot make changes to this site." msgstr "Et voi lähettää viestiä tälle käyttäjälle." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 #, fuzzy msgid "Changes to that panel are not allowed." msgstr "Rekisteröityminen ei ole sallittu." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 #, fuzzy msgid "showForm() not implemented." @@ -5054,167 +5372,205 @@ msgstr "Komentoa ei ole vielä toteutettu." msgid "saveSettings() not implemented." msgstr "Komentoa ei ole vielä toteutettu." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 #, fuzzy msgid "Unable to delete design setting." msgstr "Twitter-asetuksia ei voitu tallentaa!" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "Sähköpostiosoitteen vahvistus" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "Kutsu" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "SMS vahvistus" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "Ulkoasu" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "SMS vahvistus" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Käyttäjä" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "SMS vahvistus" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "SMS vahvistus" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "SMS vahvistus" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "Palvelun ilmoitus" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "SMS vahvistus" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Kuvaile ryhmää tai aihetta 140 merkillä" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "Kuvaile ryhmää tai aihetta 140 merkillä" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Lähdekoodi" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "Lähdekoodi" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Peruuta" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "Poista" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 #, fuzzy msgid "Provider" msgstr "Profiili" @@ -5237,37 +5593,57 @@ msgstr "Salasanan vaihto" msgid "Password changing is not allowed" msgstr "Salasanan vaihto" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Komennon tulos" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Komento suoritettu" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Komento epäonnistui" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Valitettavasti tätä komentoa ei ole vielä toteutettu." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Ei profiilia tuolla id:llä." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Käyttäjällä ei ole viimeistä päivitystä" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Valitettavasti tätä komentoa ei ole vielä toteutettu." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Tönäisy lähetetty" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5275,203 +5651,207 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Ei profiilia tuolla id:llä." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Käyttäjällä ei ole viimeistä päivitystä" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Päivitys on merkitty suosikiksi." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Sinä kuulut jo tähän ryhmään." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s." -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s liittyi ryhmään %s" - -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s erosi ryhmästä %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Koko nimi: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Kotipaikka: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Kotisivu: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Tietoa: %s" -#: lib/command.php:349 +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" -#: lib/command.php:367 +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Suora viesti käyttäjälle %s lähetetty" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Tapahtui virhe suoran viestin lähetyksessä." -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "Poista tämä päivitys" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Päivitys lähetetty" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:482 +#: lib/command.php:562 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Vastaa tähän päivitykseen" -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Käyttäjää ei ole." +#: lib/command.php:628 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Käyttäjän %s päivitykset tilattu" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Käyttäjän %s päivitysten tilaus lopetettu" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Komentoa ei ole vielä toteutettu." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Ilmoitukset pois päältä." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Ilmoituksia ei voi pistää pois päältä." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Ilmoitukset päällä." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Käyttäjän %s päivitysten tilaus lopetettu" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:" msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Toista ei voitu asettaa tilaamaan sinua." msgstr[1] "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "Sinä et kuulu tähän ryhmään." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sinä et kuulu tähän ryhmään." msgstr[1] "Sinä et kuulu tähän ryhmään." -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5513,20 +5893,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Varmistuskoodia ei ole annettu." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Kirjaudu sisään palveluun" @@ -5705,53 +6085,54 @@ msgstr "Ryhmät, joissa eniten päivityksiä" msgid "Tags in %s group's notices" msgstr "Tagit ryhmän %s päivityksissä" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä." -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Kuvatiedoston formaattia ei ole tuettu." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Voit ladata ryhmälle logon." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Osittain ladattu palvelimelle." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Tuo ei ole kelvollinen kuva tai tiedosto on rikkoutunut." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Kuvatiedoston formaattia ei ole tuettu." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Tiedosto hävisi." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tunnistamaton tiedoston tyyppi" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5772,11 +6153,13 @@ msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla" msgid "Sign up for a new account" msgstr "Luo uusi käyttäjätili" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Sähköpostiosoitteen vahvistus" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5793,12 +6176,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5823,19 +6208,22 @@ msgstr "" "----\n" "Voit vaihtaa sähköpostiosoitetta tai ilmoitusasetuksiasi %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Tietoja: %s\n" "\n" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5856,21 +6244,31 @@ msgstr "" "Terveisin,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s päivitys" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS vahvistus" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "Odotetaan vahvistusta tälle puhelinnumerolle." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "%s tönäisi sinua" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5886,12 +6284,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Uusi yksityisviesti käyttäjältä %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5910,12 +6310,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s lisäsi päivityksesi suosikkeihinsa" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5936,12 +6338,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5954,6 +6366,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5966,7 +6390,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 #, fuzzy msgid "from" msgstr " lähteestä " @@ -6096,51 +6520,55 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 #, fuzzy msgid "N" msgstr "Ei" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 #, fuzzy msgid "in context" msgstr "Ei sisältöä!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "Luotu" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Vastaa tähän päivitykseen" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Vastaus" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "Päivitys on poistettu." @@ -6165,6 +6593,10 @@ msgstr "Virhe tapahtui uuden profiilin lisäämisessä" msgid "Error inserting avatar" msgstr "Virhe tapahtui profiilikuvan lisäämisessä" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Virhe tapahtui etäprofiilin päivittämisessä" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä" @@ -6216,7 +6648,7 @@ msgstr "Tagit käyttäjän %s päivityksissä" msgid "Unknown" msgstr "Tuntematon toiminto" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tilaukset" @@ -6224,33 +6656,33 @@ msgstr "Tilaukset" msgid "All subscriptions" msgstr "Kaikki tilaukset" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Tilaajat" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Kaikki tilaajat" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 #, fuzzy msgid "User ID" msgstr "Käyttäjä" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Käyttäjänä alkaen" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Kaikki ryhmät" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "Ei id parametria." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6274,11 +6706,20 @@ msgstr "Esittelyssä" msgid "Popular" msgstr "Suosituimmat" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "Ei id parametria." + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "Vastaa tähän päivitykseen" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Kyllä" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6289,7 +6730,7 @@ msgstr "Vastaa tähän päivitykseen" msgid "Revoke the \"%s\" role from this user" msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6423,93 +6864,112 @@ msgstr "Peruuta tämän käyttäjän tilaus" msgid "Unsubscribe" msgstr "Peruuta tilaus" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Käyttäjällä ei ole profiilia." + +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Kuva" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Käyttäjän toiminnot" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 #, fuzzy msgid "Edit profile settings" msgstr "Profiiliasetukset" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Lähetä suora viesti tälle käyttäjälle" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Viesti" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "Käyttäjän profiili" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Ylläpitäjät" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "noin vuosi sitten" @@ -6523,7 +6983,7 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 4c9429e216..07c850bdd0 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -7,6 +7,7 @@ # Author@translatewiki.net: Julien C # Author@translatewiki.net: McDutchie # Author@translatewiki.net: Peter17 +# Author@translatewiki.net: Y-M D # -- # This file is distributed under the same license as the StatusNet package. # @@ -14,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:51+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:52+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -27,7 +28,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Accès" @@ -77,7 +78,13 @@ msgstr "Fermé" msgid "Save access settings" msgstr "Sauvegarder les paramètres d’accès" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Enregistrer" @@ -85,8 +92,8 @@ msgstr "Enregistrer" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "Page non trouvée" +msgid "No such page." +msgstr "Page non trouvée." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -96,9 +103,9 @@ msgstr "Page non trouvée" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -106,11 +113,9 @@ msgstr "Page non trouvée" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Utilisateur non trouvé." @@ -122,8 +127,9 @@ msgstr "%1$s et ses amis, page %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -190,8 +196,10 @@ msgstr "" msgid "You and friends" msgstr "Vous et vos amis" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Statuts de %1$s et ses amis dans %2$s!" @@ -206,18 +214,18 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Méthode API non trouvée !" @@ -230,18 +238,18 @@ msgstr "Méthode API non trouvée !" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Ce processus requiert un POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" "Vous devez spécifier un paramètre « device » avec une des valeurs suivantes : " -"sms, im, none" +"sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -252,7 +260,7 @@ msgstr "Impossible de mettre à jour l’utilisateur." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Aucun profil ne correspond à cet utilisateur." @@ -262,9 +270,9 @@ msgid "Could not save profile." msgstr "Impossible d’enregistrer le profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -350,7 +358,7 @@ msgstr "Aucun statut trouvé avec cet identifiant. " msgid "This status is already a favorite." msgstr "Cet avis est déjà un favori." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Impossible de créer le favori." @@ -442,11 +450,10 @@ msgstr "Emplacement trop long (maximum de 255 caractères)." msgid "Too many aliases! Maximum %d." msgstr "Trop d’alias ! Maximum %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Alias invalide : « %s »" +msgid "Invalid alias: \"%s\"." +msgstr "Alias invalide : « %s »." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -462,14 +469,14 @@ msgstr "L’alias ne peut pas être le même que le pseudo." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Groupe non trouvé !" +msgid "Group not found." +msgstr "Groupe non trouvé." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Vous êtes déjà membre de ce groupe." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Vous avez été bloqué de ce groupe par l’administrateur." @@ -487,17 +494,26 @@ msgstr "Vous n’êtes pas membre de ce groupe." msgid "Could not remove user %1$s from group %2$s." msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Groupes de %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Groupes de %1$s dont %2$s est membre." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Groupes de %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "groupes sur %s" @@ -511,17 +527,17 @@ msgid "Invalid token." msgstr "Jeton incorrect." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -559,12 +575,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "Le jeton de connexion %s a été refusé et révoqué." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Soumission de formulaire inattendue." @@ -589,20 +608,22 @@ msgstr "" "devriez donner l’accès à votre compte %4$s qu’aux tiers à qui vous faites " "confiance." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Compte" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Pseudo" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Mot de passe" @@ -647,17 +668,17 @@ msgstr "Statut supprimé." msgid "No status with that ID found." msgstr "Aucun statut trouvé avec cet identifiant." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Non trouvé" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Non trouvé." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -668,12 +689,12 @@ msgstr "" msgid "Unsupported format." msgstr "Format non supporté." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoris de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s statuts favoris de %2$s / %2$s." @@ -683,17 +704,17 @@ msgstr "%1$s statuts favoris de %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Mises à jour mentionnant %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Activité publique %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s statuts de tout le monde !" @@ -708,20 +729,16 @@ msgstr "Repris pour %s" msgid "Repeats of %s" msgstr "Reprises de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Avis marqués avec %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mises à jour marquées avec %1$s dans %2$s !" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Non trouvé." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Pièce jointe non trouvée." @@ -741,8 +758,9 @@ msgstr "Aucune taille" msgid "Invalid size." msgstr "Taille incorrecte." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -754,10 +772,10 @@ msgstr "" "taille maximale du fichier est de %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Utilisateur sans profil correspondant" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Utilisateur sans profil correspondant." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -775,7 +793,7 @@ msgid "Preview" msgstr "Aperçu" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Supprimer" @@ -787,23 +805,27 @@ msgstr "Transfert" msgid "Crop" msgstr "Recadrer" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Aucun fichier n’a été téléversé." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Données perdues." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar mis à jour." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "La mise à jour de l’avatar a échoué." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar supprimé." @@ -811,7 +833,7 @@ msgstr "Avatar supprimé." msgid "You already blocked that user." msgstr "Vous avez déjà bloqué cet utilisateur." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquer cet utilisateur" @@ -825,27 +847,42 @@ msgstr "" "abonné à votre compte, ne pourra plus s’y abonner de nouveau, et vous ne " "serez pas informé des @-réponses de sa part." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Non" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Ne pas bloquer cet utilisateur" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Oui" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloquer cet utilisateur" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Impossible d’enregistrer les informations de blocage." @@ -858,8 +895,8 @@ msgstr "Impossible d’enregistrer les informations de blocage." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Aucun groupe trouvé." @@ -889,9 +926,11 @@ msgstr "Débloquer" msgid "Unblock this user" msgstr "Débloquer cet utilisateur" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Poster sur " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Poster sur %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -905,33 +944,43 @@ msgstr "Code de confirmation non trouvé." msgid "That confirmation code is not for you!" msgstr "Ce code de confirmation n’est pas pour vous !" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Type d’adresse non reconnu : %s" +msgid "Unrecognized address type %s." +msgstr "Type d’adresse non reconnu : %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Cette adresse a déjà été confirmée." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Impossible de mettre à jour l’utilisateur." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Impossible de supprimer le courriel de confirmation." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Confirmer l’adresse" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "L'adresse \"%s\" a été validée pour votre compte." @@ -941,7 +990,7 @@ msgid "Conversation" msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Avis" @@ -960,7 +1009,7 @@ msgstr "Vous n’êtes pas le propriétaire de cette application." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Un problème est survenu avec votre jeton de session." @@ -978,15 +1027,17 @@ msgstr "" "données à son propos de la base de données, y compris toutes les connexions " "utilisateur existantes." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Ne pas supprimer cette application" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Supprimer cette application" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1017,11 +1068,13 @@ msgstr "Supprimer cet avis" msgid "Are you sure you want to delete this notice?" msgstr "Voulez-vous vraiment supprimer cet avis ?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Ne pas supprimer cet avis" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Supprimer cet avis" @@ -1045,58 +1098,61 @@ msgstr "" "Voulez-vous vraiment supprimer cet utilisateur ? Ceci effacera toutes les " "données à son propos de la base de données, sans sauvegarde." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Supprimer cet utilisateur" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Conception" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Paramètres de conception pour ce site StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "URL du logo invalide." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Le thème n’est pas disponible : %s" +msgid "Theme not available: %s." +msgstr "Le thème n’est pas disponible : %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Modifier le logo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Logo du site" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Modifier le thème" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Thème du site" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Thème pour le site." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Changer l’image d’arrière plan" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Arrière plan" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1105,67 +1161,68 @@ msgstr "" "Vous pouvez importer une image d’arrière plan pour ce site. La taille " "maximale du fichier est de %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Activé" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Désactivé" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Activer ou désactiver l’image d’arrière plan." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Répéter l’image d’arrière plan" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Modifier les couleurs" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Contenu" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Barre latérale" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Texte" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Liens" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Utiliser les valeurs par défaut" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Restaurer les conceptions par défaut" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Revenir aux valeurs par défaut" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Enregistrer" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Sauvegarder la conception" @@ -1270,11 +1327,16 @@ msgstr "Remplissez ce formulaire pour modifier les options du groupe." msgid "description is too long (max %d chars)." msgstr "la description est trop longue (%d caractères maximum)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Alias invalide : « %s »" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Impossible de mettre à jour le groupe." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Impossible de créer les alias." @@ -1282,31 +1344,42 @@ msgstr "Impossible de créer les alias." msgid "Options saved." msgstr "Vos options ont été enregistrées." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Paramètres du courriel" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Configurez les courriels que vous souhaitez recevoir de %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adresse" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Adresse électronique" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Adresse courriel actuellement confirmée." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Retirer" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1314,108 +1387,138 @@ msgstr "" "En attente d’une confirmation pour cette adresse. Vérifiez votre boîte de " "réception (et celle de spam !) pour recevoir de nouvelles instructions." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Annuler" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Adresse électronique" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Adresse de courriel (ex : nom@example.org)" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Ajouter" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Courriel entrant" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Écrivez à cette adresse courriel pour poster de nouveaux avis." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Nouvelle adresse courriel pour poster ; annule l’ancienne." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Nouveau" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Préférences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Préférences de courrier électronique" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Avertissez-moi par courriel des nouveaux abonnements." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "Envoyez-moi un courriel quand un utilisateur ajoute un de mes avis à ses " "favoris." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie un message personnel." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie une réponse « @ »." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Autoriser mes amis à m’envoyer des courriels et des clins d’œil." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Je veux envoyer mes avis par courriel." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publier un MicroID pour mon adresse courriel." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Préférences enregistrées" +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Préférences de courrier électronique enregistrées." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Aucune adresse courriel." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Impossible d’utiliser cette adresse courriel" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Adresse courriel invalide." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Vous utilisez déjà cette adresse courriel." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Cette adresse courriel appartient déjà à un autre utilisateur." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Impossible d’insérer le code de confirmation." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1423,43 +1526,53 @@ msgstr "" "Un code de confirmation a été envoyé à l’adresse courriel indiquée. Vérifiez " "votre boîte de réception pour récupérer le code et les instructions." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Aucune confirmation à annuler." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Cette adresse de messagerie instantanée est erronée." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Cette adresse de messagerie électronique est erronée." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Confirmation annulée." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Confirmation de courrier électronique annulée." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Ceci n’est pas votre adresse courriel." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "L’adresse a été supprimée." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "L’adresse électronique a été supprimée." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Aucune adresse de courriel entrant." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Impossible de mettre à jour le dossier de l’utilisateur." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "L’adresse de courriel entrant a été supprimée." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Nouvelle adresse de courriel entrant ajoutée." @@ -1578,9 +1691,9 @@ msgstr "Impossible de convertir le jeton de requête en jeton d’accès." msgid "Remote service uses unknown version of OMB protocol." msgstr "Le service distant utilise une version inconnue du protocole OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Erreur lors de la mise à jour du profil distant" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Erreur lors de la mise à jour du profil distant." #: actions/getfile.php:79 msgid "No such file." @@ -1604,7 +1717,7 @@ msgstr "Vous ne pouvez pas attribuer des rôles aux utilisateurs sur ce site." #: actions/grantrole.php:82 msgid "User already has this role." -msgstr "L'utilisateur a déjà ce rôle." +msgstr "L’utilisateur a déjà ce rôle." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1635,11 +1748,11 @@ msgstr "Cet utilisateur est déjà bloqué pour le groupe." msgid "User is not a member of group." msgstr "L’utilisateur n’est pas membre du groupe." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Bloquer cet utilisateur du groupe" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1650,15 +1763,17 @@ msgstr "" "seront supprimés du groupe ; il leur sera interdit d’y poster et de s’y " "abonner à l’avenir." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Ne pas bloquer cet utilisateur pour ce groupe" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Bloquer cet utilisateur de de groupe" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" "Erreur de la base de données lors du blocage de l’utilisateur du groupe." @@ -1704,10 +1819,6 @@ msgstr "" "Vous pouvez choisir un logo pour votre groupe. La taille maximale du fichier " "est de %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Utilisateur sans profil correspondant." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Sélectionnez une zone de forme carrée sur l’image qui sera le logo." @@ -1738,34 +1849,38 @@ msgstr "Liste des utilisateurs inscrits à ce groupe." msgid "Admin" msgstr "Administrer" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Bloquer" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Faire de cet utilisateur un administrateur du groupe" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Faire un administrateur" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Faire de cet utilisateur un administrateur" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Activité de %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Mises à jour des membres de %1$s dans %2$s !" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Groupes" @@ -1791,7 +1906,7 @@ msgstr "" "intéresse ? Essayez d’en [rechercher un](%%%%action.groupsearch%%%%) ou de " "[créer le vôtre !](%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Créer un nouveau groupe" @@ -1844,11 +1959,15 @@ msgstr "Cet utilisateur n’est pas bloqué du groupe." msgid "Error removing the block." msgstr "Erreur lors de l’annulation du blocage." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Paramètres de messagerie instantanée" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1858,15 +1977,24 @@ msgstr "" "(%%doc.im%%) Jabber/GTalk. Configurez votre adresse et vos paramètres ci-" "dessous." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "La messagerie instantanée n’est pas disponible." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Adresse de messagerie instantanée" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Adresse Jabber/GTalk actuellement confirmée." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1876,11 +2004,9 @@ msgstr "" "Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à " "votre liste de contacts ?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "Adresse de messagerie instantanée" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1890,46 +2016,67 @@ msgstr "" "votre liste d’amis dans votre logiciel de messagerie instantanée ou dans " "GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Préférences de messagerie instantanée" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Envoyez-moi les avis par Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" "Poster un avis chaque fois que mon statut est modifié dans Jabber/GTalk" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Envoyez-moi par Jabber/GTalk les réponses des personnes auxquelles je ne " "suis pas abonné." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publier un MicroID pour mon adresse Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Préférences enregistrées" + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Aucun identifiant Jabber" -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Impossible d’utiliser cet identifiant Jabber" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Identifiant Jabber invalide." -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Vous utilisez déjà cet idenfiant Jabber." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Identifiant Jabber déjà utilisé par un autre utilisateur." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1938,10 +2085,32 @@ msgstr "" "Un code de confirmation a été envoyé à votre adresse de messagerie " "instantanée. Vous devez approuver %s pour recevoir des messages." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Cette adresse de messagerie instantanée est erronée." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Impossible de supprimer la confirmation de messagerie instantanée." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Confirmation de messagerie instantanée annulée." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Ceci n’est pas votre identifiant Jabber." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "L’adresse de messagerie instantanée a été supprimée." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1964,9 +2133,9 @@ msgstr "Les invitations ont été désactivées." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" +msgid "You must be logged in to invite other users to use %s." msgstr "" -"Vous devez ouvrir une session pour inviter d’autres utilisateurs dans %s" +"Vous devez ouvrir une session pour inviter d’autres utilisateurs dans %s." #: actions/invite.php:72 #, php-format @@ -1985,7 +2154,9 @@ msgstr "Inviter de nouveaux utilisateurs" msgid "You are already subscribed to these users:" msgstr "Vous êtes déjà abonné à ces utilisateurs :" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2037,12 +2208,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Envoyer" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s vous invite à vous inscrire sur %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2109,7 +2282,9 @@ msgstr "Vous devez ouvrir une session pour rejoindre un groupe." msgid "No nickname or ID." msgstr "Aucun pseudo ou ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s a rejoint le groupe %2$s" @@ -2118,11 +2293,13 @@ msgstr "%1$s a rejoint le groupe %2$s" msgid "You must be logged in to leave a group." msgstr "Vous devez ouvrir une session pour quitter un groupe." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Vous n’êtes pas membre de ce groupe." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s a quitté le groupe %2$s" @@ -2172,14 +2349,16 @@ msgstr "" "votre mot de passe afin d’enregistrer vos préférences." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Ouvrez une session avec un identifiant et un mot de passe." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Ouvrez une session avec votre identifiant et votre mot de passe. Vous n’avez " -"pas encore d’identifiant ? [Créez-vous](%%action.register%%) un nouveau " -"compte." +"Vous n’avez pas encore d’identifiant ? [Créez-vous](%%action.register%%) un " +"nouveau compte." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2204,8 +2383,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Impossible de rendre %1$s administrateur du groupe %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Aucun statut actuel" +msgid "No current status." +msgstr "Aucun statut actuel." #: actions/newapplication.php:52 msgid "New Application" @@ -2239,12 +2418,12 @@ msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :" msgid "New message" msgstr "Nouveau message" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Aucun contenu !" @@ -2252,7 +2431,7 @@ msgstr "Aucun contenu !" msgid "No recipient specified." msgstr "Aucun destinataire n’a été spécifié." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2267,7 +2446,7 @@ msgstr "Message envoyé" msgid "Direct message to %s sent." msgstr "Message direct envoyé à %s." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Erreur Ajax" @@ -2275,7 +2454,7 @@ msgstr "Erreur Ajax" msgid "New notice" msgstr "Nouvel avis" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Avis publié" @@ -2372,11 +2551,11 @@ msgid "You are not a user of that application." msgstr "Vous n’êtes pas un utilisateur de cette application." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "Impossible d’annuler l’accès de l’application : " +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Impossible d’annuler l’accès de l’application %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "Vous n’avez autorisé aucune application à utiliser votre compte." @@ -2387,24 +2566,29 @@ msgstr "" "applications " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "L’avis n’a pas de profil" +msgid "Notice has no profile." +msgstr "L’avis n’a pas de profil." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Statut de %1$s sur %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "type de contenu " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Type de contenu %s non supporté." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Seulement " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -2508,7 +2692,7 @@ msgid "6 or more characters" msgstr "6 caractères ou plus" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Confirmer" @@ -2536,7 +2720,7 @@ msgstr "Ancien mot de passe incorrect" msgid "Error saving user; invalid." msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Impossible de sauvegarder le nouveau mot de passe." @@ -2545,7 +2729,7 @@ msgid "Password saved." msgstr "Mot de passe enregistré." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Chemins" @@ -2555,23 +2739,23 @@ msgstr "Paramètres de chemin et serveur pour ce site StatusNet." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Dossier des thème non lisible : %s" +msgid "Theme directory not readable: %s." +msgstr "Dossier des thème non lisible : %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Dossier des avatars non inscriptible : %s" +msgid "Avatar directory not writable: %s." +msgstr "Dossier des avatars non inscriptible : %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Dossier des arrière plans non inscriptible : %s" +msgid "Background directory not writable: %s." +msgstr "Dossier des arrière plans non inscriptible : %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Dossier des paramètres régionaux non lisible : %s" +msgid "Locales directory not readable: %s." +msgstr "Dossier des paramètres régionaux non lisible : %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2711,19 +2895,19 @@ msgstr "" msgid "People search" msgstr "Recherche de personnes" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Cette marque est invalide : %s" +msgid "Not a valid people tag: %s." +msgstr "Cette marque est invalide : %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Utilisateurs marqués par eux-mêmes avec %1$s - page %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Contenu de l’avis invalide" +msgid "Invalid notice content." +msgstr "Contenu de l’avis invalide." #: actions/postnotice.php:101 #, php-format @@ -2752,13 +2936,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nom complet" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Site personnel" @@ -2780,9 +2965,9 @@ msgid "Bio" msgstr "Bio" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Emplacement" @@ -2796,7 +2981,7 @@ msgstr "Partager ma localisation lorsque je poste des avis" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Marques" @@ -2871,8 +3056,8 @@ msgstr "Préférences enregistrées." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Au-delà de la limite de page (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Au-delà de la limite de page (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3043,7 +3228,7 @@ msgstr "Réinitialiser le mot de passe" msgid "Recover password" msgstr "Récupérer le mot de passe" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Récupération de mot de passe demandée" @@ -3063,19 +3248,19 @@ msgstr "Réinitialiser" msgid "Enter a nickname or email address." msgstr "Entrez un pseudo ou une adresse courriel." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Aucun utilisateur trouvé avec ce courriel ou ce nom." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Aucune adresse courriel enregistrée pour cet utilisateur." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Erreur lors de l’enregistrement de la confirmation du courriel." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3083,23 +3268,23 @@ msgstr "" "Les instructions pour récupérer votre mot de passe ont été envoyées à " "l’adresse courriel indiquée dans votre compte." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Réinitialisation inattendue du mot de passe." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Le mot de passe doit contenir au moins 6 caractères." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Le mot de passe et sa confirmation ne correspondent pas." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Erreur lors de la configuration de l’utilisateur." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" "Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte." @@ -3116,7 +3301,7 @@ msgstr "Désolé, code d’invitation invalide." msgid "Registration successful" msgstr "Compte créé avec succès" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Créer un compte" @@ -3138,7 +3323,7 @@ msgstr "Identifiant ou mot de passe incorrect." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite " @@ -3157,8 +3342,9 @@ msgstr "6 caractères ou plus. Requis." msgid "Same as password above. Required." msgstr "Identique au mot de passe ci-dessus. Requis." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Courriel" @@ -3173,22 +3359,16 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nom plus long, votre \"vrai\" nom de préférence" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Mes textes et mes fichiers sont disponibles sous" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Paternité 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -" à l’exception de ces données personnelles : mot de passe, adresse e-mail, " -"adresse de messagerie instantanée, numéro de téléphone." +"Mon texte et mes fichiers sont disponibles sous %s à l’exception de ces " +"données personnelles : mot de passe, adresse électronique, adresse de " +"messagerie instantanée, numéro de téléphone." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3222,7 +3402,7 @@ msgstr "" "Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre " "service." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3267,7 +3447,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL de votre profil sur un autre service de micro-blogging compatible" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "S’abonner" @@ -3304,7 +3484,7 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis." msgid "You already repeated that notice." msgstr "Vous avez déjà repris cet avis." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Repris" @@ -3395,7 +3575,7 @@ msgstr "L’utilisateur est déjà dans le bac à sable." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sessions" @@ -3432,26 +3612,30 @@ msgstr "Vous devez être connecté pour voir une application." msgid "Application profile" msgstr "Profil de l’application" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Icône" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Nom" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organisation" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Description" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statistiques" @@ -3571,67 +3755,67 @@ msgstr "Groupe %s" msgid "%1$s group, page %2$d" msgstr "Groupe %1$s, page %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Profil du groupe" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Note" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Alias" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Actions du groupe" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Fil des avis du groupe %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Fil des avis du groupe %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Fil des avis du groupe %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "ami d’un ami pour le groupe %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Membres" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(aucun)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Tous les membres" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Créé" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3647,7 +3831,7 @@ msgstr "" "action.register%%%%) pour devenir membre de ce groupe et bien plus ! ([En " "lire plus](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3660,7 +3844,7 @@ msgstr "" "logiciel libre [StatusNet](http://status.net/). Ses membres partagent des " "messages courts à propos de leur vie et leurs intérêts. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Administrateurs" @@ -3802,11 +3986,11 @@ msgid "Unknown language \"%s\"." msgstr "Langue « %s » inconnue." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "La limite minimale de texte est de 140 caractères." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "La limite minimale de texte est de 0 caractères (illimité)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "La limite de doublon doit être d’une seconde ou plus." #: actions/siteadminpanel.php:221 @@ -3898,8 +4082,8 @@ msgid "Unable to save site notice." msgstr "Impossible d'enregistrer l'avis du site." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "La longueur maximale pour l'avis du site est de 255 caractères" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "La longueur maximale pour l'avis du site est de 255 caractères." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -3914,47 +4098,74 @@ msgstr "" msgid "Save site notice" msgstr "Enregistrer l'avis du site" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Paramètres SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" "Vous pouvez recevoir des messages SMS par courriel en provenance de %%site." "name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "Les SMS ne sont pas disponibles." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "Adresse SMS" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Numéro de téléphone actuellement confirmé pour recevoir les SMS." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Numéro de téléphone en attente de confirmation." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Code de confirmation" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Entrez le code que vous avez reçu sur votre téléphone." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Confirmer" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Numéro de téléphone pour les SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" "Numéro de téléphone, sans ponctuation ni espaces, incluant le code régional" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "Préférences pour les SMS" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3962,23 +4173,33 @@ msgstr "" "Envoyez-moi les avis par SMS ; je comprends que cela pourrait affecter ma " "facture de téléphonie mobile." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Préférences pour les SMS enregistrées." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Aucun numéro de téléphone." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Aucun fournisseur sélectionné." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Vous utilisez déjà ce numéro de téléphone." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Ce numéro de téléphone est déjà utilisé." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3987,23 +4208,40 @@ msgstr "" "Vérifiez votre boîte de réception pour récupérer le code et les instructions " "pour son utilisation." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Ce code de confirmation est incorrect." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Confirmation de SMS annulée." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Ceci n’est pas votre numéro de téléphone." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Le numéro de téléphone pour les SMS a été retiré." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Fournisseur de téléphonie mobile" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Sélectionnez un fournisseur de téléphone mobile" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -4013,13 +4251,14 @@ msgstr "" "qui accepte la réception de SMS par courriel mais qui n’est pas listé ici, " "écrivez-nous à %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Aucun code entré" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Instantanés" @@ -4040,7 +4279,7 @@ msgid "Invalid snapshot report URL." msgstr "URL de rapport d’instantanés invalide." #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "Au hasard lors des requêtes web" #: actions/snapshotadminpanel.php:201 @@ -4079,8 +4318,7 @@ msgstr "Sauvegarder les paramètres des instantanés" msgid "You are not subscribed to that profile." msgstr "Vous n’êtes pas abonné(e) à ce profil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Impossible d’enregistrer l’abonnement." @@ -4183,11 +4421,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s ne suit actuellement personne." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4220,12 +4458,12 @@ msgstr "Aucun argument d’identifiant." msgid "Tag %s" msgstr "Marque %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Profil de l’utilisateur" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Photo" @@ -4278,8 +4516,8 @@ msgid "User is not silenced." msgstr "L’utilisateur n’est pas réduit au silence." #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "Aucune identité de profil dans la requête." +msgid "No profile ID in request." +msgstr "Aucun identifiant de profil dans la requête." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4316,7 +4554,8 @@ msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères." msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" @@ -4482,29 +4721,35 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Bon appétit !" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "Groupes %1$s, page %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Rechercher pour plus de groupes" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s n’est pas membre d’un groupe." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Essayez de [rechercher un groupe](%%action.groupsearch%%) et de vous y " "inscrire." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Statuts de %1$s dans %2$s!" @@ -4564,7 +4809,8 @@ msgstr "" msgid "Plugins" msgstr "Extensions" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Version" @@ -4572,7 +4818,7 @@ msgstr "Version" msgid "Author(s)" msgstr "Auteur(s)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4581,12 +4827,12 @@ msgstr "" "Un fichier ne peut pas être plus gros que %d octets et le fichier que vous " "avez envoyé pesait %d octets. Essayez d’importer une version moins grosse." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets." @@ -4624,27 +4870,28 @@ msgstr "Impossible d’insérer le message." msgid "Could not update message with new URI." msgstr "Impossible de mettre à jour le message avec un nouvel URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Problème lors de l’enregistrement de l’avis ; trop long." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques " "minutes." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4652,287 +4899,319 @@ msgstr "" "Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau " "dans quelques minutes." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Il vous est interdit de poster des avis sur ce site." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." -msgstr "Il vous avez été interdit de vous abonner." +msgstr "Il vous a été interdit de vous abonner." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Déjà abonné !" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Cet utilisateur vous a bloqué." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Pas abonné !" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Impossible de supprimer l’abonnement à soi-même." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Impossible de supprimer le jeton OMB de l'abonnement ." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Impossible de cesser l’abonnement" -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenue à %1$s, @%2$s !" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Impossible de créer le groupe." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Impossible de définir l'URI du groupe." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Impossible d’établir l’inscription au groupe." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Impossible d’enregistrer les informations du groupe local." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Modifier vos paramètres de profil" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Ajouter un avatar" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Modifier votre mot de passe" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Modifier le traitement des courriels" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Concevez votre profil" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Autres " - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Autres options" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Autres " + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Page sans nom" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Navigation primaire du site" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Profil personnel et flux des amis" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Personnel" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Modifier votre adresse électronique, avatar, mot de passe, profil" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Se connecter aux services" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Connecter" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Modifier la configuration du site" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Administrer" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Inviter des amis et collègues à vous rejoindre sur %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Inviter" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Fermer la session" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Déconnexion" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Créer un compte" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "S'inscrire" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Ouvrir une session" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Connexion" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "À l’aide !" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Aide" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Rechercher des personnes ou du texte" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Rechercher" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Notice du site" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Vues locales" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Avis de la page" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Navigation secondaire du site" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Aide" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "À propos" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "CGU" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Confidentialité" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Source" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Contact" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Insigne" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Licence du logiciel StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" -"**%%site.name%%** est un service de microblogging qui vous est proposé par " -"[%%site.broughtby%%](%%site.broughtbyurl%%)." +"**%%site.name%%** est un service de microblogging qui vous est proposé par [%" +"%site.broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** est un service de micro-blogging." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4943,71 +5222,86 @@ msgstr "" "version %s, disponible sous la licence [GNU Affero General Public License] " "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Licence du contenu du site" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Le contenu et les données de %1$s sont privés et confidentiels." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Le contenu et les données sont sous le droit d’auteur de %1$s. Tous droits " "réservés." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Le contenu et les données sont sous le droit d’auteur du contributeur. Tous " "droits réservés." -#: lib/action.php:847 -msgid "All " -msgstr "Tous " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" +"Tous les contenus %1$s et les données sont disponibles sous la licence %2$s." -#: lib/action.php:853 -msgid "license." -msgstr "licence." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Après" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Avant" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Attendait un élément racine mais a reçu tout un document XML." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Impossible de gérer le contenu distant pour le moment." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Impossible de gérer le contenu XML embarqué pour le moment." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Impossible de gérer le contenu en Base64 embarqué pour le moment." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Vous ne pouvez pas faire de modifications sur ce site." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "La modification de ce panneau n’est pas autorisée." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() n’a pas été implémentée." @@ -5017,157 +5311,193 @@ msgstr "showForm() n’a pas été implémentée." msgid "saveSettings() not implemented." msgstr "saveSettings() n’a pas été implémentée." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Impossible de supprimer les paramètres de conception." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Configuration basique du site" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Site" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Configuration de la conception" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Conception" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Configuration utilisateur" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Utilisateur" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Configuration d’accès" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Configuration des chemins" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Configuration des sessions" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 msgid "Edit site notice" msgstr "Modifier l'avis du site" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" msgstr "Configuration des instantanés" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "La ressource de l’API a besoin de l’accès en lecture et en écriture, mais " "vous n’y avez accès qu’en lecture." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" -"L’essai d’authentification de l’API a échoué ; pseudo = %1$s, proxy = %2$s, " -"ip = %3$s" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Modifier votre application" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Icône pour cette application" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Décrivez votre application en %d caractères" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Décrivez votre application" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "URL source" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "URL de la page d’accueil de cette application" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "URL source" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Organisation responsable de cette application" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "URL de la page d’accueil de l’organisation" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "URL vers laquelle rediriger après l’authentification" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Navigateur" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Bureau" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Type d’application, navigateur ou bureau" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Lecture seule" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Lecture-écriture" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Accès par défaut pour cette application : en lecture seule ou en lecture-" "écriture" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Annuler" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "lecture-écriture" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "lecture seule" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Accès « %2$s » approuvé le %1$s." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Révoquer" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Pièces jointes" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Auteur" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Fournisseur" @@ -5187,37 +5517,56 @@ msgstr "La modification du mot de passe a échoué" msgid "Password changing is not allowed" msgstr "La modification du mot de passe n’est pas autorisée" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Résultats de la commande" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Commande complétée" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Échec de la commande" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Désolé, cette commande n’a pas encore été implémentée." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Aucun avis avec cet identifiant n’existe" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Aucun avis récent pour cet utilisateur" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Impossible de trouver un utilisateur avec le pseudo %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Impossible de trouver un utilisateur local portant le pseudo %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Désolé, cette commande n’a pas encore été implémentée." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Clin d’œil envoyé à %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5228,201 +5577,207 @@ msgstr "" "Abonnés : %2$s\n" "Messages : %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Aucun avis avec cet identifiant n’existe" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Aucun avis récent pour cet utilisateur" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Avis ajouté aux favoris." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Vous êtes déjà membre de ce groupe" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%s a rejoint le groupe %s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Impossible de retirer l’utilisateur %s du groupe %s" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s a quitté le groupe %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Nom complet : %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Emplacement : %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Site Web : %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "À propos : %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -"Message trop long ! La taille maximale est de %d caractères ; vous en avez " -"entré %d." +"%s est un profil distant ; vous ne pouvez envoyer de messages directs qu'aux " +"utilisateurs du même serveur." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"Message trop long ! La taille maximale est de %1$d caractères ; vous en avez " +"entré %2$d." + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Message direct envoyé à %s." -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Une erreur est survenue pendant l’envoi de votre message." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Impossible de reprendre votre propre avis" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Avis déjà repris" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Avis de %s repris" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Erreur lors de la reprise de l’avis." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Avis trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Réponse à %s envoyée" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Utilisateur non trouvé." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Impossible de s'inscrire aux profils OMB par cette commande." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Cette commande n’a pas encore été implémentée." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Avertissements désactivés." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Impossible de désactiver les avertissements." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Avertissements activés." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Impossible d’activer les avertissements." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "La commande d’ouverture de session est désactivée" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Ce lien n’est utilisable qu’une seule fois, et est valable uniquement " "pendant 2 minutes : %s" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "Désabonné de %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Vous n’êtes abonné(e) à personne." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Vous êtes abonné à cette personne :" msgstr[1] "Vous êtes abonné à ces personnes :" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Personne ne s’est abonné à vous." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Cette personne est abonnée à vous :" msgstr[1] "Ces personnes sont abonnées à vous :" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Vous n’êtes membre d’aucun groupe." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Vous êtes membre de ce groupe :" msgstr[1] "Vous êtes membre de ces groupes :" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5503,20 +5858,20 @@ msgstr "" "tracks - pas encore implémenté.\n" "tracking - pas encore implémenté.\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Aucun fichier de configuration n’a été trouvé. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" "J’ai cherché des fichiers de configuration dans les emplacements suivants : " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Aller au programme d’installation" @@ -5692,54 +6047,55 @@ msgstr "Groupes avec le plus d’éléments publiés" msgid "Tags in %s group's notices" msgstr "Marques dans les avis du groupe %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" "Cette page n’est pas disponible dans un des formats que vous avez autorisés." -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Format de fichier d’image non supporté." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ce fichier est trop grand. La taille maximale est %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Transfert partiel." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Erreur système lors du transfert du fichier." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Format de fichier d’image non supporté." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Fichier perdu." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Type de fichier inconnu" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "Mo" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "Ko" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Source %d inconnue pour la boîte de réception." @@ -5760,11 +6116,13 @@ msgstr "Ouvrez une session avec un identifiant et un mot de passe" msgid "Sign up for a new account" msgstr "Créer un nouveau compte" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Confirmation de l’adresse courriel" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5794,12 +6152,14 @@ msgstr "" "Merci de votre attention,\n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s suit maintenant vos avis sur %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5824,17 +6184,20 @@ msgstr "" "----\n" "Changez votre adresse de courriel ou vos options de notification sur %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Bio : %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Nouvelle adresse courriel pour poster dans %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5855,21 +6218,32 @@ msgstr "" "Cordialement,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Statut de %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Confirmation SMS" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" +"%s : confirmez que vous possédez ce numéro de téléphone grâce à ce code :" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Vous avez reçu un clin d’œil de %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5896,12 +6270,14 @@ msgstr "" "Bien à vous,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Nouveau message personnel de %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5934,12 +6310,14 @@ msgstr "" "Bien à vous,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) a ajouté un de vos avis à ses favoris" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5977,12 +6355,25 @@ msgstr "" "Cordialement,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"La conversation complète peut être lue ici :\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) vous a envoyé un avis" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5995,17 +6386,42 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"%1$s (@%9$s) vient de vous envoyer un avis (une réponse « @ ») sur %2$s.\n" +"%1$s (@%9$s) vient de soumettre un avis à votre attention (un « @-reply ») " +"sur %2$s.\n" "\n" -"L’avis est là :\n" +"L'avis est ici :\n" "\n" -"\t%3$s\n" +"%3$s\n" "\n" "Il dit :\n" "\n" -"\t%4$s\n" +"%4$s\n" "\n" +"%5$sVous pouvez répondre ici :\n" +"\n" +"%6$s\n" +"\n" +"La liste des @-replies qui vous sont destinées est ici :\n" +"\n" +"%7$s\n" +"\n" +"Cordialement,\n" +"%2$s\n" +"\n" +"P.S. Vous pouvez désactiver ces notifications électroniques ici : %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6020,7 +6436,7 @@ msgstr "" "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent " "vous envoyer des messages destinés à vous seul(e)." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "de" @@ -6151,48 +6567,52 @@ msgstr "" "Désolé, l’obtention de votre localisation prend plus de temps que prévu. " "Veuillez réessayer plus tard." -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "S" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "E" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "O" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "chez" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "dans le contexte" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Repris par" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Répondre à cet avis" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Répondre" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Avis repris" @@ -6216,6 +6636,10 @@ msgstr "Erreur lors de l’insertion du nouveau profil" msgid "Error inserting avatar" msgstr "Erreur lors de l’insertion de l’avatar" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Erreur lors de la mise à jour du profil distant" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Erreur lors de l’insertion du profil distant" @@ -6265,7 +6689,7 @@ msgstr "Marques dans les avis de %s" msgid "Unknown" msgstr "Inconnu" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnements" @@ -6273,31 +6697,32 @@ msgstr "Abonnements" msgid "All subscriptions" msgstr "Tous les abonnements" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnés" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Tous les abonnés" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ID de l’utilisateur" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Membre depuis" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Moyenne journalière" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Tous les groupes" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Aucun argument de retour." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Méthode non implémentée." @@ -6321,10 +6746,18 @@ msgstr "En vedette" msgid "Popular" msgstr "Populaires" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Aucun argument de retour." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Reprendre cet avis ?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Oui" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Reprendre cet avis" @@ -6334,7 +6767,7 @@ msgstr "Reprendre cet avis" msgid "Revoke the \"%s\" role from this user" msgstr "Révoquer le rôle « %s » de cet utilisateur" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur." @@ -6460,89 +6893,108 @@ msgstr "Ne plus suivre cet utilisateur" msgid "Unsubscribe" msgstr "Désabonnement" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "L’utilisateur %s (%d) n’a pas de profil." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modifier l’avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Actions de l’utilisateur" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Suppression de l'utilisateur en cours..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Modifier les paramètres du profil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Modifier" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Envoyer un message à cet utilisateur" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Message" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Modérer" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 msgid "User role" msgstr "Rôle de l'utilisateur" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "Administrateur" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "Modérateur" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "il y a quelques secondes" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "il y a environ 1 an" @@ -6557,7 +7009,7 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" "%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index dea9dd11c1..d16b9d2d96 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:54+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:16:55+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -22,7 +22,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 #, fuzzy msgid "Access" msgstr "Aceptar" @@ -79,7 +79,13 @@ msgstr "Bloquear" msgid "Save access settings" msgstr "Configuracións de Twitter" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -89,7 +95,7 @@ msgstr "Gardar" #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy -msgid "No such page" +msgid "No such page." msgstr "Non existe a etiqueta." #: actions/all.php:75 actions/allrss.php:68 @@ -100,9 +106,9 @@ msgstr "Non existe a etiqueta." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -110,11 +116,9 @@ msgstr "Non existe a etiqueta." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Ningún usuario." @@ -126,8 +130,9 @@ msgstr "%s e amigos" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -186,8 +191,10 @@ msgstr "" msgid "You and friends" msgstr "%s e amigos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizacións dende %1$s e amigos en %2$s!" @@ -202,18 +209,18 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Método da API non atopado" @@ -227,15 +234,15 @@ msgstr "Método da API non atopado" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Este método require un POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -248,7 +255,7 @@ msgstr "Non se puido actualizar o usuario." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "O usuario non ten perfil." @@ -259,9 +266,9 @@ msgid "Could not save profile." msgstr "Non se puido gardar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -349,7 +356,7 @@ msgstr "Non se atopou un estado con ese ID." msgid "This status is already a favorite." msgstr "Este chío xa é un favorito!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Non se puido crear o favorito." @@ -446,10 +453,9 @@ msgstr "A localización é demasiado longa (max 255 car.)." msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, fuzzy, php-format -msgid "Invalid alias: \"%s\"" +msgid "Invalid alias: \"%s\"." msgstr "Etiqueta inválida: '%s'" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -467,14 +473,14 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy -msgid "Group not found!" +msgid "Group not found." msgstr "Método da API non atopado" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Xa estas suscrito a estes usuarios:" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -492,17 +498,26 @@ msgstr "Non estás suscrito a ese perfil" msgid "Could not remove user %1$s from group %2$s." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, fuzzy, php-format msgid "%s's groups" msgstr "Usuarios" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%1s non é unha orixe fiable." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, fuzzy, php-format msgid "groups on %s" msgstr "Outras opcions" @@ -517,17 +532,17 @@ msgid "Invalid token." msgstr "Tamaño inválido." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -561,12 +576,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Envio de formulario non esperada." @@ -586,21 +604,23 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 #, fuzzy msgid "Account" msgstr "Sobre" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Alcume" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Contrasinal" @@ -649,18 +669,18 @@ msgstr "Avatar actualizado." msgid "No status with that ID found." msgstr "Non existe ningún estado con esa ID atopada." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres." -#: actions/apistatusesupdate.php:202 -msgid "Not found" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." msgstr "Non atopado" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -670,12 +690,12 @@ msgstr "" msgid "Unsupported format." msgstr "Formato de ficheiro de imaxe non soportado." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Favoritos dende %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s updates favorited by %s / %s." @@ -685,17 +705,17 @@ msgstr "%s updates favorited by %s / %s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Chíos que respostan a %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Liña de tempo pública de %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s chíos de calquera!" @@ -710,20 +730,16 @@ msgstr "Replies to %s" msgid "Repeats of %s" msgstr "Replies to %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Chíos tagueados con %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Non atopado" - #: actions/attachment.php:73 #, fuzzy msgid "No such attachment." @@ -744,8 +760,9 @@ msgstr "Sen tamaño." msgid "Invalid size." msgstr "Tamaño inválido." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -755,9 +772,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Podes actualizar a túa información do perfil persoal aquí" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." msgstr "Usuario sen un perfil que coincida." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -777,7 +795,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 #, fuzzy msgid "Delete" msgstr "eliminar" @@ -790,23 +808,28 @@ msgstr "Subir" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Non se especificou ningún perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualizado." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Acounteceu un fallo ó actualizar o avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Avatar actualizado." @@ -816,7 +839,7 @@ msgstr "Avatar actualizado." msgid "You already blocked that user." msgstr "Xa bloqueaches a este usuario." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquear usuario" @@ -830,29 +853,46 @@ msgstr "" "do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a " "ser notificado de ningunha resposta-@ del." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "No" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Bloquear usuario" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "Si" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "Bloquear usuario" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Erro ao gardar información de bloqueo." @@ -865,8 +905,8 @@ msgstr "Erro ao gardar información de bloqueo." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 #, fuzzy msgid "No such group." msgstr "Non existe a etiqueta." @@ -899,9 +939,10 @@ msgstr "Desbloquear" msgid "Unblock this user" msgstr "Bloquear usuario" -#: actions/bookmarklet.php:50 -#, fuzzy -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" msgstr "Chíos dende SMS" #: actions/confirmaddress.php:75 @@ -916,34 +957,44 @@ msgstr "Confirmation code not found." msgid "That confirmation code is not for you!" msgstr "¡Ese código de confirmación non é para ti!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "Tipo de enderezo %s non recoñecido" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Esa dirección xa foi confirmada." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Non se puido actualizar o usuario." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Non se pode eliminar a confirmación de email." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "Confirmar enderezo" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "A dirección \"%s\" xa foi confirmada para a túa conta." @@ -954,7 +1005,7 @@ msgid "Conversation" msgstr "Código de confirmación." #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Chíos" @@ -976,7 +1027,7 @@ msgstr "Non estás suscrito a ese perfil" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 #, fuzzy msgid "There was a problem with your session token." msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." @@ -993,17 +1044,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "Non se pode eliminar este chíos." -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "Eliminar chío" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1035,12 +1088,14 @@ msgstr "Eliminar chío" msgid "Are you sure you want to delete this notice?" msgstr "Estas seguro que queres eliminar este chío?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 #, fuzzy msgid "Do not delete this notice" msgstr "Non se pode eliminar este chíos." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 #, fuzzy msgid "Delete this notice" msgstr "Eliminar chío" @@ -1066,135 +1121,139 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 #, fuzzy msgid "Delete this user" msgstr "Eliminar chío" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "Tamaño inválido." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "Cambiar contrasinal" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 #, fuzzy msgid "Site logo" msgstr "Invitar" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "Modificado" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "Novo chío" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Podes actualizar a túa información do perfil persoal aquí" -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Cambiar contrasinal" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Conectar" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Buscar" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Texto" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Lista" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Gardar" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1314,12 +1373,17 @@ msgstr "" msgid "description is too long (max %d chars)." msgstr "O teu Bio é demasiado longo (max 140 car.)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Etiqueta inválida: '%s'" + #: actions/editgroup.php:258 #, fuzzy msgid "Could not update group." msgstr "Non se puido actualizar o usuario." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Non se puido crear o favorito." @@ -1329,32 +1393,45 @@ msgstr "Non se puido crear o favorito." msgid "Options saved." msgstr "Configuracións gardadas." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "Configuración de Correo" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Xestina como recibir correo dende %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Enderezo" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "Enderezos de correo" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Direccións de correo confirmadas actualmente." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "Eliminar" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1363,108 +1440,142 @@ msgstr "" "GTalk que ten que haber unha mensaxe coas seguintes instrucións. (Engadiches " "a %s á túa lista de contactos?)" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "Cancelar" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "Enderezos de correo" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Dirección de correo, coma \"Nomede Usuario@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "Engadir" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Correo Entrante" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Enviar un correo a esta dirección para enviar novos chíos." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Crear unha nova dirección de correo para enviar, elimina a antiga." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "Novo" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "Preferencias" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Envíame chios de novas suscricións por email." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 #, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Permitir aos amigos darme toques e enviarme correos electrónicos." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Quero enviar chíos dende o mail." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publicar unha MicroID dende a miña dirección de correo." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." msgstr "Preferencias gardadas." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Non se inseriu unha dirección de correo" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Esa dirección de correo non se pode normalizar " -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Non é un enderezo de correo válido." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Xa é o teu enderezo de correo." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Este enderezo de correo xa pertence a outro usuario." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Non se puido inserir o código de confirmación." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1473,43 +1584,56 @@ msgstr "" "Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que " "debes seguir." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Non hai ningunha confirmación pendente para cancelar." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "Esa é unha enderezo IM incorrecto." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "Confirmación cancealada." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Esa non é a túa dirección de correo." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "Enderezo eliminado." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Non hai direccións de correo entrante" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Non se puido actualizar o rexistro de usuario." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Dirección de correo entrante eliminada." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Engadida nova dirección de correo entrante." @@ -1631,8 +1755,9 @@ msgstr "Non se pode convertir o token da petición a tokens de acceso." msgid "Remote service uses unknown version of OMB protocol." msgstr "Versión de protocolo OMB descoñecida." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "Acounteceu un erro actualizando o perfil remoto" #: actions/getfile.php:79 @@ -1694,12 +1819,12 @@ msgstr "O usuario bloqueoute." msgid "User is not a member of group." msgstr "%1s non é unha orixe fiable." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 #, fuzzy msgid "Block user from group" msgstr "Bloquear usuario" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, fuzzy, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1710,15 +1835,17 @@ msgstr "" "do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a " "ser notificado de ningunha resposta-@ del." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1763,11 +1890,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "Usuario sen un perfil que coincida." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1800,34 +1922,38 @@ msgstr "" msgid "Admin" msgstr "" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Liña de tempo de %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -1847,7 +1973,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 #, fuzzy msgid "Create a new group" msgstr "Crear nova conta" @@ -1899,12 +2025,16 @@ msgstr "O usuario bloqueoute." msgid "Error removing the block." msgstr "Acounteceu un erro borrando o bloqueo." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "Configuracións de IM" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1913,15 +2043,25 @@ msgstr "" "Podes enviar e recibir chíos a través de Jabber/GTalk [mensaxes instantáneos]" "(%%doc.im%%). Configura a túa conta e configuracións abaixo." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "Enderezo de IM" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Direccións Jabber/GTalk confirmadas." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1930,12 +2070,9 @@ msgstr "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " "message with further instructions. (Did you add %s to your buddy list?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "Enderezo de IM" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1945,44 +2082,66 @@ msgstr "" "asegurate de engadir %s á tua lista de contactos no teu cliente de IM ou no " "GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Preferencias" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Enviarme advertencias a través de Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Post a notice when my Jabber/GTalk status changes." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Envíame respostas a través de Jabber/GTalk da xente á que non estou suscrito." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publicar unha MicroID dende a miña dirección de Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Preferencias gardadas." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Sen Identificador de Jabber." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Non se pode normalizar ese identificador de Jabber" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Non é un Identificador de Jabber válido" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Xa é a túa conta de Jabber." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "O identificador de Jabber xa pertence a outro usuario." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1991,10 +2150,35 @@ msgstr "" "O código de confirmación foi embiado á dirección IM que engadiches. Deberías " "engadir a %s como contacto para que che poida enviar mensaxes." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Esa é unha enderezo IM incorrecto." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Non se pode eliminar a confirmación de email." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "Confirmación cancealada." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Esa non é a túa conta Jabber." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Enderezo eliminado." + #: actions/inbox.php:59 #, fuzzy, php-format msgid "Inbox for %1$s - page %2$d" @@ -2015,8 +2199,8 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" #: actions/invite.php:72 @@ -2036,7 +2220,9 @@ msgstr "Invitar a novos usuarios" msgid "You are already subscribed to these users:" msgstr "Xa estas suscrito a estes usuarios:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2088,12 +2274,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Enviar" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s invitoute a unirse a él en %2$s." -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2158,7 +2346,9 @@ msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" msgid "No nickname or ID." msgstr "Sen alcume." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s / Favoritos dende %s" @@ -2168,12 +2358,14 @@ msgstr "%s / Favoritos dende %s" msgid "You must be logged in to leave a group." msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 #, fuzzy msgid "You are not a member of that group." msgstr "Non estás suscrito a ese perfil" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s / Favoritos dende %s" @@ -2220,10 +2412,14 @@ msgstr "" "contrasinal antes de cambiar as túas preferenzas." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Accede co teu nome de usuario e contrasinal." + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Accede co teu nome de usuario e contrasinal. ¿Non tes un todavía?? [Rexistra]" "(%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%" @@ -2249,7 +2445,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "O usuario bloqueoute." #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "Sen estado actual" #: actions/newapplication.php:52 @@ -2287,12 +2484,12 @@ msgstr "" msgid "New message" msgstr "Nova mensaxe" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Non podes enviar mensaxes a este usurio." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Sen contido!" @@ -2300,7 +2497,7 @@ msgstr "Sen contido!" msgid "No recipient specified." msgstr "Non se especificou ningún destinatario" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2317,7 +2514,7 @@ msgstr "Non hai mensaxes de texto!" msgid "Direct message to %s sent." msgstr "Mensaxe directo a %s enviado" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Erro de Ajax" @@ -2325,7 +2522,7 @@ msgstr "Erro de Ajax" msgid "New notice" msgstr "Novo chío" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Chío publicado" @@ -2419,11 +2616,11 @@ msgid "You are not a user of that application." msgstr "Non estás suscrito a ese perfil" #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2432,25 +2629,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "O chío non ten perfil" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Estado de %1$s en %2$s" -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "Conectar" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -2562,7 +2764,7 @@ msgid "6 or more characters" msgstr "6 ou máis caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Confirmar" @@ -2590,7 +2792,7 @@ msgstr "Contrasinal actual incorrecta" msgid "Error saving user; invalid." msgstr "Acounteceu un erro gardando o usuario: é inválido." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Non se pode gardar a contrasinal." @@ -2599,7 +2801,7 @@ msgid "Password saved." msgstr "Contrasinal gardada." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2609,23 +2811,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2776,18 +2978,19 @@ msgstr "" msgid "People search" msgstr "Procurar xente." -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "%s non é unha etiqueta de xente válida" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usuarios auto-etiquetados como %s - páxina %d" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "Contido do chío inválido" #: actions/postnotice.php:101 @@ -2817,13 +3020,14 @@ msgstr "" "De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome completo" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Páxina persoal" @@ -2846,9 +3050,9 @@ msgid "Bio" msgstr "Bio" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Localización" @@ -2862,7 +3066,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Tags" @@ -2938,7 +3142,7 @@ msgstr "Configuracións gardadas." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -3103,7 +3307,7 @@ msgstr "Restaurar contrasinal" msgid "Recover password" msgstr "Recuperar contrasinal" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Petición de recuperación de contrasinal" @@ -3123,19 +3327,19 @@ msgstr "Restaurar" msgid "Enter a nickname or email address." msgstr "Insire o teu alcume ou enderezo de correo." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Non hai ningún usuario con isa dirección de correo ou nome de usuario." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Non hai un enderezo de correo rexistrado para ese usuario." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Acounteceu un erro gardando a confirmación de enderezo." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3143,23 +3347,23 @@ msgstr "" "As instruccións para recuperar a túa contrasinal foron enviadas ó enderezo " "de correo da túa conta." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Restauración de contrasinal non esperada." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "A contrasinal debe ter 6 caracteres ou máis." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "A contrasinal e a súa confirmación non coinciden." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Acounteceu un erro configurando o usuario." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado." @@ -3176,7 +3380,7 @@ msgstr "Acounteceu un erro co código de confirmación." msgid "Registration successful" msgstr "Xa estas rexistrado!!" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrar" @@ -3199,7 +3403,7 @@ msgstr "Usuario ou contrasinal inválidos." #: actions/register.php:343 #, fuzzy msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Neste formulario podes crear unha conta de usuario. Logo poderás publicar " @@ -3220,8 +3424,9 @@ msgstr "6 ou máis caracteres. Requerido." msgid "Same as password above. Required." msgstr "A mesma contrasinal que arriba. Requerido." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Correo Electrónico" @@ -3235,23 +3440,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nome máis longo, preferiblemente o teu nome \"real\"" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "O meu texto e arquivos están dispoñibles baixo licenza " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" " agás esta informción privada: contrasinal, dirección de correo electrónico, " "dirección IM, número de teléfono." -#: actions/register.php:538 +#: actions/register.php:542 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3283,7 +3480,7 @@ msgstr "" "\n" "Grazas por rexistrarte e esperamos que laretexes moito." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3329,7 +3526,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Subscribir" @@ -3372,7 +3569,7 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza." msgid "You already repeated that notice." msgstr "Xa bloqueaches a este usuario." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "Crear" @@ -3461,7 +3658,7 @@ msgstr "O usuario bloqueoute." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3501,29 +3698,33 @@ msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" msgid "Application profile" msgstr "O chío non ten perfil" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "Alcume" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "Invitación(s) enviada(s)." +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "Subscricións" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Estatísticas" @@ -3634,73 +3835,73 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "Tódalas subscricións" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "Non existe o perfil." -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 #, fuzzy msgid "Note" msgstr "Chíos" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 #, fuzzy msgid "Group actions" msgstr "Outras opcions" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Fonte de chíos para %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Fonte de chíos para %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Fonte de chíos para %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "Band. Saída para %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Membro dende" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 #, fuzzy msgid "(None)" msgstr "(nada)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 #, fuzzy msgid "Created" msgstr "Crear" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3714,7 +3915,7 @@ msgstr "" "(http://status.net/). [Únete agora](%%action.register%%) para compartir " "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3727,7 +3928,7 @@ msgstr "" "(http://status.net/). [Únete agora](%%action.register%%) para compartir " "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "" @@ -3866,11 +4067,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3965,7 +4166,7 @@ msgid "Unable to save site notice." msgstr "Non se puideron gardar os teus axustes de Twitter!" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3982,46 +4183,76 @@ msgstr "" msgid "Save site notice" msgstr "Novo chío" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "Configuracións de SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Podes recibir mensaxes SMS a través do email dende %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "Enderezo de IM" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Número de teléfono actual confirmado mediante SMS." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Agardando a confirmación neste número de teléfono." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Código de confirmación." -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Insire o código que recibiches no teu teléfono." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Confirmar" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 #, fuzzy msgid "SMS phone number" msgstr "Número de Teléfono do SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Número de teléfono, sen puntuacións ou espazos, co código de área" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Preferencias" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -4029,23 +4260,34 @@ msgstr "" "Enviarme chíos mediante SMS, entendo que a miña operadora poida cobrarme " "grandes facturas." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "Preferencias gardadas." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Non hai ningún número de teléfono." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Non se seleccionou unha operadora." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Xa é o teu número de teléfono." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "O número de teléfono xa pertence a outro usuario." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " @@ -4055,24 +4297,43 @@ msgstr "" "Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que " "debes seguir." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Ese é un número de confirmación incorrecto." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Confirmación cancealada." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Ese non é o teu número de teléfono." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "Número de Teléfono do SMS" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 #, fuzzy msgid "Mobile carrier" msgstr "Selecciona unha operadora" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Selecciona unha operadora" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -4081,13 +4342,14 @@ msgstr "" "Operadora móbil do teu teléfono. Se sabes se a operadora acepta SMS sobre " "email e non está listada aquí, envianos unha mensaxe para incluilo en %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Non se inseriu ningún código" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -4109,7 +4371,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4149,8 +4411,7 @@ msgstr "Configuracións de Twitter" msgid "You are not subscribed to that profile." msgstr "Non estás suscrito a ese perfil" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Non se pode gardar a subscrición." @@ -4243,11 +4504,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%1$s está a escoitar os teus chíos %2$s." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber." -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4281,13 +4542,13 @@ msgstr "Non hai argumento id." msgid "Tag %s" msgstr "Tags" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "O usuario non ten perfil." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -4345,7 +4606,8 @@ msgid "User is not silenced." msgstr "O usuario non ten perfil." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +#, fuzzy +msgid "No profile ID in request." msgstr "Non hai identificador de perfil na peticion." #: actions/unsubscribe.php:98 @@ -4382,7 +4644,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" @@ -4556,27 +4819,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "Tódalas subscricións" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, fuzzy, php-format msgid "%s is not a member of any group." msgstr "%1s non é unha orixe fiable." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" @@ -4624,7 +4893,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Persoal" @@ -4633,19 +4903,19 @@ msgstr "Persoal" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4688,28 +4958,29 @@ msgstr "Non se pode inserir unha mensaxe." msgid "Could not update message with new URI." msgstr "Non se puido actualizar a mensaxe coa nova URI." -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" msgstr "Erro ó inserir o hashtag na BD: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:256 +#: classes/Notice.php:260 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4718,168 +4989,183 @@ msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Tes restrinxido o envio de chíos neste sitio." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Este usuario non che permite suscribirte a el." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "O usuario bloqueoute." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Non está suscrito!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Non se pode eliminar a subscrición." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Non se pode eliminar a subscrición." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Non se pode eliminar a subscrición." -#: classes/User.php:373 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaxe de %1$s en %2$s" -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "Non se puido crear o favorito." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Non se pode gardar a subscrición." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Non se pode gardar a subscrición." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Non se pode gardar a subscrición." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Configuración de perfil" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 #, fuzzy msgid "Upload an avatar" msgstr "Acounteceu un fallo ó actualizar o avatar." -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Cambiar contrasinal" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Cambiar a xestión de email" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "O usuario non ten perfil." -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Outros" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Outras opcions" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Outros" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%1$s (%2$s)" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Persoal" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Cambiar contrasinal" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Non se pode redireccionar ao servidor: %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Conectar" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Navegación de subscricións" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" @@ -4887,69 +5173,72 @@ msgstr "" "Emprega este formulario para invitar ós teus amigos e colegas a empregar " "este servizo." -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Invitar" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Sair" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Crear nova conta" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "Rexistrar" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "Inicio de sesión" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Axuda" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "Axuda" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4957,76 +5246,90 @@ msgstr "Buscar" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 #, fuzzy msgid "Site notice" msgstr "Novo chío" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 #, fuzzy msgid "Page notice" msgstr "Novo chío" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 #, fuzzy msgid "Secondary site navigation" msgstr "Navegación de subscricións" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Axuda" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Sobre" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "Preguntas frecuentes" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Privacidade" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Fonte" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Contacto" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** é un servizo de microbloguexo." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -5037,73 +5340,86 @@ msgstr "" "%s, dispoñible baixo licenza [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "Atopar no contido dos chíos" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -#, fuzzy -msgid "All " -msgstr "Todos" - -#: lib/action.php:853 -msgid "license." +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 #, fuzzy msgid "After" msgstr "« Despois" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 #, fuzzy msgid "Before" msgstr "Antes »" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 #, fuzzy msgid "You cannot make changes to this site." msgstr "Non podes enviar mensaxes a este usurio." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 #, fuzzy msgid "Changes to that panel are not allowed." msgstr "Non se permite o rexistro neste intre." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 #, fuzzy msgid "showForm() not implemented." @@ -5115,167 +5431,205 @@ msgstr "Comando non implementado." msgid "saveSettings() not implemented." msgstr "Comando non implementado." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 #, fuzzy msgid "Unable to delete design setting." msgstr "Non se puideron gardar os teus axustes de Twitter!" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "Confirmar correo electrónico" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "Invitar" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "Confirmación de SMS" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "Persoal" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "Confirmación de SMS" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Usuario" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "Confirmación de SMS" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "Confirmación de SMS" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "Confirmación de SMS" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "Novo chío" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "Confirmación de SMS" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Fonte" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "Fonte" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Cancelar" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "Eliminar" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 #, fuzzy msgid "Provider" msgstr "Perfil" @@ -5298,37 +5652,57 @@ msgstr "Contrasinal gardada." msgid "Password changing is not allowed" msgstr "Contrasinal gardada." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultados do comando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando completo" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Comando fallido" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Desculpa, este comando todavía non está implementado." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Non se atopou un perfil con ese ID." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "O usuario non ten último chio." + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Desculpa, este comando todavía non está implementado." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Toque enviado" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5339,176 +5713,180 @@ msgstr "" "Suscriptores: %2$s\n" "Chíos: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Non se atopou un perfil con ese ID." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "O usuario non ten último chio." - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Chío marcado coma favorito." -#: lib/command.php:217 +#: lib/command.php:323 #, fuzzy msgid "You are already a member of that group" msgstr "Xa estas suscrito a estes usuarios:" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, fuzzy, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "Non podes seguir a este usuario: o Usuario non se atopa." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, fuzzy, php-format -msgid "%s joined group %s" -msgstr "%s / Favoritos dende %s" - -#: lib/command.php:275 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "Non podes seguir a este usuario: o Usuario non se atopa." -#: lib/command.php:280 -#, fuzzy, php-format -msgid "%s left group %s" -msgstr "%s / Favoritos dende %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Ubicación: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Páxina persoal: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:349 +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " -#: lib/command.php:367 +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Mensaxe directo a %s enviado" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Erro ó enviar a mensaxe directa." -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Non se pode activar a notificación." -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "Eliminar chío" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Chío publicado" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:482 +#: lib/command.php:562 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Non se pode eliminar este chíos." -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Especifica o nome do usuario ó que queres suscribirte" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Ningún usuario." +#: lib/command.php:628 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica o nome de usuario ó que queres deixar de seguir" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscribir de %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Comando non implementado." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notificación desactivada." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "No se pode desactivar a notificación." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notificación habilitada." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Non se pode activar a notificación." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Desuscribir de %s" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Xa estas suscrito a estes usuarios:" @@ -5517,12 +5895,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Outro usuario non se puido suscribir a ti." @@ -5531,12 +5909,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non estás suscrito a ese perfil" @@ -5545,7 +5923,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:769 +#: lib/command.php:838 #, fuzzy msgid "" "Commands:\n" @@ -5614,20 +5992,20 @@ msgstr "" "tracks - non implementado por agora.\n" "tracking - non implementado por agora.\n" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Sen código de confirmación." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5808,55 +6186,56 @@ msgstr "" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Formato de ficheiro de imaxe non soportado." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Podes actualizar a túa información do perfil persoal aquí" -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Carga parcial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Non é unha imaxe ou está corrupta." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato de ficheiro de imaxe non soportado." - #: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Bloqueo de usuario fallido." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 #, fuzzy msgid "Unknown file type" msgstr "tipo de ficheiro non soportado" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5881,11 +6260,13 @@ msgstr "Accede co teu nome de usuario e contrasinal." msgid "Sign up for a new account" msgstr "Crear nova conta" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Confirmar correo electrónico" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5914,12 +6295,14 @@ msgstr "" "Grazas polo teu tempo, \n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s está a escoitar os teus chíos %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5940,17 +6323,20 @@ msgstr "" "Atentamente todo seu,\n" "%4$s.\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "Ubicación: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Nova dirección de email para posterar en %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5971,21 +6357,31 @@ msgstr "" "Sempre teu...,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Estado de %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Confirmación de SMS" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "Agardando a confirmación neste número de teléfono." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "%s douche un toque" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6011,12 +6407,14 @@ msgstr "" "With kind regards,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "%s enviouche unha nova mensaxe privada" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6049,12 +6447,14 @@ msgstr "" "With kind regards,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s gustoulle o teu chío" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, fuzzy, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6087,12 +6487,22 @@ msgstr "" "Fielmente teu,\n" "%5$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6105,6 +6515,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -6117,7 +6539,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 #, fuzzy msgid "from" msgstr " dende " @@ -6250,53 +6672,57 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 #, fuzzy msgid "in context" msgstr "Sen contido!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "Crear" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 #, fuzzy msgid "Reply to this notice" msgstr "Non se pode eliminar este chíos." -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 #, fuzzy msgid "Reply" msgstr "contestar" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "Chío publicado" @@ -6324,6 +6750,10 @@ msgstr "Acounteceu un erro ó inserir o novo perfil" msgid "Error inserting avatar" msgstr "Acounteceu un erro ó inserir o avatar" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Acounteceu un erro actualizando o perfil remoto" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Aconteceu un erro ó inserir o perfil remoto" @@ -6375,7 +6805,7 @@ msgstr "O usuario non ten último chio." msgid "Unknown" msgstr "Acción descoñecida" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscricións" @@ -6383,35 +6813,35 @@ msgstr "Subscricións" msgid "All subscriptions" msgstr "Tódalas subscricións" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscritores" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 #, fuzzy msgid "All subscribers" msgstr "Subscritores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 #, fuzzy msgid "User ID" msgstr "Usuario" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Membro dende" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 #, fuzzy msgid "All groups" msgstr "Tódalas etiquetas" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "Non hai argumento id." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6436,11 +6866,20 @@ msgstr "Destacado" msgid "Popular" msgstr "Popular" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "Non hai argumento id." + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "Non se pode eliminar este chíos." +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Si" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6451,7 +6890,7 @@ msgstr "Non se pode eliminar este chíos." msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6590,95 +7029,114 @@ msgstr "Desuscribir de %s" msgid "Unsubscribe" msgstr "Eliminar subscrición" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "O usuario non ten perfil." + +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 #, fuzzy msgid "User actions" msgstr "Outras opcions" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 #, fuzzy msgid "Edit profile settings" msgstr "Configuración de perfil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 #, fuzzy msgid "Send a direct message to this user" msgstr "Non podes enviar mensaxes a este usurio." -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 #, fuzzy msgid "Message" msgstr "Nova mensaxe" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "O usuario non ten perfil." -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "fai un día" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "fai %d días" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "fai un ano" @@ -6692,7 +7150,7 @@ msgstr "%1s non é unha orixe fiable." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po new file mode 100644 index 0000000000..ee17dbd292 --- /dev/null +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -0,0 +1,6972 @@ +# Translation of StatusNet to Galician +# +# Author@translatewiki.net: Gallaecio +# Author@translatewiki.net: Toliño +# -- +# This file is distributed under the same license as the StatusNet package. +# +msgid "" +msgstr "" +"Project-Id-Version: StatusNet\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:07+0000\n" +"Language-Team: Galician\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Translation-Project: translatewiki.net at http://translatewiki.net\n" +"X-Language-Code: gl\n" +"X-Message-Group: out-statusnet\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. TRANS: Page title +#. TRANS: Menu item for site administration +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 +msgid "Access" +msgstr "Acceso" + +#. TRANS: Page notice +#: actions/accessadminpanel.php:67 +msgid "Site access settings" +msgstr "Configuración do acceso ao sitio" + +#. TRANS: Form legend for registration form. +#: actions/accessadminpanel.php:161 +msgid "Registration" +msgstr "Rexistro" + +#. TRANS: Checkbox instructions for admin setting "Private" +#: actions/accessadminpanel.php:165 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "Prohibir que os usuarios anónimos (sen sesión iniciada) vexan o sitio?" + +#. TRANS: Checkbox label for prohibiting anonymous users from viewing site. +#: actions/accessadminpanel.php:167 +msgctxt "LABEL" +msgid "Private" +msgstr "Privado" + +#. TRANS: Checkbox instructions for admin setting "Invite only" +#: actions/accessadminpanel.php:174 +msgid "Make registration invitation only." +msgstr "Que o rexistro só se poida facer previa invitación." + +#. TRANS: Checkbox label for configuring site as invite only. +#: actions/accessadminpanel.php:176 +msgid "Invite only" +msgstr "Só por invitación" + +#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations) +#: actions/accessadminpanel.php:183 +msgid "Disable new registrations." +msgstr "Desactivar os novos rexistros." + +#. TRANS: Checkbox label for disabling new user registrations. +#: actions/accessadminpanel.php:185 +msgid "Closed" +msgstr "Pechado" + +#. TRANS: Title / tooltip for button to save access settings in site admin panel +#: actions/accessadminpanel.php:202 +msgid "Save access settings" +msgstr "Gardar a configuración de acceso" + +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 +msgctxt "BUTTON" +msgid "Save" +msgstr "Gardar" + +#. TRANS: Server error when page not found (404) +#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/showfavorites.php:138 actions/tag.php:52 +msgid "No such page." +msgstr "Esa páxina non existe." + +#: actions/all.php:75 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/otp.php:76 actions/remotesubscribe.php:145 +#: actions/remotesubscribe.php:154 actions/replies.php:73 +#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 +msgid "No such user." +msgstr "Non existe tal usuario." + +#. TRANS: Page title. %1$s is user nickname, %2$d is page number +#: actions/all.php:86 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s e amigos, páxina %2$d" + +#. TRANS: Page title. %1$s is user nickname +#. TRANS: H1 text. %1$s is user nickname +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 +#, php-format +msgid "%s and friends" +msgstr "%s e amigos" + +#. TRANS: %1$s is user nickname +#: actions/all.php:103 +#, php-format +msgid "Feed for friends of %s (RSS 1.0)" +msgstr "Fonte de novas dos amigos de %s (RSS 1.0)" + +#. TRANS: %1$s is user nickname +#: actions/all.php:112 +#, php-format +msgid "Feed for friends of %s (RSS 2.0)" +msgstr "Fonte de novas dos amigos de %s (RSS 2.0)" + +#. TRANS: %1$s is user nickname +#: actions/all.php:121 +#, php-format +msgid "Feed for friends of %s (Atom)" +msgstr "Fonte de novas dos amigos de %s (Atom)" + +#. TRANS: %1$s is user nickname +#: actions/all.php:134 +#, php-format +msgid "" +"This is the timeline for %s and friends but no one has posted anything yet." +msgstr "" +"Esta é a liña do tempo de %s e amigos pero ninguén publicou nada aínda." + +#: actions/all.php:139 +#, php-format +msgid "" +"Try subscribing to more people, [join a group](%%action.groups%%) or post " +"something yourself." +msgstr "" +"Probe a subscribirse a máis xente, [únase a un grupo](%%action.groups%%) ou " +"publique algo." + +#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" +#: actions/all.php:142 +#, php-format +msgid "" +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." +msgstr "" +"Pode probar a [facerlle un aceno a %1$s](../%2$s) dende o seu perfil ou " +"[publicar algo dirixido a el ou ela](%%%%action.newnotice%%%%?" +"status_textarea=%3$s)." + +#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and then nudge %s or " +"post a notice to his or her attention." +msgstr "" +"Por que non [rexistrar unha conta](%%%%action.register%%%%) e entón facerlle " +"un aceno a %s ou publicar unha nota dirixida a el ou ela?" + +#. TRANS: H1 text +#: actions/all.php:178 +msgid "You and friends" +msgstr "Vostede e mailos seus amigos" + +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 +#, php-format +msgid "Updates from %1$s and friends on %2$s!" +msgstr "Actualizacións de %1$s e amigos en %2$s!" + +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 +#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 +#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 +#: actions/apigroupshow.php:115 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +msgid "API method not found." +msgstr "Non se atopou o método da API." + +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 +#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +msgid "This method requires a POST." +msgstr "Este método require un POST." + +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none." +msgstr "" +"Ten que especificar un parámetro chamado \"device\" cun destes valores: sms, " +"im, none." + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "Non se puido actualizar o usuario." + +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 +#: lib/profileaction.php:84 +msgid "User has no profile." +msgstr "O usuario non ten perfil." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Non se puido gardar o perfil." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 +#: lib/designsettings.php:283 +#, php-format +msgid "" +"The server was unable to handle that much POST data (%s bytes) due to its " +"current configuration." +msgstr "" +"O servidor non puido manexar tantos datos POST (%s bytes) por mor da súa " +"configuración actual." + +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 +msgid "Unable to save your design settings." +msgstr "Non se puido gardar a súa configuración de deseño." + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "Non se puido actualizar o seu deseño." + +#: actions/apiblockcreate.php:105 +msgid "You cannot block yourself!" +msgstr "Non pode bloquearse a si mesmo!" + +#: actions/apiblockcreate.php:126 +msgid "Block user failed." +msgstr "Non se puido bloquear o usuario." + +#: actions/apiblockdestroy.php:114 +msgid "Unblock user failed." +msgstr "Non se puido desbloquear o usuario." + +#: actions/apidirectmessage.php:89 +#, php-format +msgid "Direct messages from %s" +msgstr "Mensaxes directas de %s" + +#: actions/apidirectmessage.php:93 +#, php-format +msgid "All the direct messages sent from %s" +msgstr "Todas as mensaxes directas enviadas por %s" + +#: actions/apidirectmessage.php:101 +#, php-format +msgid "Direct messages to %s" +msgstr "Mensaxes directas a %s" + +#: actions/apidirectmessage.php:105 +#, php-format +msgid "All the direct messages sent to %s" +msgstr "Todas as mensaxes directas enviadas a %s" + +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "A mensaxe non ten texto!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" +"Iso é longo de máis. A lonxitude máxima das mensaxes é de %d caracteres." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Non se atopou o destinatario." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Non pode enviar mensaxes directas a usuarios que non sexan amigos seus." + +#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 +#: actions/apistatusesdestroy.php:113 +msgid "No status found with that ID." +msgstr "Non se atopou ningún estado con esa ID." + +#: actions/apifavoritecreate.php:119 +msgid "This status is already a favorite." +msgstr "Este estado xa é dos favoritos." + +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +msgid "Could not create favorite." +msgstr "Non se puido crear o favorito." + +#: actions/apifavoritedestroy.php:122 +msgid "That status is not a favorite." +msgstr "Ese estado non é un dos favoritos." + +#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +msgid "Could not delete favorite." +msgstr "Non se puido eliminar o favorito." + +#: actions/apifriendshipscreate.php:109 +msgid "Could not follow user: User not found." +msgstr "Non se puido seguir o usuario: non se atopou." + +#: actions/apifriendshipscreate.php:118 +#, php-format +msgid "Could not follow user: %s is already on your list." +msgstr "Non se puido seguir o usuario: %s xa está na súa lista." + +#: actions/apifriendshipsdestroy.php:109 +msgid "Could not unfollow user: User not found." +msgstr "Non se puido deixar de seguir o usuario: non se atopou." + +#: actions/apifriendshipsdestroy.php:120 +msgid "You cannot unfollow yourself." +msgstr "Non pode deixar de seguirse a si mesmo." + +#: actions/apifriendshipsexists.php:94 +msgid "Two user ids or screen_names must be supplied." +msgstr "Deben fornecerse dúas identificacións ou nomes de usuario." + +#: actions/apifriendshipsshow.php:134 +msgid "Could not determine source user." +msgstr "Non se puido determinar o usuario de orixe." + +#: actions/apifriendshipsshow.php:142 +msgid "Could not find target user." +msgstr "Non se puido atopar o usuario de destino." + +#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/newgroup.php:126 actions/profilesettings.php:215 +#: actions/register.php:205 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "" +"O alcume debe ter só letras en minúscula e números, e non pode ter espazos " +"en branco." + +#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/newgroup.php:130 actions/profilesettings.php:238 +#: actions/register.php:208 +msgid "Nickname already in use. Try another one." +msgstr "Ese alcume xa está en uso. Probe con outro." + +#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/newgroup.php:133 actions/profilesettings.php:218 +#: actions/register.php:210 +msgid "Not a valid nickname." +msgstr "O formato do alcume non é correcto." + +#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/editgroup.php:199 actions/newapplication.php:203 +#: actions/newgroup.php:139 actions/profilesettings.php:222 +#: actions/register.php:217 +msgid "Homepage is not a valid URL." +msgstr "O URL da páxina persoal non é correcto." + +#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/newgroup.php:142 actions/profilesettings.php:225 +#: actions/register.php:220 +msgid "Full name is too long (max 255 chars)." +msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)." + +#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/newapplication.php:172 +#, php-format +msgid "Description is too long (max %d chars)." +msgstr "A descrición é longa de máis (o máximo son %d caracteres)." + +#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/newgroup.php:148 actions/profilesettings.php:232 +#: actions/register.php:227 +msgid "Location is too long (max 255 chars)." +msgstr "A localidade é longa de máis (o máximo son 255 caracteres)." + +#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/newgroup.php:159 +#, php-format +msgid "Too many aliases! Maximum %d." +msgstr "Demasiados pseudónimos! O número máximo é %d." + +#: actions/apigroupcreate.php:266 +#, php-format +msgid "Invalid alias: \"%s\"." +msgstr "Pseudónimo incorrecto: \"%s\"." + +#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/newgroup.php:172 +#, php-format +msgid "Alias \"%s\" already in use. Try another one." +msgstr "O pseudónimo \"%s\" xa se está a usar. Proba con outro." + +#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/newgroup.php:178 +msgid "Alias can't be the same as nickname." +msgstr "O pseudónimo non pode coincidir co alcume." + +#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 +#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 +#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +msgid "Group not found." +msgstr "Non se atopou o grupo." + +#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +msgid "You are already a member of that group." +msgstr "Xa forma parte dese grupo." + +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +msgid "You have been blocked from that group by the admin." +msgstr "O administrador bloqueouno nese grupo." + +#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#, php-format +msgid "Could not join user %1$s to group %2$s." +msgstr "O usuario %1$s non se puido engadir ao grupo %2$s." + +#: actions/apigroupleave.php:114 +msgid "You are not a member of this group." +msgstr "Vostede non pertence a este grupo." + +#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#, php-format +msgid "Could not remove user %1$s from group %2$s." +msgstr "O usuario %1$s non se puido eliminar do grupo %2$s." + +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 +#, php-format +msgid "%s's groups" +msgstr "Os grupos de %s" + +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Grupos de %1$s aos que pertence %2$s." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#, php-format +msgid "%s groups" +msgstr "grupos %s" + +#: actions/apigrouplistall.php:95 +#, php-format +msgid "groups on %s" +msgstr "grupos en %s" + +#: actions/apioauthauthorize.php:101 +msgid "No oauth_token parameter provided." +msgstr "Non se forneceu o parámetro oauth_token." + +#: actions/apioauthauthorize.php:106 +msgid "Invalid token." +msgstr "Pase incorrecto." + +#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/groupblock.php:66 actions/grouplogo.php:312 +#: actions/groupunblock.php:66 actions/imsettings.php:227 +#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 +#: actions/subscribe.php:86 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 +msgid "There was a problem with your session token. Try again, please." +msgstr "Houbo un erro co seu pase. Inténteo de novo." + +#: actions/apioauthauthorize.php:135 +msgid "Invalid nickname / password!" +msgstr "O alcume ou o contrasinal son incorrectos!" + +#: actions/apioauthauthorize.php:159 +msgid "Database error deleting OAuth application user." +msgstr "" +"Houbo un erro na base de datos ao intentar borrar o usuario da aplicación " +"OAuth." + +#: actions/apioauthauthorize.php:185 +msgid "Database error inserting OAuth application user." +msgstr "" +"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación " +"OAuth." + +#: actions/apioauthauthorize.php:214 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "Autorizouse a ficha da solicitude %s. Intercámbiea por un pase." + +#: actions/apioauthauthorize.php:227 +#, php-format +msgid "The request token %s has been denied and revoked." +msgstr "Denegouse e revogouse a ficha da solicitude %s." + +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. +#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 +#: actions/smssettings.php:277 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Envío de formulario inesperado." + +#: actions/apioauthauthorize.php:259 +msgid "An application would like to connect to your account" +msgstr "Unha aplicación quere conectarse á súa conta" + +#: actions/apioauthauthorize.php:276 +msgid "Allow or deny access" +msgstr "Permitir ou denegar o acceso" + +#: actions/apioauthauthorize.php:292 +#, php-format +msgid "" +"The application %1$s by %2$s would like " +"the ability to %3$s your %4$s account data. You should only " +"give access to your %4$s account to third parties you trust." +msgstr "" +"A aplicación %1$s de %2$s quere poder " +"%3$s os datos da súa conta %4$s. Só debería permitir o " +"acceso á súa conta %4$s a xente de confianza." + +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 +msgid "Account" +msgstr "Conta" + +#: actions/apioauthauthorize.php:313 actions/login.php:230 +#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/showgroup.php:245 actions/tagother.php:94 +#: actions/userauthorization.php:145 lib/groupeditform.php:152 +#: lib/userprofile.php:132 +msgid "Nickname" +msgstr "Alcume" + +#. TRANS: Link description in user account settings menu. +#: actions/apioauthauthorize.php:316 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:125 +msgid "Password" +msgstr "Contrasinal" + +#: actions/apioauthauthorize.php:328 +msgid "Deny" +msgstr "Denegar" + +#: actions/apioauthauthorize.php:334 +msgid "Allow" +msgstr "Permitir" + +#: actions/apioauthauthorize.php:351 +msgid "Allow or deny access to your account information." +msgstr "Permitir ou denegar o acceso á información da súa conta." + +#: actions/apistatusesdestroy.php:107 +msgid "This method requires a POST or DELETE." +msgstr "Este método require un POST ou un DELETE." + +#: actions/apistatusesdestroy.php:130 +msgid "You may not delete another user's status." +msgstr "Non pode borrar o estado doutro usuario." + +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." +msgstr "Non existe tal nota." + +#: actions/apistatusesretweet.php:83 +msgid "Cannot repeat your own notice." +msgstr "Non pode repetir a súa propia nota." + +#: actions/apistatusesretweet.php:91 +msgid "Already repeated that notice." +msgstr "Xa repetiu esa nota." + +#: actions/apistatusesshow.php:138 +msgid "Status deleted." +msgstr "Borrouse o estado." + +#: actions/apistatusesshow.php:144 +msgid "No status with that ID found." +msgstr "Non se atopou ningún estado con esa ID." + +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: lib/mailhandler.php:60 +#, php-format +msgid "That's too long. Max notice size is %d chars." +msgstr "Iso é longo de máis. A nota non pode exceder os %d caracteres." + +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Non se atopou." + +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#, php-format +msgid "Max notice size is %d chars, including attachment URL." +msgstr "" +"A lonxitude máxima das notas é de %d caracteres, incluído o URL do dato " +"adxunto." + +#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 +msgid "Unsupported format." +msgstr "Formato non soportado." + +#: actions/apitimelinefavorites.php:109 +#, php-format +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s / Favoritos de %2$s" + +#: actions/apitimelinefavorites.php:118 +#, php-format +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "%1$s actualizacións marcadas como favoritas por %2$s / %2$s." + +#: actions/apitimelinementions.php:117 +#, php-format +msgid "%1$s / Updates mentioning %2$s" +msgstr "%1$s / Actualizacións que mencionan %2$s" + +#: actions/apitimelinementions.php:130 +#, php-format +msgid "%1$s updates that reply to updates from %2$s / %3$s." +msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s." + +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#, php-format +msgid "%s public timeline" +msgstr "Liña do tempo pública de %s" + +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#, php-format +msgid "%s updates from everyone!" +msgstr "%s actualizacións de todos!" + +#: actions/apitimelineretweetedtome.php:111 +#, php-format +msgid "Repeated to %s" +msgstr "Repetiu a %s" + +#: actions/apitimelineretweetsofme.php:114 +#, php-format +msgid "Repeats of %s" +msgstr "Repeticións de %s" + +#: actions/apitimelinetag.php:104 actions/tag.php:67 +#, php-format +msgid "Notices tagged with %s" +msgstr "Notas etiquetadas con %s" + +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#, php-format +msgid "Updates tagged with %1$s on %2$s!" +msgstr "Actualizacións etiquetadas con %1$s en %2$s!" + +#: actions/attachment.php:73 +msgid "No such attachment." +msgstr "Non existe tal dato adxunto." + +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/showgroup.php:121 +msgid "No nickname." +msgstr "Sen alcume." + +#: actions/avatarbynickname.php:64 +msgid "No size." +msgstr "Sen tamaño." + +#: actions/avatarbynickname.php:69 +msgid "Invalid size." +msgstr "Tamaño non válido." + +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 +msgid "Avatar" +msgstr "Avatar" + +#: actions/avatarsettings.php:78 +#, php-format +msgid "You can upload your personal avatar. The maximum file size is %s." +msgstr "" +"Pode cargar o seu avatar personalizado. O tamaño máximo para o ficheiro é de " +"%s." + +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "O usuario non ten perfil." + +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 +#: actions/grouplogo.php:254 +msgid "Avatar settings" +msgstr "Configuración do avatar" + +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 +#: actions/grouplogo.php:202 actions/grouplogo.php:262 +msgid "Original" +msgstr "Orixinal" + +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 +#: actions/grouplogo.php:213 actions/grouplogo.php:274 +msgid "Preview" +msgstr "Vista previa" + +#: actions/avatarsettings.php:149 actions/showapplication.php:252 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 +msgid "Delete" +msgstr "Borrar" + +#: actions/avatarsettings.php:166 actions/grouplogo.php:236 +msgid "Upload" +msgstr "Cargar" + +#: actions/avatarsettings.php:231 actions/grouplogo.php:289 +msgid "Crop" +msgstr "Recortar" + +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Non se subiu ficheiro ningún." + +#: actions/avatarsettings.php:332 +msgid "Pick a square area of the image to be your avatar" +msgstr "Escolla unha zona cadrada da imaxe para usala como avatar" + +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 +msgid "Lost our file data." +msgstr "Perdéronse os datos do ficheiro." + +#: actions/avatarsettings.php:370 +msgid "Avatar updated." +msgstr "Actualizouse o avatar." + +#: actions/avatarsettings.php:373 +msgid "Failed updating avatar." +msgstr "Non se puido actualizar o avatar." + +#: actions/avatarsettings.php:397 +msgid "Avatar deleted." +msgstr "Borrouse o avatar." + +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "Xa bloqueou ese usuario." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +msgid "Block user" +msgstr "Bloquear o usuario" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" +"Está seguro de querer bloquear este usuario? Unha vez feito deixará de estar " +"subscrito a vostede mentres siga bloqueado, e vostede non recibirá ningunha " +"das súas respostas." + +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 +#: actions/groupblock.php:178 +msgctxt "BUTTON" +msgid "No" +msgstr "Non" + +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 +msgid "Do not block this user" +msgstr "Non bloquear este usuario" + +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" +msgid "Yes" +msgstr "Si" + +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +msgid "Block this user" +msgstr "Bloquear este usuario" + +#: actions/block.php:179 +msgid "Failed to save block information." +msgstr "Non se puido gardar a información do bloqueo." + +#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87 +#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62 +#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83 +#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102 +#: actions/groupmembers.php:83 actions/groupmembers.php:90 +#: actions/grouprss.php:98 actions/grouprss.php:105 +#: actions/groupunblock.php:86 actions/joingroup.php:82 +#: actions/joingroup.php:93 actions/leavegroup.php:82 +#: actions/leavegroup.php:93 actions/makeadmin.php:86 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 +msgid "No such group." +msgstr "Non existe tal grupo." + +#: actions/blockedfromgroup.php:97 +#, php-format +msgid "%s blocked profiles" +msgstr "%s perfís bloqueados" + +#: actions/blockedfromgroup.php:100 +#, php-format +msgid "%1$s blocked profiles, page %2$d" +msgstr "%1$s perfís bloqueados, páxina %2$d" + +#: actions/blockedfromgroup.php:115 +msgid "A list of the users blocked from joining this group." +msgstr "Unha lista de usuarios bloqueados fronte á unión a este grupo." + +#: actions/blockedfromgroup.php:288 +msgid "Unblock user from group" +msgstr "Desbloquear o usuario do grupo" + +#: actions/blockedfromgroup.php:320 lib/unblockform.php:69 +msgid "Unblock" +msgstr "Desbloquear" + +#: actions/blockedfromgroup.php:320 lib/unblockform.php:80 +msgid "Unblock this user" +msgstr "Desbloquear este usuario" + +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Publicar en %s" + +#: actions/confirmaddress.php:75 +msgid "No confirmation code." +msgstr "Sen código de confirmación." + +#: actions/confirmaddress.php:80 +msgid "Confirmation code not found." +msgstr "Non se atopou o código de confirmación." + +#: actions/confirmaddress.php:85 +msgid "That confirmation code is not for you!" +msgstr "Ese código de confirmación non é para vostede!" + +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, php-format +msgid "Unrecognized address type %s." +msgstr "Non se recoñeceu o tipo de enderezo %s." + +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 +msgid "That address has already been confirmed." +msgstr "Ese enderezo xa se confirmou." + +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 +msgid "Couldn't update user." +msgstr "Non se puido actualizar o usuario." + +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 +msgid "Couldn't delete email confirmation." +msgstr "Non se puido borrar a confirmación por correo electrónico." + +#: actions/confirmaddress.php:146 +msgid "Confirm address" +msgstr "Confirmar o enderezo" + +#: actions/confirmaddress.php:161 +#, php-format +msgid "The address \"%s\" has been confirmed for your account." +msgstr "Confirmouse o enderezo \"%s\" para a súa conta." + +#: actions/conversation.php:99 +msgid "Conversation" +msgstr "Conversa" + +#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 +msgid "Notices" +msgstr "Notas" + +#: actions/deleteapplication.php:63 +msgid "You must be logged in to delete an application." +msgstr "Ten que iniciar sesión para borrar unha aplicación." + +#: actions/deleteapplication.php:71 +msgid "Application not found." +msgstr "Non se atopou a aplicación." + +#: actions/deleteapplication.php:78 actions/editapplication.php:77 +#: actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "Non é o dono desa aplicación." + +#: actions/deleteapplication.php:102 actions/editapplication.php:127 +#: actions/newapplication.php:110 actions/showapplication.php:118 +#: lib/action.php:1253 +msgid "There was a problem with your session token." +msgstr "Houbo un problema co seu pase." + +#: actions/deleteapplication.php:123 actions/deleteapplication.php:147 +msgid "Delete application" +msgstr "Borrar a aplicación" + +#: actions/deleteapplication.php:149 +msgid "" +"Are you sure you want to delete this application? This will clear all data " +"about the application from the database, including all existing user " +"connections." +msgstr "" +"Está seguro de querer borrar esta aplicación? Se o fai, borrará todos os " +"datos da aplicación da base de datos, incluídas todas as conexións do " +"usuario existentes." + +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 +msgid "Do not delete this application" +msgstr "Non borrar a aplicación" + +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 +msgid "Delete this application" +msgstr "Borrar a aplicación" + +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. +#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 +#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 +#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 +#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 +msgid "Not logged in." +msgstr "Non iniciou sesión." + +#: actions/deletenotice.php:71 +msgid "Can't delete this notice." +msgstr "Non se pode borrar esta nota." + +#: actions/deletenotice.php:103 +msgid "" +"You are about to permanently delete a notice. Once this is done, it cannot " +"be undone." +msgstr "" +"Está a piques de borrar unha nota definitivamente. Unha vez feito, non se " +"poderá recuperar." + +#: actions/deletenotice.php:109 actions/deletenotice.php:141 +msgid "Delete notice" +msgstr "Borrar a nota" + +#: actions/deletenotice.php:144 +msgid "Are you sure you want to delete this notice?" +msgstr "Está seguro de querer borrar esta nota?" + +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 +msgid "Do not delete this notice" +msgstr "Non borrar esta nota" + +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 +msgid "Delete this notice" +msgstr "Borrar esta nota" + +#: actions/deleteuser.php:67 +msgid "You cannot delete users." +msgstr "Non pode borrar usuarios." + +#: actions/deleteuser.php:74 +msgid "You can only delete local users." +msgstr "Só pode borrar usuarios locais." + +#: actions/deleteuser.php:110 actions/deleteuser.php:133 +msgid "Delete user" +msgstr "Borrar o usuario" + +#: actions/deleteuser.php:136 +msgid "" +"Are you sure you want to delete this user? This will clear all data about " +"the user from the database, without a backup." +msgstr "" +"Está seguro de querer borrar este usuario? Isto borrará todos os datos do " +"usuario da base de datos, sen posibilidade de recuperalos." + +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 +msgid "Delete this user" +msgstr "Borrar o usuario" + +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 +#: lib/groupnav.php:119 +msgid "Design" +msgstr "Deseño" + +#: actions/designadminpanel.php:74 +msgid "Design settings for this StatusNet site." +msgstr "Configuración do deseño deste sitio StatusNet." + +#: actions/designadminpanel.php:276 +msgid "Invalid logo URL." +msgstr "URL do logo incorrecto." + +#: actions/designadminpanel.php:280 +#, php-format +msgid "Theme not available: %s." +msgstr "O tema visual non está dispoñible: %s." + +#: actions/designadminpanel.php:376 +msgid "Change logo" +msgstr "Cambiar o logo" + +#: actions/designadminpanel.php:381 +msgid "Site logo" +msgstr "Logo do sitio" + +#: actions/designadminpanel.php:388 +msgid "Change theme" +msgstr "Cambar o tema visual" + +#: actions/designadminpanel.php:405 +msgid "Site theme" +msgstr "Tema visual do sitio" + +#: actions/designadminpanel.php:406 +msgid "Theme for the site." +msgstr "Tema visual para o sitio." + +#: actions/designadminpanel.php:418 lib/designsettings.php:101 +msgid "Change background image" +msgstr "Cambiar a imaxe de fondo" + +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 +#: lib/designsettings.php:178 +msgid "Background" +msgstr "Fondo" + +#: actions/designadminpanel.php:428 +#, php-format +msgid "" +"You can upload a background image for the site. The maximum file size is %1" +"$s." +msgstr "" +"Pode cargar unha imaxe de fondo para o sitio. O tamaño máximo para o " +"ficheiro é de %1$s." + +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 +msgid "On" +msgstr "Activado" + +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 +msgid "Off" +msgstr "Desactivado" + +#: actions/designadminpanel.php:477 lib/designsettings.php:156 +msgid "Turn background image on or off." +msgstr "Activar ou desactivar a imaxe de fondo." + +#: actions/designadminpanel.php:482 lib/designsettings.php:161 +msgid "Tile background image" +msgstr "Imaxe de fondo en mosaico" + +#: actions/designadminpanel.php:491 lib/designsettings.php:170 +msgid "Change colours" +msgstr "Cambiar as cores" + +#: actions/designadminpanel.php:513 lib/designsettings.php:191 +msgid "Content" +msgstr "Contido" + +#: actions/designadminpanel.php:526 lib/designsettings.php:204 +msgid "Sidebar" +msgstr "Barra lateral" + +#: actions/designadminpanel.php:539 lib/designsettings.php:217 +msgid "Text" +msgstr "Texto" + +#: actions/designadminpanel.php:552 lib/designsettings.php:230 +msgid "Links" +msgstr "Ligazóns" + +#: actions/designadminpanel.php:580 lib/designsettings.php:247 +msgid "Use defaults" +msgstr "Utilizar os valores por defecto" + +#: actions/designadminpanel.php:581 lib/designsettings.php:248 +msgid "Restore default designs" +msgstr "Restaurar o deseño por defecto" + +#: actions/designadminpanel.php:587 lib/designsettings.php:254 +msgid "Reset back to default" +msgstr "Volver ao deseño por defecto" + +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 +#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 +#: lib/designsettings.php:256 lib/groupeditform.php:202 +msgid "Save" +msgstr "Gardar" + +#: actions/designadminpanel.php:590 lib/designsettings.php:257 +msgid "Save design" +msgstr "Gardar o deseño" + +#: actions/disfavor.php:81 +msgid "This notice is not a favorite!" +msgstr "Esta nota non é unha das favoritas!" + +#: actions/disfavor.php:94 +msgid "Add to favorites" +msgstr "Engadir aos favoritos" + +#: actions/doc.php:158 +#, php-format +msgid "No such document \"%s\"" +msgstr "Non hai ningún documento \"%s\"" + +#: actions/editapplication.php:54 +msgid "Edit Application" +msgstr "Editar a aplicación" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "Ten que iniciar sesión para editar unha aplicación." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "Non existe esa aplicación." + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "Utilice este formulario para editar a súa aplicación." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "Fai falla un nome." + +#: actions/editapplication.php:180 actions/newapplication.php:165 +msgid "Name is too long (max 255 chars)." +msgstr "O nome é longo de máis (o límite é de 255 caracteres)." + +#: actions/editapplication.php:183 actions/newapplication.php:162 +msgid "Name already in use. Try another one." +msgstr "O nome xa está en uso. Probe con outro." + +#: actions/editapplication.php:186 actions/newapplication.php:168 +msgid "Description is required." +msgstr "Fai falla unha descrición." + +#: actions/editapplication.php:194 +msgid "Source URL is too long." +msgstr "O URL de orixe é longo de máis." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Source URL is not valid." +msgstr "O URL de orixe é incorrecto." + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is required." +msgstr "Fai falla unha organización." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization is too long (max 255 chars)." +msgstr "A organización é longa de máis (o límite é de 255 caracteres)." + +#: actions/editapplication.php:209 actions/newapplication.php:194 +msgid "Organization homepage is required." +msgstr "Fai falla unha páxina web da organización." + +#: actions/editapplication.php:218 actions/newapplication.php:206 +msgid "Callback is too long." +msgstr "O retorno de chamada é longo de máis." + +#: actions/editapplication.php:225 actions/newapplication.php:215 +msgid "Callback URL is not valid." +msgstr "O URL do retorno de chamada é incorrecto." + +#: actions/editapplication.php:258 +msgid "Could not update application." +msgstr "Non se puido actualizar a aplicación." + +#: actions/editgroup.php:56 +#, php-format +msgid "Edit %s group" +msgstr "Editar o grupo %s" + +#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 +msgid "You must be logged in to create a group." +msgstr "Ten que iniciar sesión para crear un grupo." + +#: actions/editgroup.php:107 actions/editgroup.php:172 +#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109 +msgid "You must be an admin to edit the group." +msgstr "Ten que ser administrador para editar o grupo." + +#: actions/editgroup.php:158 +msgid "Use this form to edit the group." +msgstr "Utilice este formulario para editar o grupo." + +#: actions/editgroup.php:205 actions/newgroup.php:145 +#, php-format +msgid "description is too long (max %d chars)." +msgstr "a descrición é longa de máis (o límite é de %d caracteres)." + +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Pseudónimo inválido: \"%s\"" + +#: actions/editgroup.php:258 +msgid "Could not update group." +msgstr "Non se puido actualizar o grupo." + +#: actions/editgroup.php:264 classes/User_group.php:496 +msgid "Could not create aliases." +msgstr "Non se puideron crear os pseudónimos." + +#: actions/editgroup.php:280 +msgid "Options saved." +msgstr "Gardáronse as preferencias." + +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 +msgid "Email settings" +msgstr "Configuración do correo electrónico" + +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 +#, php-format +msgid "Manage how you get email from %%site.name%%." +msgstr "Xestiona a forma en que recibes correo electrónico de %%site.name%%." + +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Enderezo de correo electrónico" + +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 +msgid "Current confirmed email address." +msgstr "Enderezo de correo electrónico confirmado actualmente." + +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" +msgid "Remove" +msgstr "Borrar" + +#: actions/emailsettings.php:122 +msgid "" +"Awaiting confirmation on this address. Check your inbox (and spam box!) for " +"a message with further instructions." +msgstr "" +"Agardando pola confirmación deste enderezo. Busque unha mensaxe con máis " +"instrucións na súa bandexa de entrada (e na de correo non desexado!)." + +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" +msgid "Cancel" +msgstr "Cancelar" + +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 +msgid "Email address, like \"UserName@example.org\"" +msgstr "Enderezo de correo electrónico, coma \"nomedeusuario@example.org\"" + +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" +msgid "Add" +msgstr "Engadir" + +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 +msgid "Incoming email" +msgstr "Correo entrante" + +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 +msgid "Send email to this address to post new notices." +msgstr "" +"Enviar un correo electrónico a este enderezo para publicar novas notas." + +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 +msgid "Make a new email address for posting to; cancels the old one." +msgstr "" +"Establece un novo enderezo de correo electrónico no que publicar, e cancela " +"o vello." + +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" +msgid "New" +msgstr "Novo" + +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Preferencias de correo electrónico" + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 +msgid "Send me notices of new subscriptions through email." +msgstr "Enviarme notas acerca de novas subscricións por correo electrónico." + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 +msgid "Send me email when someone adds my notice as a favorite." +msgstr "" +"Enviádeme un correo electrónico cando alguén marque como favorito algunha " +"das miñas notas." + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 +msgid "Send me email when someone sends me a private message." +msgstr "" +"Enviádeme un correo electrónico cando alguén me envíe unha mensaxe privada." + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 +msgid "Send me email when someone sends me an \"@-reply\"." +msgstr "Enviádeme un correo electrónico cando alguén me envíe unha resposta." + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 +msgid "Allow friends to nudge me and send me an email." +msgstr "" +"Permitirlles aos meus amigos facerme acenos e enviarme correos electrónicos." + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 +msgid "I want to post notices by email." +msgstr "Quero publicar notas por correo electrónico." + +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 +msgid "Publish a MicroID for my email address." +msgstr "Publicar unha MicroID para o meu enderezo de correo electrónico." + +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Gardáronse as preferencias de correo electrónico." + +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 +msgid "No email address." +msgstr "Non hai enderezo de correo electrónico." + +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 +msgid "Cannot normalize that email address" +msgstr "Non se pode normalizar ese enderezo de correo electrónico" + +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/siteadminpanel.php:144 +msgid "Not a valid email address." +msgstr "O enderezo de correo electrónico é incorrecto." + +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 +msgid "That is already your email address." +msgstr "Ese enderezo de correo electrónico é o que ten agora." + +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 +msgid "That email address already belongs to another user." +msgstr "Ese enderezo de correo electrónico xa pertence a outro usuario." + +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 +msgid "Couldn't insert confirmation code." +msgstr "Non se puido inserir o código de confirmación." + +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 +msgid "" +"A confirmation code was sent to the email address you added. Check your " +"inbox (and spam box!) for the code and instructions on how to use it." +msgstr "" +"Enviouse un código de confirmación ao enderezo de correo electrónico que " +"engadiu. Busque o código e as instrucións para usalo na súa bandexa de " +"entrada (e na de correo non desexado!)." + +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 +msgid "No pending confirmation to cancel." +msgstr "Non hai ningunha confirmación pendente que cancelar." + +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Ese enderezo de correo electrónico é incorrecto." + +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Cancelouse a confirmación por correo electrónico." + +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 +msgid "That is not your email address." +msgstr "Ese non é o seu enderezo de correo electrónico." + +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "Borrouse o enderezo de correo electrónico." + +#: actions/emailsettings.php:493 actions/smssettings.php:568 +msgid "No incoming email address." +msgstr "Non hai ningún enderezo ao que enviar." + +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 +msgid "Couldn't update user record." +msgstr "Non se puido actualizar o rexistro do usuario." + +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 +msgid "Incoming email address removed." +msgstr "Borrouse o enderezo de correo electrónico entrante." + +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 +msgid "New incoming email address added." +msgstr "Engadiuse un novo enderezo de correo electrónico entrante." + +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "A nota xa é unha das súas favoritas!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Desmarcar como favorita" + +#: actions/favorited.php:65 lib/popularnoticesection.php:91 +#: lib/publicgroupnav.php:93 +msgid "Popular notices" +msgstr "Notas populares" + +#: actions/favorited.php:67 +#, php-format +msgid "Popular notices, page %d" +msgstr "Notas populares, páxina %d" + +#: actions/favorited.php:79 +msgid "The most popular notices on the site right now." +msgstr "As notas máis populares do sitio nestes intres." + +#: actions/favorited.php:150 +msgid "Favorite notices appear on this page but no one has favorited one yet." +msgstr "As notas favoritas aparecen nesta páxina, pero aínda non hai ningunha." + +#: actions/favorited.php:153 +msgid "" +"Be the first to add a notice to your favorites by clicking the fave button " +"next to any notice you like." +msgstr "" +"Sexa o primeiro en engadir unha nota aos seus favoritos premendo sobre o " +"botón de favoritos que aparece ao carón de calquera nota que lle guste." + +#: actions/favorited.php:156 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to add a " +"notice to your favorites!" +msgstr "" +"Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en " +"engadir unha nota aos seus favoritos?" + +#: actions/favoritesrss.php:111 actions/showfavorites.php:77 +#: lib/personalgroupnav.php:115 +#, php-format +msgid "%s's favorite notices" +msgstr "Notas favoritas de %s" + +#: actions/favoritesrss.php:115 +#, php-format +msgid "Updates favored by %1$s on %2$s!" +msgstr "Actualizacións favoritas de %1$s en %2$s!" + +#: actions/featured.php:69 lib/featureduserssection.php:87 +#: lib/publicgroupnav.php:89 +msgid "Featured users" +msgstr "Usuarios do momento" + +#: actions/featured.php:71 +#, php-format +msgid "Featured users, page %d" +msgstr "Usuarios do momento, páxina %d" + +#: actions/featured.php:99 +#, php-format +msgid "A selection of some great users on %s" +msgstr "Unha selección dalgúns bos usuarios en %s" + +#: actions/file.php:34 +msgid "No notice ID." +msgstr "A nota non ten ningunha ID." + +#: actions/file.php:38 +msgid "No notice." +msgstr "Non hai ningunha nota." + +#: actions/file.php:42 +msgid "No attachments." +msgstr "Non hai ningún dato adxunto." + +#: actions/file.php:51 +msgid "No uploaded attachments." +msgstr "Non se cargou ningún dato adxunto." + +#: actions/finishremotesubscribe.php:69 +msgid "Not expecting this response!" +msgstr "Non se esperaba esta resposta!" + +#: actions/finishremotesubscribe.php:80 +msgid "User being listened to does not exist." +msgstr "Non existe o usuario ao que está seguindo." + +#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 +msgid "You can use the local subscription!" +msgstr "Pode usar a subscrición local!" + +#: actions/finishremotesubscribe.php:99 +msgid "That user has blocked you from subscribing." +msgstr "Ese usuario bloqueouno fronte á subscrición a el." + +#: actions/finishremotesubscribe.php:110 +msgid "You are not authorized." +msgstr "Non está autorizado." + +#: actions/finishremotesubscribe.php:113 +msgid "Could not convert request token to access token." +msgstr "Non se puido converter a ficha da solicitude nun pase." + +#: actions/finishremotesubscribe.php:118 +msgid "Remote service uses unknown version of OMB protocol." +msgstr "O servizo remoto utiliza unha versión descoñecida do protocolo OMB." + +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Houbo un erro ao actualizar o perfil remoto." + +#: actions/getfile.php:79 +msgid "No such file." +msgstr "Non existe tal ficheiro." + +#: actions/getfile.php:83 +msgid "Cannot read file." +msgstr "Non se pode ler o ficheiro." + +#: actions/grantrole.php:62 actions/revokerole.php:62 +msgid "Invalid role." +msgstr "Rol incorrecto." + +#: actions/grantrole.php:66 actions/revokerole.php:66 +msgid "This role is reserved and cannot be set." +msgstr "Non se pode establecer este rol, está reservado." + +#: actions/grantrole.php:75 +msgid "You cannot grant user roles on this site." +msgstr "Non pode concederlles roles aos usuarios neste sitio." + +#: actions/grantrole.php:82 +msgid "User already has this role." +msgstr "O usuario xa ten este rol." + +#: actions/groupblock.php:71 actions/groupunblock.php:71 +#: actions/makeadmin.php:71 actions/subedit.php:46 +#: lib/profileformaction.php:70 +msgid "No profile specified." +msgstr "Non se especificou ningún perfil." + +#: actions/groupblock.php:76 actions/groupunblock.php:76 +#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +msgid "No profile with that ID." +msgstr "Ningún perfil ten esa ID." + +#: actions/groupblock.php:81 actions/groupunblock.php:81 +#: actions/makeadmin.php:81 +msgid "No group specified." +msgstr "Non se especificou ningún grupo." + +#: actions/groupblock.php:91 +msgid "Only an admin can block group members." +msgstr "Só os administradores poden excluír a membros do grupo." + +#: actions/groupblock.php:95 +msgid "User is already blocked from group." +msgstr "O usuario xa está excluído do grupo." + +#: actions/groupblock.php:100 +msgid "User is not a member of group." +msgstr "O usuario non pertence ao grupo." + +#: actions/groupblock.php:134 actions/groupmembers.php:360 +msgid "Block user from group" +msgstr "Excluír do grupo ao usuario" + +#: actions/groupblock.php:160 +#, php-format +msgid "" +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." +msgstr "" +"Seguro que quere excluír do grupo \"%2$s\" ao usuario \"%1$s\"? Quedará fóra " +"do grupo, sen a posibilidade de publicar nada nel nin volver subscribirse a " +"el no futuro." + +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 +msgid "Do not block this user from this group" +msgstr "Non excluír deste grupo a este usuario" + +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 +msgid "Block this user from this group" +msgstr "Excluír deste grupo a este usuario" + +#: actions/groupblock.php:206 +msgid "Database error blocking user from group." +msgstr "Houbo un erro na base de datos ao excluír do grupo ao usuario." + +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Sen ID." + +#: actions/groupdesignsettings.php:68 +msgid "You must be logged in to edit a group." +msgstr "Ten que estar identificado para editar un grupo." + +#: actions/groupdesignsettings.php:144 +msgid "Group design" +msgstr "Deseño do grupo" + +#: actions/groupdesignsettings.php:155 +msgid "" +"Customize the way your group looks with a background image and a colour " +"palette of your choice." +msgstr "" +"Personaliza o aspecto do grupo cunha imaxe de fondo e unha paleta de cores " +"da súa escolla." + +#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 +msgid "Couldn't update your design." +msgstr "Non se puido actualizar o seu deseño." + +#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231 +msgid "Design preferences saved." +msgstr "Gardáronse as preferencias de deseño." + +#: actions/grouplogo.php:142 actions/grouplogo.php:195 +msgid "Group logo" +msgstr "Logo do grupo" + +#: actions/grouplogo.php:153 +#, php-format +msgid "" +"You can upload a logo image for your group. The maximum file size is %s." +msgstr "" +"Pode cargar un logo para o seu grupo. O tamaño máximo para o ficheiro é de %" +"s." + +#: actions/grouplogo.php:365 +msgid "Pick a square area of the image to be the logo." +msgstr "Escolla unha zona cadrada da imaxe para usala como logo." + +#: actions/grouplogo.php:399 +msgid "Logo updated." +msgstr "Actualizouse o logo." + +#: actions/grouplogo.php:401 +msgid "Failed updating logo." +msgstr "Non se puido actualizar o logo." + +#: actions/groupmembers.php:100 lib/groupnav.php:92 +#, php-format +msgid "%s group members" +msgstr "Membros do grupo %s" + +#: actions/groupmembers.php:103 +#, php-format +msgid "%1$s group members, page %2$d" +msgstr "Membros do grupo %1$s, páxina %2$d" + +#: actions/groupmembers.php:118 +msgid "A list of the users in this group." +msgstr "Unha lista dos usuarios pertencentes a este grupo." + +#: actions/groupmembers.php:182 lib/groupnav.php:107 +msgid "Admin" +msgstr "Administrador" + +#: actions/groupmembers.php:392 lib/blockform.php:69 +msgid "Block" +msgstr "Excluír" + +#: actions/groupmembers.php:487 +msgid "Make user an admin of the group" +msgstr "Converter ao usuario en administrador do grupo" + +#: actions/groupmembers.php:519 +msgid "Make Admin" +msgstr "Converter en administrador" + +#: actions/groupmembers.php:519 +msgid "Make this user an admin" +msgstr "Converter a este usuario en administrador" + +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#, php-format +msgid "%s timeline" +msgstr "Liña do tempo de %s" + +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 +#, php-format +msgid "Updates from members of %1$s on %2$s!" +msgstr "Actualizacións de membros de %1$s en %2$s!" + +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Grupos" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Grupos, páxina %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" +"Os grupos de %%%%site.name%%%% permiten atopar e porse en contacto con " +"persoas de intereses similares aos seus. Tras unirse a un grupo pode enviar " +"mensaxes a todos os membros utilizando a sintaxe \"!nomedogrupo\". Non atopa " +"un grupo que lle guste? Probe a [buscar un](%%%%action.groupsearch%%%%) ou " +"[crear un pola súa conta!](%%%%action.newgroup%%%%)" + +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Crear un grupo novo" + +#: actions/groupsearch.php:52 +#, php-format +msgid "" +"Search for groups on %%site.name%% by their name, location, or description. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" +"Buscar grupos en %%site.name%% por nome, lugar ou descrición. Separe os " +"termos con espazos en branco. Cada termo ten que estar formado por tres ou " +"máis caracteres." + +#: actions/groupsearch.php:58 +msgid "Group search" +msgstr "Busca de grupos" + +#: actions/groupsearch.php:79 actions/noticesearch.php:117 +#: actions/peoplesearch.php:83 +msgid "No results." +msgstr "Non houbo resultados." + +#: actions/groupsearch.php:82 +#, php-format +msgid "" +"If you can't find the group you're looking for, you can [create it](%%action." +"newgroup%%) yourself." +msgstr "Se non atopa o grupo que busca, pode [crealo](%%action.newgroup%%)." + +#: actions/groupsearch.php:85 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and [create the group](%%" +"action.newgroup%%) yourself!" +msgstr "" +"Por que non [rexistrar unha conta](%%action.register%%) e [crear o grupo](%%" +"action.newgroup%%)?" + +#: actions/groupunblock.php:91 +msgid "Only an admin can unblock group members." +msgstr "Só os administradores poden readmitir a membros do grupo." + +#: actions/groupunblock.php:95 +msgid "User is not blocked from group." +msgstr "O usuario non está excluído do grupo." + +#: actions/groupunblock.php:128 actions/unblock.php:86 +msgid "Error removing the block." +msgstr "Houbo un erro ao facer efectiva a readmisión." + +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 +msgid "IM settings" +msgstr "Configuración da mensaxería instantánea" + +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 +#, php-format +msgid "" +"You can send and receive notices through Jabber/GTalk [instant messages](%%" +"doc.im%%). Configure your address and settings below." +msgstr "" +"Pode enviar e recibir notas mediante [mensaxes instantáneas](%%doc.im%%) de " +"Jabber/GTalk. Configure a continuación o seu enderezo e preferencias." + +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 +msgid "IM is not available." +msgstr "A mensaxería instantánea non está dispoñible." + +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Enderezo de mensaxería instantánea" + +#: actions/imsettings.php:113 +msgid "Current confirmed Jabber/GTalk address." +msgstr "Enderezo de Jabber/GTalk confirmado actualmente." + +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 +#, php-format +msgid "" +"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " +"message with further instructions. (Did you add %s to your buddy list?)" +msgstr "" +"Agardando pola confirmación deste enderezo. Busque na cúa conta de Jabber/" +"GTalk unha mensaxe con máis instrucións. (Engadiu a %s á súa lista de " +"amigos?)" + +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 +#, php-format +msgid "" +"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " +"add %s to your buddy list in your IM client or on GTalk." +msgstr "" +"Enderezo de Jabber ou GTalk, coma \"nomedeusuario@example.org\". Asegúrese " +"primeiro de engadir a %s á súa lista de amigos no seu cliente de mensaxería " +"instantánea ou en GTalk." + +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Preferencias de mensaxería instantánea" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 +msgid "Send me notices through Jabber/GTalk." +msgstr "Enviádeme as notas mediante Jabber ou GTalk." + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 +msgid "Post a notice when my Jabber/GTalk status changes." +msgstr "Publicar unha nota cando cambie o meu estado en Jabber ou GTalk." + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 +msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." +msgstr "" +"Enviádeme as respostas mediante Jabber ou GTalk da xente á que non estou " +"subscrita." + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 +msgid "Publish a MicroID for my Jabber/GTalk address." +msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk." + +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Gardáronse as preferencias." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 +msgid "No Jabber ID." +msgstr "Non existe ningunha ID de Jabber." + +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 +msgid "Cannot normalize that Jabber ID" +msgstr "Non se pode normalizar esa ID de Jabber" + +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 +msgid "Not a valid Jabber ID" +msgstr "A ID de Jabber non é correcta" + +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 +msgid "That is already your Jabber ID." +msgstr "Esa xa é a súa ID de Jabber." + +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 +msgid "Jabber ID already belongs to another user." +msgstr "Esa ID de Jabber xa corresponde a un usuario." + +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 +#, php-format +msgid "" +"A confirmation code was sent to the IM address you added. You must approve %" +"s for sending messages to you." +msgstr "" +"Enviouse un código de confirmación ao enderezo de mensaxería instantánea que " +"engadiu. Ten que aprobar que %s lle envíe mensaxes." + +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Ese enderezo de mensaxería instantánea é incorrecto." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Non se puido borrar a confirmación por mensaxería instantánea." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Cancelouse a confirmación por mensaxería instantánea." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 +msgid "That is not your Jabber ID." +msgstr "Esa ID de Jabber non é súa." + +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "Borrouse o enderezo de mensaxería instantánea." + +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "Caixa de entrada de %1$s - páxina %2$d" + +#: actions/inbox.php:62 +#, php-format +msgid "Inbox for %s" +msgstr "Caixa de entrada de %s" + +#: actions/inbox.php:115 +msgid "This is your inbox, which lists your incoming private messages." +msgstr "" +"Esta é a súa caixa de correo, onde se listan as mensaxes privadas recibidas." + +#: actions/invite.php:39 +msgid "Invites have been disabled." +msgstr "As invitacións están desactivadas." + +#: actions/invite.php:41 +#, php-format +msgid "You must be logged in to invite other users to use %s." +msgstr "Ten que identificarse para invitar a outros a usar %s." + +#: actions/invite.php:72 +#, php-format +msgid "Invalid email address: %s" +msgstr "Enderezo de correo electrónico incorrecto: %s" + +#: actions/invite.php:110 +msgid "Invitation(s) sent" +msgstr "Enviáronse as invitacións" + +#: actions/invite.php:112 +msgid "Invite new users" +msgstr "Invitar a novos usuarios" + +#: actions/invite.php:128 +msgid "You are already subscribed to these users:" +msgstr "Xa está subscrito aos seguintes usuarios:" + +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 +#, php-format +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" + +#: actions/invite.php:136 +msgid "" +"These people are already users and you were automatically subscribed to them:" +msgstr "" +"Estas persoas xa son usuarios e subscribíuselle automaticamente a elas:" + +#: actions/invite.php:144 +msgid "Invitation(s) sent to the following people:" +msgstr "Enviáronse invitacións ás seguintes persoas:" + +#: actions/invite.php:150 +msgid "" +"You will be notified when your invitees accept the invitation and register " +"on the site. Thanks for growing the community!" +msgstr "" +"Notificaráselle cando os seus convidados acepten a invitación e se rexistren " +"no sitio. Grazas por ampliar a comunidade!" + +#: actions/invite.php:162 +msgid "" +"Use this form to invite your friends and colleagues to use this service." +msgstr "" +"Utilice o seguinte formulario para invitar aos seus amigos e compañeiros a " +"utilizar este servizo." + +#: actions/invite.php:187 +msgid "Email addresses" +msgstr "Enderezos de correo electrónico" + +#: actions/invite.php:189 +msgid "Addresses of friends to invite (one per line)" +msgstr "Enderezos de amigos aos que invitar (un por liña)" + +#: actions/invite.php:192 +msgid "Personal message" +msgstr "Mensaxe persoal" + +#: actions/invite.php:194 +msgid "Optionally add a personal message to the invitation." +msgstr "Engadir opcionalmente unha mensaxe persoal á invitación." + +#. TRANS: Send button for inviting friends +#: actions/invite.php:198 +msgctxt "BUTTON" +msgid "Send" +msgstr "Enviar" + +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 +#, php-format +msgid "%1$s has invited you to join them on %2$s" +msgstr "%1$s convidouno a unirse a el en %2$s" + +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 +#, php-format +msgid "" +"%1$s has invited you to join them on %2$s (%3$s).\n" +"\n" +"%2$s is a micro-blogging service that lets you keep up-to-date with people " +"you know and people who interest you.\n" +"\n" +"You can also share news about yourself, your thoughts, or your life online " +"with people who know about you. It's also great for meeting new people who " +"share your interests.\n" +"\n" +"%1$s said:\n" +"\n" +"%4$s\n" +"\n" +"You can see %1$s's profile page on %2$s here:\n" +"\n" +"%5$s\n" +"\n" +"If you'd like to try the service, click on the link below to accept the " +"invitation.\n" +"\n" +"%6$s\n" +"\n" +"If not, you can ignore this message. Thanks for your patience and your " +"time.\n" +"\n" +"Sincerely, %2$s\n" +msgstr "" +"%1$s convidouno a unirse a el en %2$s (%3$s).\n" +"\n" +"%2$s é un servizo de microblogue que lle permite estar ao día coas persoas " +"que coñece e coas que lle interesen.\n" +"\n" +"Tamén pode compartir novas persoais, pensamentos ou a súa vida en liña con " +"outros coñecidos. Tamén está moi ben para coñecer xente con intereses " +"similares aos seus.\n" +"\n" +"%1$s dixo:\n" +"\n" +"%4$s\n" +"\n" +"Pode ver a páxina do perfil de %1$s en %2$s aquí:\n" +"\n" +"%5$s\n" +"\n" +"Se quere probar o servizo, prema na seguinte ligazón para aceptar a " +"invitación.\n" +"\n" +"%6$s\n" +"\n" +"Se non, pode ignorar esta mensaxe. Grazas polo seu tempo.\n" +"\n" +"Cordialmente, %2$s\n" + +#: actions/joingroup.php:60 +msgid "You must be logged in to join a group." +msgstr "Ten que identificarse para unirse a un grupo." + +#: actions/joingroup.php:88 actions/leavegroup.php:88 +msgid "No nickname or ID." +msgstr "Nin alcume nin ID." + +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 +#, php-format +msgid "%1$s joined group %2$s" +msgstr "%1$s uniuse ao grupo %2$s" + +#: actions/leavegroup.php:60 +msgid "You must be logged in to leave a group." +msgstr "Ten que identificarse para deixar un grupo." + +#: actions/leavegroup.php:100 lib/command.php:373 +msgid "You are not a member of that group." +msgstr "Non pertence a ese grupo." + +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 +#, php-format +msgid "%1$s left group %2$s" +msgstr "%1$s deixou o grupo %2$s" + +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +msgid "Already logged in." +msgstr "Xa se identificou." + +#: actions/login.php:126 +msgid "Incorrect username or password." +msgstr "Nome de usuario ou contrasinal incorrectos." + +#: actions/login.php:132 actions/otp.php:120 +msgid "Error setting user. You are probably not authorized." +msgstr "" +"Houbo un erro ao configurar o usuario. Probablemente non estea autorizado " +"para facelo." + +#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +msgid "Login" +msgstr "Identificarse" + +#: actions/login.php:227 +msgid "Login to site" +msgstr "Identificarse no sitio" + +#: actions/login.php:236 actions/register.php:478 +msgid "Remember me" +msgstr "Lembrádeme" + +#: actions/login.php:237 actions/register.php:480 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" +"Identificarse automaticamente no futuro. Non se aconsella en computadoras " +"compartidas!" + +#: actions/login.php:247 +msgid "Lost or forgotten password?" +msgstr "Esqueceu ou perdeu o contrasinal?" + +#: actions/login.php:266 +msgid "" +"For security reasons, please re-enter your user name and password before " +"changing your settings." +msgstr "" +"Por razóns de seguridade, volva introducir o seu nome de usuario e " +"contrasinal antes de cambiar a súa configuración." + +#: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Identifíquese co seu nome de usuario e contrasinal." + +#: actions/login.php:273 +#, php-format +msgid "" +"Don't have a username yet? [Register](%%action.register%%) a new account." +msgstr "" +"Aínda non ten un nome de usuario? [Rexistre](%%action.register%%) unha conta " +"nova." + +#: actions/makeadmin.php:92 +msgid "Only an admin can make another user an admin." +msgstr "" +"Só os administradores poden converter a outros usuarios en administradores." + +#: actions/makeadmin.php:96 +#, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "%1$s xa é administrador do grupo \"%2$s\"." + +#: actions/makeadmin.php:133 +#, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Non se puido obter o rexistro de pertenza de %1$s ao grupo %2$s." + +#: actions/makeadmin.php:146 +#, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Non se pode converter a %1$s en administrador do grupo %2$s." + +#: actions/microsummary.php:69 +msgid "No current status." +msgstr "Sen estado actual." + +#: actions/newapplication.php:52 +msgid "New Application" +msgstr "Aplicación nova" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "Ten que identificarse para rexistrar unha aplicación." + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "Utilice o seguinte formulario para rexistrar unha aplicación nova." + +#: actions/newapplication.php:176 +msgid "Source URL is required." +msgstr "Necesítase o URL de orixe." + +#: actions/newapplication.php:258 actions/newapplication.php:267 +msgid "Could not create application." +msgstr "Non se puido crear a aplicación." + +#: actions/newgroup.php:53 +msgid "New group" +msgstr "Novo grupo" + +#: actions/newgroup.php:110 +msgid "Use this form to create a new group." +msgstr "Utilice o seguinte formulario para crear un novo grupo." + +#: actions/newmessage.php:71 actions/newmessage.php:231 +msgid "New message" +msgstr "Mensaxe nova" + +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 +msgid "You can't send a message to this user." +msgstr "Non pode enviarlle unha mensaxe a este usuario." + +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 +msgid "No content!" +msgstr "Non hai contido ningún!" + +#: actions/newmessage.php:158 +msgid "No recipient specified." +msgstr "Non se especificou ningún destinatario." + +#: actions/newmessage.php:164 lib/command.php:484 +msgid "" +"Don't send a message to yourself; just say it to yourself quietly instead." +msgstr "Non se envíe unha mensaxe, limítese a pensar nela." + +#: actions/newmessage.php:181 +msgid "Message sent" +msgstr "Enviouse a mensaxe" + +#: actions/newmessage.php:185 +#, php-format +msgid "Direct message to %s sent." +msgstr "Enviouse a mensaxe directa a %s." + +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 +msgid "Ajax Error" +msgstr "Houbo un erro de AJAX" + +#: actions/newnotice.php:69 +msgid "New notice" +msgstr "Nova nota" + +#: actions/newnotice.php:217 +msgid "Notice posted" +msgstr "Publicouse a nota" + +#: actions/noticesearch.php:68 +#, php-format +msgid "" +"Search for notices on %%site.name%% by their contents. Separate search terms " +"by spaces; they must be 3 characters or more." +msgstr "" +"Buscar notas en %%site.name%% polo seu contido. Separe os termos de busca " +"con espazos en branco. Teñen que ter tres ou máis caracteres." + +#: actions/noticesearch.php:78 +msgid "Text search" +msgstr "Busca de texto" + +#: actions/noticesearch.php:91 +#, php-format +msgid "Search results for \"%1$s\" on %2$s" +msgstr "Resultados da busca de \"%1$s\" en %2$s" + +#: actions/noticesearch.php:121 +#, php-format +msgid "" +"Be the first to [post on this topic](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" +msgstr "" +"Sexa o primeiro en [publicar sobre este tema](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" + +#: actions/noticesearch.php:124 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and be the first to " +"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" +msgstr "" +"Por que non [rexistrar unha conta](%%%%action.register%%%%) e ser o primeiro " +"en [publicar sobre este tema](%%%%action.newnotice%%%%?status_textarea=%s)?" + +#: actions/noticesearchrss.php:96 +#, php-format +msgid "Updates with \"%s\"" +msgstr "Actualizacións con \"%s\"" + +#: actions/noticesearchrss.php:98 +#, php-format +msgid "Updates matching search term \"%1$s\" on %2$s!" +msgstr "Actualizacións que conteñen o termo \"%1$s\" en %2$s!" + +#: actions/nudge.php:85 +msgid "" +"This user doesn't allow nudges or hasn't confirmed or set his email yet." +msgstr "" +"Este usuario non permite acenos ou aínda non corfirmou ou configurou o seu " +"enderezo de correo electrónico." + +#: actions/nudge.php:94 +msgid "Nudge sent" +msgstr "Enviouse o aceno" + +#: actions/nudge.php:97 +msgid "Nudge sent!" +msgstr "Enviouse o aceno!" + +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "Ten que identificarse para listar as súas aplicacións." + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "Aplicacións de OAuth" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "Aplicacións que rexistrou" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "Aínda non rexistrou ningunha aplicación." + +#: actions/oauthconnectionssettings.php:72 +msgid "Connected applications" +msgstr "Aplicacións conectadas" + +#: actions/oauthconnectionssettings.php:83 +msgid "You have allowed the following applications to access you account." +msgstr "Permitiulle o acceso á súa conta ás seguintes aplicacións." + +#: actions/oauthconnectionssettings.php:175 +msgid "You are not a user of that application." +msgstr "Non é usuario desa aplicación." + +#: actions/oauthconnectionssettings.php:186 +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Non se puido revogar o acceso da aplicación: %s." + +#: actions/oauthconnectionssettings.php:198 +msgid "You have not authorized any applications to use your account." +msgstr "Non autorizou o acceso á súa conta para ningunha aplicación." + +#: actions/oauthconnectionssettings.php:211 +msgid "Developers can edit the registration settings for their applications " +msgstr "" +"Os desenvolvedores poden editar a configuración de rexistro das súas " +"aplicacións " + +#: actions/oembed.php:79 actions/shownotice.php:100 +msgid "Notice has no profile." +msgstr "Non hai perfil para a nota." + +#: actions/oembed.php:86 actions/shownotice.php:175 +#, php-format +msgid "%1$s's status on %2$s" +msgstr "Estado de %1$s en %2$s" + +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Non se soporta o tipo de contido %s." + +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Só %s enderezos URL sobre HTTP simple." + +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 +msgid "Not a supported data format." +msgstr "Non se soporta ese formato de datos." + +#: actions/opensearch.php:64 +msgid "People Search" +msgstr "Busca de xente" + +#: actions/opensearch.php:67 +msgid "Notice Search" +msgstr "Busca de notas" + +#: actions/othersettings.php:60 +msgid "Other settings" +msgstr "Outras opcións" + +#: actions/othersettings.php:71 +msgid "Manage various other options." +msgstr "Configure outras tantas opcións." + +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr " (servizo gratuíto)" + +#: actions/othersettings.php:116 +msgid "Shorten URLs with" +msgstr "Abreviar os enderezos URL con" + +#: actions/othersettings.php:117 +msgid "Automatic shortening service to use." +msgstr "Servizo de abreviación automática a usar." + +#: actions/othersettings.php:122 +msgid "View profile designs" +msgstr "Deseños visuais do perfil" + +#: actions/othersettings.php:123 +msgid "Show or hide profile designs." +msgstr "Amosar ou agochar os deseños do perfil." + +#: actions/othersettings.php:153 +msgid "URL shortening service is too long (max 50 chars)." +msgstr "" +"O servizo de abreviación de enderezos URL é longo de máis (o límite está en " +"50 caracteres)." + +#: actions/otp.php:69 +msgid "No user ID specified." +msgstr "Non se especificou ningunha ID de usuario." + +#: actions/otp.php:83 +msgid "No login token specified." +msgstr "Non se especificou ningún pase." + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "Non se solicitou ningún pase." + +#: actions/otp.php:95 +msgid "Invalid login token specified." +msgstr "O pase especificado é incorrecto." + +#: actions/otp.php:104 +msgid "Login token expired." +msgstr "O pase caducou." + +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "Caixa de saída de %1$s - páxina %2$d" + +#: actions/outbox.php:61 +#, php-format +msgid "Outbox for %s" +msgstr "Caixa de saída de %s" + +#: actions/outbox.php:116 +msgid "This is your outbox, which lists private messages you have sent." +msgstr "" +"Esta é a súa caixa de saída. Nela lístanse as mensaxes privadas que enviou." + +#: actions/passwordsettings.php:58 +msgid "Change password" +msgstr "Cambiar o contrasinal" + +#: actions/passwordsettings.php:69 +msgid "Change your password." +msgstr "Cambiar o seu contrasinal." + +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 +msgid "Password change" +msgstr "Cambio de contrasinal" + +#: actions/passwordsettings.php:104 +msgid "Old password" +msgstr "Contrasinal anterior" + +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 +msgid "New password" +msgstr "Novo contrasinal" + +#: actions/passwordsettings.php:109 +msgid "6 or more characters" +msgstr "Seis ou máis caracteres" + +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 +#: actions/register.php:433 +msgid "Confirm" +msgstr "Confirmar" + +#: actions/passwordsettings.php:113 actions/recoverpassword.php:240 +msgid "Same as password above" +msgstr "Igual ao contrasinal anterior" + +#: actions/passwordsettings.php:117 +msgid "Change" +msgstr "Cambiar" + +#: actions/passwordsettings.php:154 actions/register.php:230 +msgid "Password must be 6 or more characters." +msgstr "O contrasinal debe conter seis ou máis caracteres." + +#: actions/passwordsettings.php:157 actions/register.php:233 +msgid "Passwords don't match." +msgstr "Os contrasinais non coinciden." + +#: actions/passwordsettings.php:165 +msgid "Incorrect old password" +msgstr "O contrasinal anterior non é correcto" + +#: actions/passwordsettings.php:181 +msgid "Error saving user; invalid." +msgstr "Houbo un erro ao gardar o usuario. Incorrecto." + +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 +msgid "Can't save new password." +msgstr "Non se puido gardar o novo contrasinal." + +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 +msgid "Password saved." +msgstr "Gardouse o contrasinal." + +#. TRANS: Menu item for site administration +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 +msgid "Paths" +msgstr "Rutas" + +#: actions/pathsadminpanel.php:70 +msgid "Path and server settings for this StatusNet site." +msgstr "Configuración do servidor e das rutas para este sitio StatusNet." + +#: actions/pathsadminpanel.php:157 +#, php-format +msgid "Theme directory not readable: %s." +msgstr "Non se pode ler o directorio de temas visuais: %s." + +#: actions/pathsadminpanel.php:163 +#, php-format +msgid "Avatar directory not writable: %s." +msgstr "Non se pode escribir no directorio de avatares: %s." + +#: actions/pathsadminpanel.php:169 +#, php-format +msgid "Background directory not writable: %s." +msgstr "Non se pode escribir no directorio de fondos: %s." + +#: actions/pathsadminpanel.php:177 +#, php-format +msgid "Locales directory not readable: %s." +msgstr "Non se pode ler o directorio de traducións: %s." + +#: actions/pathsadminpanel.php:183 +msgid "Invalid SSL server. The maximum length is 255 characters." +msgstr "Servidor SSL incorrecto. O tamaño máximo é de 255 caracteres." + +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 +msgid "Site" +msgstr "Sitio" + +#: actions/pathsadminpanel.php:238 +msgid "Server" +msgstr "Servidor" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "Nome do servidor do sitio." + +#: actions/pathsadminpanel.php:242 +msgid "Path" +msgstr "Ruta" + +#: actions/pathsadminpanel.php:242 +msgid "Site path" +msgstr "Ruta do sitio" + +#: actions/pathsadminpanel.php:246 +msgid "Path to locales" +msgstr "Ruta das traducións" + +#: actions/pathsadminpanel.php:246 +msgid "Directory path to locales" +msgstr "Ruta do directorio das traducións" + +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "Enderezos URL elegantes" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "Quere utilizar os enderezos URL elegantes (mellores de ler e lembrar)?" + +#: actions/pathsadminpanel.php:259 +msgid "Theme" +msgstr "Tema visual" + +#: actions/pathsadminpanel.php:264 +msgid "Theme server" +msgstr "Servidor de temas visuais" + +#: actions/pathsadminpanel.php:268 +msgid "Theme path" +msgstr "Ruta do tema visual" + +#: actions/pathsadminpanel.php:272 +msgid "Theme directory" +msgstr "Directorio de temas visuais" + +#: actions/pathsadminpanel.php:279 +msgid "Avatars" +msgstr "Avatares" + +#: actions/pathsadminpanel.php:284 +msgid "Avatar server" +msgstr "Servidor de avatares" + +#: actions/pathsadminpanel.php:288 +msgid "Avatar path" +msgstr "Ruta do avatar" + +#: actions/pathsadminpanel.php:292 +msgid "Avatar directory" +msgstr "Directorio de avatares" + +#: actions/pathsadminpanel.php:301 +msgid "Backgrounds" +msgstr "Fondos" + +#: actions/pathsadminpanel.php:305 +msgid "Background server" +msgstr "Servidor de fondos" + +#: actions/pathsadminpanel.php:309 +msgid "Background path" +msgstr "Ruta do fondo" + +#: actions/pathsadminpanel.php:313 +msgid "Background directory" +msgstr "Directorio de fondos" + +#: actions/pathsadminpanel.php:320 +msgid "SSL" +msgstr "SSL" + +#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202 +msgid "Never" +msgstr "Nunca" + +#: actions/pathsadminpanel.php:324 +msgid "Sometimes" +msgstr "Ás veces" + +#: actions/pathsadminpanel.php:325 +msgid "Always" +msgstr "Sempre" + +#: actions/pathsadminpanel.php:329 +msgid "Use SSL" +msgstr "Utilizar SSL" + +#: actions/pathsadminpanel.php:330 +msgid "When to use SSL" +msgstr "Cando utilizar SSL" + +#: actions/pathsadminpanel.php:335 +msgid "SSL server" +msgstr "Servidor SSL" + +#: actions/pathsadminpanel.php:336 +msgid "Server to direct SSL requests to" +msgstr "Servidor ao que dirixir as solicitudes SSL" + +#: actions/pathsadminpanel.php:352 +msgid "Save paths" +msgstr "Gardar as rutas" + +#: actions/peoplesearch.php:52 +#, php-format +msgid "" +"Search for people on %%site.name%% by their name, location, or interests. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" +"Buscar xente en %%site.name%% por nome, lugar ou intereses. Separe os termos " +"con espazos en branco. Teñen que ter tres ou máis caracteres." + +#: actions/peoplesearch.php:58 +msgid "People search" +msgstr "Busca de xente" + +#: actions/peopletag.php:68 +#, php-format +msgid "Not a valid people tag: %s." +msgstr "A etiqueta de persoa non é correcta: %s." + +#: actions/peopletag.php:142 +#, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Usuarios etiquetados por si mesmos con %1$s - páxina %2$d" + +#: actions/postnotice.php:95 +msgid "Invalid notice content." +msgstr "O contido da nota é incorrecto." + +#: actions/postnotice.php:101 +#, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." +msgstr "" +"A licenza \"%1$s\" da nota non é compatible coa licenza \"%2$s\" do sitio." + +#: actions/profilesettings.php:60 +msgid "Profile settings" +msgstr "Configuración do perfil" + +#: actions/profilesettings.php:71 +msgid "" +"You can update your personal profile info here so people know more about you." +msgstr "" +"Pode actualizar a información do seu perfil persoal para que a xente o " +"coñeza mellor." + +#: actions/profilesettings.php:99 +msgid "Profile information" +msgstr "Información do perfil" + +#: actions/profilesettings.php:108 lib/groupeditform.php:154 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" +"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, " +"espazos, tiles ou eñes" + +#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 +msgid "Full name" +msgstr "Nome completo" + +#. TRANS: Form input field label. +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 +msgid "Homepage" +msgstr "Páxina persoal" + +#: actions/profilesettings.php:117 actions/register.php:455 +msgid "URL of your homepage, blog, or profile on another site" +msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio" + +#: actions/profilesettings.php:122 actions/register.php:461 +#, php-format +msgid "Describe yourself and your interests in %d chars" +msgstr "Descríbase a vostede e mailos seus intereses en %d caracteres" + +#: actions/profilesettings.php:125 actions/register.php:464 +msgid "Describe yourself and your interests" +msgstr "Descríbase a vostede e mailos seus intereses" + +#: actions/profilesettings.php:127 actions/register.php:466 +msgid "Bio" +msgstr "Biografía" + +#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/showgroup.php:265 actions/tagother.php:112 +#: actions/userauthorization.php:166 lib/groupeditform.php:177 +#: lib/userprofile.php:165 +msgid "Location" +msgstr "Lugar" + +#: actions/profilesettings.php:134 actions/register.php:473 +msgid "Where you are, like \"City, State (or Region), Country\"" +msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”" + +#: actions/profilesettings.php:138 +msgid "Share my current location when posting notices" +msgstr "Compartir o lugar onde vivo ao publicar notas" + +#: actions/profilesettings.php:145 actions/tagother.php:149 +#: actions/tagother.php:209 lib/subscriptionlist.php:106 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 +msgid "Tags" +msgstr "Etiquetas" + +#: actions/profilesettings.php:147 +msgid "" +"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" +msgstr "" +"Etiquetas para vostede (letras salvo eñes e tiles, números, puntos, guións e " +"guións baixos), separados por comas ou espazos" + +#: actions/profilesettings.php:151 +msgid "Language" +msgstr "Lingua" + +#: actions/profilesettings.php:152 +msgid "Preferred language" +msgstr "Lingua escollida" + +#: actions/profilesettings.php:161 +msgid "Timezone" +msgstr "Fuso horario" + +#: actions/profilesettings.php:162 +msgid "What timezone are you normally in?" +msgstr "En que fuso horario adoita estar?" + +#: actions/profilesettings.php:167 +msgid "" +"Automatically subscribe to whoever subscribes to me (best for non-humans)" +msgstr "" +"Subscribirse automaticamente a quen se subscriba a min (o mellor para os " +"bots)" + +#: actions/profilesettings.php:228 actions/register.php:223 +#, php-format +msgid "Bio is too long (max %d chars)." +msgstr "A biografía é longa de máis (o límite son %d caracteres)." + +#: actions/profilesettings.php:235 actions/siteadminpanel.php:151 +msgid "Timezone not selected." +msgstr "Non se escolleu ningún fuso horario." + +#: actions/profilesettings.php:241 +msgid "Language is too long (max 50 chars)." +msgstr "A lingua é longa de máis (o límite é de 50 caracteres)." + +#: actions/profilesettings.php:253 actions/tagother.php:178 +#, php-format +msgid "Invalid tag: \"%s\"" +msgstr "Etiqueta incorrecta: \"%s\"" + +#: actions/profilesettings.php:306 +msgid "Couldn't update user for autosubscribe." +msgstr "Non se puido actualizar o usuario para subscribirse automaticamente." + +#: actions/profilesettings.php:363 +msgid "Couldn't save location prefs." +msgstr "Non se puideron gardar as preferencias de lugar." + +#: actions/profilesettings.php:375 +msgid "Couldn't save profile." +msgstr "Non se puido gardar o perfil." + +#: actions/profilesettings.php:383 +msgid "Couldn't save tags." +msgstr "Non se puideron gardar as etiquetas." + +#. TRANS: Message after successful saving of administrative settings. +#: actions/profilesettings.php:391 lib/adminpanelaction.php:141 +msgid "Settings saved." +msgstr "Gardouse a configuración." + +#: actions/public.php:83 +#, php-format +msgid "Beyond the page limit (%s)." +msgstr "Alén do límite da páxina (%s)." + +#: actions/public.php:92 +msgid "Could not retrieve public stream." +msgstr "Non se puido obter o fluxo público." + +#: actions/public.php:130 +#, php-format +msgid "Public timeline, page %d" +msgstr "Liña do tempo pública, páxina %d" + +#: actions/public.php:132 lib/publicgroupnav.php:79 +msgid "Public timeline" +msgstr "Liña do tempo pública" + +#: actions/public.php:160 +msgid "Public Stream Feed (RSS 1.0)" +msgstr "Fonte de novas no fluxo público (RSS 1.0)" + +#: actions/public.php:164 +msgid "Public Stream Feed (RSS 2.0)" +msgstr "Fonte de novas no fluxo público (RSS 2.0)" + +#: actions/public.php:168 +msgid "Public Stream Feed (Atom)" +msgstr "Fonte de novas no fluxo público (Atom)" + +#: actions/public.php:188 +#, php-format +msgid "" +"This is the public timeline for %%site.name%% but no one has posted anything " +"yet." +msgstr "" +"Esta é a liña do tempo pública para %%site.name%% pero ninguén publicou nada " +"aínda." + +#: actions/public.php:191 +msgid "Be the first to post!" +msgstr "Sexa o primeiro en publicar!" + +#: actions/public.php:195 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post!" +msgstr "" +"Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en " +"publicar?" + +#: actions/public.php:242 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool. [Join now](%%action.register%%) to share notices about yourself with " +"friends, family, and colleagues! ([Read more](%%doc.help%%))" +msgstr "" +"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/" +"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre " +"[StatusNet](http://status.net/). [Únase agora](%%action.register%%) para " +"compartir notas persoais cos amigos, a familia e os compañeiros! ([Máis " +"información](%%doc.help%%))" + +#: actions/public.php:247 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool." +msgstr "" +"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/" +"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre " +"[StatusNet](http://status.net/)." + +#: actions/publictagcloud.php:57 +msgid "Public tag cloud" +msgstr "Nube de etiquetas públicas" + +#: actions/publictagcloud.php:63 +#, php-format +msgid "These are most popular recent tags on %s " +msgstr "Estas son as etiquetas máis populares en %s " + +#: actions/publictagcloud.php:69 +#, php-format +msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." +msgstr "Ninguén publicou aínda ningunha nota cunha [etiqueta](%%doc.tags%%)." + +#: actions/publictagcloud.php:72 +msgid "Be the first to post one!" +msgstr "Sexa o primeiro en publicar unha!" + +#: actions/publictagcloud.php:75 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post " +"one!" +msgstr "" +"Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en " +"publicar unha?" + +#: actions/publictagcloud.php:134 +msgid "Tag cloud" +msgstr "Nube de etiquetas" + +#: actions/recoverpassword.php:36 +msgid "You are already logged in!" +msgstr "Xa está identificado!" + +#: actions/recoverpassword.php:62 +msgid "No such recovery code." +msgstr "Ese código de recuperación non existe." + +#: actions/recoverpassword.php:66 +msgid "Not a recovery code." +msgstr "Iso non é un código de recuperación." + +#: actions/recoverpassword.php:73 +msgid "Recovery code for unknown user." +msgstr "Código de recuperación para un usuario descoñecido." + +#: actions/recoverpassword.php:86 +msgid "Error with confirmation code." +msgstr "Houbo un erro co código de confirmación." + +#: actions/recoverpassword.php:97 +msgid "This confirmation code is too old. Please start again." +msgstr "Este código de confirmación é vello de máis. Volva empezar." + +#: actions/recoverpassword.php:111 +msgid "Could not update user with confirmed email address." +msgstr "" +"Non se puido actualizar o usuario co enderezo de correo electrónico " +"confirmado." + +#: actions/recoverpassword.php:152 +msgid "" +"If you have forgotten or lost your password, you can get a new one sent to " +"the email address you have stored in your account." +msgstr "" +"Se esqueceu ou perdeu o seu contrasinal, pode solicitar que se lle envíe un " +"novo ao enderezo de correo electrónico da conta." + +#: actions/recoverpassword.php:158 +msgid "You have been identified. Enter a new password below. " +msgstr "Acaba de identificarse. Introduza un contrasinal novo a continuación. " + +#: actions/recoverpassword.php:188 +msgid "Password recovery" +msgstr "Recuperación do contrasinal" + +#: actions/recoverpassword.php:191 +msgid "Nickname or email address" +msgstr "Alcume ou enderezo de correo electrónico" + +#: actions/recoverpassword.php:193 +msgid "Your nickname on this server, or your registered email address." +msgstr "" +"O seu alcume neste servidor, ou o enderezo de correo electrónico co que se " +"rexistrou." + +#: actions/recoverpassword.php:199 actions/recoverpassword.php:200 +msgid "Recover" +msgstr "Recuperar" + +#: actions/recoverpassword.php:208 +msgid "Reset password" +msgstr "Restablecer o contrasinal" + +#: actions/recoverpassword.php:209 +msgid "Recover password" +msgstr "Recuperar o contrasinal" + +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 +msgid "Password recovery requested" +msgstr "Solicitouse a recuperación do contrasinal" + +#: actions/recoverpassword.php:213 +msgid "Unknown action" +msgstr "Non se coñece esa acción" + +#: actions/recoverpassword.php:236 +msgid "6 or more characters, and don't forget it!" +msgstr "Seis ou máis caracteres, e non o esqueza!" + +#: actions/recoverpassword.php:243 +msgid "Reset" +msgstr "Restablecer" + +#: actions/recoverpassword.php:252 +msgid "Enter a nickname or email address." +msgstr "Introduza un alcume ou enderezo de correo electrónico." + +#: actions/recoverpassword.php:282 +msgid "No user with that email address or username." +msgstr "" +"Non hai ningún usuario con ese enderezo de correo electrónico ou alcume." + +#: actions/recoverpassword.php:299 +msgid "No registered email address for that user." +msgstr "" +"Non se rexistrou ningún enderezo de correo electrónico para ese usuario." + +#: actions/recoverpassword.php:313 +msgid "Error saving address confirmation." +msgstr "Houbo un erro ao gardar a confirmación do enderezo." + +#: actions/recoverpassword.php:338 +msgid "" +"Instructions for recovering your password have been sent to the email " +"address registered to your account." +msgstr "" +"Enviáronse instrucións para a recuperación do seu contrasinal ao enderezo de " +"correo electrónico rexistrado para a súa conta." + +#: actions/recoverpassword.php:357 +msgid "Unexpected password reset." +msgstr "Restablecemento de contrasinal inesperado." + +#: actions/recoverpassword.php:365 +msgid "Password must be 6 chars or more." +msgstr "O contrasinal debe ter seis ou máis caracteres." + +#: actions/recoverpassword.php:369 +msgid "Password and confirmation do not match." +msgstr "O contrasinal e a confirmación non coinciden." + +#: actions/recoverpassword.php:388 actions/register.php:248 +msgid "Error setting user." +msgstr "Houbo un erro ao configurar o usuario." + +#: actions/recoverpassword.php:395 +msgid "New password successfully saved. You are now logged in." +msgstr "O novo contrasinal gardouse correctamente. Agora está identificado." + +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +msgid "Sorry, only invited people can register." +msgstr "Só se pode rexistrar mediante invitación." + +#: actions/register.php:92 +msgid "Sorry, invalid invitation code." +msgstr "O código da invitación é incorrecto." + +#: actions/register.php:112 +msgid "Registration successful" +msgstr "Rexistrouse correctamente" + +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +msgid "Register" +msgstr "Rexistrarse" + +#: actions/register.php:135 +msgid "Registration not allowed." +msgstr "Non se permite o rexistro." + +#: actions/register.php:198 +msgid "You can't register if you don't agree to the license." +msgstr "Non pode rexistrarse se non acepta a licenza." + +#: actions/register.php:212 +msgid "Email address already exists." +msgstr "O enderezo de correo electrónico xa existe." + +#: actions/register.php:243 actions/register.php:265 +msgid "Invalid username or password." +msgstr "O nome de usuario ou contrasinal non son correctos." + +#: actions/register.php:343 +msgid "" +"With this form you can create a new account. You can then post notices and " +"link up to friends and colleagues. " +msgstr "" +"Con este formulario pode crear unha conta nova. Entón poderá publicar notas " +"e porse en contacto con amigos e compañeiros. " + +#: actions/register.php:425 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." +msgstr "" +"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, " +"espazos, tiles ou eñes. Obrigatorio." + +#: actions/register.php:430 +msgid "6 or more characters. Required." +msgstr "6 ou máis caracteres. Obrigatorio." + +#: actions/register.php:434 +msgid "Same as password above. Required." +msgstr "O mesmo contrasinal que o anterior. Obrigatorio." + +#. TRANS: Link description in user account settings menu. +#: actions/register.php:438 actions/register.php:442 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 +msgid "Email" +msgstr "Correo electrónico" + +#: actions/register.php:439 actions/register.php:443 +msgid "Used only for updates, announcements, and password recovery" +msgstr "" +"Só se utiliza para actualizacións, anuncios e recuperación de contrasinais" + +#: actions/register.php:450 +msgid "Longer name, preferably your \"real\" name" +msgstr "Nome longo, preferiblemente o seu nome \"real\"" + +#: actions/register.php:494 +#, php-format +msgid "" +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." +msgstr "" +"Os meus textos e ficheiros están dispoñibles baixo %s, salvo os seguintes " +"datos privados: contrasinais, enderezos de correo electrónico e mensaxería " +"instantánea e números de teléfono." + +#: actions/register.php:542 +#, php-format +msgid "" +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " +"want to...\n" +"\n" +"* Go to [your profile](%2$s) and post your first message.\n" +"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " +"notices through instant messages.\n" +"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " +"share your interests. \n" +"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell " +"others more about you. \n" +"* Read over the [online docs](%%%%doc.help%%%%) for features you may have " +"missed. \n" +"\n" +"Thanks for signing up and we hope you enjoy using this service." +msgstr "" +"Parabéns, %1$s! E benvido a %%%%site.name%%%%. Agora quizais queira...\n" +"\n" +"* Ir ao [seu perfil](%2$s) e publicar a súa primeira mensaxe.\n" +"* Engadir un [enderezo de Jabber ou GTalk](%%%%action.imsettings%%%%) para " +"poder enviar notas por medio de mensaxes instantáneas.\n" +"* [Buscar xente](%%%%action.peoplesearch%%%%) que coñeza ou que comparta os " +"seus intereses. \n" +"* Actualizar a [configuración do seu perfil](%%%%action.profilesettings%%%%) " +"para que os outros saiban máis de vostede. \n" +"* Botar unha ollada á [documentación en liña](%%%%doc.help%%%%) en busca de " +"funcionalidades que ao mellor non coñecía. \n" +"\n" +"Grazas por rexistrarse. Esperamos que goce deste servizo." + +#: actions/register.php:566 +msgid "" +"(You should receive a message by email momentarily, with instructions on how " +"to confirm your email address.)" +msgstr "" +"(Debería recibir unha mensaxe por correo electrónico nuns intres, con " +"instrucións para a confirmación do seu enderezo de correo electrónico.)" + +#: actions/remotesubscribe.php:98 +#, php-format +msgid "" +"To subscribe, you can [login](%%action.login%%), or [register](%%action." +"register%%) a new account. If you already have an account on a [compatible " +"microblogging site](%%doc.openmublog%%), enter your profile URL below." +msgstr "" +"Para subscribirse, pode [identificarse](%%action.login%%) ou [rexistrar](%%" +"action.register%%) unha conta nova. Se xa ten unha conta nun [sitio de " +"microblogging compatible](%%doc.openmublog%%), introduza a continuación o " +"URL do seu perfil." + +#: actions/remotesubscribe.php:112 +msgid "Remote subscribe" +msgstr "Subscribirse remotamente" + +#: actions/remotesubscribe.php:124 +msgid "Subscribe to a remote user" +msgstr "Subscribirse a un usuario remoto" + +#: actions/remotesubscribe.php:129 +msgid "User nickname" +msgstr "Alcume do usuario" + +#: actions/remotesubscribe.php:130 +msgid "Nickname of the user you want to follow" +msgstr "Alcume do usuario ao que quere seguir" + +#: actions/remotesubscribe.php:133 +msgid "Profile URL" +msgstr "URL do perfil" + +#: actions/remotesubscribe.php:134 +msgid "URL of your profile on another compatible microblogging service" +msgstr "URL do seu perfil noutro servizo de microblogue compatible" + +#: actions/remotesubscribe.php:137 lib/subscribeform.php:139 +#: lib/userprofile.php:406 +msgid "Subscribe" +msgstr "Subscribirse" + +#: actions/remotesubscribe.php:159 +msgid "Invalid profile URL (bad format)" +msgstr "O enderezo URL do perfil é incorrecto (formato erróneo)" + +#: actions/remotesubscribe.php:168 +msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." +msgstr "" +"Non é un URL de perfil correcto (non hai un documento YADIS ou definiuse un " +"XRDS incorrecto)." + +#: actions/remotesubscribe.php:176 +msgid "That’s a local profile! Login to subscribe." +msgstr "Ese é un perfil local! Identifíquese para subscribirse." + +#: actions/remotesubscribe.php:183 +msgid "Couldn’t get a request token." +msgstr "Non se puido obter o pase solicitado." + +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "Só os usuarios identificados poden repetir notas." + +#: actions/repeat.php:64 actions/repeat.php:71 +msgid "No notice specified." +msgstr "Non se especificou nota ningunha." + +#: actions/repeat.php:76 +msgid "You can't repeat your own notice." +msgstr "Non pode repetir a súa propia nota." + +#: actions/repeat.php:90 +msgid "You already repeated that notice." +msgstr "Xa repetiu esa nota." + +#: actions/repeat.php:114 lib/noticelist.php:675 +msgid "Repeated" +msgstr "Repetida" + +#: actions/repeat.php:119 +msgid "Repeated!" +msgstr "Repetida!" + +#: actions/replies.php:126 actions/repliesrss.php:68 +#: lib/personalgroupnav.php:105 +#, php-format +msgid "Replies to %s" +msgstr "Respostas a %s" + +#: actions/replies.php:128 +#, php-format +msgid "Replies to %1$s, page %2$d" +msgstr "Respostas a %1$s, páxina %2$d" + +#: actions/replies.php:145 +#, php-format +msgid "Replies feed for %s (RSS 1.0)" +msgstr "Fonte de novas coas respostas a %s (RSS 1.0)" + +#: actions/replies.php:152 +#, php-format +msgid "Replies feed for %s (RSS 2.0)" +msgstr "Fonte de novas coas respostas a %s (RSS 2.0)" + +#: actions/replies.php:159 +#, php-format +msgid "Replies feed for %s (Atom)" +msgstr "Fonte de novas coas respostas a %s (Atom)" + +#: actions/replies.php:199 +#, php-format +msgid "" +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." +msgstr "" +"Esta é a liña do tempo coas respostas a %1$s, pero a %2$s aínda non lle " +"mandaron ningunha nota." + +#: actions/replies.php:204 +#, php-format +msgid "" +"You can engage other users in a conversation, subscribe to more people or " +"[join groups](%%action.groups%%)." +msgstr "" +"Pode conversar con outros usuarios, subscribirse a máis xente ou [unirse a " +"grupos](%%action.groups%%)." + +#: actions/replies.php:206 +#, php-format +msgid "" +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." +msgstr "" +"Pode probar a [facerlle un aceno a %1$s](../%2$s) ou [publicar algo dirixido " +"a el ou ela](%%%%action.newnotice%%%%?status_textarea=%3$s)." + +#: actions/repliesrss.php:72 +#, php-format +msgid "Replies to %1$s on %2$s!" +msgstr "Respostas a %1$s en %2$s!" + +#: actions/revokerole.php:75 +msgid "You cannot revoke user roles on this site." +msgstr "Non pode revogar os roles dos usuarios neste sitio." + +#: actions/revokerole.php:82 +msgid "User doesn't have this role." +msgstr "O usuario non ten este rol." + +#: actions/rsd.php:146 actions/version.php:157 +msgid "StatusNet" +msgstr "StatusNet" + +#: actions/sandbox.php:65 actions/unsandbox.php:65 +msgid "You cannot sandbox users on this site." +msgstr "Non pode illar usuarios neste sitio." + +#: actions/sandbox.php:72 +msgid "User is already sandboxed." +msgstr "O usuario xa está illado." + +#. TRANS: Menu item for site administration +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:391 +msgid "Sessions" +msgstr "Sesións" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "Configuración da sesión para este sitio StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Manexar as sesións" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "Manexar ou non as sesións nós mesmos." + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Depuración da sesión" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Activar a saída de depuración para as sesións." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 +#: actions/useradminpanel.php:294 +msgid "Save site settings" +msgstr "Gardar a configuración do sitio" + +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "Debe estar identificado para ver unha aplicación." + +#: actions/showapplication.php:157 +msgid "Application profile" +msgstr "Perfil da aplicación" + +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "Icona" + +#. TRANS: Form input field label for application name. +#: actions/showapplication.php:169 actions/version.php:195 +#: lib/applicationeditform.php:199 +msgid "Name" +msgstr "Nome" + +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 +msgid "Organization" +msgstr "Organización" + +#. TRANS: Form input field label. +#: actions/showapplication.php:187 actions/version.php:198 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descrición" + +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 +msgid "Statistics" +msgstr "Estatísticas" + +#: actions/showapplication.php:203 +#, php-format +msgid "Created by %1$s - %2$s access by default - %3$d users" +msgstr "Creado por %1$s - acceso %2$s por defecto - %3$d usuarios" + +#: actions/showapplication.php:213 +msgid "Application actions" +msgstr "Accións da aplicación" + +#: actions/showapplication.php:236 +msgid "Reset key & secret" +msgstr "Restablecer o contrasinal ou a pregunta secreta" + +#: actions/showapplication.php:261 +msgid "Application info" +msgstr "Información da aplicación" + +#: actions/showapplication.php:263 +msgid "Consumer key" +msgstr "Clave do consumidor" + +#: actions/showapplication.php:268 +msgid "Consumer secret" +msgstr "Pregunta secreta do consumidor" + +#: actions/showapplication.php:273 +msgid "Request token URL" +msgstr "Solicitar un URL de pase" + +#: actions/showapplication.php:278 +msgid "Access token URL" +msgstr "Acceder ao URL do pase" + +#: actions/showapplication.php:283 +msgid "Authorize URL" +msgstr "Autorizar o URL" + +#: actions/showapplication.php:288 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" +"Nota: sopórtanse as sinaturas HMAC-SHA1. Non se soporta o método de asinado " +"con texto sinxelo." + +#: actions/showapplication.php:309 +msgid "Are you sure you want to reset your consumer key and secret?" +msgstr "" +"Seguro que quere restablecer a súa clave e maila súa pregunta secreta de " +"consumidor?" + +#: actions/showfavorites.php:79 +#, php-format +msgid "%1$s's favorite notices, page %2$d" +msgstr "Notas favoritas de %1$s, páxina %2$d" + +#: actions/showfavorites.php:132 +msgid "Could not retrieve favorite notices." +msgstr "Non se puideron obter as notas favoritas." + +#: actions/showfavorites.php:171 +#, php-format +msgid "Feed for favorites of %s (RSS 1.0)" +msgstr "Fonte de novas dos favoritos de %s (RSS 1.0)" + +#: actions/showfavorites.php:178 +#, php-format +msgid "Feed for favorites of %s (RSS 2.0)" +msgstr "Fonte de novas dos favoritos de %s (RSS 2.0)" + +#: actions/showfavorites.php:185 +#, php-format +msgid "Feed for favorites of %s (Atom)" +msgstr "Fonte de novas dos favoritos de %s (Atom)" + +#: actions/showfavorites.php:206 +msgid "" +"You haven't chosen any favorite notices yet. Click the fave button on " +"notices you like to bookmark them for later or shed a spotlight on them." +msgstr "" +"Aínda non escolleu ningunha nota favorita. Prema no botón de nota favorita " +"naquelas notas que lle gusten para marcalas para logo ou para salientalas." + +#: actions/showfavorites.php:208 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Post something interesting " +"they would add to their favorites :)" +msgstr "" +"%s aínda non marcou ningunha nota como favorita. Publique algo interesante " +"que poida querer engadir aos seus favoritos :)" + +#: actions/showfavorites.php:212 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Why not [register an " +"account](%%%%action.register%%%%) and then post something interesting they " +"would add to their favorites :)" +msgstr "" +"%s aínda non marcou ningunha nota como favorita. Por que non [rexistrar unha " +"conta](%%%%action.register%%%%) e publicar algo interesante que puidese " +"querer engadir aos seus favoritos? :)" + +#: actions/showfavorites.php:243 +msgid "This is a way to share what you like." +msgstr "Isto é un modo de compartir o que lle gusta." + +#: actions/showgroup.php:82 lib/groupnav.php:86 +#, php-format +msgid "%s group" +msgstr "Grupo %s" + +#: actions/showgroup.php:84 +#, php-format +msgid "%1$s group, page %2$d" +msgstr "Grupo %1$s, páxina %2$d" + +#: actions/showgroup.php:227 +msgid "Group profile" +msgstr "Perfil do grupo" + +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 +msgid "URL" +msgstr "URL" + +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 +msgid "Note" +msgstr "Nota" + +#: actions/showgroup.php:293 lib/groupeditform.php:184 +msgid "Aliases" +msgstr "Pseudónimos" + +#: actions/showgroup.php:302 +msgid "Group actions" +msgstr "Accións do grupo" + +#: actions/showgroup.php:338 +#, php-format +msgid "Notice feed for %s group (RSS 1.0)" +msgstr "Fonte de novas das notas do grupo %s (RSS 1.0)" + +#: actions/showgroup.php:344 +#, php-format +msgid "Notice feed for %s group (RSS 2.0)" +msgstr "Fonte de novas das notas do grupo %s (RSS 2.0)" + +#: actions/showgroup.php:350 +#, php-format +msgid "Notice feed for %s group (Atom)" +msgstr "Fonte de novas das notas do grupo %s (Atom)" + +#: actions/showgroup.php:355 +#, php-format +msgid "FOAF for %s group" +msgstr "Amigo dun amigo para o grupo %s" + +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 +msgid "Members" +msgstr "Membros" + +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 +msgid "(None)" +msgstr "(Ningún)" + +#: actions/showgroup.php:404 +msgid "All members" +msgstr "Todos os membros" + +#: actions/showgroup.php:447 +msgid "Created" +msgstr "Creado" + +#: actions/showgroup.php:463 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. [Join now](%%%%action.register%%%%) to become part " +"of this group and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" +"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de " +"[microblogue](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " +"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os " +"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. " +"[Únase agora](%%%%action.register%%%%) para pasar a formar parte deste grupo " +"e de moitos máis! ([Máis información](%%%%doc.help%%%%))" + +#: actions/showgroup.php:469 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. " +msgstr "" +"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de " +"[microblogue](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " +"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os " +"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. " + +#: actions/showgroup.php:497 +msgid "Admins" +msgstr "Administradores" + +#: actions/showmessage.php:81 +msgid "No such message." +msgstr "Non se atopou esa mensaxe." + +#: actions/showmessage.php:98 +msgid "Only the sender and recipient may read this message." +msgstr "Esta mensaxe só a poden ler o destinatario e mais o remitente." + +#: actions/showmessage.php:108 +#, php-format +msgid "Message to %1$s on %2$s" +msgstr "Mensaxe a %1$s en %2$s" + +#: actions/showmessage.php:113 +#, php-format +msgid "Message from %1$s on %2$s" +msgstr "Mensaxe de %1$s en %2$s" + +#: actions/shownotice.php:90 +msgid "Notice deleted." +msgstr "Borrouse a nota." + +#: actions/showstream.php:73 +#, php-format +msgid " tagged %s" +msgstr " etiquetouse %s" + +#: actions/showstream.php:79 +#, php-format +msgid "%1$s, page %2$d" +msgstr "%1$s, páxina %2$d" + +#: actions/showstream.php:122 +#, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Fonte de novas das notas para %1$s etiquetadas con %2$s (RSS 1.0)" + +#: actions/showstream.php:129 +#, php-format +msgid "Notice feed for %s (RSS 1.0)" +msgstr "Fonte de novas das notas para %s (RSS 1.0)" + +#: actions/showstream.php:136 +#, php-format +msgid "Notice feed for %s (RSS 2.0)" +msgstr "Fonte de novas das notas para %s (RSS 2.0)" + +#: actions/showstream.php:143 +#, php-format +msgid "Notice feed for %s (Atom)" +msgstr "Fonte de novas das notas para %s (Atom)" + +#: actions/showstream.php:148 +#, php-format +msgid "FOAF for %s" +msgstr "Amigo dun amigo para %s" + +#: actions/showstream.php:200 +#, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "Esta é a liña do tempo para %1$s pero %2$s aínda non publicou nada." + +#: actions/showstream.php:205 +msgid "" +"Seen anything interesting recently? You haven't posted any notices yet, now " +"would be a good time to start :)" +msgstr "" +"Viu algo interesante hoxe? Aínda non publicou ningunha nota, este sería un " +"bo momento para comezar :)" + +#: actions/showstream.php:207 +#, php-format +msgid "" +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." +msgstr "" +"Pode probar a facerlle un aceno a %1$s ou [publicar algo dirixido a el ou " +"ela](%%%%action.newnotice%%%%?status_textarea=%2$s)." + +#: actions/showstream.php:243 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " +"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" +"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]" +"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na " +"ferramenta de software libre [StatusNet](http://status.net/). [Únase agora](%" +"%%%action.register%%%%) para seguir as notas de **%s** e de moita máis " +"xente! ([Máis información](%%%%doc.help%%%%))" + +#: actions/showstream.php:248 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. " +msgstr "" +"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]" +"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na " +"ferramenta de software libre [StatusNet](http://status.net/). " + +#: actions/showstream.php:305 +#, php-format +msgid "Repeat of %s" +msgstr "Repeticións de %s" + +#: actions/silence.php:65 actions/unsilence.php:65 +msgid "You cannot silence users on this site." +msgstr "Non pode silenciar usuarios neste sitio." + +#: actions/silence.php:72 +msgid "User is already silenced." +msgstr "O usuario xa está silenciado." + +#: actions/siteadminpanel.php:69 +msgid "Basic settings for this StatusNet site" +msgstr "Configuración básica para este sitio StatusNet" + +#: actions/siteadminpanel.php:133 +msgid "Site name must have non-zero length." +msgstr "O nome do sitio non pode quedar baleiro." + +#: actions/siteadminpanel.php:141 +msgid "You must have a valid contact email address." +msgstr "Ten que ter un enderezo de correo electrónico de contacto correcto." + +#: actions/siteadminpanel.php:159 +#, php-format +msgid "Unknown language \"%s\"." +msgstr "Non se coñece a lingua \"%s\"." + +#: actions/siteadminpanel.php:165 +msgid "Minimum text limit is 0 (unlimited)." +msgstr "O límite mínimo de texto é 0 (ilimitado)." + +#: actions/siteadminpanel.php:171 +msgid "Dupe limit must be one or more seconds." +msgstr "O tempo límite de repetición debe ser de 1 ou máis segundos." + +#: actions/siteadminpanel.php:221 +msgid "General" +msgstr "Xeral" + +#: actions/siteadminpanel.php:224 +msgid "Site name" +msgstr "Nome do sitio" + +#: actions/siteadminpanel.php:225 +msgid "The name of your site, like \"Yourcompany Microblog\"" +msgstr "" +"O nome do seu sitio, como por exemplo \"O microblogue da miña empresa\"" + +#: actions/siteadminpanel.php:229 +msgid "Brought by" +msgstr "Publicado por" + +#: actions/siteadminpanel.php:230 +msgid "Text used for credits link in footer of each page" +msgstr "Texto utilizado para a ligazón aos créditos ao pé de cada páxina" + +#: actions/siteadminpanel.php:234 +msgid "Brought by URL" +msgstr "URL do publicador" + +#: actions/siteadminpanel.php:235 +msgid "URL used for credits link in footer of each page" +msgstr "URL utilizado para a ligazón aos créditos ao pé de cada páxina" + +#: actions/siteadminpanel.php:239 +msgid "Contact email address for your site" +msgstr "Enderezo de correo electrónico de contacto para o seu sitio" + +#: actions/siteadminpanel.php:245 +msgid "Local" +msgstr "Local" + +#: actions/siteadminpanel.php:256 +msgid "Default timezone" +msgstr "Fuso horario por defecto" + +#: actions/siteadminpanel.php:257 +msgid "Default timezone for the site; usually UTC." +msgstr "Fuso horario por defecto para este sitio. Adoita poñerse o UTC." + +#: actions/siteadminpanel.php:262 +msgid "Default language" +msgstr "Lingua por defecto" + +#: actions/siteadminpanel.php:263 +msgid "Site language when autodetection from browser settings is not available" +msgstr "" +"Lingua do sitio para cando a detección automática a partir do navegador non " +"sexa posible" + +#: actions/siteadminpanel.php:271 +msgid "Limits" +msgstr "Límites" + +#: actions/siteadminpanel.php:274 +msgid "Text limit" +msgstr "Límite de texto" + +#: actions/siteadminpanel.php:274 +msgid "Maximum number of characters for notices." +msgstr "Número máximo de caracteres para as notas." + +#: actions/siteadminpanel.php:278 +msgid "Dupe limit" +msgstr "Tempo límite de repetición" + +#: actions/siteadminpanel.php:278 +msgid "How long users must wait (in seconds) to post the same thing again." +msgstr "" +"Tempo (en segundos) que teñen que agardar os usuarios para publicar unha " +"nota de novo." + +#: actions/sitenoticeadminpanel.php:56 +msgid "Site Notice" +msgstr "Nota do sitio" + +#: actions/sitenoticeadminpanel.php:67 +msgid "Edit site-wide message" +msgstr "Editar a mensaxe global do sitio" + +#: actions/sitenoticeadminpanel.php:103 +msgid "Unable to save site notice." +msgstr "Non se puido gardar a nota do sitio." + +#: actions/sitenoticeadminpanel.php:113 +msgid "Max length for the site-wide notice is 255 chars." +msgstr "O tamaño máximo da nota global do sitio é de 255 caracteres." + +#: actions/sitenoticeadminpanel.php:176 +msgid "Site notice text" +msgstr "Texto da nota do sitio" + +#: actions/sitenoticeadminpanel.php:178 +msgid "Site-wide notice text (255 chars max; HTML okay)" +msgstr "" +"Texto da nota global do sitio (255 caracteres como máximo, pode conter HTML)" + +#: actions/sitenoticeadminpanel.php:198 +msgid "Save site notice" +msgstr "Gardar a nota do sitio" + +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 +msgid "SMS settings" +msgstr "Configuración dos SMS" + +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 +#, php-format +msgid "You can receive SMS messages through email from %%site.name%%." +msgstr "Pode recibir mensaxes SMS de %%site.name%% por correo electrónico." + +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 +msgid "SMS is not available." +msgstr "Os SMS non están dispoñibles." + +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "Enderezo dos SMS" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 +msgid "Current confirmed SMS-enabled phone number." +msgstr "Número de teléfono cos SMS activados confirmado actualmente." + +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 +msgid "Awaiting confirmation on this phone number." +msgstr "Agardando pola confirmación do número de teléfono." + +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 +msgid "Confirmation code" +msgstr "Código de confirmación" + +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 +msgid "Enter the code you received on your phone." +msgstr "Introduza o código que recibiu no teléfono." + +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Confirmar" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 +msgid "SMS phone number" +msgstr "Número de teléfono para os SMS" + +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 +msgid "Phone number, no punctuation or spaces, with area code" +msgstr "" +"Número de teléfono, sen signos de puntuación nin espazos en branco, co " +"código da zona" + +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "Preferencias dos SMS" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 +msgid "" +"Send me notices through SMS; I understand I may incur exorbitant charges " +"from my carrier." +msgstr "" +"Enviádeme notas por SMS. Comprendo que isto podería supoñerme uns custos " +"exorbitantes na factura da miña compañía." + +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Gardáronse as preferencias dos SMS." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 +msgid "No phone number." +msgstr "Non hai ningún número de teléfono." + +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 +msgid "No carrier selected." +msgstr "Non se escolleu unha compañía." + +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 +msgid "That is already your phone number." +msgstr "Ese xa é o seu número de teléfono." + +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 +msgid "That phone number already belongs to another user." +msgstr "Ese número de teléfono xa pertence a outro usuario." + +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 +msgid "" +"A confirmation code was sent to the phone number you added. Check your phone " +"for the code and instructions on how to use it." +msgstr "" +"Enviouse un código de confirmación ao número de teléfono que engadiu. " +"Comprobe no seu teléfono o código e as instrucións para utilizalo." + +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 +msgid "That is the wrong confirmation number." +msgstr "Ese número de confirmación é incorrecto." + +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Cancelouse a confirmación para os SMS." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 +msgid "That is not your phone number." +msgstr "Ese número de teléfono non é seu." + +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Borrouse o número de teléfono para os SMS." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 +msgid "Mobile carrier" +msgstr "Compañía" + +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 +msgid "Select a carrier" +msgstr "Escolla unha compañía" + +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 +#, php-format +msgid "" +"Mobile carrier for your phone. If you know a carrier that accepts SMS over " +"email but isn't listed here, send email to let us know at %s." +msgstr "" +"Compañía de telecomunicacións coa que contratou o seu móbil. Se sabe " +"dalgunha compañía que permita SMS sobre correo electrónico pero non aparece " +"nesta lista, envíenos un correo electrónico para notificárnolo a %s." + +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 +msgid "No code entered" +msgstr "Non se introduciu ningún código" + +#. TRANS: Menu item for site administration +#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 +#: lib/adminpanelaction.php:407 +msgid "Snapshots" +msgstr "Instantáneas" + +#: actions/snapshotadminpanel.php:65 +msgid "Manage snapshot configuration" +msgstr "Xestione a configuración das instantáneas" + +#: actions/snapshotadminpanel.php:127 +msgid "Invalid snapshot run value." +msgstr "Valor de execución da instantánea incorrecto." + +#: actions/snapshotadminpanel.php:133 +msgid "Snapshot frequency must be a number." +msgstr "A frecuencia das instantáneas debe ser un número." + +#: actions/snapshotadminpanel.php:144 +msgid "Invalid snapshot report URL." +msgstr "URL de envío das instantáneas incorrecto." + +#: actions/snapshotadminpanel.php:200 +msgid "Randomly during web hit" +msgstr "Ao chou durante o acceso á rede" + +#: actions/snapshotadminpanel.php:201 +msgid "In a scheduled job" +msgstr "Nun proceso programado" + +#: actions/snapshotadminpanel.php:206 +msgid "Data snapshots" +msgstr "Instantáneas de datos" + +#: actions/snapshotadminpanel.php:208 +msgid "When to send statistical data to status.net servers" +msgstr "Cando enviar información estatística aos servidores status.net" + +#: actions/snapshotadminpanel.php:217 +msgid "Frequency" +msgstr "Frecuencia" + +#: actions/snapshotadminpanel.php:218 +msgid "Snapshots will be sent once every N web hits" +msgstr "As instantáneas enviaranse unha vez cada N accesos á rede" + +#: actions/snapshotadminpanel.php:226 +msgid "Report URL" +msgstr "URL de envío" + +#: actions/snapshotadminpanel.php:227 +msgid "Snapshots will be sent to this URL" +msgstr "As instantáneas enviaranse a este URL" + +#: actions/snapshotadminpanel.php:248 +msgid "Save snapshot settings" +msgstr "Gardar a configuración das instantáneas" + +#: actions/subedit.php:70 +msgid "You are not subscribed to that profile." +msgstr "Non está subscrito a ese perfil." + +#: actions/subedit.php:83 classes/Subscription.php:132 +msgid "Could not save subscription." +msgstr "Non se puido gardar a subscrición." + +#: actions/subscribe.php:77 +msgid "This action only accepts POST requests." +msgstr "Esta acción só permite solicitudes POST." + +#: actions/subscribe.php:107 +msgid "No such profile." +msgstr "Non existe ese perfil." + +#: actions/subscribe.php:117 +msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." +msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción." + +#: actions/subscribe.php:145 +msgid "Subscribed" +msgstr "Subscrito" + +#: actions/subscribers.php:50 +#, php-format +msgid "%s subscribers" +msgstr "%s subscritores" + +#: actions/subscribers.php:52 +#, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "%1$s subscritores, páxina %2$d" + +#: actions/subscribers.php:63 +msgid "These are the people who listen to your notices." +msgstr "Estas son as persoas que seguen as súas notas." + +#: actions/subscribers.php:67 +#, php-format +msgid "These are the people who listen to %s's notices." +msgstr "Estas son as persoas que están seguindo as notas de %s." + +#: actions/subscribers.php:108 +msgid "" +"You have no subscribers. Try subscribing to people you know and they might " +"return the favor" +msgstr "" +"Non ten subscritores. Probe a subscribirse a xente que coñeza e pode que lle " +"devolvan o favor" + +#: actions/subscribers.php:110 +#, php-format +msgid "%s has no subscribers. Want to be the first?" +msgstr "%s non ten subscritores. Quere ser o primeiro?" + +#: actions/subscribers.php:114 +#, php-format +msgid "" +"%s has no subscribers. Why not [register an account](%%%%action.register%%%" +"%) and be the first?" +msgstr "" +"%s non ten subscritores. Por que non [rexistrar unha conta](%%%%action." +"register%%%%) e ser o primeiro?" + +#: actions/subscriptions.php:52 +#, php-format +msgid "%s subscriptions" +msgstr "%s subscricións" + +#: actions/subscriptions.php:54 +#, php-format +msgid "%1$s subscriptions, page %2$d" +msgstr "%1$s subscricións, páxina %2$d" + +#: actions/subscriptions.php:65 +msgid "These are the people whose notices you listen to." +msgstr "Estas son as persoas cuxas notas segue." + +#: actions/subscriptions.php:69 +#, php-format +msgid "These are the people whose notices %s listens to." +msgstr "Estas son as persoas cuxas notas segue %s." + +#: actions/subscriptions.php:126 +#, php-format +msgid "" +"You're not listening to anyone's notices right now, try subscribing to " +"people you know. Try [people search](%%action.peoplesearch%%), look for " +"members in groups you're interested in and in our [featured users](%%action." +"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " +"automatically subscribe to people you already follow there." +msgstr "" +"Agora mesmo non está a seguir as notas de ninguén, probe a subscribirse a " +"xente que coñeza. Intente [buscar xente](%%action.peoplesearch%%), buscar " +"xente en grupos que lle interesen e nos nosos [usuarios destacados](%%action." +"featured%%). Se é [usuario do Twitter](%%action.twittersettings%%), pode " +"subscribirse automaticamente á xente que segue alí." + +#: actions/subscriptions.php:128 actions/subscriptions.php:132 +#, php-format +msgid "%s is not listening to anyone." +msgstr "%s non está seguindo a ninguén." + +#: actions/subscriptions.php:208 +msgid "Jabber" +msgstr "Jabber" + +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 +msgid "SMS" +msgstr "SMS" + +#: actions/tag.php:69 +#, php-format +msgid "Notices tagged with %1$s, page %2$d" +msgstr "Notas etiquetadas con %1$s, páxina %2$d" + +#: actions/tag.php:87 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Fonte de novas das notas para a etiqueta %s (RSS 1.0)" + +#: actions/tag.php:93 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Fonte de novas das notas para a etiqueta %s (RSS 2.0)" + +#: actions/tag.php:99 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Fonte de novas das notas para a etiqueta %s (Atom)" + +#: actions/tagother.php:39 +msgid "No ID argument." +msgstr "Sen argumento ID." + +#: actions/tagother.php:65 +#, php-format +msgid "Tag %s" +msgstr "Etiqueta %s" + +#: actions/tagother.php:77 lib/userprofile.php:76 +msgid "User profile" +msgstr "Perfil do usuario" + +#: actions/tagother.php:81 actions/userauthorization.php:132 +#: lib/userprofile.php:103 +msgid "Photo" +msgstr "Fotografía" + +#: actions/tagother.php:141 +msgid "Tag user" +msgstr "Etiquetar ao usuario" + +#: actions/tagother.php:151 +msgid "" +"Tags for this user (letters, numbers, -, ., and _), comma- or space- " +"separated" +msgstr "" +"Etiquetas para este usuario (letras, números, -, ., e _), separadas por " +"comas ou espazos en branco" + +#: actions/tagother.php:193 +msgid "" +"You can only tag people you are subscribed to or who are subscribed to you." +msgstr "" +"Só pode etiquetar a xente á que estea subscrito ou que estean subscritos a " +"vostede." + +#: actions/tagother.php:200 +msgid "Could not save tags." +msgstr "Non se puideron gardar as etiquetas." + +#: actions/tagother.php:236 +msgid "Use this form to add tags to your subscribers or subscriptions." +msgstr "" +"Utilice este formulario para engadir etiquetas aos seus subscritores ou " +"subscricións." + +#: actions/tagrss.php:35 +msgid "No such tag." +msgstr "Esa etiqueta non existe." + +#: actions/twitapitrends.php:85 +msgid "API method under construction." +msgstr "Método API en desenvolvemento." + +#: actions/unblock.php:59 +msgid "You haven't blocked that user." +msgstr "Non bloqueou a ese usuario." + +#: actions/unsandbox.php:72 +msgid "User is not sandboxed." +msgstr "O usuario non está illado." + +#: actions/unsilence.php:72 +msgid "User is not silenced." +msgstr "O usuario non está silenciado." + +#: actions/unsubscribe.php:77 +msgid "No profile ID in request." +msgstr "Á solicitude fáltalle o ID do perfil." + +#: actions/unsubscribe.php:98 +msgid "Unsubscribed" +msgstr "Cancelouse a subscrición" + +#: actions/updateprofile.php:64 actions/userauthorization.php:337 +#, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." +msgstr "" +"A licenza \"%1$s\" das transmisións da persoa seguida non é compatible coa " +"licenza deste sitio: \"%2$s\"." + +#. TRANS: User admin panel title +#: actions/useradminpanel.php:59 +msgctxt "TITLE" +msgid "User" +msgstr "Usuario" + +#: actions/useradminpanel.php:70 +msgid "User settings for this StatusNet site." +msgstr "Preferencias de usuario para este sitio StatusNet." + +#: actions/useradminpanel.php:149 +msgid "Invalid bio limit. Must be numeric." +msgstr "Límite da biografía incorrecto. Debe ser numérico." + +#: actions/useradminpanel.php:155 +msgid "Invalid welcome text. Max length is 255 characters." +msgstr "Texto de benvida incorrecto. A extensión máxima é de 255 caracteres." + +#: actions/useradminpanel.php:165 +#, php-format +msgid "Invalid default subscripton: '%1$s' is not user." +msgstr "Subscrición por defecto incorrecta. \"%1$s\" non é un usuario." + +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 +#: lib/personalgroupnav.php:109 +msgid "Profile" +msgstr "Perfil" + +#: actions/useradminpanel.php:222 +msgid "Bio Limit" +msgstr "Límite da biografía" + +#: actions/useradminpanel.php:223 +msgid "Maximum length of a profile bio in characters." +msgstr "Extensión máxima da biografía dun perfil en caracteres." + +#: actions/useradminpanel.php:231 +msgid "New users" +msgstr "Novos usuarios" + +#: actions/useradminpanel.php:235 +msgid "New user welcome" +msgstr "Nova benvida para os usuarios" + +#: actions/useradminpanel.php:236 +msgid "Welcome text for new users (Max 255 chars)." +msgstr "Texto de benvida para os novos usuarios (255 caracteres como máximo)." + +#: actions/useradminpanel.php:241 +msgid "Default subscription" +msgstr "Subscrición por defecto" + +#: actions/useradminpanel.php:242 +msgid "Automatically subscribe new users to this user." +msgstr "Subscribir automaticamente aos novos usuarios a este usuario." + +#: actions/useradminpanel.php:251 +msgid "Invitations" +msgstr "Invitacións" + +#: actions/useradminpanel.php:256 +msgid "Invitations enabled" +msgstr "Activáronse as invitacións" + +#: actions/useradminpanel.php:258 +msgid "Whether to allow users to invite new users." +msgstr "Permitir ou non que os usuarios poidan invitar a novos usuarios." + +#: actions/userauthorization.php:105 +msgid "Authorize subscription" +msgstr "Autorizar a subscrición" + +#: actions/userauthorization.php:110 +msgid "" +"Please check these details to make sure that you want to subscribe to this " +"user’s notices. If you didn’t just ask to subscribe to someone’s notices, " +"click “Reject”." +msgstr "" +"Verifique estes detalles para certificar que quere subscribirse ás notas " +"deste usuario. Se non pediu a subscrición ás notas de alguén, prema en " +"\"Rexeitar\"." + +#: actions/userauthorization.php:196 actions/version.php:165 +msgid "License" +msgstr "Licenza" + +#: actions/userauthorization.php:217 +msgid "Accept" +msgstr "Aceptar" + +#: actions/userauthorization.php:218 lib/subscribeform.php:115 +#: lib/subscribeform.php:139 +msgid "Subscribe to this user" +msgstr "Subscribirse a este usuario" + +#: actions/userauthorization.php:219 +msgid "Reject" +msgstr "Rexeitar" + +#: actions/userauthorization.php:220 +msgid "Reject this subscription" +msgstr "Rexeitar esta subscrición" + +#: actions/userauthorization.php:232 +msgid "No authorization request!" +msgstr "Non se solicitou a autorización!" + +#: actions/userauthorization.php:254 +msgid "Subscription authorized" +msgstr "Autorizouse a subscrición" + +#: actions/userauthorization.php:256 +msgid "" +"The subscription has been authorized, but no callback URL was passed. Check " +"with the site’s instructions for details on how to authorize the " +"subscription. Your subscription token is:" +msgstr "" +"Autorizouse a subscrición, pero non se devolveu ningún URL. Bote unha ollada " +"ás instrucións do sitio para saber máis sobre como autorizar a subscrición. " +"O pase da súa subscrición é:" + +#: actions/userauthorization.php:266 +msgid "Subscription rejected" +msgstr "Rexeitouse a subscrición" + +#: actions/userauthorization.php:268 +msgid "" +"The subscription has been rejected, but no callback URL was passed. Check " +"with the site’s instructions for details on how to fully reject the " +"subscription." +msgstr "" +"Rexeitouse a subscrición, pero non se devolveu ningún URL. Bote unha ollada " +"ás instrucións do sitio para obter máis información sobre como rexeitar " +"completamente a subscrición." + +#: actions/userauthorization.php:303 +#, php-format +msgid "Listener URI ‘%s’ not found here." +msgstr "Non se atopou o URI do seguidor, \"%s\", aquí." + +#: actions/userauthorization.php:308 +#, php-format +msgid "Listenee URI ‘%s’ is too long." +msgstr "O URI do seguidor, \"%s\", é longo de máis." + +#: actions/userauthorization.php:314 +#, php-format +msgid "Listenee URI ‘%s’ is a local user." +msgstr "O URI do seguidor, \"%s\", é dun usuario local." + +#: actions/userauthorization.php:329 +#, php-format +msgid "Profile URL ‘%s’ is for a local user." +msgstr "O URL do perfil, \"%s\", pertence a un usuario local." + +#: actions/userauthorization.php:345 +#, php-format +msgid "Avatar URL ‘%s’ is not valid." +msgstr "O URL do avatar, \"%s\", é incorrecto." + +#: actions/userauthorization.php:350 +#, php-format +msgid "Can’t read avatar URL ‘%s’." +msgstr "Non se puido ler o URL do avatar, \"%s\"." + +#: actions/userauthorization.php:355 +#, php-format +msgid "Wrong image type for avatar URL ‘%s’." +msgstr "O tipo de imaxe do URL do avatar, \"%s\", é incorrecto." + +#: actions/userdesignsettings.php:76 lib/designsettings.php:65 +msgid "Profile design" +msgstr "Deseño do perfil" + +#: actions/userdesignsettings.php:87 lib/designsettings.php:76 +msgid "" +"Customize the way your profile looks with a background image and a colour " +"palette of your choice." +msgstr "" +"Personalice a aparencia do seu perfil cunha imaxe de fondo e unha paleta de " +"cores escollida por vostede." + +#: actions/userdesignsettings.php:282 +msgid "Enjoy your hotdog!" +msgstr "Bo proveito!" + +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 +#, php-format +msgid "%1$s groups, page %2$d" +msgstr "%1$s grupos, páxina %2$d" + +#: actions/usergroups.php:132 +msgid "Search for more groups" +msgstr "Buscar máis grupos" + +#: actions/usergroups.php:159 +#, php-format +msgid "%s is not a member of any group." +msgstr "%s non pertence a ningún grupo." + +#: actions/usergroups.php:164 +#, php-format +msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." +msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse a eles." + +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 +#, php-format +msgid "Updates from %1$s on %2$s!" +msgstr "Actualizacións de %1$s en %2$s!" + +#: actions/version.php:73 +#, php-format +msgid "StatusNet %s" +msgstr "%s de StatusNet" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" +"Este sitio foi desenvolvido sobre a versión %2$s de %1$s, propiedade de " +"StatusNet, Inc. e colaboradores, 2008-2010." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "Colaboradores" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" +"StatusNet é software libre: pode redistribuílo e modificalo baixo os termos " +"da Licenza Pública Xeral Affero de GNU, tal e como a publicou a Free " +"Software Foundation, versión 3 ou calquera versión posterior (a elección do " +"usuario) da licenza. " + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" +"Este programa distribúese coa esperanza de que resulte útil, pero SEN " +"NINGUNHA GARANTÍA, nin sequera as garantías implícitas de COMERCIALIZACIÓN " +"ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Lea a Licenza Pública Xeral " +"Affero de GNU para máis información. " + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" +"Debeu recibir unha copia da Licenza Pública Xeral Affero de GNU xunto co " +"programa. En caso contrario, vexa %s." + +#: actions/version.php:189 +msgid "Plugins" +msgstr "Complementos" + +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 +msgid "Version" +msgstr "Versión" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "Autores" + +#: classes/File.php:169 +#, php-format +msgid "" +"No file may be larger than %d bytes and the file you sent was %d bytes. Try " +"to upload a smaller version." +msgstr "" +"Ningún ficheiro pode superar os %d bytes e o que enviou ocupaba %d. Probe a " +"subir un ficheiro máis pequeno." + +#: classes/File.php:179 +#, php-format +msgid "A file this large would exceed your user quota of %d bytes." +msgstr "" +"Un ficheiro deste tamaño excedería a súa cota de usuario, que é de %d bytes." + +#: classes/File.php:186 +#, php-format +msgid "A file this large would exceed your monthly quota of %d bytes." +msgstr "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes." + +#: classes/Group_member.php:41 +msgid "Group join failed." +msgstr "Non se puido unir ao grupo." + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "Non forma parte do grupo." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "Non se puido deixar o grupo." + +#: classes/Local_group.php:41 +msgid "Could not update local group." +msgstr "Non se puido actualizar o grupo local." + +#: classes/Login_token.php:76 +#, php-format +msgid "Could not create login token for %s" +msgstr "Non se puido crear un pase de sesión para %s" + +#: classes/Message.php:45 +msgid "You are banned from sending direct messages." +msgstr "Prohibíuselle enviar mensaxes directas de momento." + +#: classes/Message.php:61 +msgid "Could not insert message." +msgstr "Non se puido inserir a mensaxe." + +#: classes/Message.php:71 +msgid "Could not update message with new URI." +msgstr "Non se puido actualizar a mensaxe co novo URI." + +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, php-format +msgid "Database error inserting hashtag: %s" +msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta: %s" + +#: classes/Notice.php:245 +msgid "Problem saving notice. Too long." +msgstr "Houbo un problema ao gardar a nota. É longa de máis." + +#: classes/Notice.php:249 +msgid "Problem saving notice. Unknown user." +msgstr "Houbo un problema ao gardar a nota. Descoñécese o usuario." + +#: classes/Notice.php:254 +msgid "" +"Too many notices too fast; take a breather and post again in a few minutes." +msgstr "" +"Escribiu demasiadas notas en moi pouco tempo. Tómese un respiro e volva " +"publicar nuns minutos." + +#: classes/Notice.php:260 +msgid "" +"Too many duplicate messages too quickly; take a breather and post again in a " +"few minutes." +msgstr "" +"Repetiu demasiadas mensaxes en moi pouco tempo. Tómese un respiro e volva " +"publicar nuns minutos." + +#: classes/Notice.php:266 +msgid "You are banned from posting notices on this site." +msgstr "Prohibíuselle publicar notas neste sitio de momento." + +#: classes/Notice.php:332 classes/Notice.php:358 +msgid "Problem saving notice." +msgstr "Houbo un problema ao gardar a nota." + +#: classes/Notice.php:967 +msgid "Problem saving group inbox." +msgstr "Houbo un problema ao gardar a caixa de entrada do grupo." + +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "♻ @%1$s %2$s" + +#: classes/Subscription.php:74 lib/oauthstore.php:465 +msgid "You have been banned from subscribing." +msgstr "Prohibíuselle realizar subscricións de momento." + +#: classes/Subscription.php:78 +msgid "Already subscribed!" +msgstr "Xa está subscrito!" + +#: classes/Subscription.php:82 +msgid "User has blocked you." +msgstr "O usuario bloqueouno." + +#: classes/Subscription.php:167 +msgid "Not subscribed!" +msgstr "Non está subscrito!" + +#: classes/Subscription.php:173 +msgid "Couldn't delete self-subscription." +msgstr "Non se puido borrar a subscrición a si mesmo." + +#: classes/Subscription.php:200 +msgid "Couldn't delete subscription OMB token." +msgstr "Non se puido borrar o pase de subscrición OMB." + +#: classes/Subscription.php:211 +msgid "Couldn't delete subscription." +msgstr "Non se puido borrar a subscrición." + +#: classes/User.php:363 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Benvido a %1$s, @%2$s!" + +#: classes/User_group.php:480 +msgid "Could not create group." +msgstr "Non se puido crear o grupo." + +#: classes/User_group.php:489 +msgid "Could not set group URI." +msgstr "Non se puido establecer o URI do grupo." + +#: classes/User_group.php:510 +msgid "Could not set group membership." +msgstr "Non se puido establecer a pertenza ao grupo." + +#: classes/User_group.php:524 +msgid "Could not save local group info." +msgstr "Non se puido gardar a información do grupo local." + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 +msgid "Change your profile settings" +msgstr "Cambie a configuración do seu perfil" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 +msgid "Upload an avatar" +msgstr "Cargue un avatar" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 +msgid "Change your password" +msgstr "Cambie o seu contrasinal" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 +msgid "Change email handling" +msgstr "Cambie a xestión do correo electrónico" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 +msgid "Design your profile" +msgstr "Deseñe o seu perfil" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 +msgid "Other options" +msgstr "Outras opcións" + +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Outros" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 +msgid "Untitled page" +msgstr "Páxina sen título" + +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 +msgid "Primary site navigation" +msgstr "Navegación principal do sitio" + +#. TRANS: Tooltip for main menu option "Personal" +#: lib/action.php:432 +msgctxt "TOOLTIP" +msgid "Personal profile and friends timeline" +msgstr "Liña do tempo do perfil persoal e os amigos" + +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 +msgctxt "MENU" +msgid "Personal" +msgstr "Persoal" + +#. TRANS: Tooltip for main menu option "Account" +#: lib/action.php:437 +msgctxt "TOOLTIP" +msgid "Change your email, avatar, password, profile" +msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil" + +#. TRANS: Tooltip for main menu option "Services" +#: lib/action.php:442 +msgctxt "TOOLTIP" +msgid "Connect to services" +msgstr "Conectarse aos servizos" + +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 +msgid "Connect" +msgstr "Conectarse" + +#. TRANS: Tooltip for menu option "Admin" +#: lib/action.php:448 +msgctxt "TOOLTIP" +msgid "Change site configuration" +msgstr "Cambiar a configuración do sitio" + +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 +msgctxt "MENU" +msgid "Admin" +msgstr "Administrador" + +#. TRANS: Tooltip for main menu option "Invite" +#: lib/action.php:455 +#, php-format +msgctxt "TOOLTIP" +msgid "Invite friends and colleagues to join you on %s" +msgstr "Convide a amigos e compañeiros a unírselle en %s" + +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 +msgctxt "MENU" +msgid "Invite" +msgstr "Convidar" + +#. TRANS: Tooltip for main menu option "Logout" +#: lib/action.php:464 +msgctxt "TOOLTIP" +msgid "Logout from the site" +msgstr "Saír ao anonimato" + +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 +msgctxt "MENU" +msgid "Logout" +msgstr "Saír" + +#. TRANS: Tooltip for main menu option "Register" +#: lib/action.php:472 +msgctxt "TOOLTIP" +msgid "Create an account" +msgstr "Crear unha conta" + +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 +msgctxt "MENU" +msgid "Register" +msgstr "Rexistrarse" + +#. TRANS: Tooltip for main menu option "Login" +#: lib/action.php:478 +msgctxt "TOOLTIP" +msgid "Login to the site" +msgstr "Identificarse no sitio" + +#: lib/action.php:481 +msgctxt "MENU" +msgid "Login" +msgstr "Identificarse" + +#. TRANS: Tooltip for main menu option "Help" +#: lib/action.php:484 +msgctxt "TOOLTIP" +msgid "Help me!" +msgstr "Axuda!" + +#: lib/action.php:487 +msgctxt "MENU" +msgid "Help" +msgstr "Axuda" + +#. TRANS: Tooltip for main menu option "Search" +#: lib/action.php:490 +msgctxt "TOOLTIP" +msgid "Search for people or text" +msgstr "Buscar persoas ou palabras" + +#: lib/action.php:493 +msgctxt "MENU" +msgid "Search" +msgstr "Buscar" + +#. TRANS: DT element for site notice. String is hidden in default CSS. +#. TRANS: Menu item for site administration +#: lib/action.php:515 lib/adminpanelaction.php:399 +msgid "Site notice" +msgstr "Nota do sitio" + +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 +msgid "Local views" +msgstr "Vistas locais" + +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 +msgid "Page notice" +msgstr "Nota da páxina" + +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 +msgid "Secondary site navigation" +msgstr "Navegación secundaria do sitio" + +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 +msgid "Help" +msgstr "Axuda" + +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 +msgid "About" +msgstr "Acerca de" + +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 +msgid "FAQ" +msgstr "Preguntas máis frecuentes" + +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 +msgid "TOS" +msgstr "Condicións do servicio" + +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 +msgid "Privacy" +msgstr "Protección de datos" + +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 +msgid "Source" +msgstr "Código fonte" + +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 +msgid "Contact" +msgstr "Contacto" + +#: lib/action.php:784 +msgid "Badge" +msgstr "Insignia" + +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 +msgid "StatusNet software license" +msgstr "Licenza do software StatusNet" + +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, php-format +msgid "" +"**%%site.name%%** is a microblogging service brought to you by [%%site." +"broughtby%%](%%site.broughtbyurl%%)." +msgstr "" +"**%%site.name%%** é un servizo de microblogue ofrecido por [%%site.broughtby%" +"%](%%site.broughtbyurl%%)." + +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 +#, php-format +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** é un servizo de microblogue." + +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 +#, php-format +msgid "" +"It runs the [StatusNet](http://status.net/) microblogging software, version %" +"s, available under the [GNU Affero General Public License](http://www.fsf." +"org/licensing/licenses/agpl-3.0.html)." +msgstr "" +"Utiliza a versión %s do software de microblogue [StatusNet](http://status." +"net/), dispoñible baixo a [Licenza Pública Xeral Affero de GNU](http://www." +"fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)." + +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 +msgid "Site content license" +msgstr "Licenza dos contidos do sitio" + +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 +#, php-format +msgid "Content and data of %1$s are private and confidential." +msgstr "O contido e os datos de %1$s son privados e confidenciais." + +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 +#, php-format +msgid "Content and data copyright by %1$s. All rights reserved." +msgstr "" +"Os contidos e datos son propiedade intelectual de %1$s. Quedan reservados " +"todos os dereitos." + +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 +msgid "Content and data copyright by contributors. All rights reserved." +msgstr "" +"Os contidos e datos son propiedade intelectual dos colaboradores. Quedan " +"reservados todos os dereitos." + +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" +"Todos os contidos e datos de %1$s están dispoñibles baixo a licenza %2$s." + +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 +msgid "Pagination" +msgstr "Paxinación" + +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 +msgid "After" +msgstr "Posteriores" + +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 +msgid "Before" +msgstr "Anteriores" + +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" +"Esperábase unha fonte de novas raíz pero recibiuse un documento XML completo." + +#: lib/activityutils.php:208 +msgid "Can't handle remote content yet." +msgstr "Aínda non é posible manexar contidos remotos." + +#: lib/activityutils.php:236 +msgid "Can't handle embedded XML content yet." +msgstr "Aínda non se poden manexar contidos XML integrados." + +#: lib/activityutils.php:240 +msgid "Can't handle embedded Base64 content yet." +msgstr "Aínda non se poden manexar contidos Base64." + +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. +#: lib/adminpanelaction.php:98 +msgid "You cannot make changes to this site." +msgstr "Non pode realizar cambios neste sitio." + +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. +#: lib/adminpanelaction.php:110 +msgid "Changes to that panel are not allowed." +msgstr "Non se permite realizar cambios nese panel." + +#. TRANS: Client error message. +#: lib/adminpanelaction.php:229 +msgid "showForm() not implemented." +msgstr "showForm() non está integrado." + +#. TRANS: Client error message +#: lib/adminpanelaction.php:259 +msgid "saveSettings() not implemented." +msgstr "saveSettings() non está integrado." + +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 +msgid "Unable to delete design setting." +msgstr "Non se puido borrar a configuración do deseño." + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:349 +msgid "Basic site configuration" +msgstr "Configuración básica do sitio" + +#. TRANS: Menu item for site administration +#: lib/adminpanelaction.php:351 +msgctxt "MENU" +msgid "Site" +msgstr "Sitio" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:357 +msgid "Design configuration" +msgstr "Configuración do deseño" + +#. TRANS: Menu item for site administration +#: lib/adminpanelaction.php:359 +msgctxt "MENU" +msgid "Design" +msgstr "Deseño" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:365 +msgid "User configuration" +msgstr "Configuración do usuario" + +#. TRANS: Menu item for site administration +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 +msgid "User" +msgstr "Usuario" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:373 +msgid "Access configuration" +msgstr "Configuración de acceso" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:381 +msgid "Paths configuration" +msgstr "Configuración das rutas" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:389 +msgid "Sessions configuration" +msgstr "Configuración das sesións" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:397 +msgid "Edit site notice" +msgstr "Modificar a nota do sitio" + +#. TRANS: Menu item title/tooltip +#: lib/adminpanelaction.php:405 +msgid "Snapshots configuration" +msgstr "Configuración das instantáneas" + +#. TRANS: Client error 401. +#: lib/apiauth.php:113 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" +"O recurso API precisa permisos de lectura e escritura, pero só dispón de " +"permisos de lectura." + +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 +msgid "Edit application" +msgstr "Modificar a aplicación" + +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 +msgid "Icon for this application" +msgstr "Icona para esta aplicación" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 +#, php-format +msgid "Describe your application in %d characters" +msgstr "Describa a súa aplicación en %d caracteres" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 +msgid "Describe your application" +msgstr "Describa a súa aplicación" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 +msgid "URL of the homepage of this application" +msgstr "URL do sitio web desta aplicación" + +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "URL de orixe" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 +msgid "Organization responsible for this application" +msgstr "Organización responsable desta aplicación" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 +msgid "URL for the homepage of the organization" +msgstr "URL do sitio web da organización" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 +msgid "URL to redirect to after authentication" +msgstr "URL ao que ir tras a autenticación" + +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 +msgid "Browser" +msgstr "Navegador" + +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 +msgid "Desktop" +msgstr "Escritorio" + +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 +msgid "Type of application, browser or desktop" +msgstr "Tipo de aplicación, de navegador ou de escritorio" + +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 +msgid "Read-only" +msgstr "Lectura" + +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 +msgid "Read-write" +msgstr "Lectura e escritura" + +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 +msgid "Default access for this application: read-only, or read-write" +msgstr "" +"Permisos por defecto para esta aplicación: lectura ou lectura e escritura" + +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Cancelar" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "lectura e escritura" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "lectura" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Aprobado o %1$s - permisos de \"%2$s\"." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" +msgid "Revoke" +msgstr "Revogar" + +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 +msgid "Attachments" +msgstr "Ficheiros anexos" + +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:265 +msgid "Author" +msgstr "Autor" + +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 +msgid "Provider" +msgstr "Provedor" + +#: lib/attachmentnoticesection.php:67 +msgid "Notices where this attachment appears" +msgstr "Notas nas que se anexou este ficheiro" + +#: lib/attachmenttagcloudsection.php:48 +msgid "Tags for this attachment" +msgstr "Etiquetas para este ficheiro" + +#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +msgid "Password changing failed" +msgstr "Non se puido cambiar o contrasinal" + +#: lib/authenticationplugin.php:235 +msgid "Password changing is not allowed" +msgstr "Non se permite cambiar o contrasinal" + +#: lib/channel.php:157 lib/channel.php:177 +msgid "Command results" +msgstr "Resultados da orde" + +#: lib/channel.php:229 lib/mailhandler.php:142 +msgid "Command complete" +msgstr "Completouse a orde" + +#: lib/channel.php:240 +msgid "Command failed" +msgstr "A orde fallou" + +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Non hai ningunha nota con esa id" + +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "O usuario non ten ningunha última nota" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 +#, php-format +msgid "Could not find a user with nickname %s" +msgstr "Non se deu atopado ningún usuario co alcume %s" + +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Non se deu atopado ningún usuario local co alcume %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Esta orde aínda non está integrada." + +#: lib/command.php:225 +msgid "It does not make a lot of sense to nudge yourself!" +msgstr "Non ten sentido ningún facerse un aceno a un mesmo!" + +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 +#, php-format +msgid "Nudge sent to %s" +msgstr "Fíxoselle un aceno a %s" + +#: lib/command.php:260 +#, php-format +msgid "" +"Subscriptions: %1$s\n" +"Subscribers: %2$s\n" +"Notices: %3$s" +msgstr "" +"Subscricións: %1$s\n" +"Subscritores: %2$s\n" +"Notas: %3$s" + +#: lib/command.php:302 +msgid "Notice marked as fave." +msgstr "Marcouse a nota como favorita." + +#: lib/command.php:323 +msgid "You are already a member of that group" +msgstr "Xa forma parte dese grupo" + +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 +#, php-format +msgid "Could not join user %1$s to group %2$s" +msgstr "Non se puido meter ao usuario %1$s no grupo %2$s" + +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, php-format +msgid "Could not remove user %1$s from group %2$s" +msgstr "Non se puido eliminar ao usuario %1$s do grupo %2$s" + +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 +#, php-format +msgid "Fullname: %s" +msgstr "Nome completo: %s" + +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 +#, php-format +msgid "Location: %s" +msgstr "Localidade: %s" + +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 +#, php-format +msgid "Homepage: %s" +msgstr "Sitio web: %s" + +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 +#, php-format +msgid "About: %s" +msgstr "Acerca de: %s" + +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" +"%s é un perfil remoto. Só pode enviarlle mensaxes persoais aos usuarios do " +"mesmo servidor." + +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "A mensaxe é longa de máis. O límite son %1$d caracteres, e enviou %2$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 +#, php-format +msgid "Direct message to %s sent" +msgstr "Envióuselle a mensaxe directa a %s" + +#: lib/command.php:494 +msgid "Error sending direct message." +msgstr "Houbo un erro ao enviar a mensaxe directa." + +#: lib/command.php:514 +msgid "Cannot repeat your own notice" +msgstr "Non pode repetir unha nota propia" + +#: lib/command.php:519 +msgid "Already repeated that notice" +msgstr "Xa repetiu esa nota" + +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 +#, php-format +msgid "Notice from %s repeated" +msgstr "Repetiuse a nota de %s" + +#: lib/command.php:531 +msgid "Error repeating notice." +msgstr "Houbo un erro ao repetir a nota." + +#: lib/command.php:562 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" +msgstr "A nota é longa de máis. O límite son %d caracteres, e enviou %d" + +#: lib/command.php:571 +#, php-format +msgid "Reply to %s sent" +msgstr "Enviouse a resposta a %s" + +#: lib/command.php:573 +msgid "Error saving notice." +msgstr "Houbo un erro ao gardar a nota." + +#: lib/command.php:620 +msgid "Specify the name of the user to subscribe to" +msgstr "Introduza o nome do usuario ao que quere subscribirse" + +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Non se pode subscribir aos perfís OMB cunha orde." + +#: lib/command.php:634 +#, php-format +msgid "Subscribed to %s" +msgstr "Subscribiuse a %s" + +#: lib/command.php:655 lib/command.php:754 +msgid "Specify the name of the user to unsubscribe from" +msgstr "Introduza o nome do usuario ao que quer deixar de estar subscrito" + +#: lib/command.php:664 +#, php-format +msgid "Unsubscribed from %s" +msgstr "Cancelar a subscrición a %s" + +#: lib/command.php:682 lib/command.php:705 +msgid "Command not yet implemented." +msgstr "Aínda non se integrou esa orde." + +#: lib/command.php:685 +msgid "Notification off." +msgstr "Desactivar a notificación." + +#: lib/command.php:687 +msgid "Can't turn off notification." +msgstr "Non se pode desactivar a notificación." + +#: lib/command.php:708 +msgid "Notification on." +msgstr "Activar a notificación." + +#: lib/command.php:710 +msgid "Can't turn on notification." +msgstr "Non se pode activar a notificación." + +#: lib/command.php:723 +msgid "Login command is disabled" +msgstr "A orde de identificación está desactivada" + +#: lib/command.php:734 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" +"Esta ligazón só se pode utilizar unha vez, e só nos próximos dous minutos: %s" + +#: lib/command.php:761 +#, php-format +msgid "Unsubscribed %s" +msgstr "Cancelou a subscrición a %s" + +#: lib/command.php:778 +msgid "You are not subscribed to anyone." +msgstr "Non está subscrito a ninguén." + +#: lib/command.php:780 +msgid "You are subscribed to this person:" +msgid_plural "You are subscribed to these people:" +msgstr[0] "Vostede está subscrito a esta persoa:" +msgstr[1] "Vostede está subscrito a estas persoas:" + +#: lib/command.php:800 +msgid "No one is subscribed to you." +msgstr "Non hai ninguén subscrito a vostede." + +#: lib/command.php:802 +msgid "This person is subscribed to you:" +msgid_plural "These people are subscribed to you:" +msgstr[0] "Esta persoa está subscrita a vostede:" +msgstr[1] "Estas persoas están subscritas a vostede:" + +#: lib/command.php:822 +msgid "You are not a member of any groups." +msgstr "Non forma parte de ningún grupo." + +#: lib/command.php:824 +msgid "You are a member of this group:" +msgid_plural "You are a member of these groups:" +msgstr[0] "Vostede pertence a este grupo:" +msgstr[1] "Vostede pertence a estes grupos:" + +#: lib/command.php:838 +msgid "" +"Commands:\n" +"on - turn on notifications\n" +"off - turn off notifications\n" +"help - show this help\n" +"follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" +"leave - unsubscribe from user\n" +"d - direct message to user\n" +"get - get last notice from user\n" +"whois - get profile info on user\n" +"lose - force user to stop following you\n" +"fav - add user's last notice as a 'fave'\n" +"fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" +"reply # - reply to notice with a given id\n" +"reply - reply to the last notice from user\n" +"join - join group\n" +"login - Get a link to login to the web interface\n" +"drop - leave group\n" +"stats - get your stats\n" +"stop - same as 'off'\n" +"quit - same as 'off'\n" +"sub - same as 'follow'\n" +"unsub - same as 'leave'\n" +"last - same as 'get'\n" +"on - not yet implemented.\n" +"off - not yet implemented.\n" +"nudge - remind a user to update.\n" +"invite - not yet implemented.\n" +"track - not yet implemented.\n" +"untrack - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" +msgstr "" +"Ordes:\n" +"on - activa as notificacións\n" +"off - desactiva as notificacións\n" +"help - amosa esta axuda\n" +"follow - subscribirse ao usuario\n" +"groups - lista os grupos nos que está\n" +"subscriptions - lista a xente á que segue\n" +"subscribers - lista a xente que o segue\n" +"leave - cancela a subscrición ao usuario\n" +"d - mensaxe directa a un usuario\n" +"get - obter a última nota do usuario\n" +"whois - obtén a información do perfil do usuario\n" +"lose - facer que o usuario deixe de seguilo\n" +"fav - marcar como “favorita” a última nota do usuario\n" +"fav # - marcar como “favorita” a nota coa id indicada\n" +"repeat # - repetir a nota doa id indicada\n" +"repeat - repetir a última nota do usuario\n" +"reply # - responder a unha nota coa id indicada\n" +"reply - responder á última nota do usuario\n" +"join - unirse ao grupo indicado\n" +"login - obter un enderezo para identificarse na interface web\n" +"drop - deixar o grupo indicado\n" +"stats - obter as súas estatísticas\n" +"stop - idéntico a “off”\n" +"quit - idéntico a “off”\n" +"sub - idéntico a “follow”\n" +"unsub - idéntico a “leave”\n" +"last - idéntico a “get”\n" +"on - aínda non se integrou\n" +"off - aínda non se integrou\n" +"nudge - facerlle un aceno ao usuario indicado\n" +"invite - aínda non se integrou\n" +"track - aínda non se integrou\n" +"untrack - aínda non se integrou\n" +"track off - aínda non se integrou\n" +"untrack all - aínda non se integrou\n" +"tracks - aínda non se integrou\n" +"tracking - aínda non se integrou\n" + +#: lib/common.php:135 +msgid "No configuration file found. " +msgstr "Non se atopou ningún ficheiro de configuración. " + +#: lib/common.php:136 +msgid "I looked for configuration files in the following places: " +msgstr "Buscáronse ficheiros de configuración nos seguintes lugares: " + +#: lib/common.php:138 +msgid "You may wish to run the installer to fix this." +msgstr "Pode que queira executar o instalador para arranxalo." + +#: lib/common.php:139 +msgid "Go to the installer." +msgstr "Ir ao instalador." + +#: lib/connectsettingsaction.php:110 +msgid "IM" +msgstr "MI" + +#: lib/connectsettingsaction.php:111 +msgid "Updates by instant messenger (IM)" +msgstr "" + +#: lib/connectsettingsaction.php:116 +msgid "Updates by SMS" +msgstr "Actualizacións por SMS" + +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "Conexións" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "Aplicacións conectadas autorizadas" + +#: lib/dberroraction.php:60 +msgid "Database error" +msgstr "Houbo un erro na base de datos" + +#: lib/designsettings.php:105 +msgid "Upload file" +msgstr "Cargar un ficheiro" + +#: lib/designsettings.php:109 +msgid "" +"You can upload your personal background image. The maximum file size is 2MB." +msgstr "" +"Pode cargar a súa imaxe de fondo persoal. O ficheiro non pode ocupar máis de " +"2 MiB." + +#: lib/designsettings.php:418 +msgid "Design defaults restored." +msgstr "Restableceuse o deseño por defecto." + +#: lib/disfavorform.php:114 lib/disfavorform.php:140 +msgid "Disfavor this notice" +msgstr "Desmarcar esta nota como favorita" + +#: lib/favorform.php:114 lib/favorform.php:140 +msgid "Favor this notice" +msgstr "Marcar esta nota como favorita" + +#: lib/favorform.php:140 +msgid "Favor" +msgstr "Marcar como favorito" + +#: lib/feed.php:85 +msgid "RSS 1.0" +msgstr "RSS 1.0" + +#: lib/feed.php:87 +msgid "RSS 2.0" +msgstr "RSS 2.0" + +#: lib/feed.php:89 +msgid "Atom" +msgstr "Atom" + +#: lib/feed.php:91 +msgid "FOAF" +msgstr "FOAF" + +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Exportar os datos" + +#: lib/galleryaction.php:121 +msgid "Filter tags" +msgstr "Filtrar etiquetas" + +#: lib/galleryaction.php:131 +msgid "All" +msgstr "Todas" + +#: lib/galleryaction.php:139 +msgid "Select tag to filter" +msgstr "Escolla unha etiqueta a filtrar" + +#: lib/galleryaction.php:140 +msgid "Tag" +msgstr "Etiqueta" + +#: lib/galleryaction.php:141 +msgid "Choose a tag to narrow list" +msgstr "Escolla unha etiqueta para reducir a lista" + +#: lib/galleryaction.php:143 +msgid "Go" +msgstr "Continuar" + +#: lib/grantroleform.php:91 +#, php-format +msgid "Grant this user the \"%s\" role" +msgstr "Atribuírlle a este usuario o rol «%s»" + +#: lib/groupeditform.php:163 +msgid "URL of the homepage or blog of the group or topic" +msgstr "URL do sitio web persoal ou blogue do grupo ou tema" + +#: lib/groupeditform.php:168 +msgid "Describe the group or topic" +msgstr "Describa o grupo ou o tema" + +#: lib/groupeditform.php:170 +#, php-format +msgid "Describe the group or topic in %d characters" +msgstr "Describa o grupo ou o tema en %d caracteres" + +#: lib/groupeditform.php:179 +msgid "" +"Location for the group, if any, like \"City, State (or Region), Country\"" +msgstr "" +"Localidade do grupo, e a ten, como por exemplo «Cidade, Provincia, " +"Comunidade, País»." + +#: lib/groupeditform.php:187 +#, php-format +msgid "Extra nicknames for the group, comma- or space- separated, max %d" +msgstr "" +"Alcumes adicionais para o grupo, separados por comas ou espazos, %d como " +"máximo" + +#: lib/groupnav.php:85 +msgid "Group" +msgstr "Grupo" + +#: lib/groupnav.php:101 +msgid "Blocked" +msgstr "Bloqueado" + +#: lib/groupnav.php:102 +#, php-format +msgid "%s blocked users" +msgstr "%s usuarios bloqueados" + +#: lib/groupnav.php:108 +#, php-format +msgid "Edit %s group properties" +msgstr "Modificar as propiedades do grupo %s" + +#: lib/groupnav.php:113 +msgid "Logo" +msgstr "Logotipo" + +#: lib/groupnav.php:114 +#, php-format +msgid "Add or edit %s logo" +msgstr "Engadir ou modificar o logotipo de %s" + +#: lib/groupnav.php:120 +#, php-format +msgid "Add or edit %s design" +msgstr "Engadir ou modificar o deseño de %s" + +#: lib/groupsbymemberssection.php:71 +msgid "Groups with most members" +msgstr "Grupos con máis membros" + +#: lib/groupsbypostssection.php:71 +msgid "Groups with most posts" +msgstr "Grupos con máis notas" + +#: lib/grouptagcloudsection.php:56 +#, php-format +msgid "Tags in %s group's notices" +msgstr "Etiquetas nas notas do grupo %s" + +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 +msgid "This page is not available in a media type you accept" +msgstr "Esta páxina non está dispoñible nun formato axeitado para vostede" + +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Non se soporta o formato da imaxe." + +#: lib/imagefile.php:88 +#, php-format +msgid "That file is too big. The maximum file size is %s." +msgstr "Ese ficheiro é grande de máis. O tamaño máximo por ficheiro son %s." + +#: lib/imagefile.php:93 +msgid "Partial upload." +msgstr "Carga parcial." + +#: lib/imagefile.php:101 lib/mediafile.php:170 +msgid "System error uploading file." +msgstr "Houbo un erro no sistema ao cargar o ficheiro." + +#: lib/imagefile.php:109 +msgid "Not an image or corrupt file." +msgstr "O ficheiro está mal ou non é unha imaxe." + +#: lib/imagefile.php:122 +msgid "Lost our file." +msgstr "Perdeuse o noso ficheiro." + +#: lib/imagefile.php:163 lib/imagefile.php:224 +msgid "Unknown file type" +msgstr "Non se coñece o tipo de ficheiro" + +#: lib/imagefile.php:244 +msgid "MB" +msgstr "MiB" + +#: lib/imagefile.php:246 +msgid "kB" +msgstr "KiB" + +#: lib/jabber.php:387 +#, php-format +msgid "[%s]" +msgstr "[%s]" + +#: lib/jabber.php:567 +#, php-format +msgid "Unknown inbox source %d." +msgstr "Non se coñece a fonte %d da caixa de entrada." + +#: lib/joinform.php:114 +msgid "Join" +msgstr "Unirse" + +#: lib/leaveform.php:114 +msgid "Leave" +msgstr "Deixar" + +#: lib/logingroupnav.php:80 +msgid "Login with a username and password" +msgstr "Identificarse cun nome de usuario e contrasinal" + +#: lib/logingroupnav.php:86 +msgid "Sign up for a new account" +msgstr "Rexistrar unha conta nova" + +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 +msgid "Email address confirmation" +msgstr "Confirmación do enderezo de correo electrónico" + +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 +#, php-format +msgid "" +"Hey, %s.\n" +"\n" +"Someone just entered this email address on %s.\n" +"\n" +"If it was you, and you want to confirm your entry, use the URL below:\n" +"\n" +"\t%s\n" +"\n" +"If not, just ignore this message.\n" +"\n" +"Thanks for your time, \n" +"%s\n" +msgstr "" +"Ola, %s:\n" +"\n" +"Alguén acaba de introducir este enderezo de correo electrónico en %s.\n" +"\n" +"Se foi vostede, e quere confirmalo, utilice o seguinte URL:\n" +"\n" +"%s\n" +"\n" +"En caso contrario, simplemente ignore esta mensaxe.\n" +"\n" +"Grazas polo seu tempo, \n" +"%s\n" + +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 +#, php-format +msgid "%1$s is now listening to your notices on %2$s." +msgstr "Agora %1$s segue as súas notas en %2$s." + +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 +#, php-format +msgid "" +"%1$s is now listening to your notices on %2$s.\n" +"\n" +"\t%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"Faithfully yours,\n" +"%7$s.\n" +"\n" +"----\n" +"Change your email address or notification options at %8$s\n" +msgstr "" +"Agora %1$s segue as súas notas en %2$s.\n" +"\n" +"%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"Atentamente,\n" +"%7$s.\n" +"\n" +"----\n" +"Modifique o seu enderezo de correo electrónico ou as súas preferencias de " +"notificación en %8$s\n" + +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 +#, php-format +msgid "Bio: %s" +msgstr "Biografía: %s" + +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 +#, php-format +msgid "New email address for posting to %s" +msgstr "Novo enderezo de correo electrónico para publicar en %s" + +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 +#, php-format +msgid "" +"You have a new posting address on %1$s.\n" +"\n" +"Send email to %2$s to post new messages.\n" +"\n" +"More email instructions at %3$s.\n" +"\n" +"Faithfully yours,\n" +"%4$s" +msgstr "" +"Ten un novo enderezo de correo electrónico para publicar en %1$s.\n" +"\n" +"Envíe un correo electrónico a %2$s para publicar mensaxes novas.\n" +"\n" +"Máis información en %3$s.\n" +"\n" +"Atentamente,\n" +"%4$s" + +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 +#, php-format +msgid "%s status" +msgstr "Estado de %s" + +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 +msgid "SMS confirmation" +msgstr "Confirmación dos SMS" + +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" +"%s: utilice o seguinte código para confirmar que o número de teléfono é seu:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 +#, php-format +msgid "You've been nudged by %s" +msgstr "%s fíxolle un aceno" + +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 +#, php-format +msgid "" +"%1$s (%2$s) is wondering what you are up to these days and is inviting you " +"to post some news.\n" +"\n" +"So let's hear from you :)\n" +"\n" +"%3$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%4$s\n" +msgstr "" +"%1$s (%2$s) pregúntase que estivo a facer vostede estes días, e convídao a " +"publicar algunha nova.\n" +"\n" +"Así que anímese, conte algo :)\n" +"\n" +"%3$s\n" +"\n" +"Non responda a esta mensaxe, non lle chegará ao remitente.\n" +"\n" +"Atentamente,\n" +"%4$s\n" + +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 +#, php-format +msgid "New private message from %s" +msgstr "Nova mensaxe privada de %s" + +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 +#, php-format +msgid "" +"%1$s (%2$s) sent you a private message:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"You can reply to their message here:\n" +"\n" +"%4$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%5$s\n" +msgstr "" +"%1$s (%2$s) envioulle unha mensaxe privada:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Pode responder á mensaxe aquí:\n" +"\n" +"%4$s\n" +"\n" +"Non responda a este correo, non lle chegará ao remitente.\n" +"\n" +"Atentamente,\n" +"%5$s\n" + +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 +#, php-format +msgid "%s (@%s) added your notice as a favorite" +msgstr "%s (@%s) marcou a súa nota como favorita" + +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 +#, php-format +msgid "" +"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" +"\n" +"The URL of your notice is:\n" +"\n" +"%3$s\n" +"\n" +"The text of your notice is:\n" +"\n" +"%4$s\n" +"\n" +"You can see the list of %1$s's favorites here:\n" +"\n" +"%5$s\n" +"\n" +"Faithfully yours,\n" +"%6$s\n" +msgstr "" +"%1$s (@%7$s) acaba de marcar a súa nota en %2$s coma unha das súas " +"favoritas.\n" +"\n" +"O URL da súa nota é:\n" +"\n" +"%3$s\n" +"\n" +"O texto da nota di:\n" +"\n" +"%4$s\n" +"\n" +"Pode ver a lista das notas favoritas de %1$s en:\n" +"\n" +"%5$s\n" +"\n" +"Atentamente,\n" +"%6$s\n" + +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"Pode ler a conversación completa en:\n" +"\n" +"%s" + +#: lib/mail.php:651 +#, php-format +msgid "%s (@%s) sent a notice to your attention" +msgstr "%s (@%s) enviou unha nota á súa atención" + +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 +#, php-format +msgid "" +"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" +"\n" +"The notice is here:\n" +"\n" +"\t%3$s\n" +"\n" +"It reads:\n" +"\n" +"\t%4$s\n" +"\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" +msgstr "" +"%1$s (@%9$s) acaba de enviar unha nota á súa atención (un “respost@”) en %2" +"$s.\n" +"\n" +"A nota está en:\n" +"\n" +"%3$s\n" +"\n" +"Di:\n" +"\n" +"%4$s\n" +"\n" +"%5$sPode responder en:\n" +"\n" +"%6$s\n" +"\n" +"A lista de todas as notas á súa @tención está en:\n" +"\n" +"%7$s\n" +"\n" +"Atentamente,\n" +"%2$s\n" +"\n" +"P.S: pode desactivar estas notificacións por correo electrónico en %8$s\n" + +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Só o usuario pode ler as súas caixas de entrada." + +#: lib/mailbox.php:139 +msgid "" +"You have no private messages. You can send private message to engage other " +"users in conversation. People can send you messages for your eyes only." +msgstr "" +"Non ten mensaxes privadas. Pode enviar mensaxes privadas para conversar con " +"outros usuarios. A xente pode enviarlle mensaxes para que só as lea vostede." + +#: lib/mailbox.php:227 lib/noticelist.php:494 +msgid "from" +msgstr "de" + +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Non se puido analizar a mensaxe." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Non está rexistrado." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Ese non é o seu enderezo de correo electrónico para recibir correos." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Non se permite recibir correo electrónico." + +#: lib/mailhandler.php:228 +#, php-format +msgid "Unsupported message type: %s" +msgstr "Non se soporta o tipo de mensaxe %s" + +#: lib/mediafile.php:98 lib/mediafile.php:123 +msgid "There was a database error while saving your file. Please try again." +msgstr "" +"Houbo un erro na base de datos ao gardar o seu ficheiro. Volva intentalo." + +#: lib/mediafile.php:142 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." +msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini." + +#: lib/mediafile.php:147 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form." +msgstr "" +"O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no " +"formulario HTML." + +#: lib/mediafile.php:152 +msgid "The uploaded file was only partially uploaded." +msgstr "O ficheiro só se subiu parcialmente." + +#: lib/mediafile.php:159 +msgid "Missing a temporary folder." +msgstr "Falta un cartafol temporal." + +#: lib/mediafile.php:162 +msgid "Failed to write file to disk." +msgstr "Non se puido escribir o ficheiro en disco." + +#: lib/mediafile.php:165 +msgid "File upload stopped by extension." +msgstr "Interrompeuse a carga do ficheiro por mor da extensión." + +#: lib/mediafile.php:179 lib/mediafile.php:216 +msgid "File exceeds user's quota." +msgstr "O ficheiro supera a cota do usuario." + +#: lib/mediafile.php:196 lib/mediafile.php:233 +msgid "File could not be moved to destination directory." +msgstr "Non se puido mover o ficheiro ao directorio de destino." + +#: lib/mediafile.php:201 lib/mediafile.php:237 +msgid "Could not determine file's MIME type." +msgstr "Non se puido determinar o tipo MIME do ficheiro." + +#: lib/mediafile.php:270 +#, php-format +msgid " Try using another %s format." +msgstr "Inténteo utilizando outro formato %s." + +#: lib/mediafile.php:275 +#, php-format +msgid "%s is not a supported file type on this server." +msgstr "Neste servidor non se soporta o tipo de ficheiro %s." + +#: lib/messageform.php:120 +msgid "Send a direct notice" +msgstr "Enviar unha nota directa" + +#: lib/messageform.php:146 +msgid "To" +msgstr "a" + +#: lib/messageform.php:159 lib/noticeform.php:185 +msgid "Available characters" +msgstr "Caracteres dispoñibles" + +#: lib/messageform.php:178 lib/noticeform.php:236 +msgctxt "Send button for sending notice" +msgid "Send" +msgstr "Enviar" + +#: lib/noticeform.php:160 +msgid "Send a notice" +msgstr "Enviar unha nota" + +#: lib/noticeform.php:173 +#, php-format +msgid "What's up, %s?" +msgstr "Que hai de novo, %s?" + +#: lib/noticeform.php:192 +msgid "Attach" +msgstr "Anexar" + +#: lib/noticeform.php:196 +msgid "Attach a file" +msgstr "Anexar un ficheiro" + +#: lib/noticeform.php:212 +msgid "Share my location" +msgstr "Publicar a miña localidade" + +#: lib/noticeform.php:215 +msgid "Do not share my location" +msgstr "Non publicar a miña localidade" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" +"Estase tardando máis do esperado en obter a súa xeolocalización, vólvao " +"intentar máis tarde." + +#. TRANS: Used in coordinates as abbreviation of north +#: lib/noticelist.php:430 +msgid "N" +msgstr "N" + +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 +msgid "S" +msgstr "S" + +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 +msgid "E" +msgstr "L" + +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 +msgid "W" +msgstr "O" + +#: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "1% u $ ½% 2 $ u '% 3 $ u \"s% 4% 5 $ u $ ½% 6 $ u' 7% $ u\" 8% $ s" + +#: lib/noticelist.php:447 +msgid "at" +msgstr "en" + +#: lib/noticelist.php:567 +msgid "in context" +msgstr "no contexto" + +#: lib/noticelist.php:602 +msgid "Repeated by" +msgstr "Repetida por" + +#: lib/noticelist.php:629 +msgid "Reply to this notice" +msgstr "Responder a esta nota" + +#: lib/noticelist.php:630 +msgid "Reply" +msgstr "Responder" + +#: lib/noticelist.php:674 +msgid "Notice repeated" +msgstr "Repetiuse a nota" + +#: lib/nudgeform.php:116 +msgid "Nudge this user" +msgstr "Facerlle un aceno a este usuario" + +#: lib/nudgeform.php:128 +msgid "Nudge" +msgstr "Facer un aceno" + +#: lib/nudgeform.php:128 +msgid "Send a nudge to this user" +msgstr "Facerlle un aceno a este usuario" + +#: lib/oauthstore.php:283 +msgid "Error inserting new profile" +msgstr "Houbo un erro ao inserir o novo perfil" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar" +msgstr "Houbo un erro ao inserir o avatar" + +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Houbo un erro ao actualizar o perfil remoto" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile" +msgstr "Houbo un erro ao inserir o perfil remoto" + +#: lib/oauthstore.php:345 +msgid "Duplicate notice" +msgstr "Nota duplicada" + +#: lib/oauthstore.php:490 +msgid "Couldn't insert new subscription." +msgstr "Non se puido inserir unha subscrición nova." + +#: lib/personalgroupnav.php:99 +msgid "Personal" +msgstr "Persoal" + +#: lib/personalgroupnav.php:104 +msgid "Replies" +msgstr "Respostas" + +#: lib/personalgroupnav.php:114 +msgid "Favorites" +msgstr "Favoritas" + +#: lib/personalgroupnav.php:125 +msgid "Inbox" +msgstr "Caixa de entrada" + +#: lib/personalgroupnav.php:126 +msgid "Your incoming messages" +msgstr "As mensaxes recibidas" + +#: lib/personalgroupnav.php:130 +msgid "Outbox" +msgstr "Caixa de saída" + +#: lib/personalgroupnav.php:131 +msgid "Your sent messages" +msgstr "As mensaxes enviadas" + +#: lib/personaltagcloudsection.php:56 +#, php-format +msgid "Tags in %s's notices" +msgstr "Etiquetas nas notas de %s" + +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "Descoñecida" + +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 +msgid "Subscriptions" +msgstr "Subscricións" + +#: lib/profileaction.php:126 +msgid "All subscriptions" +msgstr "Todas as subscricións" + +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 +msgid "Subscribers" +msgstr "Subscritores" + +#: lib/profileaction.php:161 +msgid "All subscribers" +msgstr "Todos os subscritores" + +#: lib/profileaction.php:191 +msgid "User ID" +msgstr "ID do usuario" + +#: lib/profileaction.php:196 +msgid "Member since" +msgstr "Membro dende" + +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Media diaria" + +#: lib/profileaction.php:264 +msgid "All groups" +msgstr "Todos os grupos" + +#: lib/profileformaction.php:114 +msgid "Unimplemented method." +msgstr "Aínda non se implantou o método." + +#: lib/publicgroupnav.php:78 +msgid "Public" +msgstr "Públicas" + +#: lib/publicgroupnav.php:82 +msgid "User groups" +msgstr "Grupos do usuario" + +#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 +msgid "Recent tags" +msgstr "Últimas etiquetas" + +#: lib/publicgroupnav.php:88 +msgid "Featured" +msgstr "Salientadas" + +#: lib/publicgroupnav.php:92 +msgid "Popular" +msgstr "Populares" + +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Sen argumentos “return-to”." + +#: lib/repeatform.php:107 +msgid "Repeat this notice?" +msgstr "Quere repetir esta nova?" + +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Si" + +#: lib/repeatform.php:132 +msgid "Repeat this notice" +msgstr "Repetir esta nova" + +#: lib/revokeroleform.php:91 +#, php-format +msgid "Revoke the \"%s\" role from this user" +msgstr "Revogarlle o rol “%s” a este usuario" + +#: lib/router.php:704 +msgid "No single user defined for single-user mode." +msgstr "Non se estableceu ningún usuario único para o modo de usuario único." + +#: lib/sandboxform.php:67 +msgid "Sandbox" +msgstr "Illar" + +#: lib/sandboxform.php:78 +msgid "Sandbox this user" +msgstr "Illar a este usuario" + +#: lib/searchaction.php:120 +msgid "Search site" +msgstr "Buscar no sitio" + +#: lib/searchaction.php:126 +msgid "Keyword(s)" +msgstr "Termos de busca" + +#: lib/searchaction.php:127 +msgid "Search" +msgstr "Buscar" + +#: lib/searchaction.php:162 +msgid "Search help" +msgstr "Buscar na axuda" + +#: lib/searchgroupnav.php:80 +msgid "People" +msgstr "Xente" + +#: lib/searchgroupnav.php:81 +msgid "Find people on this site" +msgstr "Atopar xente neste sitio" + +#: lib/searchgroupnav.php:83 +msgid "Find content of notices" +msgstr "Buscar nos contidos das notas" + +#: lib/searchgroupnav.php:85 +msgid "Find groups on this site" +msgstr "Buscar grupos neste sitio" + +#: lib/section.php:89 +msgid "Untitled section" +msgstr "Sección sen título" + +#: lib/section.php:106 +msgid "More..." +msgstr "Máis..." + +#: lib/silenceform.php:67 +msgid "Silence" +msgstr "Silenciar" + +#: lib/silenceform.php:78 +msgid "Silence this user" +msgstr "Silenciar a este usuario" + +#: lib/subgroupnav.php:83 +#, php-format +msgid "People %s subscribes to" +msgstr "Persoas ás que está subscrito %s" + +#: lib/subgroupnav.php:91 +#, php-format +msgid "People subscribed to %s" +msgstr "Persoas subscritas a %s" + +#: lib/subgroupnav.php:99 +#, php-format +msgid "Groups %s is a member of" +msgstr "Grupos aos que pertence %s" + +#: lib/subgroupnav.php:105 +msgid "Invite" +msgstr "Convidar" + +#: lib/subgroupnav.php:106 +#, php-format +msgid "Invite friends and colleagues to join you on %s" +msgstr "Convida a amigos e compañeiros a unírseche en %s" + +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "Nube de etiquetas que as persoas se puxeron a si mesmas" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "Nube de etiquetas que lle puxo a outras persoas" + +#: lib/tagcloudsection.php:56 +msgid "None" +msgstr "Ningún" + +#: lib/topposterssection.php:74 +msgid "Top posters" +msgstr "Os que máis publican" + +#: lib/unsandboxform.php:69 +msgid "Unsandbox" +msgstr "Deixar de illar" + +#: lib/unsandboxform.php:80 +msgid "Unsandbox this user" +msgstr "Deixar de illar a este usuario" + +#: lib/unsilenceform.php:67 +msgid "Unsilence" +msgstr "Dar voz" + +#: lib/unsilenceform.php:78 +msgid "Unsilence this user" +msgstr "Darlle voz a este usuario" + +#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 +msgid "Unsubscribe from this user" +msgstr "Cancelar a subscrición a este usuario" + +#: lib/unsubscribeform.php:137 +msgid "Unsubscribe" +msgstr "Cancelar a subscrición" + +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "O usuario %s (%d) non ten perfil." + +#: lib/userprofile.php:117 +msgid "Edit Avatar" +msgstr "Modificar o avatar" + +#: lib/userprofile.php:234 lib/userprofile.php:248 +msgid "User actions" +msgstr "Accións do usuario" + +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Procedendo a borrar o usuario..." + +#: lib/userprofile.php:263 +msgid "Edit profile settings" +msgstr "Modificar a configuración do perfil" + +#: lib/userprofile.php:264 +msgid "Edit" +msgstr "Modificar" + +#: lib/userprofile.php:287 +msgid "Send a direct message to this user" +msgstr "Enviarlle unha mensaxe directa a este usuario" + +#: lib/userprofile.php:288 +msgid "Message" +msgstr "Mensaxe" + +#: lib/userprofile.php:326 +msgid "Moderate" +msgstr "Moderar" + +#: lib/userprofile.php:364 +msgid "User role" +msgstr "Rol do usuario" + +#: lib/userprofile.php:366 +msgctxt "role" +msgid "Administrator" +msgstr "Administrador" + +#: lib/userprofile.php:367 +msgctxt "role" +msgid "Moderator" +msgstr "Moderador" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 +msgid "a few seconds ago" +msgstr "hai uns segundos" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 +msgid "about a minute ago" +msgstr "hai como un minuto" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 +#, php-format +msgid "about %d minutes ago" +msgstr "hai como %d minutos" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 +msgid "about an hour ago" +msgstr "hai como unha hora" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 +#, php-format +msgid "about %d hours ago" +msgstr "hai como %d horas" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 +msgid "about a day ago" +msgstr "hai como un día" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 +#, php-format +msgid "about %d days ago" +msgstr "hai como %d días" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 +msgid "about a month ago" +msgstr "hai como un mes" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 +#, php-format +msgid "about %d months ago" +msgstr "hai como %d meses" + +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 +msgid "about a year ago" +msgstr "hai como un ano" + +#: lib/webcolor.php:82 +#, php-format +msgid "%s is not a valid color!" +msgstr "%s non é unha cor correcta!" + +#: lib/webcolor.php:123 +#, php-format +msgid "%s is not a valid color! Use 3 or 6 hex chars." +msgstr "%s non é unha cor correcta! Use 3 ou 6 caracteres hexadecimais." + +#: lib/xmppmanager.php:403 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" +"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d." diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 49f229a96a..857ce5a2c3 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:57+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:10+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -20,7 +20,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 #, fuzzy msgid "Access" msgstr "קבל" @@ -76,7 +76,13 @@ msgstr "אין משתמש כזה." msgid "Save access settings" msgstr "הגדרות" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -86,7 +92,7 @@ msgstr "שמור" #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy -msgid "No such page" +msgid "No such page." msgstr "אין הודעה כזו." #: actions/all.php:75 actions/allrss.php:68 @@ -97,9 +103,9 @@ msgstr "אין הודעה כזו." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -107,11 +113,9 @@ msgstr "אין הודעה כזו." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "אין משתמש כזה." @@ -123,8 +127,9 @@ msgstr "%s וחברים" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -183,8 +188,10 @@ msgstr "" msgid "You and friends" msgstr "%s וחברים" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -199,18 +206,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "קוד האישור לא נמצא." @@ -224,15 +231,15 @@ msgstr "קוד האישור לא נמצא." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -245,7 +252,7 @@ msgstr "עידכון המשתמש נכשל." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "למשתמש אין פרופיל." @@ -256,9 +263,9 @@ msgid "Could not save profile." msgstr "שמירת הפרופיל נכשלה." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -343,7 +350,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "זהו כבר זיהוי ה-Jabber שלך." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" @@ -437,10 +444,9 @@ msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)." msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, fuzzy, php-format -msgid "Invalid alias: \"%s\"" +msgid "Invalid alias: \"%s\"." msgstr "כתובת אתר הבית '%s' אינה חוקית" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -458,7 +464,7 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy -msgid "Group not found!" +msgid "Group not found." msgstr "לא נמצא" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 @@ -466,7 +472,7 @@ msgstr "לא נמצא" msgid "You are already a member of that group." msgstr "כבר נכנסת למערכת!" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -485,17 +491,26 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" msgid "Could not remove user %1$s from group %2$s." msgstr "נכשלה יצירת OpenID מתוך: %s" -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, fuzzy, php-format msgid "%s's groups" msgstr "פרופיל" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "לא שלחנו אלינו את הפרופיל הזה" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "" @@ -510,17 +525,17 @@ msgid "Invalid token." msgstr "גודל לא חוקי." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -554,12 +569,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "הגשת טופס לא צפויה." @@ -579,21 +597,23 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 #, fuzzy msgid "Account" msgstr "אודות" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "כינוי" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "סיסמה" @@ -641,17 +661,18 @@ msgstr "התמונה עודכנה." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: actions/apistatusesupdate.php:202 -msgid "Not found" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#, fuzzy +msgid "Not found." msgstr "לא נמצא" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -661,12 +682,12 @@ msgstr "" msgid "Unsupported format." msgstr "פורמט התמונה אינו נתמך." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "הסטטוס של %1$s ב-%2$s " -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "מיקרובלוג מאת %s" @@ -676,17 +697,17 @@ msgstr "מיקרובלוג מאת %s" msgid "%1$s / Updates mentioning %2$s" msgstr "הסטטוס של %1$s ב-%2$s " -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -701,21 +722,16 @@ msgstr "תגובת עבור %s" msgid "Repeats of %s" msgstr "תגובת עבור %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "מיקרובלוג מאת %s" -#: actions/apiusershow.php:96 -#, fuzzy -msgid "Not found." -msgstr "לא נמצא" - #: actions/attachment.php:73 #, fuzzy msgid "No such attachment." @@ -736,8 +752,9 @@ msgstr "אין גודל." msgid "Invalid size." msgstr "גודל לא חוקי." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "תמונה" @@ -747,10 +764,11 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." +msgstr "למשתמש אין פרופיל." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -769,7 +787,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 #, fuzzy msgid "Delete" msgstr "מחק" @@ -782,23 +800,28 @@ msgstr "ההעלה" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "העלאה חלקית." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "התמונה עודכנה." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "עדכון התמונה נכשל." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "התמונה עודכנה." @@ -808,7 +831,7 @@ msgstr "התמונה עודכנה." msgid "You already blocked that user." msgstr "כבר נכנסת למערכת!" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "אין משתמש כזה." @@ -820,29 +843,46 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "לא" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "אין משתמש כזה." -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "כן" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "אין משתמש כזה." -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "" @@ -855,8 +895,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 #, fuzzy msgid "No such group." msgstr "אין הודעה כזו." @@ -889,9 +929,11 @@ msgstr "" msgid "Unblock this user" msgstr "אין משתמש כזה." -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "" +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" +msgstr "תגובת עבור %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -905,34 +947,44 @@ msgstr "קוד האישור לא נמצא." msgid "That confirmation code is not for you!" msgstr "קוד האישור הזה אינו מיועד לך!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "סוג לא מזוהה של כתובת %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "כתובת זו כבר אושרה." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "עידכון המשתמש נכשל." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "" -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "אשר כתובת" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "הכתובת \"%s\" אושרה עבור חשבונך." @@ -943,7 +995,7 @@ msgid "Conversation" msgstr "מיקום" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "הודעות" @@ -965,7 +1017,7 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -981,17 +1033,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "אין הודעה כזו." -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1020,12 +1074,14 @@ msgstr "" msgid "Are you sure you want to delete this notice?" msgstr "" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 #, fuzzy msgid "Do not delete this notice" msgstr "אין הודעה כזו." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "" @@ -1050,135 +1106,139 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 #, fuzzy msgid "Delete this user" msgstr "אין משתמש כזה." -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "גודל לא חוקי." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "שנה סיסמה" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 #, fuzzy msgid "Site logo" msgstr "הודעה חדשה" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "שנה" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "הודעה חדשה" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "שנה סיסמה" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "התחבר" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "חיפוש" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "טקסט" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "היכנס" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "שמור" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1292,12 +1352,17 @@ msgstr "" msgid "description is too long (max %d chars)." msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"" +msgstr "כתובת אתר הבית '%s' אינה חוקית" + #: actions/editgroup.php:258 #, fuzzy msgid "Could not update group." msgstr "עידכון המשתמש נכשל." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "שמירת מידע התמונה נכשל" @@ -1307,180 +1372,240 @@ msgstr "שמירת מידע התמונה נכשל" msgid "Options saved." msgstr "ההגדרות נשמרו." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "הגדרות הפרופיל" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "כתבות" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "כתובת מסרים מידיים" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "הסר" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "בטל" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "כתובת מסרים מידיים" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "הוסף" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "חדש" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "העדפות" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "" -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." msgstr "העדפות נשמרו." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "" -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "הכנסת קוד האישור נכשלה." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "אין אישור ממתין שניתן לבטל." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "זוהי כתובת מסרים מידיים שגויה." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "האישור בוטל." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "" -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "הכתובת הוסרה." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" @@ -1602,8 +1727,9 @@ msgstr "המרת אסימון הבקשה לאסימון גישה לא הצליח msgid "Remote service uses unknown version of OMB protocol." msgstr "גירסה לא מוכרת של פרוטוקול OMB" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "שגיאה בעדכון פרופיל מרוחק" #: actions/getfile.php:79 @@ -1666,12 +1792,12 @@ msgstr "למשתמש אין פרופיל." msgid "User is not a member of group." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 #, fuzzy msgid "Block user from group" msgstr "אין משתמש כזה." -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1679,17 +1805,19 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 #, fuzzy msgid "Do not block this user from this group" msgstr "נכשלה ההפניה לשרת: %s" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 #, fuzzy msgid "Block this user from this group" msgstr "אין משתמש כזה." -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1734,11 +1862,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "למשתמש אין פרופיל." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1771,34 +1894,38 @@ msgstr "" msgid "Admin" msgstr "" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "מיקרובלוג מאת %s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "קבוצות" @@ -1818,7 +1945,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 #, fuzzy msgid "Create a new group" msgstr "צור חשבון חדש" @@ -1871,12 +1998,16 @@ msgstr "למשתמש אין פרופיל." msgid "Error removing the block." msgstr "שגיאה בשמירת המשתמש." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "הגדרות מסרים מידיים" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1885,16 +2016,26 @@ msgstr "" "אפשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant messages](%%doc.im%%) הגדר " "את כתובתך והעדפותיך למטה." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 #, fuzzy msgid "IM is not available." msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "כתובת מסרים מידיים" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "כתובת מאושרת נוכחית של Jabber/GTalk." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1903,12 +2044,9 @@ msgstr "" "מחכה לאישור כתובת זו. בדוק את חשבון ה-Jabber/GTalk שלך לקבלת מסר עם הוראות " "נוספותץ (האם הוספת את %s לרשימת החברים שלך?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "כתובת מסרים מידיים" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1917,43 +2055,65 @@ msgstr "" "כתובת Jabber או GTalk, כגון \"UserName@example.org\". הוסף את %s אל רשימת " "החברים בתוכנת ההמסרים המידיים או GTalk שלך." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "העדפות" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "שלח לי הודעות דרך Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "פרסם הודעה כששורת הסטטוס שלי ב-Jabber/GTalk מתעדכנת." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "העדפות נשמרו." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "אין זיהוי Jabber כזה." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "לא ניתן לנרמל את זהות ה-Jabber הזה" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "לא עומד בכללים לזיהוי Jabber" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "זהו כבר זיהוי ה-Jabber שלך." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "זיהוי ה-Jabber כבר שייך למשתמש אחר." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1962,10 +2122,35 @@ msgstr "" "קוד אישור נשלח אל כתובת המסרים המידיים שהוספת. עליך לאשר את %s לשליחת מסרים " "מידיים אליך." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "זוהי כתובת מסרים מידיים שגויה." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "הכנסת קוד האישור נכשלה." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "האישור בוטל." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "זהו לא זיהוי ה-Jabber שלך." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "הכתובת הוסרה." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1985,9 +2170,9 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." +msgstr "עידכון המשתמש נכשל." #: actions/invite.php:72 #, php-format @@ -2006,7 +2191,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2054,12 +2241,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "שלח" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2099,7 +2288,9 @@ msgstr "" msgid "No nickname or ID." msgstr "אין כינוי" -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -2108,12 +2299,14 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 #, fuzzy msgid "You are not a member of that group." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "הסטטוס של %1$s ב-%2$s " @@ -2158,10 +2351,14 @@ msgid "" msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "שם המשתמש או הסיסמה לא חוקיים" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "היכנס בעזרת שם המשתמש והסיסמה שלך. עדיין אין לך שם משתמש? [הרשם](%%action." "register%%) לחשבון " @@ -2186,8 +2383,9 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "למשתמש אין פרופיל." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "" +#, fuzzy +msgid "No current status." +msgstr "אין תוצאות" #: actions/newapplication.php:52 #, fuzzy @@ -2223,12 +2421,12 @@ msgstr "" msgid "New message" msgstr "הודעה חדשה" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "אין תוכן!" @@ -2236,7 +2434,7 @@ msgstr "אין תוכן!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2251,7 +2449,7 @@ msgstr "הודעה חדשה" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2259,7 +2457,7 @@ msgstr "" msgid "New notice" msgstr "הודעה חדשה" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 #, fuzzy msgid "Notice posted" msgstr "הודעות" @@ -2350,11 +2548,11 @@ msgid "You are not a user of that application." msgstr "לא שלחנו אלינו את הפרופיל הזה" #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2363,25 +2561,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "להודעה אין פרופיל" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "הסטטוס של %1$s ב-%2$s " -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "התחבר" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -2493,7 +2696,7 @@ msgid "6 or more characters" msgstr "לפחות 6 אותיות" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "אשר" @@ -2521,7 +2724,7 @@ msgstr "הסיסמה הישנה לא נכונה" msgid "Error saving user; invalid." msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "לא ניתן לשמור את הסיסמה" @@ -2530,7 +2733,7 @@ msgid "Password saved." msgstr "הסיסמה נשמרה." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2540,23 +2743,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2706,18 +2909,19 @@ msgstr "" msgid "People search" msgstr "חיפוש סיסמה" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, fuzzy, php-format -msgid "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." msgstr "לא עומד בכללים ל-OpenID." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "מיקרובלוג מאת %s" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "תוכן ההודעה לא חוקי" #: actions/postnotice.php:101 @@ -2744,13 +2948,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים." #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "שם מלא" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "אתר בית" @@ -2773,9 +2978,9 @@ msgid "Bio" msgstr "ביוגרפיה" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "מיקום" @@ -2789,7 +2994,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -2862,7 +3067,7 @@ msgstr "ההגדרות נשמרו." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -3019,7 +3224,7 @@ msgstr "איפוס סיסמה" msgid "Recover password" msgstr "סיסמת שיחזור" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "התבקש שיחזור סיסמה" @@ -3039,41 +3244,41 @@ msgstr "איפוס" msgid "Enter a nickname or email address." msgstr "" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "שגיאה בשמירת אישור הכתובת." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "איפוס סיסמה לא צפוי." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "הסיסמה ואישורה אינן תואמות." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "שגיאה ביצירת שם המשתמש." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למערכת." @@ -3090,7 +3295,7 @@ msgstr "שגיאה באישור הקוד." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "הירשם" @@ -3112,7 +3317,7 @@ msgstr "שם המשתמש או הסיסמה לא חוקיים" #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3128,8 +3333,9 @@ msgstr " לפחות 6 אותיות. שדה חובה." msgid "Same as password above. Required." msgstr "" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "" @@ -3142,20 +3348,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "הטקסטים והקבצים שלי מופצים תחת רשיון" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3174,7 +3373,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3217,7 +3416,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תואם אחר" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "הירשם כמנוי" @@ -3258,7 +3457,7 @@ msgstr "לא ניתן להירשם ללא הסכמה לרשיון" msgid "You already repeated that notice." msgstr "כבר נכנסת למערכת!" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "צור" @@ -3347,7 +3546,7 @@ msgstr "למשתמש אין פרופיל." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3386,29 +3585,33 @@ msgstr "" msgid "Application profile" msgstr "להודעה אין פרופיל" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "כינוי" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "מיקום" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "הרשמות" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "סטטיסטיקה" @@ -3518,71 +3721,71 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "כל המנויים" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "אין הודעה כזו." -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 #, fuzzy msgid "Note" msgstr "הודעות" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "הזנת הודעות של %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "הזנת הודעות של %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "הזנת הודעות של %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "הזנת הודעות של %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "חבר מאז" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 #, fuzzy msgid "Created" msgstr "צור" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3592,7 +3795,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3601,7 +3804,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "" @@ -3730,11 +3933,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3827,7 +4030,7 @@ msgid "Unable to save site notice." msgstr "בעיה בשמירת ההודעה." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3844,104 +4047,165 @@ msgstr "" msgid "Save site notice" msgstr "הודעה חדשה" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "הגדרות מסרים מידיים" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "כתובת מסרים מידיים" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "" -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "אשר" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "העדפות" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "העדפות נשמרו." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "" -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "" -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "קוד האישור הזה אינו מיועד לך!" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "" -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "האישור בוטל." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "" -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "הכתובת הוסרה." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3963,7 +4227,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4004,8 +4268,7 @@ msgstr "הגדרות" msgid "You are not subscribed to that profile." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "יצירת המנוי נכשלה." @@ -4100,12 +4363,12 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 #, fuzzy msgid "Jabber" msgstr "אין זיהוי Jabber כזה." -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "סמס" @@ -4139,13 +4402,13 @@ msgstr "אין מסמך כזה." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "למשתמש אין פרופיל." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -4199,7 +4462,7 @@ msgstr "למשתמש אין פרופיל." #: actions/unsubscribe.php:77 #, fuzzy -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "השרת לא החזיר כתובת פרופיל" #: actions/unsubscribe.php:98 @@ -4237,7 +4500,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "פרופיל" @@ -4405,27 +4669,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "כל המנויים" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, fuzzy, php-format msgid "%s is not a member of any group." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4473,7 +4743,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "אישי" @@ -4482,19 +4753,19 @@ msgstr "אישי" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4536,262 +4807,281 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" +msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:245 +#: classes/Notice.php:249 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "למשתמש אין פרופיל." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "לא מנוי!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "מחיקת המנוי לא הצליחה." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "מחיקת המנוי לא הצליחה." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "מחיקת המנוי לא הצליחה." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "שמירת מידע התמונה נכשל" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "יצירת המנוי נכשלה." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "יצירת המנוי נכשלה." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "יצירת המנוי נכשלה." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 #, fuzzy msgid "Upload an avatar" msgstr "עדכון התמונה נכשל." -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "למשתמש אין פרופיל." -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "הסטטוס של %1$s ב-%2$s " -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "אישי" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "שנה סיסמה" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "נכשלה ההפניה לשרת: %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "התחבר" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "הרשמות" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "גודל לא חוקי." #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "צא" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "צור חשבון חדש" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "הירשם" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "היכנס" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "עזרה" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "עזרה" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4799,76 +5089,90 @@ msgstr "חיפוש" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 #, fuzzy msgid "Site notice" msgstr "הודעה חדשה" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 #, fuzzy msgid "Page notice" msgstr "הודעה חדשה" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 #, fuzzy msgid "Secondary site navigation" msgstr "הרשמות" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "עזרה" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "אודות" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "רשימת שאלות נפוצות" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "פרטיות" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "מקור" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "צור קשר" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%" "site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** הוא שרות ביקרובלוג." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4879,70 +5183,84 @@ msgstr "" "s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)" -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "הודעה חדשה" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 #, fuzzy msgid "After" msgstr "<< אחרי" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 #, fuzzy msgid "Before" msgstr "לפני >>" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4952,165 +5270,203 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "הרשמות" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "הודעה חדשה" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "אישי" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "הרשמות" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "מתשמש" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "הרשמות" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "הרשמות" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "הרשמות" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "הודעה חדשה" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "הרשמות" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "מקור" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר " -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "מקור" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר " -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "בטל" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "הסר" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 #, fuzzy msgid "Provider" msgstr "פרופיל" @@ -5133,37 +5489,58 @@ msgstr "הסיסמה נשמרה." msgid "Password changing is not allowed" msgstr "הסיסמה נשמרה." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "אין פרופיל תואם לפרופיל המרוחק " -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +#, fuzzy +msgid "User has no last notice" +msgstr "למשתמש אין פרופיל." + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "עידכון המשתמש נכשל." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "עידכון המשתמש נכשל." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "תגובת עבור %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5171,206 +5548,208 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "אין פרופיל תואם לפרופיל המרוחק " - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "למשתמש אין פרופיל." - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 #, fuzzy msgid "You are already a member of that group" msgstr "כבר נכנסת למערכת!" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, fuzzy, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "נכשלה ההפניה לשרת: %s" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, fuzzy, php-format -msgid "%s joined group %s" -msgstr "הסטטוס של %1$s ב-%2$s " - -#: lib/command.php:275 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "נכשלה יצירת OpenID מתוך: %s" -#: lib/command.php:280 -#, fuzzy, php-format -msgid "%s left group %s" -msgstr "הסטטוס של %1$s ב-%2$s " - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, fuzzy, php-format msgid "Fullname: %s" msgstr "שם מלא" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "אודות: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "לא ניתן להירשם ללא הסכמה לרשיון" -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "כבר נכנסת למערכת!" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "הודעות" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "תגובת עבור %s" -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:628 #, fuzzy -msgid "No such user" -msgstr "אין משתמש כזה." +msgid "Can't subscribe to OMB profiles by command." +msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "בטל מנוי" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "הרשמה מרוחקת" -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "הרשמה מרוחקת" msgstr[1] "הרשמה מרוחקת" -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5412,20 +5791,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "אין קוד אישור." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5604,54 +5983,55 @@ msgstr "" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "פורמט התמונה אינו נתמך." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "העלאה חלקית." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "שגיאת מערכת בהעלאת הקובץ." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "זהו לא קובץ תמונה, או שחל בו שיבוש." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "פורמט התמונה אינו נתמך." - #: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "אין הודעה כזו." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5676,11 +6056,13 @@ msgstr "שם המשתמש או הסיסמה לא חוקיים" msgid "Sign up for a new account" msgstr "צור חשבון חדש" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5697,12 +6079,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5722,17 +6106,20 @@ msgstr "" " שלך,\n" " %4$s.\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "אודות: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5745,21 +6132,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5775,12 +6172,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5799,12 +6198,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5825,12 +6226,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5843,6 +6254,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5855,7 +6278,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "" @@ -5986,52 +6409,56 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 #, fuzzy msgid "N" msgstr "לא" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 #, fuzzy msgid "in context" msgstr "אין תוכן!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "צור" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 #, fuzzy msgid "Reply" msgstr "הגב" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "הודעות" @@ -6056,6 +6483,10 @@ msgstr "שגיאה בהכנסת הפרופיל" msgid "Error inserting avatar" msgstr "שגיאה בהכנסת התמונה." +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "שגיאה בעדכון פרופיל מרוחק" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "שגיאה בהכנסת פרופיל מרוחק" @@ -6106,7 +6537,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "הרשמות" @@ -6114,34 +6545,34 @@ msgstr "הרשמות" msgid "All subscriptions" msgstr "כל המנויים" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "מנויים" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 #, fuzzy msgid "All subscribers" msgstr "מנויים" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 #, fuzzy msgid "User ID" msgstr "מתשמש" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "חבר מאז" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "אין מסמך כזה." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6166,11 +6597,20 @@ msgstr "" msgid "Popular" msgstr "אנשים" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "אין מסמך כזה." + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "אין הודעה כזו." +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "כן" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6181,7 +6621,7 @@ msgstr "אין הודעה כזו." msgid "Revoke the \"%s\" role from this user" msgstr "אין משתמש כזה." -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6315,93 +6755,112 @@ msgstr "" msgid "Unsubscribe" msgstr "בטל מנוי" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "למשתמש אין פרופיל." + +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "תמונה" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 #, fuzzy msgid "Edit profile settings" msgstr "הגדרות הפרופיל" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 #, fuzzy msgid "Message" msgstr "הודעה חדשה" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "למשתמש אין פרופיל." -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "לפני מספר שניות" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "לפני כדקה" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "לפני כ-%d דקות" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "לפני כשעה" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "לפני כ-%d שעות" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "לפני כיום" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "לפני כ-%d ימים" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "לפני כחודש" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "לפני כ-%d חודשים" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "לפני כשנה" @@ -6415,7 +6874,7 @@ msgstr "לאתר הבית יש כתובת לא חוקית." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 91d9c9c73c..5d226be60a 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:00+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:21+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -23,21 +23,19 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Přistup" #. TRANS: Page notice #: actions/accessadminpanel.php:67 -#, fuzzy msgid "Site access settings" -msgstr "Sydłowe nastajenja składować" +msgstr "Nastajenja za sydłowy přistup" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 -#, fuzzy msgid "Registration" -msgstr "Registrować" +msgstr "Registrowanje" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -46,7 +44,6 @@ msgstr "" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Priwatny" @@ -73,12 +70,16 @@ msgstr "Začinjeny" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "Sydłowe nastajenja składować" +msgstr "Přistupne nastajenja składować" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Składować" @@ -86,8 +87,8 @@ msgstr "Składować" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "Strona njeeksistuje" +msgid "No such page." +msgstr "Strona njeeksistuje." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -97,9 +98,9 @@ msgstr "Strona njeeksistuje" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -107,11 +108,9 @@ msgstr "Strona njeeksistuje" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Wužiwar njeeksistuje" @@ -123,8 +122,9 @@ msgstr "%1$s a přećeljo, strona %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -182,8 +182,10 @@ msgstr "" msgid "You and friends" msgstr "Ty a přećeljo" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -198,18 +200,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-metoda njenamakana." @@ -222,15 +224,15 @@ msgstr "API-metoda njenamakana." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Tuta metoda wužaduje sej POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -242,7 +244,7 @@ msgstr "Wužiwar njeje so dał aktualizować." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Wužiwar nima profil." @@ -252,9 +254,9 @@ msgid "Could not save profile." msgstr "Profil njeje so składować dał." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -336,7 +338,7 @@ msgstr "Status z tym ID njenamakany." msgid "This status is already a favorite." msgstr "Tutón status je hižo faworit." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" @@ -426,11 +428,10 @@ msgstr "Městno je předołho (maks. 255 znamješkow)." msgid "Too many aliases! Maximum %d." msgstr "Přewjele aliasow! Maksimum: %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Njepłaćiwy alias: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Njepłaćiwy alias: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -446,14 +447,14 @@ msgstr "Alias njemóže samsny kaž přimjeno być." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Skupina njenamakana!" +msgid "Group not found." +msgstr "Skupina njenamakana." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Sy hižo čłon teje skupiny." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -471,17 +472,26 @@ msgstr "Njejsy čłon tuteje skupiny." msgid "Could not remove user %1$s from group %2$s." msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 #, php-format -msgid "%s groups" +msgid "%1$s groups %2$s is a member of." msgstr "" -#: actions/apigrouplistall.php:94 +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#, php-format +msgid "%s groups" +msgstr "%s skupinow" + +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "skupiny na %s" @@ -491,22 +501,21 @@ msgid "No oauth_token parameter provided." msgstr "" #: actions/apioauthauthorize.php:106 -#, fuzzy msgid "Invalid token." -msgstr "Njepłaćiwa wulkosć." +msgstr "Njepłaćiwy token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -518,12 +527,10 @@ msgid "Invalid nickname / password!" msgstr "Njepłaćiwe přimjeno abo hesło!" #: actions/apioauthauthorize.php:159 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije." +msgstr "Zmylk datoweje banki při zhašenju wužiwarja OAuth-aplikacije." #: actions/apioauthauthorize.php:185 -#, fuzzy msgid "Database error inserting OAuth application user." msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije." @@ -539,12 +546,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" @@ -564,20 +574,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Přimjeno" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Hesło" @@ -622,17 +634,17 @@ msgstr "Status zničeny." msgid "No status with that ID found." msgstr "Žadyn status z tym ID namakany." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Njenamakany" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Njenamakany." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -641,12 +653,12 @@ msgstr "" msgid "Unsupported format." msgstr "Njepodpěrany format." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" @@ -656,17 +668,17 @@ msgstr "" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -681,20 +693,16 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Njenamakany." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Přiwěšk njeeksistuje." @@ -714,8 +722,9 @@ msgstr "Žana wulkosć." msgid "Invalid size." msgstr "Njepłaćiwa wulkosć." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Awatar" @@ -726,10 +735,10 @@ msgstr "" "Móžeš swój wosobinski awatar nahrać. Maksimalna datajowa wulkosć je %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Wužiwar bjez hodźaceho so profila" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Wužiwar bjez hodźaceho so profila." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -747,7 +756,7 @@ msgid "Preview" msgstr "Přehlad" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Zničić" @@ -759,23 +768,27 @@ msgstr "Nahrać" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Žana dataja nahrata." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Awatar zaktualizowany." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Awatar zničeny." @@ -783,7 +796,7 @@ msgstr "Awatar zničeny." msgid "You already blocked that user." msgstr "Sy tutoho wužiwarja hižo zablokował." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Wužiwarja blokować" @@ -794,27 +807,42 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Ně" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Tutoho wužiwarja njeblokować" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Haj" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Tutoho wužiwarja blokować" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "" @@ -827,8 +855,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Skupina njeeksistuje." @@ -858,9 +886,11 @@ msgstr "" msgid "Unblock this user" msgstr "" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "" +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Na %s pósłać" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -874,33 +904,43 @@ msgstr "Wobkrućenski kod njenamakany." msgid "That confirmation code is not for you!" msgstr "Tutón wobkrućenski kod njeje za tebje!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Njespóznany adresowy typ %s" +msgid "Unrecognized address type %s." +msgstr "Njespóznaty adresowy typ %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Tuta adresa bu hižo wobkrućena." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "" -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "" -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Adresu wobkrućić" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Adresa \"%s\" bu za twoje konto wobkrućena." @@ -910,19 +950,17 @@ msgid "Conversation" msgstr "Konwersacija" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Zdźělenki" #: actions/deleteapplication.php:63 -#, fuzzy msgid "You must be logged in to delete an application." -msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał." +msgstr "Dyrbiš přizjewjeny być, zo by aplikaciju zničił." #: actions/deleteapplication.php:71 -#, fuzzy msgid "Application not found." -msgstr "Aplikaciski profil" +msgstr "Aplikaciska njenamakana." #: actions/deleteapplication.php:78 actions/editapplication.php:77 #: actions/showapplication.php:94 @@ -931,14 +969,13 @@ msgstr "Njejsy wobsedźer tuteje aplikacije." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 -#, fuzzy msgid "Delete application" -msgstr "Aplikacija njeeksistuje." +msgstr "Aplikaciju zničić" #: actions/deleteapplication.php:149 msgid "" @@ -947,17 +984,17 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 -#, fuzzy +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" -msgstr "Tutu zdźělenku njewušmórnyć" +msgstr "Tutu aplikaciju njezničić" -#: actions/deleteapplication.php:160 -#, fuzzy +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" -msgstr "Tutu zdźělenku wušmórnyć" +msgstr "Tutu aplikaciju zničić" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -986,11 +1023,13 @@ msgstr "Zdźělenku wušmórnyć" msgid "Are you sure you want to delete this notice?" msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Tutu zdźělenku njewušmórnyć" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Tutu zdźělenku wušmórnyć" @@ -1012,58 +1051,61 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Tutoho wužiwarja wušmórnyć" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Design" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Designowe nastajenja za tute sydło StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "Njepłaćiwy logowy URL." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Šat njesteji k dispoziciji: %s" +msgid "Theme not available: %s." +msgstr "Šat njesteji k dispoziciji: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Logo změnić" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Logo sydła" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Šat změnić" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Šat sydła" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Šat za sydło." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Pozadkowy wobraz změnić" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Pozadk" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1071,67 +1113,68 @@ msgid "" msgstr "" "Móžeš pozadkowy wobraz za sydło nahrać. Maksimalna datajowa wulkosć je %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Zapinjeny" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Wupinjeny" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Barby změnić" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Wobsah" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Bóčnica" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Tekst" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Wotkazy" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Standardne hódnoty wužiwać" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Standardne designy wobnowić" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Na standard wróćo stajić" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Składować" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Design składować" @@ -1144,14 +1187,13 @@ msgid "Add to favorites" msgstr "K faworitam přidać" #: actions/doc.php:158 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Dokument njeeksistuje." +msgstr "Dokument \"%s\" njeeksistuje" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" -msgstr "Aplikacije OAuth" +msgstr "Aplikaciju wobdźěłać" #: actions/editapplication.php:66 msgid "You must be logged in to edit an application." @@ -1175,9 +1217,8 @@ msgid "Name is too long (max 255 chars)." msgstr "Mjeno je předołho (maks. 255 znamješkow)." #: actions/editapplication.php:183 actions/newapplication.php:162 -#, fuzzy msgid "Name already in use. Try another one." -msgstr "Přimjeno so hižo wužiwa. Spytaj druhe." +msgstr "Mjeno so hižo wužiwa. Spytaj druhe." #: actions/editapplication.php:186 actions/newapplication.php:168 msgid "Description is required." @@ -1185,7 +1226,7 @@ msgstr "Wopisanje je trěbne." #: actions/editapplication.php:194 msgid "Source URL is too long." -msgstr "" +msgstr "Žórłowy URL je předołhi." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Source URL is not valid." @@ -1238,11 +1279,16 @@ msgstr "Wuž tutón formular, zo by skupinu wobdźěłał." msgid "description is too long (max %d chars)." msgstr "wopisanje je předołho (maks. %d znamješkow)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Njepłaćiwy alias: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Skupina njeje so dała aktualizować." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Aliasy njejsu so dali wutworić." @@ -1250,178 +1296,229 @@ msgstr "Aliasy njejsu so dali wutworić." msgid "Options saved." msgstr "Opcije składowane." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "E-mejlowe nastajenja" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adresa" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "E-mejlowa adresa" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Aktualna wobkrućena e-mejlowa adresa." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Wotstronić" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Přetorhnyć" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "E-mejlowa adresa" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Přidać" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Dochadźaca e-mejl" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Nowy" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Nastajenja" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "E-mejlowe nastajenja" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Chcu zdźělenki přez e-mejl pósłać." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "MicroID za moju e-mejlowu adresu publikować" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Nastajenja składowane." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "E-mejlowe nastajenja składowane." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Žana e-mejlowa adresa." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Njepłaćiwa e-mejlowa adresa." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "To je hižo twoja e-mejlowa adresa." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "" -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "" -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "to je wopačna IM-adresa." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "To je wopačna e-mejlowa adresa." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Wobkrućenje přetorhnjene." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "E-mejlowe wobkrućenje přetorhnjene." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "To njeje twoja e-mejlowa adresa." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Adresa bu wotstronjena." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "E-mejlowa adresa bu wotstronjena." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Žana adresa za dochadźace e-mejle." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Adresa za dochadźaće e-mejle wotstronjena." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Nowa adresa za dochadźace e-mejle přidata." @@ -1534,9 +1631,9 @@ msgstr "" msgid "Remote service uses unknown version of OMB protocol." msgstr "" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Zmylk při aktualizaciji zdaleneho profila." #: actions/getfile.php:79 msgid "No such file." @@ -1547,23 +1644,20 @@ msgid "Cannot read file." msgstr "Dataja njeda so čitać." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Njepłaćiwa wulkosć." +msgstr "Njepłaćiwa róla." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." msgstr "" #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać." +msgstr "Njemóžeš wužiwarske róle na tutym sydle garantować." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "Wužiwar nima profil." +msgstr "Wužiwar hižo ma tutu rólu." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1594,11 +1688,11 @@ msgstr "Wužiwar je hižo za skupinu zablokowany." msgid "User is not a member of group." msgstr "Wužiwar njeje čłon skupiny." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Wužiwarja za skupinu blokować" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1606,15 +1700,17 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Tutoho wužiwarja za tutu skupinu blokować" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Tutoho wužiwarja za tutu skupinu blokować" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1657,10 +1753,6 @@ msgstr "" "Móžeš logowy wobraz za swoju skupinu nahrać. Maksimalna datajowa wulkosć je %" "s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Wužiwar bjez hodźaceho so profila." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1676,7 +1768,7 @@ msgstr "" #: actions/groupmembers.php:100 lib/groupnav.php:92 #, php-format msgid "%s group members" -msgstr "" +msgstr "%s skupinskich čłonow" #: actions/groupmembers.php:103 #, php-format @@ -1691,34 +1783,38 @@ msgstr "Lisćina wužiwarjow w tutej skupinje." msgid "Admin" msgstr "Administrator" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Blokować" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" -msgstr "" +msgstr "Wužiwarja k administratorej skupiny činić" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" -msgstr "" +msgstr "Za administratora pomjenować" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Tutoho wužiwarja k administratorej činić" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Skupiny" @@ -1738,7 +1834,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Nowu skupinu wutworić" @@ -1778,96 +1874,150 @@ msgstr "" #: actions/groupunblock.php:95 msgid "User is not blocked from group." -msgstr "" +msgstr "Wužiwar njeje zablokowany za skupinu." #: actions/groupunblock.php:128 actions/unblock.php:86 msgid "Error removing the block." msgstr "" -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "IM-nastajenja" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "IM k dispoziciji njesteji." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "IM-adresa" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "IM-adresa" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "IM-nastajenja" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Nastajenja składowane." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Žadyn ID Jabber." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Njepłaćiwy ID Jabber" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "To je hižo twój ID Jabber." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "" -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." msgstr "" -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "to je wopačna IM-adresa." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "IM-wobkrućenje njeda so zhašeć." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "IM-wobkrućenje přetorhnjene." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "To njeje twój ID Jabber." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "IM-adresa bu wotstronjena." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1888,8 +2038,10 @@ msgstr "Přeprošenja buchu znjemóžnjene." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" +msgid "You must be logged in to invite other users to use %s." msgstr "" +"Dyrbiš přizjewjeny być, zo by druheho wužiwarja přeprosył, zo by wón %s " +"wužiwał." #: actions/invite.php:72 #, php-format @@ -1908,7 +2060,9 @@ msgstr "Nowych wužiwarjow přeprosyć" msgid "You are already subscribed to these users:" msgstr "Sy tutych wužiwarjow hižo abonował:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1953,17 +2107,18 @@ msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Pósłać" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -1999,11 +2154,12 @@ msgid "You must be logged in to join a group." msgstr "" #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Žane přimjeno." +msgstr "Žane přimjeno abo žadyn ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -2012,11 +2168,13 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Njejsy čłon teje skupiny." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "" @@ -2060,10 +2218,13 @@ msgid "" msgstr "" #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 @@ -2086,13 +2247,12 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Njeje móžno %1$S k administratorej w skupinje %2$s činić." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Žadyn aktualny status" +msgid "No current status." +msgstr "Žadyn aktualny status." #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" -msgstr "Aplikacija njeeksistuje." +msgstr "Nowa aplikacija" #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2104,7 +2264,7 @@ msgstr "Wužij tutón formular, zo by nowu aplikaciju registrował." #: actions/newapplication.php:176 msgid "Source URL is required." -msgstr "" +msgstr "Žórłowy URL je trěbny." #: actions/newapplication.php:258 actions/newapplication.php:267 msgid "Could not create application." @@ -2122,12 +2282,12 @@ msgstr "Wužij tutón formular, zo by nowu skupinu wutworił." msgid "New message" msgstr "Nowa powěsć" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Žadyn wobsah!" @@ -2135,7 +2295,7 @@ msgstr "Žadyn wobsah!" msgid "No recipient specified." msgstr "Žadyn přijimowar podaty." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2149,7 +2309,7 @@ msgstr "Powěsć pósłana" msgid "Direct message to %s sent." msgstr "Direktna powěsć do %s pósłana." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Zmylk Ajax" @@ -2157,7 +2317,7 @@ msgstr "Zmylk Ajax" msgid "New notice" msgstr "Nowa zdźělenka" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Zdźělenka wotpósłana" @@ -2194,7 +2354,7 @@ msgstr "" #: actions/noticesearchrss.php:96 #, php-format msgid "Updates with \"%s\"" -msgstr "" +msgstr "Aktualizacije z \"%s\"" #: actions/noticesearchrss.php:98 #, php-format @@ -2233,7 +2393,7 @@ msgstr "" #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" -msgstr "" +msgstr "Zwjazane aplikacije" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." @@ -2244,11 +2404,11 @@ msgid "You are not a user of that application." msgstr "Njejsy wužiwar tuteje aplikacije." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2257,24 +2417,29 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Zdźělenka nima profil" +msgid "Notice has no profile." +msgstr "Zdźělenka nima profil." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Wobsahowy typ %s so njepodpěruje." + +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:160 -msgid "Only " -msgstr "Jenož " - -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -2377,7 +2542,7 @@ msgid "6 or more characters" msgstr "6 abo wjace znamješkow" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Wobkrućić" @@ -2403,18 +2568,18 @@ msgstr "Wopačne stare hesło" #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." -msgstr "" +msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." -msgstr "" +msgstr "Nowe hesło njeda so składować." #: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Hesło składowane." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Šćežki" @@ -2424,22 +2589,22 @@ msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "" +msgid "Theme directory not readable: %s." +msgstr "Šatowy zapis njeda so čitać: %s" #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +msgid "Avatar directory not writable: %s." +msgstr "Do awataroweho zapisa njeda so pisać: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "" +msgid "Background directory not writable: %s." +msgstr "Do pozadkoweho zapisa njeda so pisać: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" +msgid "Locales directory not readable: %s." msgstr "" #: actions/pathsadminpanel.php:183 @@ -2577,19 +2742,19 @@ msgstr "" msgid "People search" msgstr "Za ludźimi pytać" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "" +msgid "Not a valid people tag: %s." +msgstr "Njepłaćiwa wosobowa taflička: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Njepłaćiwy wobsah zdźělenki" +msgid "Invalid notice content." +msgstr "Njepłaćiwy wobsah zdźělenki." #: actions/postnotice.php:101 #, php-format @@ -2614,13 +2779,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Dospołne mjeno" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Startowa strona" @@ -2642,9 +2808,9 @@ msgid "Bio" msgstr "Biografija" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Městno" @@ -2658,7 +2824,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -2716,7 +2882,7 @@ msgstr "Nastajenja městna njedachu so składować." #: actions/profilesettings.php:375 msgid "Couldn't save profile." -msgstr "" +msgstr "Profil njeda so składować." #: actions/profilesettings.php:383 msgid "Couldn't save tags." @@ -2729,7 +2895,7 @@ msgstr "Nastajenja składowane." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -2869,6 +3035,7 @@ msgstr "" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." msgstr "" +"Twoje přimjeno na tutym serwerje abo twoje zregistrowana e-mejlowa adresa." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" @@ -2882,7 +3049,7 @@ msgstr "Hesło wróćo stajić" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2902,42 +3069,42 @@ msgstr "Wróćo stajić" msgid "Enter a nickname or email address." msgstr "Zapodaj přimjeno abo e-mejlowu adresu." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" "Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Hesło dyrbi 6 znamješkow abo wjace měć." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -2953,7 +3120,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod." msgid "Registration successful" msgstr "Registrowanje wuspěšne" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrować" @@ -2975,7 +3142,7 @@ msgstr "Njepłaćiwe wužiwarske mjeno abo hesło." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -2991,8 +3158,9 @@ msgstr "6 abo wjace znamješkow. Trěbne." msgid "Same as password above. Required." msgstr "Jenake kaž hesło horjeka. Trěbne." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mejl" @@ -3005,20 +3173,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Mój tekst a moje dataje steja k dispoziciji pod " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Attribution 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3037,7 +3198,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3076,7 +3237,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Abonować" @@ -3112,7 +3273,7 @@ msgstr "Njemóžeš swójsku zdźělenku wospjetować." msgid "You already repeated that notice." msgstr "Sy tutu zdźělenku hižo wospjetował." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Wospjetowany" @@ -3173,14 +3334,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać." +msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Wužiwar bjez hodźaceho so profila." +msgstr "Wužiwar nima tutu rólu." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3196,14 +3355,13 @@ msgstr "" #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Posedźenja" #: actions/sessionsadminpanel.php:65 -#, fuzzy msgid "Session settings for this StatusNet site." -msgstr "Designowe nastajenja za tute sydło StatusNet." +msgstr "Nastajenja posedźenja za tute sydło StatusNet." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" @@ -3234,26 +3392,30 @@ msgstr "Dyrbiš přizjewjeny być, zo by sej aplikaciju wobhladał." msgid "Application profile" msgstr "Aplikaciski profil" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Mjeno" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organizacija" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Wopisanje" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statistika" @@ -3301,14 +3463,13 @@ msgid "" msgstr "" #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?" +msgstr "Chceš woprawdźe swój přetrjebowarski kluč a potajny kod wróćo stajić?" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "%1$s a přećeljo, strona %2$d" +msgstr "Preferowane zdźělenki wot %1$s, strona %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3357,74 +3518,74 @@ msgstr "" #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" -msgstr "" +msgstr "skupina %s" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "%1$s skupinskich čłonow, strona %2$d" +msgstr "%1$s skupina, strona %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Skupinski profil" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliasy" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Skupinske akcije" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Čłonojo" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Žadyn)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Wšitcy čłonojo" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Wutworjeny" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3434,7 +3595,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3443,7 +3604,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Administratorojo" @@ -3475,9 +3636,9 @@ msgid " tagged %s" msgstr "" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s a přećeljo, strona %2$d" +msgstr "%1$s, strona %2$d" #: actions/showstream.php:122 #, php-format @@ -3553,9 +3714,8 @@ msgid "User is already silenced." msgstr "" #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Designowe nastajenja za tute sydło StatusNet." +msgstr "Zakładne nastajenja za tute sydło StatusNet." #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." @@ -3571,11 +3731,11 @@ msgid "Unknown language \"%s\"." msgstr "Njeznata rěč \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3623,9 +3783,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "" #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Standardna sydłowa rěč" +msgstr "Standardna rěč" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3652,140 +3811,189 @@ msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Zdźělenki" +msgstr "Sydłowa zdźělenka" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nowa powěsć" +msgstr "Sydłodaloku powěsć wobdźěłać" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Wužiwar nima poslednju powěsć" +msgstr "Njeje móžno, sydłowu zdźělenku składować." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Njepłaćiwy wobsah zdźělenki" +msgstr "Tekst sydłoweje zdźělenki" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Sydłowe nastajenja składować" +msgstr "Sydłowu zdźělenku składować" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "SMS-nastajenja" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "SMS k dispoziciji njesteji." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "SMS-adresa" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "" -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Wobkrućić" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "SMS telefonowe čisło" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "SMS-nastajenja" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "SMS-nastajenja składowane." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Žane telefonowe čisło." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "To je hižo twoje telefonowe čisło." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Te telefonowe čisło hižo druhemu wužiwarjej słuša." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "" -#: actions/smssettings.php:405 -msgid "That is not your phone number." -msgstr "" +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "SMS-wobkrućenje přetorhnjene." -#: actions/smssettings.php:465 +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 +msgid "That is not your phone number." +msgstr "To twoje telefonowe čisło njeje." + +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Telefonowe čisło za SMS bu wotstronjene." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Žadyn kod zapodaty" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "SMS-wobkrućenje" +msgstr "Konfiguraciju wobrazowkoweho fota zrjadować" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -3800,7 +4008,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3832,16 +4040,14 @@ msgid "Snapshots will be sent to this URL" msgstr "" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Sydłowe nastajenja składować" +msgstr "Nastajenja wobrazowkoweho fota składować" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." msgstr "Njejsy tón profil abonował." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -3850,14 +4056,12 @@ msgid "This action only accepts POST requests." msgstr "" #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "Dataja njeeksistuje." +msgstr "Profil njeeksistuje." #: actions/subscribe.php:117 -#, fuzzy msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "Njejsy tón profil abonował." +msgstr "Njemóžeš zdaleny profil OMB 0.1 z tutej akciju abonować." #: actions/subscribe.php:145 msgid "Subscribed" @@ -3934,11 +4138,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -3971,12 +4175,12 @@ msgstr "Žadyn argument ID." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Wužiwarski profil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -4024,8 +4228,8 @@ msgid "User is not silenced." msgstr "" #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "" +msgid "No profile ID in request." +msgstr "Žadyn profilowy ID w naprašowanju." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4039,7 +4243,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Wužiwar" @@ -4061,7 +4264,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" @@ -4213,27 +4417,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, fuzzy, php-format +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 +#, php-format msgid "%1$s groups, page %2$d" -msgstr "%1$s skupinskich čłonow, strona %2$d" +msgstr "%1$s skupinow, strona %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4281,7 +4491,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Wersija" @@ -4289,19 +4500,19 @@ msgstr "Wersija" msgid "Author(s)" msgstr "Awtorojo" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4319,9 +4530,8 @@ msgid "Group leave failed." msgstr "Wopušćenje skupiny je so njeporadźiło." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "Skupina njeje so dała aktualizować." +msgstr "Lokalna skupina njeda so aktualizować." #: classes/Login_token.php:76 #, php-format @@ -4340,330 +4550,342 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" +msgid "Database error inserting hashtag: %s" +msgstr "Zmylk datoweje banki při zasunjenju hašeje taflički: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Hižo abonowany!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Wužiwar je će zablokował." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Njeje abonowany!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Sebjeabonement njeje so dał zničić." -#: classes/Subscription.php:190 -#, fuzzy +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "Abonoment njeje so dał zničić." +msgstr "Znamjo OMB-abonementa njeda so zhašeć." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Abonoment njeje so dał zničić." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "" -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "Skupina njeje so dała aktualizować." +msgstr "URI skupiny njeda so nastajić." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "" -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "Profil njeje so składować dał." +msgstr "Informacije wo lokalnej skupinje njedachu so składować." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Druhe" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Druhe opcije" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Druhe" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Strona bjez titula" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 -#, fuzzy +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Wosobinski" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 -#, fuzzy +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Změń swoje hesło." +msgstr "Wašu e-mejl, waš awatar, waše hesło, waš profil změnić" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 -#, fuzzy +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "Zwiski" +msgstr "Ze słužbami zwjazać" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Zwjazać" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 -#, fuzzy +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "SMS-wobkrućenje" +msgstr "Sydłowu konfiguraciju změnić" -#: lib/action.php:449 -#, fuzzy +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Administrator" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 -#, fuzzy, php-format +#: lib/action.php:455 +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "" -"Wužij tutón formular, zo by swojich přećelow a kolegow přeprosył, zo bychu " -"tutu słužbu wužiwali." +msgstr "Přećelow a kolegow přeprosyć, so tebi na %s přidružić" -#: lib/action.php:456 -#, fuzzy +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Přeprosyć" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 -#, fuzzy +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" -msgstr "Šat za sydło." +msgstr "Ze sydła wotzjewić" -#: lib/action.php:465 -#, fuzzy +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" -msgstr "Logo" +msgstr "Wotzjewić" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 -#, fuzzy +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Konto załožić" -#: lib/action.php:473 -#, fuzzy +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Registrować" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 -#, fuzzy +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Při sydle přizjewić" -#: lib/action.php:479 -#, fuzzy +#: lib/action.php:481 msgctxt "MENU" msgid "Login" -msgstr "Přizjewić" +msgstr "Přizjewjenje" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 -#, fuzzy +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Pomhaj!" -#: lib/action.php:485 -#, fuzzy +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Pomoc" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 -#, fuzzy +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Za ludźimi abo tekstom pytać" -#: lib/action.php:491 -#, fuzzy +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Pytać" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Pomoc" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Wo" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "Huste prašenja" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Priwatnosć" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Žórło" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "" -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4671,67 +4893,81 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Změny na tutym woknje njejsu dowolene." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4741,158 +4977,189 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 -#, fuzzy +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Sydło" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 -#, fuzzy +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Design" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 -#, fuzzy +#: lib/adminpanelaction.php:365 msgid "User configuration" -msgstr "SMS-wobkrućenje" +msgstr "Wužiwarska konfiguracija" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Wužiwar" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 -#, fuzzy +#: lib/adminpanelaction.php:373 msgid "Access configuration" -msgstr "SMS-wobkrućenje" +msgstr "Přistupna konfiguracija" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 -#, fuzzy +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" -msgstr "SMS-wobkrućenje" +msgstr "Konfiguracija posedźenjow" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 -#, fuzzy +#: lib/adminpanelaction.php:397 msgid "Edit site notice" -msgstr "Dwójna zdźělenka" +msgstr "Sydłowu zdźělenku wobdźěłać" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 -#, fuzzy +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "SMS-wobkrućenje" +msgstr "Konfiguracija wobrazowkowych fotow" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Wopisaj swoju aplikaciju z %d znamješkami" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Wopisaj swoju aplikaciju" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "URL žórła" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "URL žórła" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" -msgstr "" +msgstr "Wobhladowak" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Přetorhnyć" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Wotwołać" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Awtor" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "" @@ -4912,37 +5179,56 @@ msgstr "Změnjenje hesła je so njeporadźiło" msgid "Password changing is not allowed" msgstr "Změnjenje hesła njeje dowolene" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Zdźělenka z tym ID njeeksistuje" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Wužiwar nima poslednju powěsć" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -4950,170 +5236,173 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Zdźělenka z tym ID njeeksistuje" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Wužiwar nima poslednju powěsć" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Sy hižo čłon teje skupiny" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Njebě móžno wužiwarja %s skupinje %s přidać" +msgid "Could not join user %1$s to group %2$s" +msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%s je so k skupinje %s přizamknył" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Njebě móžno, wužiwarja %1$s ze skupiny %2$s wotstronić" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Njebě móžno wužiwarja %s do skupiny %s přesunyć" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s je skupinu %s wopušćił" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Dospołne mjeno: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Městno: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Wo: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Direktna powěsć do %s pósłana" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Njemóžeš swójsku powěsć wospjetować" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Tuta zdźělenka bu hižo wospjetowana" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Zdźělenka wot %s wospjetowana" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Zmylk při wospjetowanju zdźělenki" -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Wotmołwa na %s pósłana" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "" -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -#, fuzzy -msgid "No such user" -msgstr "Wužiwar njeeksistuje" +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "OMB-profile njedadźa so přez přikaz abonować." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 -#, fuzzy, php-format +#: lib/command.php:761 +#, php-format msgid "Unsubscribed %s" -msgstr "Wotskazany" +msgstr "%s wotskazany" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sy tutu wosobu abonował:" @@ -5121,11 +5410,11 @@ msgstr[1] "Sy tutej wosobje abonował:" msgstr[2] "Sy tute wosoby abonował:" msgstr[3] "Sy tute wosoby abonował:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Tuta wosoba je će abonowała:" @@ -5133,11 +5422,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:" msgstr[2] "Tute wosoby su će abonowali:" msgstr[3] "Tute wosoby su će abonowali:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sy čłon tuteje skupiny:" @@ -5145,7 +5434,7 @@ msgstr[1] "Sy čłon tuteju skupinow:" msgstr[2] "Sy čłon tutych skupinow:" msgstr[3] "Sy čłon tutych skupinow:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5187,19 +5476,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Žana konfiguraciska dataja namakana. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5270,7 +5559,7 @@ msgstr "FOAF" #: lib/feedlist.php:64 msgid "Export data" -msgstr "" +msgstr "Daty eksportować" #: lib/galleryaction.php:121 msgid "Filter tags" @@ -5369,53 +5658,54 @@ msgstr "Skupiny z njawjace powěsćemi" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Dźělne nahraće." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 -msgid "Not an image or corrupt file." -msgstr "" - #: lib/imagefile.php:109 -msgid "Unsupported image file format." +msgid "Not an image or corrupt file." msgstr "" #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Naša dataja je so zhubiła." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Njeznaty datajowy typ" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "KB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Njeznate žórło postoweho kašćika %d." @@ -5436,11 +5726,13 @@ msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom" msgid "Sign up for a new account" msgstr "Nowe konto registrować" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Wobkrućenje e-mejloweje adresy" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5457,12 +5749,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5477,17 +5771,20 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Biografija: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5500,21 +5797,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS-wobkrućenje" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5530,12 +5837,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Nowa priwatna powěsć wot %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5554,12 +5863,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) je twoju zdźělenku jako faworit přidał" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5580,12 +5891,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5598,6 +5919,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5610,7 +5943,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "wot" @@ -5700,7 +6033,6 @@ msgid "Available characters" msgstr "K dispoziciji stejace znamješka" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Pósłać" @@ -5736,48 +6068,52 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "S" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "J" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "W" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "Z" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Wospjetowany wot" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Na tutu zdźělenku wotmołwić" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Wotmołwić" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Zdźělenka wospjetowana" @@ -5801,6 +6137,10 @@ msgstr "Zmylk při zasunjenju noweho profila" msgid "Error inserting avatar" msgstr "Zmylk při zasunjenju awatara" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Zmylk při zasunjenju zdaleneho profila" @@ -5850,7 +6190,7 @@ msgstr "" msgid "Unknown" msgstr "Njeznaty" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonementy" @@ -5858,31 +6198,32 @@ msgstr "Abonementy" msgid "All subscriptions" msgstr "Wšě abonementy" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonenća" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Wšitcy abonenća" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "Wužiwarski ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Čłon wot" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Wšě skupiny" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Žane wróćenske argumenty." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -5906,20 +6247,28 @@ msgstr "" msgid "Popular" msgstr "Woblubowany" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Žane wróćenske argumenty." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Tutu zdźělenku wospjetować?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Haj" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Tutu zdźělenku wospjetować" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Tutoho wužiwarja za tutu skupinu blokować" +msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -5987,7 +6336,7 @@ msgstr "" #: lib/subgroupnav.php:91 #, php-format msgid "People subscribed to %s" -msgstr "" +msgstr "Ludźo, kotřiž su %s abonowali" #: lib/subgroupnav.php:99 #, php-format @@ -6045,91 +6394,108 @@ msgstr "Tutoho wužiwarja wotskazać" msgid "Unsubscribe" msgstr "Wotskazać" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "Wužiwar %s (%d) nima profil." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Awatar wobdźěłać" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Wužiwarske akcije" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Profilowe nastajenja wobdźěłać" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Wobdźěłać" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Tutomu wužiwarja direktnu powěsć pósłać" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Powěsć" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "Wužiwarski profil" +msgstr "Wužiwarska róla" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Administratorojo" +msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "před něšto sekundami" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "před něhdźe jednej mjeńšinu" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "před %d mjeńšinami" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "před něhdźe jednej hodźinu" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "před něhdźe %d hodźinami" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "před něhdźe jednym dnjom" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "před něhdźe %d dnjemi" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "před něhdźe jednym měsacom" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "před něhdźe %d měsacami" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "před něhdźe jednym lětom" @@ -6145,7 +6511,7 @@ msgstr "" "%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 " "heksadecimalnych znamješkow." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 7a96686ed2..62ec146c31 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:08+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:24+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -21,7 +21,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Accesso" @@ -42,7 +42,6 @@ msgstr "Prohibir al usatores anonyme (sin session aperte) de vider le sito?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Private" @@ -72,8 +71,13 @@ msgstr "Claudite" msgid "Save access settings" msgstr "Salveguardar configurationes de accesso" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Salveguardar" @@ -81,8 +85,8 @@ msgstr "Salveguardar" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "Pagina non existe" +msgid "No such page." +msgstr "Pagina non existe." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -92,9 +96,9 @@ msgstr "Pagina non existe" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -102,11 +106,9 @@ msgstr "Pagina non existe" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Usator non existe." @@ -118,8 +120,9 @@ msgstr "%1$s e amicos, pagina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -185,8 +188,10 @@ msgstr "" msgid "You and friends" msgstr "Tu e amicos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualisationes de %1$s e su amicos in %2$s!" @@ -201,18 +206,18 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Methodo API non trovate." @@ -225,18 +230,18 @@ msgstr "Methodo API non trovate." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Iste methodo require un POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" "Tu debe specificar un parametro nominate 'device' con un del valores: sms, " -"im, none" +"im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -247,7 +252,7 @@ msgstr "Non poteva actualisar le usator." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Le usator non ha un profilo." @@ -257,9 +262,9 @@ msgid "Could not save profile." msgstr "Non poteva salveguardar le profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -343,7 +348,7 @@ msgstr "Nulle stato trovate con iste ID." msgid "This status is already a favorite." msgstr "Iste stato es ja favorite." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Non poteva crear le favorite." @@ -433,11 +438,10 @@ msgstr "Loco es troppo longe (max. 255 characteres)." msgid "Too many aliases! Maximum %d." msgstr "Troppo de aliases! Maximo: %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Alias invalide: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Alias invalide: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -453,14 +457,14 @@ msgstr "Le alias non pote esser identic al pseudonymo." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Gruppo non trovate!" +msgid "Group not found." +msgstr "Gruppo non trovate." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Tu es ja membro de iste gruppo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Le administrator te ha blocate de iste gruppo." @@ -478,17 +482,26 @@ msgstr "Tu non es membro de iste gruppo." msgid "Could not remove user %1$s from group %2$s." msgstr "Non poteva remover le usator %1$s del gruppo %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Gruppos de %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Gruppos de %1$s del quales %2$s es membro." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Gruppos de %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "gruppos in %s" @@ -502,17 +515,17 @@ msgid "Invalid token." msgstr "Indicio invalide." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -548,12 +561,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "Le indicio de requesta %s ha essite refusate e revocate." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Submission de formulario inexpectate." @@ -576,20 +592,22 @@ msgstr "" "%3$s le datos de tu conto de %4$s. Tu debe solmente dar " "accesso a tu conto de %4$s a tertie personas in le quales tu ha confidentia." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Conto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Pseudonymo" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Contrasigno" @@ -634,18 +652,18 @@ msgstr "Stato delite." msgid "No status with that ID found." msgstr "Nulle stato trovate con iste ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Isto es troppo longe. Le longitude maximal del notas es %d characteres." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Non trovate" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Non trovate." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -656,12 +674,12 @@ msgstr "" msgid "Unsupported format." msgstr "Formato non supportate." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favorites de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualisationes favoritisate per %2$s / %2$s." @@ -671,18 +689,18 @@ msgstr "%1$s actualisationes favoritisate per %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualisationes que mentiona %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" "Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Chronologia public de %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Actualisationes de totes in %s!" @@ -697,20 +715,16 @@ msgstr "Repetite a %s" msgid "Repeats of %s" msgstr "Repetitiones de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notas con etiquetta %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualisationes con etiquetta %1$s in %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Non trovate." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Annexo non existe." @@ -730,8 +744,9 @@ msgstr "Nulle dimension." msgid "Invalid size." msgstr "Dimension invalide." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -742,9 +757,9 @@ msgstr "" "Tu pote incargar tu avatar personal. Le dimension maximal del file es %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." msgstr "Usator sin profilo correspondente" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -763,7 +778,7 @@ msgid "Preview" msgstr "Previsualisation" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Deler" @@ -775,23 +790,27 @@ msgstr "Incargar" msgid "Crop" msgstr "Taliar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Nulle file incargate." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Selige un area quadrate del imagine pro facer lo tu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Datos del file perdite." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualisate." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Actualisation del avatar fallite." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar delite." @@ -799,7 +818,7 @@ msgstr "Avatar delite." msgid "You already blocked that user." msgstr "Tu ha ja blocate iste usator." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Blocar usator" @@ -813,27 +832,42 @@ msgstr "" "cancellate, ille non potera resubscriber se a te in le futuro, e tu non " "recipera notification de su @-responsas." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "No" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Non blocar iste usator" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Si" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blocar iste usator" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Falleva de salveguardar le information del blocada." @@ -846,8 +880,8 @@ msgstr "Falleva de salveguardar le information del blocada." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Gruppo non existe." @@ -877,9 +911,11 @@ msgstr "Disblocar" msgid "Unblock this user" msgstr "Disblocar iste usator" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Publicar in " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Publicar in %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -893,33 +929,43 @@ msgstr "Codice de confirmation non trovate." msgid "That confirmation code is not for you!" msgstr "Iste codice de confirmation non es pro te!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Typo de adresse %s non recognoscite" +msgid "Unrecognized address type %s." +msgstr "Le typo de adresse %s non es recognoscite." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Iste adresse ha ja essite confirmate." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Non poteva actualisar usator." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Non poteva deler confirmation de e-mail." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Confirmar adresse" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Le adresse \"%s\" ha essite confirmate pro tu conto." @@ -929,7 +975,7 @@ msgid "Conversation" msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notas" @@ -948,7 +994,7 @@ msgstr "Tu non es le proprietario de iste application." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Il habeva un problema con tu indicio de session." @@ -966,15 +1012,17 @@ msgstr "" "le application del base de datos, includente tote le existente connexiones " "de usator." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Non deler iste application" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Deler iste application" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1005,11 +1053,13 @@ msgstr "Deler nota" msgid "Are you sure you want to delete this notice?" msgstr "Es tu secur de voler deler iste nota?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Non deler iste nota" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Deler iste nota" @@ -1033,58 +1083,61 @@ msgstr "" "Es tu secur de voler deler iste usator? Isto radera tote le datos super le " "usator del base de datos, sin copia de reserva." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Deler iste usator" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Apparentia" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Configuration del apparentia de iste sito StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "URL de logotypo invalide." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Thema non disponibile: %s" +msgid "Theme not available: %s." +msgstr "Thema non disponibile: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Cambiar logotypo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Logotypo del sito" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Cambiar thema" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Thema del sito" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Le thema de apparentia pro le sito." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Cambiar imagine de fundo" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Fundo" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1093,67 +1146,68 @@ msgstr "" "Tu pote incargar un imagine de fundo pro le sito. Le dimension maximal del " "file es %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Active" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Non active" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Activar o disactivar le imagine de fundo." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Tegular le imagine de fundo" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Cambiar colores" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Contento" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Barra lateral" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Texto" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Ligamines" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Usar predefinitiones" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Restaurar apparentias predefinite" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Revenir al predefinitiones" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Salveguardar" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Salveguardar apparentia" @@ -1258,11 +1312,16 @@ msgstr "Usa iste formulario pro modificar le gruppo." msgid "description is too long (max %d chars)." msgstr "description es troppo longe (max %d chars)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Alias invalide: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Non poteva actualisar gruppo." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Non poteva crear aliases." @@ -1270,31 +1329,42 @@ msgstr "Non poteva crear aliases." msgid "Options saved." msgstr "Optiones salveguardate." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Configuration de e-mail" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Configurar como reciper e-mail de %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adresse" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Adresse de e-mail" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Adresse de e-mail actualmente confirmate." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Remover" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1302,107 +1372,137 @@ msgstr "" "Attende confirmation de iste adresse. Verifica tu cassa de entrata (e de " "spam!) pro un message con ulterior instructiones." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Cancellar" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Adresse de e-mail" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Le adresse de e-mail, como \"nomine@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Adder" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "E-mail entrante" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Invia e-mail a iste adresse pro publicar nove notas." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" "Face un nove adresse de e-mail per le qual publicar; cancella le vetule." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Nove" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Preferentias" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Preferentias de e-mail" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Inviar me notificationes de nove subscriptiones per e-mail." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Inviar me e-mail quando alcuno adde mi nota al favorites." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Inviar me e-mail quando alcuno me invia un message private." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Inviar me e-mail quando alcuno me invia un \"responsa @\"." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Permitte que amicos me pulsa e me invia e-mail." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Io vole publicar notas per e-mail." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publicar un MicroID pro mi adresse de e-mail." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Preferentias confirmate." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Preferentias de e-mail salveguardate." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Nulle adresse de e-mail." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Non pote normalisar iste adresse de e-mail" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Adresse de e-mail invalide." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Isto es ja tu adresse de e-mail." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Iste adresse de e-mail pertine ja a un altere usator." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Non poteva inserer le codice de confirmation." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1411,43 +1511,53 @@ msgstr "" "addeva. Verifica tu cassa de entrata (e de spam!) pro le codice e le " "instructiones pro usar lo." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Nulle confirmation pendente a cancellar." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Iste adresse de messageria instantanee es erronee." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Iste adresse de e-mail es erronee." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Confirmation cancellate." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Confirmation de e-mail cancellate." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Isto non es tu adresse de e-mail." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Le adresse ha essite removite." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "Le adresse de e-mail ha essite removite." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Nulle adresse de e-mail entrante." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Non poteva actualisar le datos del usator." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Adresse de e-mail entrante removite." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Nove adresse de e-mail entrante addite." @@ -1565,9 +1675,9 @@ msgstr "Non poteva converter le indicio de requesta in un indicio de accesso." msgid "Remote service uses unknown version of OMB protocol." msgstr "Le servicio remote usa un version incognite del protocollo OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Error in actualisar le profilo remote" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Error durante le actualisation del profilo remote." #: actions/getfile.php:79 msgid "No such file." @@ -1578,23 +1688,20 @@ msgid "Cannot read file." msgstr "Non pote leger file." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Indicio invalide." +msgstr "Rolo invalide." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Iste rolo es reservate e non pote esser apponite." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Tu non pote mitter usatores in le cassa de sablo in iste sito." +msgstr "Tu non pote conceder rolos a usatores in iste sito." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "Usator es ja silentiate." +msgstr "Le usator ha ja iste rolo." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1625,11 +1732,11 @@ msgstr "Le usator es ja blocate del gruppo." msgid "User is not a member of group." msgstr "Le usator non es membro del gruppo." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Blocar usator del gruppo" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1640,15 +1747,17 @@ msgstr "" "essera removite del gruppo, non potera publicar messages, e non potera " "subscriber se al gruppo in le futuro." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Non blocar iste usator de iste gruppo" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Blocar iste usator de iste gruppo" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "Error del base de datos al blocar le usator del gruppo." @@ -1693,10 +1802,6 @@ msgstr "" "Tu pote incargar un imagine pro le logotypo de tu gruppo. Le dimension " "maximal del file es %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Usator sin profilo correspondente" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Selige un area quadrate del imagine que devenira le logotypo." @@ -1727,34 +1832,38 @@ msgstr "Un lista de usatores in iste gruppo." msgid "Admin" msgstr "Administrator" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Blocar" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Facer le usator administrator del gruppo" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Facer administrator" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Facer iste usator administrator" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Chronologia de %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Actualisationes de membros de %1$s in %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Gruppos" @@ -1779,7 +1888,7 @@ msgstr "" "vide un gruppo que te place? Tenta [cercar un](%%%%action.groupsearch%%%%) o " "[crear le tue!](%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Crear un nove gruppo" @@ -1831,11 +1940,15 @@ msgstr "Le usator non es blocate del gruppo." msgid "Error removing the block." msgstr "Error de remover le blocada." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Configuration de messageria instantanee" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1844,15 +1957,24 @@ msgstr "" "Tu pote inviar e reciper notas per [messages instantanee](%%doc.im%%) de " "Jabber/GTalk. Configura tu adresse e parametros hic infra." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "Messageria instantanee non disponibile." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Adresse de messageria instantanee" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Adresse Jabber/GTalk actualmente confirmate." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1861,11 +1983,9 @@ msgstr "" "Attende confirmation de iste adresse. Verifica tu conto Jabber/GTalk pro un " "message con ulterior instructiones. (Ha tu addite %s a tu lista de amicos?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "Adresse de messageria instantanee" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1875,45 +1995,66 @@ msgstr "" "de adder %s a tu lista de amicos in tu cliente de messageria instantanee o " "in GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Preferentias de messageria instantanee" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Inviar me notas per Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Publicar un nota quando mi stato de Jabber/GTalk cambia." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Inviar me responsas per Jabber/GTalk de personas al quales io non es " "subscribite." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publicar un MicroID pro mi adresse Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Preferentias confirmate." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Nulle ID de Jabber." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Non pote normalisar iste ID de Jabber" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "ID de Jabber non valide" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Isto es ja tu ID de Jabber." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Le ID de Jabber pertine ja a un altere usator." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1922,10 +2063,32 @@ msgstr "" "Un codice de confirmation ha essite inviate al adresse de messageria " "instantanee specificate. Tu debe approbar que %s invia messages a te." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Iste adresse de messageria instantanee es erronee." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Non poteva deler confirmation de messageria instantanee." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Confirmation de messageria instantanee cancellate." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Isto non es tu ID de Jabber." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "Le adresse de messageria instantanee ha essite removite." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1948,8 +2111,8 @@ msgstr "Le invitationes ha essite disactivate." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "Tu debe aperir un session pro invitar altere usatores a usar %s" +msgid "You must be logged in to invite other users to use %s." +msgstr "Tu debe aperir un session pro invitar altere usatores a usar %s." #: actions/invite.php:72 #, php-format @@ -1968,7 +2131,9 @@ msgstr "Invitar nove usatores" msgid "You are already subscribed to these users:" msgstr "Tu es a subscribite a iste usatores:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2016,17 +2181,18 @@ msgstr "Si tu vole, adde un message personal al invitation." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Inviar" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s te ha invitate a accompaniar le/la in %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2088,11 +2254,12 @@ msgid "You must be logged in to join a group." msgstr "Tu debe aperir un session pro facer te membro de un gruppo." #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Nulle pseudonymo." +msgstr "Nulle pseudonymo o ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s es ora membro del gruppo %2$s" @@ -2101,11 +2268,13 @@ msgstr "%1$s es ora membro del gruppo %2$s" msgid "You must be logged in to leave a group." msgstr "Tu debe aperir un session pro quitar un gruppo." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Tu non es membro de iste gruppo." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s quitava le gruppo %2$s" @@ -2154,13 +2323,15 @@ msgstr "" "contrasigno ante de cambiar tu configurationes." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Aperi un session con tu nomine de usator e contrasigno." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Aperi un session con tu nomine de usator e contrasigno. Non ha ancora un " -"nomine de usator? [Crea](%%action.register%%) un nove conto." +"Non ha ancora un nomine de usator? [Crea](%%action.register%%) un nove conto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2182,8 +2353,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Non pote facer %1$s administrator del gruppo %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Nulle stato actual" +msgid "No current status." +msgstr "Nulle stato actual." #: actions/newapplication.php:52 msgid "New Application" @@ -2217,12 +2388,12 @@ msgstr "Usa iste formulario pro crear un nove gruppo." msgid "New message" msgstr "Nove message" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Tu non pote inviar un message a iste usator." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Nulle contento!" @@ -2230,7 +2401,7 @@ msgstr "Nulle contento!" msgid "No recipient specified." msgstr "Nulle destinatario specificate." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2246,7 +2417,7 @@ msgstr "Message inviate" msgid "Direct message to %s sent." msgstr "Message directe a %s inviate." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Error de Ajax" @@ -2254,7 +2425,7 @@ msgstr "Error de Ajax" msgid "New notice" msgstr "Nove nota" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Nota publicate" @@ -2350,11 +2521,11 @@ msgid "You are not a user of that application." msgstr "Tu non es usator de iste application." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "Impossibile revocar le accesso del application: " +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Impossibile revocar le accesso del application: %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "Tu non ha autorisate alcun application a usar tu conto." @@ -2365,24 +2536,29 @@ msgstr "" "applicationes " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Le nota ha nulle profilo" +msgid "Notice has no profile." +msgstr "Le nota ha nulle profilo." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Le stato de %1$s in %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "typo de contento " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Le typo de contento %s non es supportate." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Solmente " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Solmente le URLs %s es permittite super HTTP simple." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Formato de datos non supportate." @@ -2486,7 +2662,7 @@ msgid "6 or more characters" msgstr "6 o plus characteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Confirmar" @@ -2514,7 +2690,7 @@ msgstr "Ancian contrasigno incorrecte" msgid "Error saving user; invalid." msgstr "Error de salveguardar le usator; invalide." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Non pote salveguardar le nove contrasigno." @@ -2523,7 +2699,7 @@ msgid "Password saved." msgstr "Contrasigno salveguardate." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Camminos" @@ -2533,23 +2709,23 @@ msgstr "Configuration de cammino e servitor pro iste sito StatusNet." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Directorio de thema non legibile: %s" +msgid "Theme directory not readable: %s." +msgstr "Directorio de thema non legibile: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Directorio de avatar non scriptibile: %s" +msgid "Avatar directory not writable: %s." +msgstr "Directorio de avatar non scriptibile: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Directorio de fundo non scriptibile: %s" +msgid "Background directory not writable: %s." +msgstr "Directorio de fundo non scriptibile: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Directorio de localitates non scriptibile: %s" +msgid "Locales directory not readable: %s." +msgstr "Directorio de localitates non scriptibile: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2688,19 +2864,19 @@ msgstr "" msgid "People search" msgstr "Recerca de personas" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Etiquetta de personas invalide: %s" +msgid "Not a valid people tag: %s." +msgstr "Etiquetta de personas invalide: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usatores auto-etiquettate con %1$s - pagina %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Le contento del nota es invalide" +msgid "Invalid notice content." +msgstr "Le contento del nota es invalide." #: actions/postnotice.php:101 #, php-format @@ -2729,13 +2905,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 minusculas o numeros, sin punctuation o spatios" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nomine complete" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pagina personal" @@ -2757,9 +2934,9 @@ msgid "Bio" msgstr "Bio" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Loco" @@ -2773,7 +2950,7 @@ msgstr "Divulgar mi loco actual quando io publica notas" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Etiquettas" @@ -2847,8 +3024,8 @@ msgstr "Preferentias confirmate." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Ultra le limite de pagina (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Ultra le limite de pagina (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3015,7 +3192,7 @@ msgstr "Reinitialisar contrasigno" msgid "Recover password" msgstr "Recuperar contrasigno" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Recuperation de contrasigno requestate" @@ -3035,19 +3212,19 @@ msgstr "Reinitialisar" msgid "Enter a nickname or email address." msgstr "Entra un pseudonymo o adresse de e-mail." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Nulle adresse de e-mail registrate pro iste usator." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Error al salveguardar le confirmation del adresse." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3055,23 +3232,23 @@ msgstr "" "Instructiones pro recuperar tu contrasigno ha essite inviate al adresse de e-" "mail registrate in tu conto." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Reinitialisation inexpectate del contrasigno." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Le contrasigno debe haber 6 characteres o plus." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Contrasigno e confirmation non corresponde." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Error durante le configuration del usator." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte." @@ -3087,7 +3264,7 @@ msgstr "Pardono, le codice de invitation es invalide." msgid "Registration successful" msgstr "Registration succedite" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Crear conto" @@ -3109,7 +3286,7 @@ msgstr "Nomine de usator o contrasigno invalide." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar " @@ -3127,8 +3304,9 @@ msgstr "6 o plus characteres. Requirite." msgid "Same as password above. Required." msgstr "Identic al contrasigno hic supra. Requirite." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mail" @@ -3143,22 +3321,16 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Mi texto e files es disponibile sub le licentia " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Attribution 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -" excepte iste datos private: contrasigno, adresse de e-mail, adresse de " -"messageria instantanee, numero de telephono." +"Mi texto e files es disponibile sub %s excepte iste datos private: " +"contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de " +"telephono." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3190,7 +3362,7 @@ msgstr "" "\n" "Gratias pro inscriber te, e nos spera que iste servicio te place." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3235,7 +3407,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL de tu profilo in un altere servicio de microblogging compatibile" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Subscriber" @@ -3273,7 +3445,7 @@ msgstr "Tu non pote repeter tu proprie nota." msgid "You already repeated that notice." msgstr "Tu ha ja repetite iste nota." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Repetite" @@ -3340,14 +3512,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Responsas a %1$s in %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Tu non pote silentiar usatores in iste sito." +msgstr "Tu non pote revocar rolos de usatores in iste sito." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Usator sin profilo correspondente" +msgstr "Le usator non ha iste rolo." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3363,7 +3533,7 @@ msgstr "Usator es ja in cassa de sablo." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sessiones" @@ -3400,26 +3570,30 @@ msgstr "Tu debe aperir un session pro vider un application." msgid "Application profile" msgstr "Profilo del application" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Icone" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Nomine" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organisation" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Description" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statisticas" @@ -3539,67 +3713,67 @@ msgstr "Gruppo %s" msgid "%1$s group, page %2$d" msgstr "Gruppo %1$s, pagina %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Profilo del gruppo" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Nota" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliases" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Actiones del gruppo" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Syndication de notas pro le gruppo %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Syndication de notas pro le gruppo %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Syndication de notas pro le gruppo %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Amico de un amico pro le gruppo %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Membros" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nulle)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Tote le membros" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Create" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3614,7 +3788,7 @@ msgstr "" "lor vita e interesses. [Crea un conto](%%%%action.register%%%%) pro devenir " "parte de iste gruppo e multe alteres! ([Lege plus](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3627,7 +3801,7 @@ msgstr "" "[StatusNet](http://status.net/). Su membros condivide breve messages super " "lor vita e interesses. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Administratores" @@ -3750,9 +3924,8 @@ msgid "User is already silenced." msgstr "Usator es ja silentiate." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Configurationes de base pro iste sito de StatusNet." +msgstr "Configurationes de base pro iste sito de StatusNet" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." @@ -3768,12 +3941,12 @@ msgid "Unknown language \"%s\"." msgstr "Lingua \"%s\" incognite." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "Le limite minimal del texto es 140 characteres." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Le limite minimal del texto es 0 (illimitate)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." -msgstr "Le limite de duplicatos debe esser 1 o plus secundas." +msgid "Dupe limit must be one or more seconds." +msgstr "Le limite de duplicatos debe esser un o plus secundas." #: actions/siteadminpanel.php:221 msgid "General" @@ -3820,13 +3993,14 @@ msgid "Default timezone for the site; usually UTC." msgstr "Fuso horari predefinite pro le sito; normalmente UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Lingua predefinite del sito" +msgstr "Lingua predefinite" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Le lingua del sito quando le detection automatic ex le configuration del " +"navigator non es disponibile" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3851,76 +4025,99 @@ msgstr "" "publicar le mesme cosa de novo." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" msgstr "Aviso del sito" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nove message" +msgstr "Modificar message a tote le sito" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Impossibile salveguardar le configurationes del apparentia." +msgstr "Impossibile salveguardar le aviso del sito." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Aviso del sito" +msgstr "Texto del aviso del sito" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" +"Le texto del aviso a tote le sito (max. 255 characteres; HTML permittite)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Aviso del sito" +msgstr "Salveguardar aviso del sito" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Parametros de SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Tu pote reciper messages SMS per e-mail ab %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "SMS non es disponibile." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "Adresse SMS" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Numero de telephono actual e confirmate con servicio SMS." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Iste numero de telephono attende confirmation." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Codice de confirmation" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Entra le codice que tu ha recipite in tu telephono." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Confirmar" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Numero de telephono pro SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Numero de telephono, sin punctuation o spatios, con indicativo" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "Preferentias de SMS" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3928,23 +4125,33 @@ msgstr "" "Invia me notas per SMS; io comprende que io pote incurrer exorbitante costos " "de mi operator." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Preferentias de SMS confirmate." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Nulle numero de telephono." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Nulle operator seligite." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Isto es ja tu numero de telephono." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Iste numero de telephono pertine ja a un altere usator." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3952,23 +4159,40 @@ msgstr "" "Un codice de confirmation ha essite inviate al numero de telephono que tu ha " "addite. Vide in tu telephono le codice e le instructiones super como usar lo." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Iste codice de confirmation es incorrecte." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Confirmation de SMS cancellate." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Isto non es tu numero de telephono." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Le numero de telephono pro SMS ha essite removite." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Operator de telephonia mobile" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Selige un operator" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3978,20 +4202,20 @@ msgstr "" "que accepta SMS via e-mail ma non es listate hic, invia e-mail pro informar " "nos a %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Nulle codice entrate" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Instantaneos" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Modificar le configuration del sito" +msgstr "Gerer configuration de instantaneos" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -4006,7 +4230,7 @@ msgid "Invalid snapshot report URL." msgstr "Le URL pro reportar instantaneos es invalide." #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "Aleatorimente durante un accesso web" #: actions/snapshotadminpanel.php:201 @@ -4038,32 +4262,28 @@ msgid "Snapshots will be sent to this URL" msgstr "Le instantaneos essera inviate a iste URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Salveguardar configurationes del sito" +msgstr "Salveguardar configuration de instantaneos" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." msgstr "Tu non es subscribite a iste profilo." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Non poteva salveguardar le subscription." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "Iste action accepta solmente le requestas de typo POST." #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "File non existe." +msgstr "Profilo non existe." #: actions/subscribe.php:117 -#, fuzzy msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "Tu non es subscribite a iste profilo." +msgstr "Tu non pote subscriber te a un profilo remote OMB 0.1 con iste action." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4150,11 +4370,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s non seque alcuno." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4187,12 +4407,12 @@ msgstr "Nulle parametro de ID." msgid "Tag %s" msgstr "Etiquetta %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Profilo del usator" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Photo" @@ -4245,7 +4465,7 @@ msgid "User is not silenced." msgstr "Le usator non es silentiate." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Nulle ID de profilo in requesta." #: actions/unsubscribe.php:98 @@ -4262,7 +4482,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Usator" @@ -4284,7 +4503,8 @@ msgstr "Texto de benvenita invalide. Longitude maximal es 255 characteres." msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Subscription predefinite invalide: '%1$s' non es usator." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profilo" @@ -4446,28 +4666,34 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Bon appetito!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "Gruppos %1$s, pagina %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Cercar altere gruppos" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s non es membro de alcun gruppo." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Tenta [cercar gruppos](%%action.groupsearch%%) e facer te membro de illos." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualisationes de %1$s in %2$s!" @@ -4527,7 +4753,8 @@ msgstr "" msgid "Plugins" msgstr "Plug-ins" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Version" @@ -4535,7 +4762,7 @@ msgstr "Version" msgid "Author(s)" msgstr "Autor(es)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4544,12 +4771,12 @@ msgstr "" "Nulle file pote esser plus grande que %d bytes e le file que tu inviava ha %" "d bytes. Tenta incargar un version minus grande." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Un file de iste dimension excederea tu quota de usator de %d bytes." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Un file de iste dimension excederea tu quota mensual de %d bytes." @@ -4567,9 +4794,8 @@ msgid "Group leave failed." msgstr "Le cancellation del membrato del gruppo ha fallite." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "Non poteva actualisar gruppo." +msgstr "Non poteva actualisar gruppo local." #: classes/Login_token.php:76 #, php-format @@ -4588,27 +4814,28 @@ msgstr "Non poteva inserer message." msgid "Could not update message with new URI." msgstr "Non poteva actualisar message con nove URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" msgstr "Error in base de datos durante insertion del marca (hashtag): %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Problema salveguardar nota. Troppo longe." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Problema salveguardar nota. Usator incognite." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Troppo de notas troppo rapidemente; face un pausa e publica de novo post " "alcun minutas." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4616,307 +4843,319 @@ msgstr "" "Troppo de messages duplicate troppo rapidemente; face un pausa e publica de " "novo post alcun minutas." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Il te es prohibite publicar notas in iste sito." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problema salveguardar nota." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problema salveguardar le cassa de entrata del gruppo." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Tu ha essite blocate del subscription." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Ja subscribite!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Le usator te ha blocate." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Non subscribite!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Non poteva deler auto-subscription." -#: classes/Subscription.php:190 -#, fuzzy +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "Non poteva deler subscription." +msgstr "Non poteva deler le indicio OMB del subscription." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Non poteva deler subscription." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Benvenite a %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Non poteva crear gruppo." -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "Non poteva configurar le membrato del gruppo." +msgstr "Non poteva definir le URL del gruppo." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Non poteva configurar le membrato del gruppo." -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "Non poteva salveguardar le subscription." +msgstr "Non poteva salveguardar le informationes del gruppo local." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Cambiar le optiones de tu profilo" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Incargar un avatar" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Cambiar tu contrasigno" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Modificar le tractamento de e-mail" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Designar tu profilo" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Altere" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Altere optiones" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Altere" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Pagina sin titulo" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Navigation primari del sito" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 -#, fuzzy +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Profilo personal e chronologia de amicos" -#: lib/action.php:433 -#, fuzzy +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Personal" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 -#, fuzzy +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 -#, fuzzy +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "Connecter con servicios" +msgstr "Connecter a servicios" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Connecter" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 -#, fuzzy +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Modificar le configuration del sito" -#: lib/action.php:449 -#, fuzzy +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" -msgstr "Administrator" +msgstr "Admin" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 -#, fuzzy, php-format +#: lib/action.php:455 +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Invitar amicos e collegas a accompaniar te in %s" -#: lib/action.php:456 -#, fuzzy +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Invitar" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 -#, fuzzy +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Terminar le session del sito" -#: lib/action.php:465 -#, fuzzy +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Clauder session" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 -#, fuzzy +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Crear un conto" -#: lib/action.php:473 -#, fuzzy +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Crear conto" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 -#, fuzzy +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Identificar te a iste sito" -#: lib/action.php:479 -#, fuzzy +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Aperir session" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 -#, fuzzy +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Adjuta me!" -#: lib/action.php:485 -#, fuzzy +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Adjuta" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 -#, fuzzy +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Cercar personas o texto" -#: lib/action.php:491 -#, fuzzy +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Cercar" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Aviso del sito" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Vistas local" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Aviso de pagina" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Navigation secundari del sito" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Adjuta" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "A proposito" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "CdS" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Confidentialitate" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Fonte" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Contacto" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Insignia" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Licentia del software StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** es un servicio de microblog offerite per [%%site.broughtby%" -"%](%%site.broughtbyurl%%). " +"%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** es un servicio de microblog. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** es un servicio de microblog." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4927,68 +5166,84 @@ msgstr "" "net/), version %s, disponibile sub le [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Licentia del contento del sito" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Le contento e datos de %1$s es private e confidential." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Contento e datos sub copyright del contributores. Tote le derectos reservate." -#: lib/action.php:847 -msgid "All " -msgstr "Totes " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "Tote le contento e datos de %1$s es disponibile sub le licentia %2$s." -#: lib/action.php:853 -msgid "license." -msgstr "licentia." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Post" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Ante" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" +"Expectava le elemento-radice de un syndication, ma recipeva un documento XML " +"integre." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." -msgstr "" +msgstr "Non pote ancora tractar contento remote." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." -msgstr "" +msgstr "Non pote ancora tractar contento XML incastrate." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." -msgstr "" +msgstr "Non pote ancora tractar contento Base64 incastrate." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Tu non pote facer modificationes in iste sito." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Le modification de iste pannello non es permittite." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() non implementate." @@ -4998,161 +5253,193 @@ msgstr "showForm() non implementate." msgid "saveSettings() not implemented." msgstr "saveSettings() non implementate." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Impossibile deler configuration de apparentia." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Configuration basic del sito" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 -#, fuzzy +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Sito" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Configuration del apparentia" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 -#, fuzzy +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Apparentia" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Configuration del usator" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Usator" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Configuration del accesso" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Configuration del camminos" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Configuration del sessiones" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 -#, fuzzy +#: lib/adminpanelaction.php:397 msgid "Edit site notice" -msgstr "Aviso del sito" +msgstr "Modificar aviso del sito" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 -#, fuzzy +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "Configuration del camminos" +msgstr "Configuration del instantaneos" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Le ressource de API require accesso pro lectura e scriptura, ma tu ha " "solmente accesso pro lectura." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" -"Tentativa de authentication al API fallite, pseudonymo = %1$s, proxy = %2$s, " -"IP = %3$s" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Modificar application" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Icone pro iste application" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Describe tu application in %d characteres" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Describe tu application" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "URL de origine" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "URL del pagina initial de iste application" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "URL de origine" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Organisation responsabile de iste application" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "URL del pagina initial del organisation" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "URL verso le qual rediriger post authentication" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Navigator" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Scriptorio" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Typo de application, navigator o scriptorio" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Lectura solmente" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Lectura e scriptura" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Accesso predefinite pro iste application: lectura solmente, o lectura e " "scriptura" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Cancellar" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "lectura-scriptura" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "lectura solmente" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Accesso \"%2$s\" approbate le %1$s." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Revocar" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Annexos" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Providitor" @@ -5172,37 +5459,56 @@ msgstr "Cambio del contrasigno fallite" msgid "Password changing is not allowed" msgstr "Cambio del contrasigno non permittite" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultatos del commando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Commando complete" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Commando fallite" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Pardono, iste commando non es ancora implementate." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Non existe un nota con iste ID" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Usator non ha ultime nota" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Non poteva trovar un usator con pseudonymo %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Non poteva trovar un usator local con pseudonymo %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Pardono, iste commando non es ancora implementate." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Non ha multe senso pulsar te mesme!" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Pulsata inviate a %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5213,198 +5519,203 @@ msgstr "" "Subscriptores: %2$s\n" "Notas: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Non existe un nota con iste ID" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Usator non ha ultime nota" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Nota marcate como favorite." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Tu es ja membro de iste gruppo" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Non poteva facer le usator %s membro del gruppo %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%s se faceva membro del gruppo %s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Non poteva remover le usator %1$s del gruppo %2$s" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Non poteva remover le usator %s del gruppo %s" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s quitava le gruppo %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Nomine complete: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Loco: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Pagina personal: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "A proposito: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Message troppo longe - maximo es %d characteres, tu inviava %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" +"%s es un profilo remote; tu pote solmente inviar messages directe a usatores " +"super le mesme servitor." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Message directe a %s inviate" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Error durante le invio del message directe." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Non pote repeter tu proprie nota" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Iste nota ha ja essite repetite" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Nota de %s repetite" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Error durante le repetition del nota." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nota troppo longe - maximo es %d characteres, tu inviava %d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Responsa a %s inviate" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Errur durante le salveguarda del nota." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Specifica le nomine del usator al qual subscriber te" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Usator non existe" +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Impossibile subscriber se a profilos OMB per medio de un commando." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Subscribite a %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Specifica le nomine del usator al qual cancellar le subscription" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Subscription a %s cancellate" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Commando non ancora implementate." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notification disactivate." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Non pote disactivar notification." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notification activate." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Non pote activar notification." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "Le commando de apertura de session es disactivate" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Iste ligamine pote esser usate solmente un vice, e es valide durante " "solmente 2 minutas: %s" -#: lib/command.php:692 -#, fuzzy, php-format +#: lib/command.php:761 +#, php-format msgid "Unsubscribed %s" -msgstr "Subscription a %s cancellate" +msgstr "Subscription de %s cancellate" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Tu non es subscribite a alcuno." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Tu es subscribite a iste persona:" msgstr[1] "Tu es subscribite a iste personas:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Necuno es subscribite a te." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Iste persona es subscribite a te:" msgstr[1] "Iste personas es subscribite a te:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Tu non es membro de alcun gruppo." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Tu es membro de iste gruppo:" msgstr[1] "Tu es membro de iste gruppos:" -#: lib/command.php:769 -#, fuzzy +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5454,9 +5765,10 @@ msgstr "" "subscriptions - listar le personas que tu seque\n" "subscribers - listar le personas qui te seque\n" "leave - cancellar subscription al usator\n" -"d - diriger message al usator\n" -"get - obtener ultime nota del usator\n" +"d - diriger un message al usator\n" +"get - obtener le ultime nota del usator\n" "whois - obtener info de profilo del usator\n" +"lose - fortiar le usator de cessar de sequer te\n" "fav - adder ultime nota del usator como favorite\n" "fav # - adder nota con le ID date como favorite\n" "repeat # - repeter le nota con le ID date\n" @@ -5483,19 +5795,19 @@ msgstr "" "tracks - non ancora implementate.\n" "tracking - non ancora implementate.\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Nulle file de configuration trovate. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Io cercava files de configuration in le sequente locos: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Considera executar le installator pro reparar isto." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir al installator." @@ -5597,7 +5909,7 @@ msgstr "Ir" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Conceder le rolo \"%s\" a iste usator" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5669,53 +5981,54 @@ msgstr "Gruppos con le plus messages" msgid "Tags in %s group's notices" msgstr "Etiquettas in le notas del gruppo %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Iste pagina non es disponibile in un formato que tu accepta" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Formato de file de imagine non supportate." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Iste file es troppo grande. Le dimension maximal es %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Incargamento partial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error de systema durante le incargamento del file." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Le file non es un imagine o es defectuose." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato de file de imagine non supportate." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "File perdite." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Typo de file incognite" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "KB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Fonte de cassa de entrata \"%s\" incognite" @@ -5736,11 +6049,13 @@ msgstr "Aperir session con nomine de usator e contrasigno" msgid "Sign up for a new account" msgstr "Crear un nove conto" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Confirmation del adresse de e-mail" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5769,12 +6084,14 @@ msgstr "" "Gratias pro tu attention,\n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s seque ora tu notas in %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5799,17 +6116,20 @@ msgstr "" "----\n" "Cambia tu adresse de e-mail o optiones de notification a %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Bio: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Nove adresse de e-mail pro publicar in %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5830,21 +6150,31 @@ msgstr "" "Cordialmente,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Stato de %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Confirmation SMS" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "%s: confirma que tu possede iste numero de telephono con iste codice:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "%s te ha pulsate" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5871,12 +6201,14 @@ msgstr "" "Con salutes cordial,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Nove message private de %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5909,12 +6241,14 @@ msgstr "" "Con salutes cordial,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) ha addite tu nota como favorite" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5952,12 +6286,25 @@ msgstr "" "Cordialmente,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"Le conversation complete pote esser legite hic:\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) ha inviate un nota a tu attention" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5970,18 +6317,41 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"%1$s (@%9$s) inviava ante un momento un nota a tu attention (un 'responsa " -"@') in %2$s.\n" +"%1$s (@%9$s) ha inviate un nota a tu attention (un '@-responsa') in %2$s.\n" "\n" "Le nota es hic:\n" "\n" "%3$s\n" "\n" -"Le texto:\n" +"Illo dice:\n" "\n" "%4$s\n" "\n" +"%5$sTu pote responder hic:\n" +"\n" +"%6$s\n" +"\n" +"Le lista de tote le @-responsas pro te es hic:\n" +"\n" +"%7$s\n" +"\n" +"Cordialmente,\n" +"%2$s\n" +"\n" +"P.S. Tu pote disactivar iste notificationes electronic hic: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5996,7 +6366,7 @@ msgstr "" "altere usatores in conversation. Altere personas pote inviar te messages que " "solmente tu pote leger." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "de" @@ -6090,7 +6460,6 @@ msgid "Available characters" msgstr "Characteres disponibile" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Inviar" @@ -6128,48 +6497,52 @@ msgstr "" "Pardono, le obtention de tu geolocalisation prende plus tempore que " "previste. Per favor reproba plus tarde." -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "S" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "E" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "W" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "a" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "in contexto" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Repetite per" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Responder a iste nota" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Nota repetite" @@ -6193,6 +6566,10 @@ msgstr "Error durante le insertion del nove profilo" msgid "Error inserting avatar" msgstr "Error durante le insertion del avatar" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Error in actualisar le profilo remote" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Error durante le insertion del profilo remote" @@ -6242,7 +6619,7 @@ msgstr "Etiquettas in le notas de %s" msgid "Unknown" msgstr "Incognite" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscriptiones" @@ -6250,31 +6627,32 @@ msgstr "Subscriptiones" msgid "All subscriptions" msgstr "Tote le subscriptiones" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscriptores" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Tote le subscriptores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ID del usator" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Membro depost" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Media de cata die" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Tote le gruppos" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Nulle parametro return-to." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Methodo non implementate." @@ -6298,20 +6676,28 @@ msgstr "In evidentia" msgid "Popular" msgstr "Popular" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Nulle parametro return-to." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Repeter iste nota?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Si" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Repeter iste nota" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Blocar iste usator de iste gruppo" +msgstr "Revocar le rolo \"%s\" de iste usator" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "Nulle signule usator definite pro le modo de singule usator." @@ -6437,92 +6823,108 @@ msgstr "Cancellar subscription a iste usator" msgid "Unsubscribe" msgstr "Cancellar subscription" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "Le usator %s (%d) non ha un profilo." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modificar avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Actiones de usator" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Deletion del usator in curso…" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Modificar configuration de profilo" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Modificar" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Inviar un message directe a iste usator" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Message" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Moderar" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "Profilo del usator" +msgstr "Rolo de usator" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Administratores" +msgstr "Administrator" -#: lib/userprofile.php:355 -#, fuzzy +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "Moderar" +msgstr "Moderator" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "alcun secundas retro" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "circa un minuta retro" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "circa %d minutas retro" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "circa un hora retro" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "circa %d horas retro" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "circa un die retro" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "circa %d dies retro" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "circa un mense retro" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "circa %d menses retro" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "circa un anno retro" @@ -6536,7 +6938,7 @@ msgstr "%s non es un color valide!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s non es un color valide! Usa 3 o 6 characteres hexadecimal." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d." diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 3c8f33565d..34f87d2441 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:12+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:27+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -23,7 +23,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 #, fuzzy msgid "Access" msgstr "Samþykkja" @@ -79,7 +79,13 @@ msgstr "" msgid "Save access settings" msgstr "Stillingar fyrir mynd" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -89,7 +95,7 @@ msgstr "Vista" #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy -msgid "No such page" +msgid "No such page." msgstr "Ekkert þannig merki." #: actions/all.php:75 actions/allrss.php:68 @@ -100,9 +106,9 @@ msgstr "Ekkert þannig merki." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -110,11 +116,9 @@ msgstr "Ekkert þannig merki." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Enginn svoleiðis notandi." @@ -126,8 +130,9 @@ msgstr "%s og vinirnir, síða %d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -185,8 +190,10 @@ msgstr "" msgid "You and friends" msgstr "" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Færslur frá %1$s og vinum á %2$s!" @@ -201,18 +208,18 @@ msgstr "Færslur frá %1$s og vinum á %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Aðferð í forritsskilum fannst ekki!" @@ -226,15 +233,15 @@ msgstr "Aðferð í forritsskilum fannst ekki!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Þessi aðferð krefst POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -247,7 +254,7 @@ msgstr "Gat ekki uppfært notanda." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Notandi hefur enga persónulega síðu." @@ -258,9 +265,9 @@ msgid "Could not save profile." msgstr "Gat ekki vistað persónulega síðu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -345,7 +352,7 @@ msgstr "Engin staða fundin með þessu kenni." msgid "This status is already a favorite." msgstr "Þetta babl er nú þegar í uppáhaldi!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Gat ekki búið til uppáhald." @@ -439,11 +446,10 @@ msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)." msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 -#, php-format -msgid "Invalid alias: \"%s\"" -msgstr "" +#: actions/apigroupcreate.php:266 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"." +msgstr "Ógilt merki: \"%s\"" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -460,7 +466,7 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy -msgid "Group not found!" +msgid "Group not found." msgstr "Aðferð í forritsskilum fannst ekki!" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 @@ -468,7 +474,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!" msgid "You are already a member of that group." msgstr "Þú ert nú þegar meðlimur í þessum hópi" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -487,17 +493,26 @@ msgstr "Þú ert ekki meðlimur í þessum hópi." msgid "Could not remove user %1$s from group %2$s." msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, fuzzy, php-format msgid "%s's groups" msgstr "Hópar %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Hópar sem %s er meðlimur í" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Hópar %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, fuzzy, php-format msgid "groups on %s" msgstr "Hópsaðgerðir" @@ -512,17 +527,17 @@ msgid "Invalid token." msgstr "Ótæk stærð." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -556,12 +571,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Bjóst ekki við innsendingu eyðublaðs." @@ -581,20 +599,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Aðgangur" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Stuttnefni" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Lykilorð" @@ -642,17 +662,17 @@ msgstr "" msgid "No status with that ID found." msgstr "Engin staða með þessu kenni fannst." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Fannst ekki" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Fannst ekki." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -662,12 +682,12 @@ msgstr "" msgid "Unsupported format." msgstr "Skráarsnið myndar ekki stutt." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Uppáhaldsbabl frá %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s." @@ -677,17 +697,17 @@ msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s." msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Almenningsrás %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s færslur frá öllum!" @@ -702,20 +722,16 @@ msgstr "Svör við %s" msgid "Repeats of %s" msgstr "Svör við %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Babl merkt með %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Fannst ekki." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "" @@ -735,8 +751,9 @@ msgstr "Engin stærð." msgid "Invalid size." msgstr "Ótæk stærð." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Mynd" @@ -746,9 +763,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." msgstr "Notandi með enga persónulega síðu sem passar við" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -767,7 +785,7 @@ msgid "Preview" msgstr "Forsýn" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Eyða" @@ -779,24 +797,29 @@ msgstr "Hlaða upp" msgid "Crop" msgstr "Skera af" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Engin persónuleg síða tilgreind" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Týndum skráargögnunum okkar" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Mynd hefur verið uppfærð." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Mistókst að uppfæra mynd" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "" @@ -805,7 +828,7 @@ msgstr "" msgid "You already blocked that user." msgstr "Þú hefur nú þegar lokað á þennan notanda." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Loka á notanda" @@ -816,28 +839,45 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "Nei" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Opna á þennan notanda" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "Já" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Loka á þennan notanda" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Mistókst að vista upplýsingar um notendalokun" @@ -850,8 +890,8 @@ msgstr "Mistókst að vista upplýsingar um notendalokun" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Enginn þannig hópur." @@ -881,9 +921,10 @@ msgstr "Opna" msgid "Unblock this user" msgstr "Opna á þennan notanda" -#: actions/bookmarklet.php:50 -#, fuzzy -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" msgstr "Ljósmynd" #: actions/confirmaddress.php:75 @@ -898,34 +939,44 @@ msgstr "Staðfestingarlykill fannst ekki." msgid "That confirmation code is not for you!" msgstr "Þessi staðfestingarlykill er ekki fyrir þig!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "Óþekkt gerð tölvupóstfangs %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Þetta tölvupóstfang hefur nú þegar verið staðfest." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Gat ekki uppfært notanda." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Gat ekki eytt tölvupóstsstaðfestingu." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "Staðfesta tölvupóstfang" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "" @@ -936,7 +987,7 @@ msgid "Conversation" msgstr "" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Babl" @@ -958,7 +1009,7 @@ msgstr "Þú ert ekki meðlimur í þessum hópi." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Það komu upp vandamál varðandi setutókann þinn." @@ -974,17 +1025,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "Gat ekki uppfært hóp." -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "Eyða þessu babli" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1013,11 +1066,13 @@ msgstr "Eyða babli" msgid "Are you sure you want to delete this notice?" msgstr "Ertu viss um að þú viljir eyða þessu babli?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Eyða þessu babli" @@ -1042,132 +1097,136 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 #, fuzzy msgid "Delete this user" msgstr "Eyða þessu babli" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "Ótæk stærð." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "Þessi síða er ekki aðgengileg í " -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "Breyta" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 #, fuzzy msgid "Site logo" msgstr "Bjóða" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "Breyta" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "Babl vefsíðunnar" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 #, fuzzy msgid "Theme for the site." msgstr "Skrá þig út af síðunni" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Texti" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Vista" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1284,11 +1343,16 @@ msgstr "Notaðu þetta eyðublað til að breyta hópnum." msgid "description is too long (max %d chars)." msgstr "Lýsing er of löng (í mesta lagi 140 tákn)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Gat ekki uppfært hóp." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "" @@ -1296,32 +1360,45 @@ msgstr "" msgid "Options saved." msgstr "Valmöguleikar vistaðir." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "Tölvupóstsstillingar" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Stilla það hvernig þú færð tölvupóst frá %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Tölvupóstfang" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "Tölvupóstföng" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Núverandi staðfesta tölvupóstfangið." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "Fjarlægja" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1329,107 +1406,141 @@ msgstr "" "Býð eftir staðfestingu frá þessu netfangi. Athugaðu innhólfið þitt (og " "ruslpóstinn þinn!). Þar ættu að vera skilaboð með ítarlegri leiðbeiningum." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "Hætta við" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "Tölvupóstföng" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Tölvupóstfang eins og \"notandi@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "Bæta við" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Móttökutölvupóstur" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Sendu tölvupóst á þetta póstfang til þess að senda inn nýtt babl." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Búa til nýtt tölvupóstfang til að senda til. Skrifar yfir það gamla." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "Nýtt" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "Stillingar" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Sendu mér tilkynningu varðandi nýjar áskriftir í gegnum tölvupóst." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Leyfa vinum að ýta við mér og senda mér tölvupóst." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Ég vil babla í gegnum tölvupóst." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Birta MicroID fyrir tölvupóstfangið mitt." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." msgstr "Stillingar vistaðar." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Ekkert tölvupóstfang." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Get ekki staðlað þetta tölvupóstfang" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Ekki tækt tölvupóstfang." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Þetta er nú þegar tölvupóstfangið þitt." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Gat ekki sett inn staðfestingarlykil." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1438,43 +1549,56 @@ msgstr "" "Athugaðu innhólfið þitt (og ruslpóstinn þinn!). Þar ætti " "staðfestingarlykillinn að vera og leiðbeingar um hvernig eigi að nota hann. " -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Engin staðfesting í bið sem þarf að hætta við." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "Þetta er rangt snarskilaboðafang." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "Hætt við staðfestingu." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Þetta er ekki tölvupóstfangið þitt." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "Tölvupóstfangið hefur verið fjarlægt." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Ekkert móttökutölvupóstfang." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Gat ekki uppfært skráarfærslu notanda." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Móttökutölvupóstfang fjarlægt." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Nýju móttökutölvupóstfangi bætt við." @@ -1594,8 +1718,9 @@ msgstr "Gat ekki breytt beiðnistókum í aðgangstóka." msgid "Remote service uses unknown version of OMB protocol." msgstr "Óþekkt útgáfa OMB samskiptamátans." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu" #: actions/getfile.php:79 @@ -1656,11 +1781,11 @@ msgstr "" msgid "User is not a member of group." msgstr "" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1668,15 +1793,17 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1718,11 +1845,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "Notandi með enga persónulega síðu sem passar við" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1753,34 +1875,38 @@ msgstr "Listi yfir notendur í þessum hóp." msgid "Admin" msgstr "Stjórnandi" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Loka" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Rás %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Færslur frá %1$s á %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Hópar" @@ -1800,7 +1926,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Búa til nýjan hóp" @@ -1846,12 +1972,16 @@ msgstr "" msgid "Error removing the block." msgstr "Vill kom upp við að aflétta notendalokun." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "Snarskilaboðastillingar" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1861,16 +1991,26 @@ msgstr "" "[snarskilaboðaþjónustuna](%%doc.im%%). Settu upp netfangið þitt hér fyrir " "neðan og stilltu notkunina." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 #, fuzzy msgid "IM is not available." msgstr "Þessi síða er ekki aðgengileg í " -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "Snarskilaboðafang" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Núverandi staðfesta Jabber/GTalk snarskilaboðafangið." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1880,12 +2020,9 @@ msgstr "" "þinn. Þar ættu að vera skilaboð með ítarlegri leiðbeiningum. (Hefurðu bætt %" "s við í vinalistann þinn?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "Snarskilaboðafang" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1895,44 +2032,66 @@ msgstr "" "viss um að bæta %s við í vinalistann þinn í snarskilaboðaforritinu þínu eða " "á GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Stillingar" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Sendur mér babl í gegnum Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Senda inn babl þegar Jabber/GTalk staðan breytist." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Sendu mér svör í gegnum Jabber/GTalk frá fólki sem ég er ekki áskrifandi að." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Birta MicroID fyrir Jabber/GTalk netfangið mitt." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Stillingar vistaðar." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Ekkert Jabber-kenni" -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Get ekki staðlað þetta Jabber kenni" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Ekki tækt Jabber-kenni" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Þetta er nú þegar Jabber-kennið þitt." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber-kennið tilheyrir öðrum notanda." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1941,10 +2100,35 @@ msgstr "" "Staðfestingarlykill var sendur á snarskilaboðafangið sem þú varst að bæta " "við. Þú verður að leyfa %s að senda snarskilaboð til þín." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Þetta er rangt snarskilaboðafang." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Gat ekki eytt tölvupóstsstaðfestingu." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "Hætt við staðfestingu." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Þetta er ekki Jabber-kennið þitt." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Tölvupóstfangið hefur verið fjarlægt." + #: actions/inbox.php:59 #, fuzzy, php-format msgid "Inbox for %1$s - page %2$d" @@ -1965,8 +2149,8 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "Þú verður að vera innskráð(ur) til að geta boðið öðrum að nota %s" #: actions/invite.php:72 @@ -1986,7 +2170,9 @@ msgstr "Bjóða nýjum notendum að vera með" msgid "You are already subscribed to these users:" msgstr "Þú ert nú þegar í áskrift að þessum notendum:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2039,12 +2225,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Senda" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s hefur boðið þér að slást í hópinn með þeim á %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2110,7 +2298,9 @@ msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp." msgid "No nickname or ID." msgstr "Ekkert stuttnefni." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s bætti sér í hópinn %s" @@ -2119,11 +2309,13 @@ msgstr "%s bætti sér í hópinn %s" msgid "You must be logged in to leave a group." msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s gekk úr hópnum %s" @@ -2172,10 +2364,14 @@ msgstr "" "lykilorð áður en þú breytir stillingunum þínum." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Skráðu þig inn með notendanafni og lykilorði" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Skráðu þig inn með notendanafninu þínu og lykilorði. Ertu ekki með " "notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu [OpenID](%%" @@ -2201,7 +2397,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "Engin núverandi staða" #: actions/newapplication.php:52 @@ -2240,12 +2437,12 @@ msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp." msgid "New message" msgstr "Ný skilaboð" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Þú getur ekki sent þessum notanda skilaboð." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Ekkert innihald!" @@ -2253,7 +2450,7 @@ msgstr "Ekkert innihald!" msgid "No recipient specified." msgstr "Enginn móttökuaðili tilgreindur." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2269,7 +2466,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "Bein skilaboð send til %s" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax villa" @@ -2277,7 +2474,7 @@ msgstr "Ajax villa" msgid "New notice" msgstr "Nýtt babl" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Babl sent inn" @@ -2371,11 +2568,11 @@ msgid "You are not a user of that application." msgstr "Þú ert ekki meðlimur í þessum hópi." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2384,24 +2581,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "Babl hefur enga persónulega síðu" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Staða %1$s á %2$s" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." msgstr "" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -2512,7 +2715,7 @@ msgid "6 or more characters" msgstr "6 eða fleiri tákn" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Staðfesta" @@ -2540,7 +2743,7 @@ msgstr "Rangt eldra lykilorð" msgid "Error saving user; invalid." msgstr "Villa kom upp í vistun notanda: ótækt." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Get ekki vistað nýja lykilorðið." @@ -2549,7 +2752,7 @@ msgid "Password saved." msgstr "Lykilorð vistað." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2559,23 +2762,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "Þessi síða er ekki aðgengileg í " #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Þessi síða er ekki aðgengileg í " #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "Þessi síða er ekki aðgengileg í " #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "Þessi síða er ekki aðgengileg í " #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2725,18 +2928,19 @@ msgstr "" msgid "People search" msgstr "Leit að fólki" -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "Ekki gilt persónumerki: %s" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Notendur sjálfmerktir með %s - síða %d" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "Ótækt bablinnihald" #: actions/postnotice.php:101 @@ -2764,13 +2968,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullt nafn" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Heimasíða" @@ -2795,9 +3000,9 @@ msgid "Bio" msgstr "Lýsing" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Staðsetning" @@ -2811,7 +3016,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Merki" @@ -2887,7 +3092,7 @@ msgstr "Stillingar vistaðar." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -3042,7 +3247,7 @@ msgstr "Endurstilla lykilorð" msgid "Recover password" msgstr "Endurheimta lykilorð" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn" @@ -3062,19 +3267,19 @@ msgstr "Endurstilla" msgid "Enter a nickname or email address." msgstr "Sláðu inn stuttnefni eða tölvupóstfang." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Enginn notandi með þetta tölvupóstfang eða notendanafn" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Ekkert tölvupóstfang á skrá fyrir þennan notanda." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Villa kom upp í vistun netfangsstaðfestingar." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3082,23 +3287,23 @@ msgstr "" "Leiðbeiningar um það hvernig þú getur endurheimt lykilorðið þitt hafa verið " "sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Bjóst ekki við endurstillingu lykilorðs." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Lykilorð verður að vera 6 tákn eða fleiri." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Lykilorð og staðfesting passa ekki saman." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Villa kom upp í stillingu notanda." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)" @@ -3114,7 +3319,7 @@ msgstr "" msgid "Registration successful" msgstr "Nýskráning tókst" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Nýskrá" @@ -3136,7 +3341,7 @@ msgstr "Ótækt notendanafn eða lykilorð." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3153,8 +3358,9 @@ msgstr "6 eða fleiri tákn. Nauðsynlegt" msgid "Same as password above. Required." msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Tölvupóstur" @@ -3168,20 +3374,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Textinn og skrárnar mínar eru aðgengilegar undir " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -#: actions/register.php:538 +#: actions/register.php:542 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3214,7 +3413,7 @@ msgstr "" "\n" "Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3259,7 +3458,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Gerast áskrifandi" @@ -3304,7 +3503,7 @@ msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið." msgid "You already repeated that notice." msgstr "Þú hefur nú þegar lokað á þennan notanda." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "Í sviðsljósinu" @@ -3391,7 +3590,7 @@ msgstr "" #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3431,28 +3630,32 @@ msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp." msgid "Application profile" msgstr "Babl hefur enga persónulega síðu" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "Stuttnefni" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "Uppröðun" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Lýsing" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Tölfræði" @@ -3563,67 +3766,67 @@ msgstr "%s hópurinn" msgid "%1$s group, page %2$d" msgstr "Hópmeðlimir %s, síða %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Hópssíðan" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "Vefslóð" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Athugasemd" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Hópsaðgerðir" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "%s hópurinn" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Meðlimir" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ekkert)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Allir meðlimir" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3633,7 +3836,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3642,7 +3845,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "" @@ -3772,11 +3975,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3871,7 +4074,7 @@ msgid "Unable to save site notice." msgstr "Vandamál komu upp við að vista babl." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3888,47 +4091,77 @@ msgstr "" msgid "Save site notice" msgstr "Babl vefsíðunnar" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "SMS stillingar" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Þú getur fengið SMS í gegnum tölvupóst frá %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "Þessi síða er ekki aðgengileg í " -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "Snarskilaboðafang" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Núverandi staðfesta SMS símanúmerið." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Býð eftir staðfestingu varðandi þetta símanúmer." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Staðfestingarlykill" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Sláðu inn lykilinn sem þú fékkst í símann þinn." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Staðfesta" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 #, fuzzy msgid "SMS phone number" msgstr "SMS símanúmer" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Símanúmer, með svæðisnúmeri ef við á, án greinarmerkja eða bila" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Stillingar" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3936,45 +4169,75 @@ msgstr "" "Sendu mér babl í gegnum SMS. Ég veit að það er möguleiki að " "farsímafyrirtækið rukki fyrir móttöku á SMSunum." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "Stillingar vistaðar." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Ekkert símanúmer." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Ekkert farsímafélag valið." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Þetta er nú þegar símanúmerið þitt." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Þetta símanúmer tilheyri nú þegar öðrum notanda." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Þetta er rangur staðfestingarlykill." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Hætt við staðfestingu." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Þetta er ekki símanúmerið þitt." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "SMS símanúmer" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Farsímafyrirtæki" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Veldu farsímafyrirtæki" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3984,13 +4247,14 @@ msgstr "" "gegnum tölvupóst sem er ekki í þessum lista, sendu okkur tölvupóst í %s og " "láttu okkur vita." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Enginn lykill sleginn inn" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -4012,7 +4276,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4052,8 +4316,7 @@ msgstr "Stillingar fyrir mynd" msgid "You are not subscribed to that profile." msgstr "Þú ert ekki áskrifandi." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Gat ekki vistað áskrift." @@ -4146,11 +4409,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber snarskilaboðaþjónusta" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4184,12 +4447,12 @@ msgstr "Ekkert einkenni gefið upp." msgid "Tag %s" msgstr "Merki %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Persónuleg síða notanda" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Ljósmynd" @@ -4246,7 +4509,8 @@ msgid "User is not silenced." msgstr "Notandi hefur enga persónulega síðu." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +#, fuzzy +msgid "No profile ID in request." msgstr "Ekkert einkenni persónulegrar síðu í beiðni." #: actions/unsubscribe.php:98 @@ -4283,7 +4547,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Persónuleg síða" @@ -4453,27 +4718,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "Hópmeðlimir %s, síða %d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Færslur frá %1$s á %2$s!" @@ -4521,7 +4792,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Persónulegt" @@ -4530,19 +4802,19 @@ msgstr "Persónulegt" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4585,161 +4857,175 @@ msgstr "Gat ekki skeytt skilaboðum inn í." msgid "Could not update message with new URI." msgstr "Gat ekki uppfært skilaboð með nýju veffangi." -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Gat ekki vistað babl. Óþekktur notandi." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar " "mínútur." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Notandinn hefur lokað á þig." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Ekki í áskrift!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Gat ekki eytt áskrift." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Gat ekki eytt áskrift." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Gat ekki eytt áskrift." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Gat ekki búið til hóp." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Gat ekki skráð hópmeðlimi." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Gat ekki skráð hópmeðlimi." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Gat ekki vistað áskrift." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Breyta persónulegu stillingunum þínum" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Hlaða upp einkennismynd" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Breyta lykilorðinu þínu" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Breyta tölvupóstumsjón" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Annað" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Aðrir valkostir" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Annað" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%1$s (%2$s)" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Ónafngreind síða" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Stikl aðalsíðu" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 #, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Persónuleg síða og vinarás" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Persónulegt" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" @@ -4748,102 +5034,107 @@ msgstr "" "persónulegu síðunni þinni" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Gat ekki framsent til vefþjóns: %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Tengjast" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Stikl aðalsíðu" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Stjórnandi" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Bjóða" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 #, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Skrá þig út af síðunni" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Útskráning" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Búa til aðgang" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "Nýskrá" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 #, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Skrá þig inn á síðuna" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "Innskráning" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Hjálp!" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "Hjálp" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 #, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Leita að fólki eða texta" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4851,73 +5142,87 @@ msgstr "Leita" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Babl vefsíðunnar" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Staðbundin sýn" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Babl síðunnar" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Stikl undirsíðu" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Hjálp" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Um" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "Spurt og svarað" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Friðhelgi" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Frumþula" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Tengiliður" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Hugbúnaðarleyfi StatusNet" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** er örbloggsþjónusta." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4928,70 +5233,84 @@ msgstr "" "sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "Hugbúnaðarleyfi StatusNet" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "Allt " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "leyfi." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Uppröðun" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Eftir" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Áður" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 #, fuzzy msgid "You cannot make changes to this site." msgstr "Þú getur ekki sent þessum notanda skilaboð." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 #, fuzzy msgid "Changes to that panel are not allowed." msgstr "Nýskráning ekki leyfð." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 #, fuzzy msgid "showForm() not implemented." @@ -5003,166 +5322,204 @@ msgstr "Skipun hefur ekki verið fullbúin" msgid "saveSettings() not implemented." msgstr "Skipun hefur ekki verið fullbúin" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "Staðfesting tölvupóstfangs" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "Bjóða" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "SMS staðfesting" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "Persónulegt" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "SMS staðfesting" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Notandi" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "SMS staðfesting" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "SMS staðfesting" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "SMS staðfesting" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "Babl vefsíðunnar" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "SMS staðfesting" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Frumþula" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "Frumþula" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Hætta við" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "Fjarlægja" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "" @@ -5184,37 +5541,57 @@ msgstr "Lykilorðabreyting" msgid "Password changing is not allowed" msgstr "Lykilorðabreyting" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Niðurstöður skipunar" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Fullkláruð skipun" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Misheppnuð skipun" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Enginn persónuleg síða með þessu einkenni." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Notandi hefur ekkert nýtt babl" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Ýtt við notanda" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5222,203 +5599,207 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Enginn persónuleg síða með þessu einkenni." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Notandi hefur ekkert nýtt babl" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Babl gert að uppáhaldi." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Þú ert nú þegar meðlimur í þessum hópi" -#: lib/command.php:231 -#, php-format -msgid "Could not join user %s to group %s" +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s" msgstr "Gat ekki bætt notandanum %s í hópinn %s" -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s bætti sér í hópinn %s" - -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s gekk úr hópnum %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Fullt nafn: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Staðsetning: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Heimasíða: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Um: %s" -#: lib/command.php:349 +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" -#: lib/command.php:367 +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Bein skilaboð send til %s" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Villa kom upp við að senda bein skilaboð" -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "Eyða þessu babli" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Babl sent inn" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:482 +#: lib/command.php:562 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svara þessu babli" -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Enginn svoleiðis notandi." +#: lib/command.php:628 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Nú ert þú áskrifandi að %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Nú ert þú ekki lengur áskrifandi að %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Skipun hefur ekki verið fullbúin" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Tilkynningar af." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Get ekki slökkt á tilkynningum." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Tilkynningar á." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Nú ert þú ekki lengur áskrifandi að %s" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:" msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér." msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Þú ert ekki meðlimur í þessum hópi." msgstr[1] "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5460,20 +5841,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Enginn staðfestingarlykill." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Skrá þig inn á síðuna" @@ -5648,54 +6029,55 @@ msgstr "Hóparnir með mesta bablið" msgid "Tags in %s group's notices" msgstr "Merki í babli %s hópsins" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" "Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Skráarsnið myndar ekki stutt." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Upphal að hluta til." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Kerfisvilla kom upp við upphal skráar." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Annaðhvort ekki mynd eða þá að skráin er gölluð." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Skráarsnið myndar ekki stutt." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Týndum skránni okkar" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Óþekkt skráargerð" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5716,11 +6098,13 @@ msgstr "Skráðu þig inn með notendanafni og lykilorði" msgid "Sign up for a new account" msgstr "Búðu til nýjan aðgang" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Staðfesting tölvupóstfangs" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5737,12 +6121,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s er að hlusta á bablið þitt á %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5757,19 +6143,22 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Lýsing: %s\n" "\n" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Nýtt tölvupóstfang til að senda á %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5790,21 +6179,31 @@ msgstr "" "Með kærri kveðju,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Staða %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS staðfesting" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "Býð eftir staðfestingu varðandi þetta símanúmer." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "%s ýtti við þér" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5820,12 +6219,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Ný persónuleg skilaboð frá %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5844,12 +6245,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s heldur upp á babl frá þér" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5870,12 +6273,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5888,6 +6301,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5900,7 +6325,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 #, fuzzy msgid "from" msgstr "frá" @@ -6030,50 +6455,54 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 #, fuzzy msgid "N" msgstr "Nei" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "Í sviðsljósinu" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Svara þessu babli" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Svara" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "Babl sent inn" @@ -6098,6 +6527,10 @@ msgstr "Villa kom upp við að setja inn nýja persónulega síðu" msgid "Error inserting avatar" msgstr "Villa kom upp við að setja inn mynd" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Villa kom upp við að setja inn persónulega fjarsíðu" @@ -6149,7 +6582,7 @@ msgstr "Merki í babli %s" msgid "Unknown" msgstr "Óþekkt aðgerð" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Áskriftir" @@ -6157,32 +6590,32 @@ msgstr "Áskriftir" msgid "All subscriptions" msgstr "Allar áskriftir" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Áskrifendur" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Allir áskrifendur" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Meðlimur síðan" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Allir hópar" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "Ekkert einkenni gefið upp." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6206,11 +6639,20 @@ msgstr "Í sviðsljósinu" msgid "Popular" msgstr "Vinsælt" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "Ekkert einkenni gefið upp." + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "Svara þessu babli" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Já" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6221,7 +6663,7 @@ msgstr "Svara þessu babli" msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6353,90 +6795,109 @@ msgstr "Hætta sem áskrifandi að þessum notanda" msgid "Unsubscribe" msgstr "Fara úr áskrift" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Notandi hefur enga persónulega síðu." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Notandaaðgerðir" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Senda bein skilaboð til þessa notanda" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Skilaboð" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "Persónuleg síða notanda" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "fyrir um einum degi síðan" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "fyrir um einu ári síðan" @@ -6450,7 +6911,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 1bd3f26adb..de429fe9b6 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:15+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:37+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -22,7 +22,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Accesso" @@ -74,7 +74,13 @@ msgstr "Chiuso" msgid "Save access settings" msgstr "Salva impostazioni di accesso" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Salva" @@ -82,7 +88,7 @@ msgstr "Salva" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +msgid "No such page." msgstr "Pagina inesistente." #: actions/all.php:75 actions/allrss.php:68 @@ -93,9 +99,9 @@ msgstr "Pagina inesistente." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -103,11 +109,9 @@ msgstr "Pagina inesistente." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Utente inesistente." @@ -119,8 +123,9 @@ msgstr "%1$s e amici, pagina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -187,8 +192,10 @@ msgstr "" msgid "You and friends" msgstr "Tu e i tuoi amici" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Messaggi da %1$s e amici su %2$s!" @@ -203,18 +210,18 @@ msgstr "Messaggi da %1$s e amici su %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Metodo delle API non trovato." @@ -227,18 +234,18 @@ msgstr "Metodo delle API non trovato." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Questo metodo richiede POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" "È necessario specificare un parametro chiamato \"device\" con un valore tra: " -"\"sms\", \"im\" o \"none\"" +"\"sms\", \"im\" o \"none\"." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -249,7 +256,7 @@ msgstr "Impossibile aggiornare l'utente." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "L'utente non ha un profilo." @@ -259,9 +266,9 @@ msgid "Could not save profile." msgstr "Impossibile salvare il profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -345,7 +352,7 @@ msgstr "Nessuno messaggio trovato con quel ID." msgid "This status is already a favorite." msgstr "Questo messaggio è già un preferito." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Impossibile creare un preferito." @@ -437,11 +444,10 @@ msgstr "Ubicazione troppo lunga (max 255 caratteri)." msgid "Too many aliases! Maximum %d." msgstr "Troppi alias! Massimo %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Alias non valido: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Alias non valido: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -457,14 +463,14 @@ msgstr "L'alias non può essere lo stesso del soprannome." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Gruppo non trovato!" +msgid "Group not found." +msgstr "Gruppo non trovato." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Fai già parte di quel gruppo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo." @@ -482,17 +488,26 @@ msgstr "Non fai parte di questo gruppo." msgid "Could not remove user %1$s from group %2$s." msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Gruppi di %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Gruppi del sito %1$s a cui %2$s è iscritto." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Gruppi di %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "Gruppi su %s" @@ -506,17 +521,17 @@ msgid "Invalid token." msgstr "Token non valido." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -550,12 +565,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "Il token di richiesta %s è stato rifiutato o revocato." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Invio del modulo inaspettato." @@ -578,20 +596,22 @@ msgstr "" "%3$s ai dati del tuo account %4$s. È consigliato fornire " "accesso al proprio account %4$s solo ad applicazioni di cui ci si può fidare." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Account" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Soprannome" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Password" @@ -636,17 +656,17 @@ msgstr "Messaggio eliminato." msgid "No status with that ID found." msgstr "Nessuno stato trovato con quel ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Troppo lungo. Lunghezza massima %d caratteri." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Non trovato" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Non trovato." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -656,12 +676,12 @@ msgstr "" msgid "Unsupported format." msgstr "Formato non supportato." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Preferiti da %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s" @@ -671,17 +691,17 @@ msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Messaggi che citano %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Attività pubblica di %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Aggiornamenti di %s da tutti!" @@ -696,20 +716,16 @@ msgstr "Ripetuto a %s" msgid "Repeats of %s" msgstr "Ripetizioni di %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Messaggi etichettati con %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Messaggi etichettati con %1$s su %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Non trovato." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Nessun allegato." @@ -729,8 +745,9 @@ msgstr "Nessuna dimensione." msgid "Invalid size." msgstr "Dimensione non valida." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Immagine" @@ -741,10 +758,10 @@ msgstr "" "Puoi caricare la tua immagine personale. La dimensione massima del file è %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Utente senza profilo corrispondente" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Utente senza profilo corrispondente." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -762,7 +779,7 @@ msgid "Preview" msgstr "Anteprima" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Elimina" @@ -774,23 +791,27 @@ msgstr "Carica" msgid "Crop" msgstr "Ritaglia" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Nessun file caricato." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Scegli un'area quadrata per la tua immagine personale" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Perso il nostro file di dati." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Immagine aggiornata." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Aggiornamento dell'immagine non riuscito." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Immagine eliminata." @@ -798,7 +819,7 @@ msgstr "Immagine eliminata." msgid "You already blocked that user." msgstr "Hai già bloccato quell'utente." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Blocca utente" @@ -812,27 +833,42 @@ msgstr "" "tuoi messaggi, non potrà più abbonarsi e non riceverai notifica delle @-" "risposte che ti invierà." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "No" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Non bloccare questo utente" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Sì" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blocca questo utente" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Salvataggio delle informazioni per il blocco non riuscito." @@ -845,8 +881,8 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Nessuna gruppo." @@ -876,9 +912,11 @@ msgstr "Sblocca" msgid "Unblock this user" msgstr "Sblocca questo utente" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Invia a " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Invia a %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -892,33 +930,43 @@ msgstr "Codice di conferma non trovato." msgid "That confirmation code is not for you!" msgstr "Quel codice di conferma non è per te!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Tipo di indirizzo %s non riconosciuto" +msgid "Unrecognized address type %s." +msgstr "Tipo di indirizzo %s non riconosciuto." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Quell'indirizzo è già stato confermato." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Impossibile aggiornare l'utente." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Impossibile eliminare l'email di conferma." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Conferma indirizzo" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "L'indirizzo \"%s\" è stato confermato per il tuo account." @@ -928,7 +976,7 @@ msgid "Conversation" msgstr "Conversazione" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Messaggi" @@ -947,7 +995,7 @@ msgstr "Questa applicazione non è di tua proprietà." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Si è verificato un problema con il tuo token di sessione." @@ -964,15 +1012,17 @@ msgstr "" "Vuoi eliminare questa applicazione? Questa azione eliminerà tutti i dati " "riguardo all'applicazione dal database, comprese tutte le connessioni utente." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Non eliminare l'applicazione" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Elimina l'applicazione" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1003,11 +1053,13 @@ msgstr "Elimina messaggio" msgid "Are you sure you want to delete this notice?" msgstr "Vuoi eliminare questo messaggio?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Non eliminare il messaggio" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Elimina questo messaggio" @@ -1031,58 +1083,61 @@ msgstr "" "Vuoi eliminare questo utente? Questa azione eliminerà tutti i dati " "dell'utente dal database, senza una copia di sicurezza." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Elimina questo utente" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Aspetto" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Impostazioni dell'aspetto per questo sito di StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "URL del logo non valido." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Tema non disponibile: %s" +msgid "Theme not available: %s." +msgstr "Tema non disponibile: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Modifica logo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Logo del sito" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Modifica tema" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Tema del sito" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Tema per questo sito." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Modifica l'immagine di sfondo" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Sfondo" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1091,67 +1146,68 @@ msgstr "" "Puoi caricare un'immagine di sfondo per il sito. La dimensione massima del " "file è di %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "On" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Off" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Abilita o disabilita l'immagine di sfondo." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Affianca l'immagine di sfondo" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Modifica colori" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Contenuto" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Barra laterale" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Testo" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Collegamenti" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Usa predefiniti" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Ripristina i valori predefiniti" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Reimposta i valori predefiniti" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Salva" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Salva aspetto" @@ -1256,11 +1312,16 @@ msgstr "Usa questo modulo per modificare il gruppo." msgid "description is too long (max %d chars)." msgstr "La descrizione è troppo lunga (max %d caratteri)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Alias non valido: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Impossibile aggiornare il gruppo." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Impossibile creare gli alias." @@ -1268,31 +1329,42 @@ msgstr "Impossibile creare gli alias." msgid "Options saved." msgstr "Opzioni salvate." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Impostazioni email" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Gestisci la ricezione delle email da %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Indirizzo" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Indirizzo email" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Indirizzo email attualmente confermato." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Rimuovi" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1301,109 +1373,139 @@ msgstr "" "posta (e anche la posta indesiderata!) per un messaggio con ulteriori " "istruzioni." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Annulla" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Indirizzi email" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Indirizzo email, del tipo \"nomeutente@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Aggiungi" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Email di ricezione" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" "Crea un nuovo indirizzo email a cui inviare i messaggi e rimuovi quello " "vecchio." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Nuovo" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Preferenze" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Preferenze dell'email" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Inviami avvisi di nuovi abbonamenti via email" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Inviami un'email quando qualcuno mi invia una \"@-risposta\"" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Consenti ai miei amici di richiamarmi e inviami un'email" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Voglio inviare i messaggi via email" -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Pubblica un MicroID per il mio indirizzo email" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Preferenze salvate." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Preferenze dell'email salvate." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Nessun indirizzo email." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Impossibile normalizzare quell'indirizzo email" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Non è un indirizzo email valido." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Quello è già il tuo indirizzo email." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Quell'indirizzo email appartiene già a un altro utente." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Impossibile inserire il codice di conferma." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1412,43 +1514,53 @@ msgstr "" "Controlla la tua casella di posta (e anche la posta indesiderata!) per il " "codice e le istruzioni su come usarlo." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Nessuna conferma da annullare." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Quello è l'indirizzo di messaggistica sbagliato." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Quello è l'indirizzo email sbagliato." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Conferma annullata." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Conferma dell'email annullata." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Quello non è il tuo indirizzo email." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "L'indirizzo è stato rimosso." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "L'indirizzo email è stato rimosso." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Nessun indirizzo email di ricezione." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Impossibile aggiornare il record dell'utente." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Indirizzo email di ricezione rimosso." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Nuovo indirizzo email di ricezione aggiunto." @@ -1567,9 +1679,9 @@ msgstr "Impossibile convertire il token di richiesta in uno di accesso." msgid "Remote service uses unknown version of OMB protocol." msgstr "Il servizio remoto usa una versione del protocollo OMB sconosciuta." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Errore nell'aggiornare il profilo remoto" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Errore nell'aggiornare il profilo remoto." #: actions/getfile.php:79 msgid "No such file." @@ -1624,11 +1736,11 @@ msgstr "L'utente è già bloccato dal gruppo." msgid "User is not a member of group." msgstr "L'utente non fa parte del gruppo." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Blocca l'utente dal gruppo" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1639,15 +1751,17 @@ msgstr "" "dal gruppo, non potrà più inviare messaggi e non potrà più iscriversi al " "gruppo." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Non bloccare l'utente da questo gruppo" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Blocca l'utente da questo gruppo" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "Errore del database nel bloccare l'utente dal gruppo." @@ -1692,10 +1806,6 @@ msgstr "" "Puoi caricare un'immagine per il logo del tuo gruppo. La dimensione massima " "del file è di %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Utente senza profilo corrispondente." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Scegli un'area quadrata dell'immagine per il logo." @@ -1726,34 +1836,38 @@ msgstr "Un elenco degli utenti in questo gruppo." msgid "Admin" msgstr "Amministra" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Blocca" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Rende l'utente amministratore del gruppo" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Rendi amm." -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Rende questo utente un amministratore" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Attività di %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Messaggi dai membri di %1$s su %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Gruppi" @@ -1778,7 +1892,7 @@ msgstr "" "nomegruppo\". Non trovi un gruppo che ti piace? Prova a [cercarne uno](%%%%" "action.groupsearch%%%%) o [crea il tuo!](%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Crea un nuovo gruppo" @@ -1830,11 +1944,15 @@ msgstr "L'utente non è bloccato dal gruppo." msgid "Error removing the block." msgstr "Errore nel rimuovere il blocco." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Impostazioni messaggistica istantanea" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1844,15 +1962,24 @@ msgstr "" "istantanea](%%doc.im%%) Jabber/GTalk. Configura il tuo indirizzo e le " "impostazioni qui di seguito." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "Messaggistica istantanea non disponibile." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Indirizzo di messaggistica istantanea" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Indirizzo Jabber/GTalk attualmente confermato." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1862,11 +1989,9 @@ msgstr "" "GTalk per un messaggio con ulteriori istruzioni. Hai aggiunto %s al tuo " "elenco contatti?" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "Indirizzo di messaggistica istantanea" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1876,43 +2001,64 @@ msgstr "" "cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo programma " "di messaggistica o su GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Preferenze messaggistica" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Inviami i messaggi via Jabber/GTalk" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Preferenze salvate." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Nessun ID di Jabber." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Impossibile normalizzare quell'ID Jabber" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Non è un ID Jabber valido" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Quello è già il tuo ID di Jabber." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "ID Jabber già assegnato a un altro utente." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1921,10 +2067,32 @@ msgstr "" "Un codice di conferma è stato inviato all'indirizzo di messaggistica " "istantanea che hai aggiunto. Devi approvare %s affinché ti invii messaggi." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Quello è l'indirizzo di messaggistica sbagliato." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Impossibile eliminare la conferma della messaggistica." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Conferma della messaggistica annullata." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Quello non è il tuo ID di Jabber." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "L'indirizzo di messaggistica è stato rimosso." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1947,8 +2115,8 @@ msgstr "Gli inviti sono stati disabilitati." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s" +msgid "You must be logged in to invite other users to use %s." +msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s." #: actions/invite.php:72 #, php-format @@ -1967,7 +2135,9 @@ msgstr "Invita nuovi utenti" msgid "You are already subscribed to these users:" msgstr "Hai già un abbonamento a questi utenti:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2018,12 +2188,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Invia" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "Hai ricevuto un invito per seguire %1$s su %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2088,7 +2260,9 @@ msgstr "Devi eseguire l'accesso per iscriverti a un gruppo." msgid "No nickname or ID." msgstr "Nessun soprannome o ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s fa ora parte del gruppo %2$s" @@ -2097,11 +2271,13 @@ msgstr "%1$s fa ora parte del gruppo %2$s" msgid "You must be logged in to leave a group." msgstr "Devi eseguire l'accesso per lasciare un gruppo." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Non fai parte di quel gruppo." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s ha lasciato il gruppo %2$s" @@ -2147,13 +2323,15 @@ msgstr "" "la tua password prima di modificare le impostazioni." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Accedi con nome utente e password." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Accedi col tuo nome utente e password. Non hai ancora un nome utente? [Crea]" -"(%%action.register%%) un nuovo account." +"Non hai ancora un nome utente? [Crea](%%action.register%%) un nuovo account." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2176,8 +2354,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Impossibile rendere %1$s un amministratore del gruppo %2$s" #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Nessun messaggio corrente" +msgid "No current status." +msgstr "Nessun messaggio corrente." #: actions/newapplication.php:52 msgid "New Application" @@ -2211,12 +2389,12 @@ msgstr "Usa questo modulo per creare un nuovo gruppo." msgid "New message" msgstr "Nuovo messaggio" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Non puoi inviare un messaggio a questo utente." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Nessun contenuto!" @@ -2224,7 +2402,7 @@ msgstr "Nessun contenuto!" msgid "No recipient specified." msgstr "Nessun destinatario specificato." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente." @@ -2238,7 +2416,7 @@ msgstr "Messaggio inviato" msgid "Direct message to %s sent." msgstr "Messaggio diretto a %s inviato." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Errore di Ajax" @@ -2246,7 +2424,7 @@ msgstr "Errore di Ajax" msgid "New notice" msgstr "Nuovo messaggio" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Messaggio inviato" @@ -2341,11 +2519,11 @@ msgid "You are not a user of that application." msgstr "Non sei un utente di quella applicazione." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "Impossibile revocare l'accesso per l'applicazione: " +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Impossibile revocare l'accesso per l'applicazione: %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "Non hai autorizzato alcuna applicazione all'uso del tuo account." @@ -2356,24 +2534,29 @@ msgstr "" "loro applicazioni " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Il messaggio non ha un profilo" +msgid "Notice has no profile." +msgstr "Il messaggio non ha un profilo." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Stato di %1$s su %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "tipo di contenuto " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Tipo di contenuto %s non supportato." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Solo " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Solo URL %s attraverso HTTP semplice." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -2403,7 +2586,7 @@ msgstr "Accorcia gli URL con" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "Servizio di autoriduzione da usare." +msgstr "Servizio di autoriduzione da usare" #: actions/othersettings.php:122 msgid "View profile designs" @@ -2411,7 +2594,7 @@ msgstr "Visualizza aspetto" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "Mostra o nasconde gli aspetti del profilo." +msgstr "Mostra o nasconde gli aspetti del profilo" #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." @@ -2478,7 +2661,7 @@ msgid "6 or more characters" msgstr "6 o più caratteri" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Conferma" @@ -2506,7 +2689,7 @@ msgstr "Vecchia password non corretta" msgid "Error saving user; invalid." msgstr "Errore nel salvare l'utente; non valido." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Impossibile salvare la nuova password." @@ -2515,7 +2698,7 @@ msgid "Password saved." msgstr "Password salvata." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Percorsi" @@ -2525,23 +2708,23 @@ msgstr "Percorso e impostazioni server per questo sito StatusNet." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Directory del tema non leggibile: %s" +msgid "Theme directory not readable: %s." +msgstr "Directory del tema non leggibile: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Directory delle immagini degli utenti non scrivibile: %s" +msgid "Avatar directory not writable: %s." +msgstr "Directory delle immagini degli utenti non scrivibile: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Directory degli sfondi non scrivibile: %s" +msgid "Background directory not writable: %s." +msgstr "Directory degli sfondi non scrivibile: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Directory delle localizzazioni non leggibile: %s" +msgid "Locales directory not readable: %s." +msgstr "Directory delle localizzazioni non leggibile: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2680,19 +2863,19 @@ msgstr "" msgid "People search" msgstr "Cerca persone" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Non è un'etichetta valida di persona: %s" +msgid "Not a valid people tag: %s." +msgstr "Non è un'etichetta valida di persona: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Utenti auto-etichettati con %1$s - pagina %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Contenuto del messaggio non valido" +msgid "Invalid notice content." +msgstr "Contenuto del messaggio non valido." #: actions/postnotice.php:101 #, php-format @@ -2722,13 +2905,14 @@ msgstr "" "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pagina web" @@ -2750,9 +2934,9 @@ msgid "Bio" msgstr "Biografia" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Ubicazione" @@ -2766,7 +2950,7 @@ msgstr "Condividi la mia posizione attuale quando invio messaggi" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Etichette" @@ -2840,8 +3024,8 @@ msgstr "Impostazioni salvate." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Oltre il limite della pagina (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Oltre il limite della pagina (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3006,7 +3190,7 @@ msgstr "Reimposta la password" msgid "Recover password" msgstr "Recupera la password" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Richiesta password di ripristino" @@ -3026,19 +3210,19 @@ msgstr "Reimposta" msgid "Enter a nickname or email address." msgstr "Inserisci un soprannome o un indirizzo email." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Nessun utente con quell'email o nome utente." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Nessun indirizzo email registrato per quell'utente." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Errore nel salvare la conferma dell'indirizzo." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3046,23 +3230,23 @@ msgstr "" "Le istruzioni per recuperare la tua password sono state inviate " "all'indirizzo email registrato nel tuo account." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Ripristino della password inaspettato." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "La password deve essere lunga almeno 6 caratteri." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "La password e la conferma non corrispondono." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Errore nell'impostare l'utente." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nuova password salvata con successo. Hai effettuato l'accesso." @@ -3078,7 +3262,7 @@ msgstr "Codice di invito non valido." msgid "Registration successful" msgstr "Registrazione riuscita" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrati" @@ -3100,7 +3284,7 @@ msgstr "Nome utente o password non valido." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Attraverso questo modulo puoi creare un nuovo account con cui potrai " @@ -3120,8 +3304,9 @@ msgstr "6 o più caratteri; richiesta" msgid "Same as password above. Required." msgstr "Stessa password di sopra; richiesta" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Email" @@ -3134,22 +3319,16 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, preferibilmente il tuo \"vero\" nome" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "I miei testi e file sono disponibili nei termini della licenza " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Attribution 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -" a eccezione di questi dati personali: password, indirizzo email, indirizzo " -"messaggistica istantanea e numero di telefono." +"I miei testi e file sono disponibili nei termini di %s a eccezione di questi " +"dati personali: password, indirizzo email, indirizzo messaggistica " +"istantanea e numero di telefono." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3183,7 +3362,7 @@ msgstr "" "Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo " "servizio." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3228,7 +3407,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL del tuo profilo su un altro servizio di microblog compatibile" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Abbonati" @@ -3266,7 +3445,7 @@ msgstr "Non puoi ripetere i tuoi stessi messaggi." msgid "You already repeated that notice." msgstr "Hai già ripetuto quel messaggio." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Ripetuti" @@ -3354,7 +3533,7 @@ msgstr "L'utente è già nella \"sandbox\"." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sessioni" @@ -3391,26 +3570,30 @@ msgstr "Devi eseguire l'accesso per visualizzare un'applicazione." msgid "Application profile" msgstr "Profilo applicazione" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Icona" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Nome" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organizzazione" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descrizione" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statistiche" @@ -3529,67 +3712,67 @@ msgstr "Gruppo %s" msgid "%1$s group, page %2$d" msgstr "Gruppi di %1$s, pagina %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Profilo del gruppo" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Nota" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Alias" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Azioni dei gruppi" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Feed dei messaggi per il gruppo %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Feed dei messaggi per il gruppo %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Feed dei messaggi per il gruppo %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF per il gruppo %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Membri" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(nessuno)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Tutti i membri" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Creato" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3605,7 +3788,7 @@ msgstr "" "stesso](%%%%action.register%%%%) per far parte di questo gruppo e di molti " "altri! ([Maggiori informazioni](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3617,7 +3800,7 @@ msgstr "" "(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero " "[StatusNet](http://status.net/)." -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Amministratori" @@ -3756,11 +3939,11 @@ msgid "Unknown language \"%s\"." msgstr "Lingua \"%s\" sconosciuta." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "Il limite minimo del testo è di 140 caratteri." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Il limite minimo del testo è di 0 caratteri (illimitato)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "Il limite per i duplicati deve essere di 1 o più secondi." #: actions/siteadminpanel.php:221 @@ -3852,8 +4035,8 @@ msgid "Unable to save site notice." msgstr "Impossibile salvare il messaggio del sito." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "La dimensione massima del messaggio del sito è di 255 caratteri" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "La dimensione massima del messaggio del sito è di 255 caratteri." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -3867,44 +4050,71 @@ msgstr "Testo messaggio del sito (massimo 255 caratteri, HTML consentito)" msgid "Save site notice" msgstr "Salva messaggio" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Impostazioni SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "Il servizio SMS non è disponibile." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "Indirizzo SMS" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Numero di telefono attualmente confermato per gli SMS." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "In attesa della conferma per questo numero di telefono." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Codice di conferma" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Inserisci il codice che hai ricevuto sul tuo telefono." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Conferma" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Numero di telefono per SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "Preferenze dell'SMS" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3912,23 +4122,33 @@ msgstr "" "Inviami avvisi via SMS: comprendo che potrei incorrere in esorbitanti " "bollette da parte del mio operatore" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Preferenze dell'SMS salvate." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Nessun numero di telefono." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Nessun operatore selezionato." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Quello è già il tuo numero di telefono." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Quel numero di telefono appartiene già a un altro utente." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3937,23 +4157,40 @@ msgstr "" "aggiunto. Controlla il tuo telefono per il codice e le istruzioni su come " "usarlo." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Quello è il numero di conferma errato." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Conferma dell'SMS annullata." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Quello non è il tuo numero di telefono." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Il numero di telefono per SMS è stato rimosso." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Operatore telefonico" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Seleziona un operatore" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3962,13 +4199,14 @@ msgstr "" "Operatore di telefonia mobile. Se conosci un operatore che accetta gli SMS " "via email, ma non è elencato qui, scrivici a %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Nessun codice inserito" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Snapshot" @@ -3989,7 +4227,7 @@ msgid "Invalid snapshot report URL." msgstr "URL di segnalazione snapshot non valido." #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "A caso quando avviene un web hit" #: actions/snapshotadminpanel.php:201 @@ -4028,8 +4266,7 @@ msgstr "Salva impostazioni snapshot" msgid "You are not subscribed to that profile." msgstr "Non hai una abbonamento a quel profilo." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Impossibile salvare l'abbonamento." @@ -4130,11 +4367,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s non sta seguendo nessuno." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4167,12 +4404,12 @@ msgstr "Nessun argomento ID." msgid "Tag %s" msgstr "Etichetta %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Profilo utente" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Fotografia" @@ -4226,7 +4463,7 @@ msgid "User is not silenced." msgstr "L'utente non è zittito." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Nessun ID di profilo nella richiesta." #: actions/unsubscribe.php:98 @@ -4265,7 +4502,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Abbonamento predefinito non valido: \"%1$s\" non è un utente." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profilo" @@ -4427,27 +4665,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Gustati il tuo hotdog!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "Gruppi di %1$s, pagina %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Cerca altri gruppi" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s non fa parte di alcun gruppo." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Prova a [cercare dei gruppi](%%action.groupsearch%%) e iscriviti." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Messaggi da %1$s su %2$s!" @@ -4507,7 +4751,8 @@ msgstr "" msgid "Plugins" msgstr "Plugin" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Versione" @@ -4515,7 +4760,7 @@ msgstr "Versione" msgid "Author(s)" msgstr "Autori" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4524,13 +4769,13 @@ msgstr "" "Nessun file può superare %d byte e il file inviato era di %d byte. Prova a " "caricarne una versione più piccola." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Un file di questa dimensione supererebbe la tua quota utente di %d byte." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4569,27 +4814,28 @@ msgstr "Impossibile inserire il messaggio." msgid "Could not update message with new URI." msgstr "Impossibile aggiornare il messaggio con il nuovo URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" -msgstr "Errore del DB nell'inserire un hashtag: %s" +msgid "Database error inserting hashtag: %s" +msgstr "Errore del database nell'inserire un hashtag: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Problema nel salvare il messaggio. Troppo lungo." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Problema nel salvare il messaggio. Utente sconosciuto." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " "qualche minuto." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4597,287 +4843,319 @@ msgstr "" "Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di " "nuovo tra qualche minuto." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Ti è proibito inviare messaggi su questo sito." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problema nel salvare la casella della posta del gruppo." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Non ti è possibile abbonarti." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Hai già l'abbonamento!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "L'utente non ti consente di seguirlo." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Non hai l'abbonamento!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Impossibile eliminare l'auto-abbonamento." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Impossibile eliminare il token di abbonamento OMB." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Impossibile eliminare l'abbonamento." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Benvenuti su %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Impossibile creare il gruppo." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Impossibile impostare l'URI del gruppo." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Impossibile impostare la membership al gruppo." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Impossibile salvare le informazioni del gruppo locale." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Modifica le impostazioni del tuo profilo" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Carica un'immagine" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Modifica la tua password" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Modifica la gestione dell'email" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Progetta il tuo profilo" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Altro" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Altre opzioni" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Altro" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Pagina senza nome" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Esplorazione sito primaria" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Profilo personale e attività degli amici" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Personale" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Modifica la tua email, immagine, password o il tuo profilo" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Connettiti con altri servizi" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Connetti" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Modifica la configurazione del sito" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Amministra" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Invita amici e colleghi a seguirti su %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Invita" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Termina la tua sessione sul sito" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Esci" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Crea un account" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Registrati" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Accedi al sito" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Accedi" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Aiutami!" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Aiuto" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Cerca persone o del testo" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Cerca" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Messaggio del sito" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Viste locali" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Pagina messaggio" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Esplorazione secondaria del sito" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Aiuto" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Informazioni" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "TOS" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Privacy" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Sorgenti" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Contatti" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Badge" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Licenza del software StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** è un servizio di microblog offerto da [%%site.broughtby%%]" -"(%%site.broughtbyurl%%). " +"(%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** è un servizio di microblog. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** è un servizio di microblog." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4888,70 +5166,86 @@ msgstr "" "s, disponibile nei termini della licenza [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Licenza del contenuto del sito" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "I contenuti e i dati di %1$s sono privati e confidenziali." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti " "riservati." -#: lib/action.php:847 -msgid "All " -msgstr "Tutti " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" +"Tutti i contenuti e i dati di %1$s sono disponibili nei termini della " +"licenza %2$s." -#: lib/action.php:853 -msgid "license." -msgstr "licenza." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Paginazione" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Successivi" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Precedenti" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Impossibile gestire contenuti remoti." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Impossibile gestire contenuti XML incorporati." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Impossibile gestire contenuti Base64." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Non puoi apportare modifiche al sito." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Le modifiche al pannello non sono consentite." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() non implementata." @@ -4961,156 +5255,192 @@ msgstr "showForm() non implementata." msgid "saveSettings() not implemented." msgstr "saveSettings() non implementata." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Impossibile eliminare le impostazioni dell'aspetto." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Configurazione di base" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Sito" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Configurazione aspetto" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Aspetto" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Configurazione utente" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Utente" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Configurazione di accesso" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Configurazione percorsi" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Configurazione sessioni" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 msgid "Edit site notice" msgstr "Modifica messaggio del sito" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" msgstr "Configurazione snapshot" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo " "accesso in lettura." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" -"Tentativo di autorizzazione API non riuscito, soprannome = %1$s, proxy = %2" -"$s, IP = %3$s" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Modifica applicazione" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Icona per questa applicazione" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Descrivi l'applicazione in %d caratteri" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Descrivi l'applicazione" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "URL sorgente" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "URL della pagina web di questa applicazione" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "URL sorgente" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Organizzazione responsabile per questa applicazione" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "URL della pagina web dell'organizzazione" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "URL verso cui redirigere dopo l'autenticazione" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Browser" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Desktop" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Tipo di applicazione, browser o desktop" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Sola lettura" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Lettura-scrittura" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Accesso predefinito per questa applicazione, sola lettura o lettura-scrittura" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Annulla" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "Lettura-scrittura" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "Sola lettura" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Approvata %1$s - Accesso \"%2$s\"." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Revoca" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Allegati" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Autore" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Provider" @@ -5130,37 +5460,56 @@ msgstr "Modifica della password non riuscita" msgid "Password changing is not allowed" msgstr "La modifica della password non è permessa" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Risultati comando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando completato" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Comando non riuscito" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Questo comando non è ancora implementato." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Un messaggio con quel ID non esiste" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "L'utente non ha un ultimo messaggio." + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Impossibile trovare un utente col soprannome %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Impossibile trovare un utente locale col soprannome %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Questo comando non è ancora implementato." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Non ha molto senso se cerchi di richiamarti!" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Richiamo inviato a %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5171,197 +5520,203 @@ msgstr "" "Abbonati: %2$s\n" "Messaggi: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Un messaggio con quel ID non esiste" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "L'utente non ha un ultimo messaggio." - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Messaggio indicato come preferito." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Fai già parte di quel gruppo" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%s fa ora parte del gruppo %s" - -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s" -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%1$s ha lasciato il gruppo %2$s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Posizione: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Pagina web: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Informazioni: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" +"%s è un profilo remoto. È possibile inviare messaggi privati solo agli " +"utenti sullo stesso server." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Messaggio diretto a %s inviato." -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Errore nell'inviare il messaggio diretto." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Impossibile ripetere un proprio messaggio" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Hai già ripetuto quel messaggio" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Messaggio da %s ripetuto" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Errore nel ripetere il messaggio." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Risposta a %s inviata" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Errore nel salvare il messaggio." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Specifica il nome dell'utente a cui abbonarti." -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Utente inesistente." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Abbonati a %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento." -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Abbonamento a %s annullato" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Comando non ancora implementato." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notifiche disattivate." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Impossibile disattivare le notifiche." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notifiche attivate." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Impossibile attivare le notifiche." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "Il comando di accesso è disabilitato" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Questo collegamento è utilizzabile una sola volta ed è valido solo per 2 " "minuti: %s" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "%s ha annullato l'abbonamento" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Il tuo abbonamento è stato annullato." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Persona di cui hai già un abbonamento:" msgstr[1] "Persone di cui hai già un abbonamento:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Nessuno è abbonato ai tuoi messaggi." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Questa persona è abbonata ai tuoi messaggi:" msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Non fai parte di alcun gruppo." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non fai parte di questo gruppo:" msgstr[1] "Non fai parte di questi gruppi:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5443,21 +5798,21 @@ msgstr "" "tracks - non ancora implementato\n" "tracking - non ancora implementato\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Non è stato trovato alcun file di configurazione. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "I file di configurazione sono stati cercati in questi posti: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" "Potrebbe essere necessario lanciare il programma d'installazione per " "correggere il problema." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Vai al programma d'installazione." @@ -5591,7 +5946,7 @@ msgstr "Gruppo" #: lib/groupnav.php:101 msgid "Blocked" -msgstr "Bloccati" +msgstr "Bloccato" #: lib/groupnav.php:102 #, php-format @@ -5630,53 +5985,54 @@ msgstr "I gruppi con più messaggi" msgid "Tags in %s group's notices" msgstr "Etichette nei messaggi del gruppo %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Formato file immagine non supportato." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Quel file è troppo grande. La dimensione massima è %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Caricamento parziale." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Errore di sistema nel caricare il file." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Non è un'immagine o il file è danneggiato." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato file immagine non supportato." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Perso il nostro file." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo di file sconosciuto" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Sorgente casella in arrivo %d sconosciuta." @@ -5697,11 +6053,13 @@ msgstr "Accedi con nome utente e password" msgid "Sign up for a new account" msgstr "Iscriviti per un nuovo account" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Conferma indirizzo email" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5731,12 +6089,14 @@ msgstr "" "Grazie per il tuo tempo, \n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5761,17 +6121,20 @@ msgstr "" "----\n" "Modifica il tuo indirizzo email o le opzioni di notifica presso %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Biografia: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Nuovo indirizzo email per inviare messaggi a %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5792,21 +6155,32 @@ msgstr "" "Cordiali saluti,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "stato di %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Conferma SMS" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" +"%s: conferma che questo numero di telefono sia tuo utilizzando questo codice:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "%s ti ha richiamato" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5833,12 +6207,14 @@ msgstr "" "Cordiali saluti,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Nuovo messaggio privato da %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5871,12 +6247,14 @@ msgstr "" "Cordiali saluti,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5914,12 +6292,25 @@ msgstr "" "Cordiali saluti,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"L'intera conversazione può essere letta qui:\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) ti ha inviato un messaggio" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5932,17 +6323,42 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"%1$s (@%9$s) ti ha appena inviato un messaggio (una \"@-riposta\") su %2$s.\n" +"%1$s (@%9$s) ti ha appena inviato un messaggio (una \"@-risposta\") su %2" +"$s.\n" "\n" -"Il messaggio si trova qui:\n" +"Il messaggio è qui:\n" "\n" -"\t%3$s\n" +"%3$s\n" "\n" "E dice:\n" "\n" -"\t%4$s\n" +"%4$s\n" "\n" +"%5$sPuoi rispondere qui:\n" +"\n" +"%6$s\n" +"\n" +"L'elenco di tutte le tue @-risposte si trova qui:\n" +"\n" +"%7$s\n" +"\n" +"Cordiali saluti,\n" +"%2$s\n" +"\n" +"P.S: puoi disabilitare le notifiche via email qui: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5957,7 +6373,7 @@ msgstr "" "iniziare una conversazione con altri utenti. Altre persone possono mandare " "messaggi riservati solamente a te." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "via" @@ -6087,48 +6503,52 @@ msgstr "" "Il recupero della tua posizione geografica sta impiegando più tempo del " "previsto. Riprova più tardi." -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "S" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "E" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "O" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "presso" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "in una discussione" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Ripetuto da" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Rispondi a questo messaggio" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Rispondi" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Messaggio ripetuto" @@ -6152,6 +6572,10 @@ msgstr "Errore nell'inserire il nuovo profilo" msgid "Error inserting avatar" msgstr "Errore nell'inserire l'immagine" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Errore nell'aggiornare il profilo remoto" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Errore nell'inserire il profilo remoto" @@ -6201,7 +6625,7 @@ msgstr "Etichette nei messaggi di %s" msgid "Unknown" msgstr "Sconosciuto" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abbonamenti" @@ -6209,31 +6633,32 @@ msgstr "Abbonamenti" msgid "All subscriptions" msgstr "Tutti gli abbonamenti" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abbonati" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Tutti gli abbonati" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ID utente" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Membro dal" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Media giornaliera" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Tutti i gruppi" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Nessun argomento return-to." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Metodo non implementato" @@ -6257,10 +6682,18 @@ msgstr "In evidenza" msgid "Popular" msgstr "Famosi" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Nessun argomento return-to." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Ripetere questo messaggio?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Sì" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Ripeti questo messaggio" @@ -6270,7 +6703,7 @@ msgstr "Ripeti questo messaggio" msgid "Revoke the \"%s\" role from this user" msgstr "Revoca il ruolo \"%s\" a questo utente" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "Nessun utente singolo definito per la modalità single-user." @@ -6396,89 +6829,108 @@ msgstr "Annulla l'abbonamento da questo utente" msgid "Unsubscribe" msgstr "Disabbonati" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "L'utente %s (%d) non ha un profilo." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modifica immagine" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Azioni utente" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Eliminazione utente..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Modifica impostazioni del profilo" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Modifica" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Invia un messaggio diretto a questo utente" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Messaggio" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Modera" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 msgid "User role" msgstr "Ruolo dell'utente" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "Amministratore" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "Moderatore" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "circa un anno fa" @@ -6492,7 +6944,7 @@ msgstr "%s non è un colore valido." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d." diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 847f24c59e..76ca28c248 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -1,6 +1,5 @@ # Translation of StatusNet to Japanese # -# Author@translatewiki.net: Aotake # Author@translatewiki.net: Fryed-peach # Author@translatewiki.net: Sonoda # Author@translatewiki.net: Whym @@ -11,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:18+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:40+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -24,7 +23,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "アクセス" @@ -75,7 +74,13 @@ msgstr "閉じられた" msgid "Save access settings" msgstr "アクセス設定の保存" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -84,7 +89,8 @@ msgstr "保存" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +#, fuzzy +msgid "No such page." msgstr "そのようなページはありません。" #: actions/all.php:75 actions/allrss.php:68 @@ -95,9 +101,9 @@ msgstr "そのようなページはありません。" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -105,11 +111,9 @@ msgstr "そのようなページはありません。" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "そのようなユーザはいません。" @@ -121,8 +125,9 @@ msgstr "%1$s と友人、ページ %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -186,8 +191,10 @@ msgstr "" msgid "You and friends" msgstr "あなたと友人" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "%2$s に %1$s と友人からの更新があります！" @@ -202,18 +209,18 @@ msgstr "%2$s に %1$s と友人からの更新があります！" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API メソッドが見つかりません。" @@ -226,15 +233,16 @@ msgstr "API メソッドが見つかりません。" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "このメソッドには POST が必要です。" #: actions/apiaccountupdatedeliverydevice.php:105 +#, fuzzy msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" "「device」という名前の引数を、次の中から値を選んで、指定する必要があります: " "sms, im, none" @@ -248,7 +256,7 @@ msgstr "ユーザを更新できませんでした。" #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "ユーザはプロフィールをもっていません。" @@ -258,9 +266,9 @@ msgid "Could not save profile." msgstr "プロフィールを保存できませんでした。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -344,7 +352,7 @@ msgstr "そのＩＤのステータスが見つかりません。" msgid "This status is already a favorite." msgstr "このステータスはすでにお気に入りです。" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "お気に入りを作成できません。" @@ -437,10 +445,9 @@ msgstr "場所が長すぎます。（255字まで）" msgid "Too many aliases! Maximum %d." msgstr "別名が多すぎます! 最大 %d。" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 -#, php-format -msgid "Invalid alias: \"%s\"" +#: actions/apigroupcreate.php:266 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"." msgstr "不正な別名: \"%s\"" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -457,14 +464,15 @@ msgstr "別名はニックネームと同じではいけません。" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" +#, fuzzy +msgid "Group not found." msgstr "グループが見つかりません!" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "すでにこのグループのメンバーです。" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "管理者によってこのグループからブロックされています。" @@ -482,17 +490,26 @@ msgstr "このグループのメンバーではありません。" msgid "Could not remove user %1$s from group %2$s." msgstr "ユーザ %1$s をグループ %2$s から削除できません。" -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "%s のグループ" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "グループ %s はメンバー" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s グループ" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "%s 上のグループ" @@ -506,17 +523,17 @@ msgid "Invalid token." msgstr "不正なトークン。" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -549,12 +566,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "リクエストトークン%sは、拒否されて、取り消されました。" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "予期せぬフォーム送信です。" @@ -574,20 +594,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "アカウント" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "ニックネーム" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "パスワード" @@ -632,17 +654,17 @@ msgstr "ステータスを削除しました。" msgid "No status with that ID found." msgstr "そのＩＤでのステータスはありません。" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "長すぎます。つぶやきは最大 140 字までです。" -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "みつかりません" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "見つかりません。" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "つぶやきは URL を含めて最大 %d 字までです。" @@ -651,12 +673,12 @@ msgstr "つぶやきは URL を含めて最大 %d 字までです。" msgid "Unsupported format." msgstr "サポート外の形式です。" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / %2$s からのお気に入り" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。" @@ -666,17 +688,17 @@ msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / %2$s について更新" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%2$s からアップデートに答える %1$s アップデート" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s のパブリックタイムライン" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "皆からの %s アップデート!" @@ -691,20 +713,16 @@ msgstr "%s への返信" msgid "Repeats of %s" msgstr "%s の返信" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "%s とタグ付けされたつぶやき" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s に %1$s による更新があります！" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "見つかりません。" - #: actions/attachment.php:73 msgid "No such attachment." msgstr "そのような添付はありません。" @@ -724,8 +742,9 @@ msgstr "サイズがありません。" msgid "Invalid size." msgstr "不正なサイズ。" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "アバター" @@ -735,9 +754,9 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "自分のアバターをアップロードできます。最大サイズは%sです。" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." msgstr "合っているプロフィールのないユーザ" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -756,7 +775,7 @@ msgid "Preview" msgstr "プレビュー" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "削除" @@ -768,23 +787,28 @@ msgstr "アップロード" msgid "Crop" msgstr "切り取り" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "プロファイル記述がありません。" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "あなたのアバターとなるイメージを正方形で指定" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "ファイルデータを紛失しました。" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "アバターが更新されました。" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "アバターの更新に失敗しました。" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "アバターが削除されました。" @@ -792,7 +816,7 @@ msgstr "アバターが削除されました。" msgid "You already blocked that user." msgstr "そのユーザはすでにブロック済みです。" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "ユーザをブロック" @@ -807,27 +831,44 @@ msgstr "" "たからフォローを外されるでしょう、将来、あなたにフォローできないで、あなたは" "どんな @-返信 についてもそれらから通知されないでしょう。" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "No" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "このユーザをアンブロックする" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "Yes" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "このユーザをブロックする" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "ブロック情報の保存に失敗しました。" @@ -840,8 +881,8 @@ msgstr "ブロック情報の保存に失敗しました。" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "そのようなグループはありません。" @@ -871,8 +912,10 @@ msgstr "アンブロック" msgid "Unblock this user" msgstr "このユーザをアンブロックする" -#: actions/bookmarklet.php:50 -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" msgstr "投稿" #: actions/confirmaddress.php:75 @@ -887,33 +930,43 @@ msgstr "確認コードが見つかりません。" msgid "That confirmation code is not for you!" msgstr "その確認コードはあなたのものではありません！" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "不明なアドレスタイプ %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "そのアドレスは既に承認されています。" -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "ユーザを更新できません" -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "メール承認を削除できません" -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "アドレスの確認" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "アドレス \"%s\" はあなたのアカウントとして承認されています。" @@ -923,7 +976,7 @@ msgid "Conversation" msgstr "会話" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "つぶやき" @@ -942,7 +995,7 @@ msgstr "このアプリケーションのオーナーではありません。" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "あなたのセッショントークンに関する問題がありました。" @@ -960,15 +1013,17 @@ msgstr "" "あなたは本当にこのユーザを削除したいですか? これはバックアップなしでデータ" "ベースからユーザに関するすべてのデータをクリアします。" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "このアプリケーションを削除しないでください" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "このアプリケーションを削除" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -999,11 +1054,13 @@ msgstr "つぶやき削除" msgid "Are you sure you want to delete this notice?" msgstr "本当にこのつぶやきを削除しますか？" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "このつぶやきを削除できません。" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "このつぶやきを削除" @@ -1027,58 +1084,61 @@ msgstr "" "あなたは本当にこのユーザを削除したいですか? これはバックアップなしでデータ" "ベースからユーザに関するすべてのデータをクリアします。" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "このユーザを削除" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "デザイン" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "この StatusNet サイトのデザイン設定。" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "不正なロゴ URL" -#: actions/designadminpanel.php:279 -#, php-format -msgid "Theme not available: %s" +#: actions/designadminpanel.php:280 +#, fuzzy, php-format +msgid "Theme not available: %s." msgstr "テーマが利用できません： %s" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "ロゴの変更" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "サイトロゴ" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "テーマ変更" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "サイトテーマ" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "サイトのテーマ" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "バックグラウンドイメージの変更" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "バックグラウンド" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1087,67 +1147,68 @@ msgstr "" "このサイト用にバックグラウンドイメージをアップロードできます。最大ファイルサ" "イズは %1$s。" -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "オン" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "オフ" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "バックグラウンドイメージのオンまたはオフ。" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "タイルバックグラウンドイメージ" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "色の変更" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "内容" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "サイドバー" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "テキスト" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "リンク" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "デフォルトを使用" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "デフォルトデザインに戻す。" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "デフォルトへリセットする" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "保存" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "デザインの保存" @@ -1252,11 +1313,16 @@ msgstr "このフォームを使ってグループを編集します。" msgid "description is too long (max %d chars)." msgstr "記述が長すぎます。（最長 %d 字）" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "不正な別名: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "グループを更新できません。" -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "別名を作成できません。" @@ -1264,31 +1330,43 @@ msgstr "別名を作成できません。" msgid "Options saved." msgstr "オプションが保存されました。" -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "メール設定" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "%%site.name%% からのメールを管理。" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "住所" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "メールアドレス" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "現在確認されているメールアドレス。" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "削除" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1296,109 +1374,144 @@ msgstr "" "このアドレスは承認待ちです。受信ボックス（とスパムボックス）に追加の指示が書" "かれたメッセージが届いていないか確認してください。" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "中止" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "メールアドレス" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "メールアドレス、\"UserName@example.org\" のような" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "追加" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "入ってくるメール" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "新しいつぶやき投稿にこのアドレスへメールする" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "投稿のための新しいEメールアドレスを作ります; 古い方を取り消します。" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "New" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "設定" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "メールで新規フォローの通知を私に送ってください。" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "だれかがお気に入りとして私のつぶやきを加えたら、メールを私に送ってください。" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" "だれかがプライベート・メッセージを私に送るときには、メールを私に送ってくださ" "い。" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "友達が私に合図とメールを送ることを許可する。" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "メールでつぶやきを投稿したい。" -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "私のメールアドレスのためにMicroIDを発行してください。" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "設定が保存されました。" +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." +msgstr "デザイン設定が保存されました。" -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "メールアドレスがありません。" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "そのメールアドレスを正規化できません" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "有効なメールアドレスではありません。" -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "これはすでにあなたのメールアドレスです。" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "このメールアドレスは既に他の人が使っています。" -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "承認コードを追加できません" -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1407,43 +1520,56 @@ msgstr "" "ムボックス）にコードとそれをどう使うのかという指示が届いていないか確認してく" "ださい。" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "承認待ちのものはありません。" -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "その IM アドレスは不正です。" -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "承認作業が中止されました。" -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "これはあなたのメールアドレスではありません。" -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "アドレスは削除されました。" -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "入ってくるメールアドレスではありません。" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "ユーザレコードを更新できません。" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "入ってくるメールアドレスは削除されました。" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "新しい入ってくるメールアドレスが追加されました。" @@ -1563,8 +1689,9 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "" "リモートサービスは、不明なバージョンの OMB プロトコルを使用しています。" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "リモートプロファイル更新エラー" #: actions/getfile.php:79 @@ -1623,11 +1750,11 @@ msgstr "ユーザはすでにグループからブロックされています。 msgid "User is not a member of group." msgstr "ユーザはグループのメンバーではありません。" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "グループからユーザをブロック" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1637,15 +1764,17 @@ msgstr "" "本当にユーザ %1$s をグループ %2$s からブロックしますか? 彼らはグループから削" "除される、投稿できない、グループをフォローできなくなります。" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "このグループからこのユーザをブロックしない" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "このグループからこのユーザをブロック" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "グループからのブロックユーザのデータベースエラー" @@ -1690,10 +1819,6 @@ msgstr "" "あなたのグループ用にロゴイメージをアップロードできます。最大ファイルサイズは " "%s。" -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "合っているプロフィールのないユーザ" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "ロゴとなるイメージの正方形を選択。" @@ -1724,34 +1849,38 @@ msgstr "このグループのユーザのリスト。" msgid "Admin" msgstr "管理者" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "ブロック" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "ユーザをグループの管理者にする" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "管理者にする" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "このユーザを管理者にする" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s のタイムライン" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s 上の %1$s のメンバーから更新する" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "グループ" @@ -1776,7 +1905,7 @@ msgstr "" "うか[探してみる](%%%%action.groupsearch%%%%)か、あなた自身で[始めてください!]" "(%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "新しいグループを作成" @@ -1828,11 +1957,15 @@ msgstr "ユーザはグループからブロックされていません。" msgid "Error removing the block." msgstr "ブロックの削除エラー" -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "IM設定" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1841,15 +1974,24 @@ msgstr "" "Jabber/GTalk [instant messages](%%doc.im%%)　経由で通知の送信、受信が可能で" "す。下のアドレスを設定して下さい。" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "ＩＭ が利用不可。" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "IMアドレス" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "確認された最新の　Jabber/GTakk アドレス" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1858,11 +2000,9 @@ msgstr "" "このアドレスは承認待ちです。Jabber か Gtalk のアカウントで追加の指示が書かれ" "たメッセージを確認してください。(%s を友人リストに追加しましたか？)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "IMアドレス" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1871,45 +2011,67 @@ msgstr "" "\"UserName@example.org\" といった Jabber または GTalk のアドレス。まず、%s を" "IMクライアントやGTalkに追加して下さい。" -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "設定" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Jabber/GTalk で私に通知を送って下さい。" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Jabber/GTalkを通して回答を、私がフォローされていない人々から私に送ってくださ" "い。" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "設定が保存されました。" + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Jabbar ID はありません。" -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "その Jabbar ID を正規化できません" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "有効な Jabber ID ではありません。" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "その Jabber ID は既にあなたのものです。" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber ID ｊは既に別のユーザが使用しています。" -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1918,10 +2080,35 @@ msgstr "" "承認コードを入力された IM アドレスに送信しました。あなたにメッセージを送れる" "ようにするには%sを承認してください。" -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "その IM アドレスは不正です。" + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "メール承認を削除できません" + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "承認作業が中止されました。" + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "その Jabber ID はあなたのものではありません。" +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "アドレスは削除されました。" + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1942,8 +2129,8 @@ msgid "Invites have been disabled." msgstr "招待は無効にされました。" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "他のユーザが%sを使用するよう誘うためにはログインしなければなりません。" #: actions/invite.php:72 @@ -1963,7 +2150,9 @@ msgstr "新しいユーザを招待" msgid "You are already subscribed to these users:" msgstr "すでにこれらのユーザをフォローしています:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2016,12 +2205,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "投稿" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s があなたを %2$s へ招待しました" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2087,7 +2278,9 @@ msgstr "グループに入るためにはログインしなければなりませ msgid "No nickname or ID." msgstr "ニックネームがありません。" -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s はグループ %2$s に参加しました" @@ -2096,11 +2289,13 @@ msgstr "%1$s はグループ %2$s に参加しました" msgid "You must be logged in to leave a group." msgstr "グループから離れるにはログインしていなければなりません。" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "あなたはそのグループのメンバーではありません。" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s はグループ %2$s に残りました。" @@ -2146,10 +2341,14 @@ msgstr "" "て下さい。" #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "ユーザ名とパスワードでログイン" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "ユーザ名とパスワードで、ログインしてください。 まだユーザ名を持っていません" "か? 新しいアカウントを [登録](%%action.register%%)。" @@ -2174,7 +2373,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "%1$s をグループ %2$s の管理者にすることはできません" #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "現在のステータスはありません" #: actions/newapplication.php:52 @@ -2209,12 +2409,12 @@ msgstr "このフォームを使って新しいグループを作成します。 msgid "New message" msgstr "新しいメッセージ" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "このユーザにメッセージを送ることはできません。" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "コンテンツがありません！" @@ -2222,7 +2422,7 @@ msgstr "コンテンツがありません！" msgid "No recipient specified." msgstr "受取人が書かれていません。" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2237,7 +2437,7 @@ msgstr "メッセージを送りました" msgid "Direct message to %s sent." msgstr "ダイレクトメッセージを %s に送りました" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax エラー" @@ -2245,7 +2445,7 @@ msgstr "Ajax エラー" msgid "New notice" msgstr "新しいつぶやき" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "つぶやきを投稿しました" @@ -2339,11 +2539,11 @@ msgid "You are not a user of that application." msgstr "あなたはそのアプリケーションのユーザではありません。" #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, fuzzy, php-format +msgid "Unable to revoke access for app: %s." msgstr "アプリケーションのための取消しアクセスができません: " #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" "あなたは、どんなアプリケーションもあなたのアカウントを使用するのを認可してい" @@ -2354,24 +2554,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "開発者は彼らのアプリケーションのために登録設定を編集できます " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "つぶやきにはプロファイルはありません。" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%2$s における %1$ のステータス" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "内容種別 " -#: actions/oembed.php:160 -msgid "Only " -msgstr "だけ " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "サポートされていないデータ形式。" @@ -2476,7 +2682,7 @@ msgid "6 or more characters" msgstr "6文字以上" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "パスワード確認" @@ -2504,7 +2710,7 @@ msgstr "古いパスワードが間違っています。" msgid "Error saving user; invalid." msgstr "ユーザ保存エラー; 不正なユーザ" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "新しいパスワードを保存できません。" @@ -2513,7 +2719,7 @@ msgid "Password saved." msgstr "パスワードが保存されました。" #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "パス" @@ -2522,23 +2728,23 @@ msgid "Path and server settings for this StatusNet site." msgstr "パスと StatusNet サイトのサーバー設定" #: actions/pathsadminpanel.php:157 -#, php-format -msgid "Theme directory not readable: %s" +#, fuzzy, php-format +msgid "Theme directory not readable: %s." msgstr "テーマディレクトリが読み込めません: %s" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." msgstr "アバターディレクトリに書き込みできません: %s" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" +#, fuzzy, php-format +msgid "Background directory not writable: %s." msgstr "バックグラウンドディレクトリに書き込みできません : %s" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." msgstr "場所ディレクトリが読み込めません: %s" #: actions/pathsadminpanel.php:183 @@ -2678,18 +2884,19 @@ msgstr "" msgid "People search" msgstr "ピープルサーチ" -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "正しいタグではありません： %s" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "ユーザ自身がつけたタグ %1$s - ページ %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "不正なつぶやき内容" #: actions/postnotice.php:101 @@ -2718,13 +2925,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "フルネーム" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "ホームページ" @@ -2746,9 +2954,9 @@ msgid "Bio" msgstr "自己紹介" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "場所" @@ -2762,7 +2970,7 @@ msgstr "つぶやきを投稿するときには私の現在の場所を共有し #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "タグ" @@ -2834,8 +3042,8 @@ msgid "Settings saved." msgstr "設定が保存されました。" #: actions/public.php:83 -#, php-format -msgid "Beyond the page limit (%s)" +#, fuzzy, php-format +msgid "Beyond the page limit (%s)." msgstr "ページ制限を超えました (%s)" #: actions/public.php:92 @@ -3005,7 +3213,7 @@ msgstr "パスワードをリセット" msgid "Recover password" msgstr "パスワードを回復" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "パスワード回復がリクエストされました" @@ -3025,41 +3233,41 @@ msgstr "リセット" msgid "Enter a nickname or email address." msgstr "ニックネームかメールアドレスを入力してください。" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "そのメールアドレスかユーザ名をもっているユーザがありません。" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "そのユーザにはメールアドレスの登録がありません。" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "アドレス確認保存エラー" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "登録されたメールアドレスにパスワードの回復方法をお送りしました。" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "予期せぬパスワードのリセットです。" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "パスワードは6字以上でなければいけません。" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "パスワードと確認が一致しません。" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "ユーザ設定エラー" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "新しいパスワードの保存に成功しました。ログインしています。" @@ -3075,7 +3283,7 @@ msgstr "すみません、不正な招待コード。" msgid "Registration successful" msgstr "登録成功" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "登録" @@ -3096,8 +3304,9 @@ msgid "Invalid username or password." msgstr "不正なユーザ名またはパスワード。" #: actions/register.php:343 +#, fuzzy msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や" @@ -3116,8 +3325,9 @@ msgstr "6文字以上。必須です。" msgid "Same as password above. Required." msgstr "上のパスワードと同じです。 必須。" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "メール" @@ -3130,20 +3340,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "長い名前" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "次の下でテキスト及びファイルを利用可能 " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号" -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3176,7 +3379,7 @@ msgstr "" "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん" "で使ってくれることを願っています。" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3221,7 +3424,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "フォロー" @@ -3260,7 +3463,7 @@ msgstr "自分のつぶやきは繰り返せません。" msgid "You already repeated that notice." msgstr "すでにそのつぶやきを繰り返しています。" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "繰り返された" @@ -3350,7 +3553,7 @@ msgstr "ユーザはすでにサンドボックスです。" #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "セッション" @@ -3387,26 +3590,30 @@ msgstr "!!アプリケーションを見るためにはログインしていな msgid "Application profile" msgstr "アプリケーションプロファイル" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "アイコン" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "名前" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "組織" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "概要" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "統計データ" @@ -3527,67 +3734,67 @@ msgstr "%s グループ" msgid "%1$s group, page %2$d" msgstr "%1$s グループ、ページ %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "グループプロファイル" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "ノート" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "別名" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "グループアクション" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "%s グループのつぶやきフィード (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "%s グループのつぶやきフィード (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "%s グループのつぶやきフィード (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "%s グループの FOAF" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "メンバー" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(なし)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "全てのメンバー" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "作成日" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3602,7 +3809,7 @@ msgstr "" "する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ" "のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3615,7 +3822,7 @@ msgstr "" "wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関" "する短いメッセージを共有します。" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "管理者" @@ -3755,11 +3962,13 @@ msgid "Unknown language \"%s\"." msgstr "不明な言語 \"%s\"" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "最小のテキスト制限は140字です。" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +#, fuzzy +msgid "Dupe limit must be one or more seconds." msgstr "デュープ制限は1秒以上でなければなりません。" #: actions/siteadminpanel.php:221 @@ -3856,7 +4065,7 @@ msgid "Unable to save site notice." msgstr "あなたのデザイン設定を保存できません。" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3873,45 +4082,75 @@ msgstr "" msgid "Save site notice" msgstr "サイトつぶやき" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "SMS 設定" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" "あなたは %%site.name%% からメールでSMSメッセージを受け取ることができます。" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "SMS は利用できません。" -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "IMアドレス" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "現在の確認された SMS 可能な電話番号。" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "この電話番号は確認待ちです。" -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "確認コード" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "あなたがあなたの電話で受け取ったコードを入れてください。" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "パスワード確認" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "SMS 電話番号" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "電話番号、句読点またはスペースがない、市街番号付き" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "設定" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3919,23 +4158,34 @@ msgstr "" "SMSを通してつぶやきを私に送ってください; 私は、私のキャリアから法外な料金を被" "るかもしれないのを理解しています。" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "設定が保存されました。" + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "電話番号がありません。" -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "キャリアが選択されていません。" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "これはすでにあなたの電話番号です。" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "この電話番号はすでに他のユーザに使われています。" -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3943,23 +4193,42 @@ msgstr "" "あなたが加えた電話番号に確認コードを送りました。 どうそれを使用するかに関する" "コードと指示のために電話をチェックしてください。" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "それは間違った確認番号です。" -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "承認作業が中止されました。" + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "それはあなたの電話番号ではありません。" -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "SMS 電話番号" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "携帯電話会社" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "キャリア選択" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3969,13 +4238,14 @@ msgstr "" "載されていないキャリアを知っているなら、メールを送って、%sで私たちに知らせて" "ください。" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "コードが入力されていません" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "スナップショット" @@ -3997,7 +4267,7 @@ msgid "Invalid snapshot report URL." msgstr "不正なスナップショットレポートURL。" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4037,8 +4307,7 @@ msgstr "サイト設定の保存" msgid "You are not subscribed to that profile." msgstr "あなたはそのプロファイルにフォローされていません。" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "フォローを保存できません。" @@ -4141,11 +4410,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s はだれも言うことを聞いていません。" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4178,12 +4447,12 @@ msgstr "ID引数がありません。" msgid "Tag %s" msgstr "タグ %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "ユーザプロファイル" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "写真" @@ -4234,7 +4503,8 @@ msgid "User is not silenced." msgstr "ユーザはサイレンスではありません。" #: actions/unsubscribe.php:77 -msgid "No profile id in request." +#, fuzzy +msgid "No profile ID in request." msgstr "リクエスト内にプロファイルIDがありません。" #: actions/unsubscribe.php:98 @@ -4273,7 +4543,8 @@ msgstr "不正なウェルカムテキスト。最大長は255字です。" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "不正なデフォルトフォローです: '%1$s' はユーザではありません。" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "プロファイル" @@ -4436,27 +4707,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "あなたのhotdogを楽しんでください!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "%1$s グループ、ページ %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "もっとグループを検索" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s はどのグループのメンバーでもありません。" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "[グループを探して](%%action.groupsearch%%)それに加入してください。" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "%1$s から %2$s 上の更新をしました!" @@ -4506,7 +4783,8 @@ msgstr "" msgid "Plugins" msgstr "プラグイン" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "バージョン" @@ -4514,7 +4792,7 @@ msgstr "バージョン" msgid "Author(s)" msgstr "作者" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4524,13 +4802,13 @@ msgstr "" "ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして" "ください。" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4570,26 +4848,27 @@ msgstr "メッセージを追加できません。" msgid "Could not update message with new URI." msgstr "新しいURIでメッセージをアップデートできませんでした。" -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" msgstr "ハッシュタグ追加 ＤＢ エラー: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。" -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。" -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4597,233 +4876,251 @@ msgstr "" "多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ" "い。" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "つぶやきを保存する際に問題が発生しました。" -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "グループ受信箱を保存する際に問題が発生しました。" -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "あなたはフォローが禁止されました。" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "すでにフォローしています!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "ユーザはあなたをブロックしました。" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "フォローしていません！" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "自己フォローを削除できません。" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "フォローを削除できません" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "フォローを削除できません" -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "ようこそ %1$s、@%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "グループを作成できません。" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "グループメンバーシップをセットできません。" -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "グループメンバーシップをセットできません。" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "フォローを保存できません。" -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "プロファイル設定の変更" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "アバターのアップロード" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "パスワードの変更" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "メールの扱いを変更" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "あなたのプロファイルをデザイン" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "その他" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "その他のオプション" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "その他" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "名称未設定ページ" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "プライマリサイトナビゲーション" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 #, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "パーソナルプロファイルと友人のタイムライン" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "パーソナル" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "メールアドレス、アバター、パスワード、プロパティの変更" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "サービスへ接続" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "接続" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "サイト設定の変更" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "管理者" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "友人や同僚が %s で加わるよう誘ってください。" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "招待" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 #, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "サイトからログアウト" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "ログアウト" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "アカウントを作成" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "登録" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 #, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "サイトへログイン" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "ログイン" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "助けて！" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "ヘルプ" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 #, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "人々かテキストを検索" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4831,73 +5128,87 @@ msgstr "検索" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "サイトつぶやき" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "ローカルビュー" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "ページつぶやき" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "セカンダリサイトナビゲーション" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "ヘルプ" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "About" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "よくある質問" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "プライバシー" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "ソース" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "連絡先" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "バッジ" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "StatusNet ソフトウェアライセンス" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ" "イクロブログサービスです。 " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** はマイクロブログサービスです。 " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** はマイクロブログサービスです。" -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4908,67 +5219,81 @@ msgstr "" "いています。 ライセンス [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)。" -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "サイト内容ライセンス" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "全て " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "ライセンス。" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "ページ化" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "<<後" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "前>>" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "あなたはこのサイトへの変更を行うことができません。" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "そのパネルへの変更は許可されていません。" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() は実装されていません。" @@ -4978,159 +5303,200 @@ msgstr "showForm() は実装されていません。" msgid "saveSettings() not implemented." msgstr "saveSettings() は実装されていません。" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "デザイン設定を削除できません。" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "基本サイト設定" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "サイト" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "デザイン設定" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "デザイン" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "ユーザ設定" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "ユーザ" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "アクセス設定" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "パス設定" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "セッション設定" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "サイトつぶやき" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "パス設定" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って" "いません。" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "アプリケーション編集" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "このアプリケーションのアイコン" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "あなたのアプリケーションを %d 字以内記述" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "あなたのアプリケーションを記述" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "ソース URL" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "このアプリケーションのホームページの URL" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "ソース URL" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "このアプリケーションに責任がある組織" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "組織のホームページのURL" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "認証の後にリダイレクトするURL" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "ブラウザ" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "デスクトップ" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "アプリケーション、ブラウザ、またはデスクトップのタイプ" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "リードオンリー" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "リードライト" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード" "ライト" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "中止" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +#, fuzzy +msgid "read-write" +msgstr "リードライト" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +#, fuzzy +msgid "read-only" +msgstr "リードオンリー" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 +#, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "取消し" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "添付" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "作者" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "プロバイダ" @@ -5150,37 +5516,56 @@ msgstr "パスワード変更に失敗しました" msgid "Password changing is not allowed" msgstr "パスワード変更は許可されていません" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "コマンド結果" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "コマンド完了" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "コマンド失敗" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "すみません、このコマンドはまだ実装されていません。" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "その ID によるつぶやきは存在していません" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "ユーザはまだつぶやいていません" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "ユーザを更新できません" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "ユーザを更新できません" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "すみません、このコマンドはまだ実装されていません。" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "それは自分自身への合図で多くは意味がありません!" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "%s へ合図を送りました" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5191,193 +5576,197 @@ msgstr "" "フォローされている: %2$s\n" "つぶやき: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "その ID によるつぶやきは存在していません" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "ユーザはまだつぶやいていません" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "お気に入りにされているつぶやき。" -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "あなたは既にそのグループに参加しています。" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "ユーザ %s はグループ %s に参加できません" +msgid "Could not join user %1$s to group %2$s" +msgstr "ユーザ %1$s はグループ %2$s に参加できません。" -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s はグループ %s に参加しました" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" +msgstr "ユーザ %1$s をグループ %2$s から削除できません。" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "ユーザ %s をグループ %s から削除することができません" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s はグループ %s に残りました。" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "フルネーム： %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "場所: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "ホームページ: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "About: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "メッセージが長すぎます - 最大 %d 字、あなたが送ったのは %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "ダイレクトメッセージを %s に送りました" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "ダイレクトメッセージ送信エラー。" -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "自分のつぶやきを繰り返すことはできません" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "すでにこのつぶやきは繰り返されています" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "%s からつぶやきが繰り返されています" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "つぶやき繰り返しエラー" -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "%s へ返信を送りました" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "つぶやき保存エラー。" -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "フォローするユーザの名前を指定してください" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:628 #, fuzzy -msgid "No such user" -msgstr "そのようなユーザはいません。" +msgid "Can't subscribe to OMB profiles by command." +msgstr "あなたはそのプロファイルにフォローされていません。" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "%s をフォローしました" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "フォローをやめるユーザの名前を指定してください" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "%s のフォローをやめる" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "コマンドはまだ実装されていません。" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "通知オフ。" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "通知をオフできません。" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "通知オン。" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "通知をオンできません。" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "ログインコマンドが無効になっています。" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "このリンクは、かつてだけ使用可能であり、2分間だけ良いです: %s" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "%s のフォローをやめる" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "あなたはだれにもフォローされていません。" -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "あなたはこの人にフォローされています:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "誰もフォローしていません。" -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "この人はあなたにフォローされている:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "あなたはどのグループのメンバーでもありません。" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "あなたはこのグループのメンバーではありません:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5419,21 +5808,21 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "コンフィギュレーションファイルがありません。 " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ" "ん。" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "インストーラへ。" @@ -5605,53 +5994,54 @@ msgstr "投稿が多いグループ" msgid "Tags in %s group's notices" msgstr "%s グループのつぶやきにあるタグ" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "このページはあなたが承認したメディアタイプでは利用できません。" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "サポート外の画像形式です。" + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。" -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "不完全なアップロード。" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "ファイルのアップロードでシステムエラー" -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "画像ではないかファイルが破損しています。" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "サポート外の画像形式です。" - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "ファイルを紛失。" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "不明なファイルタイプ" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "不明な受信箱のソース %d。" @@ -5672,11 +6062,13 @@ msgstr "ユーザ名とパスワードでログイン" msgid "Sign up for a new account" msgstr "新しいアカウントでサインアップ" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "メールアドレス確認" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5705,12 +6097,14 @@ msgstr "" "ありがとうございます。\n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s は %2$s であなたのつぶやきを聞いています。" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5735,17 +6129,20 @@ msgstr "" "----\n" "%8$s でメールアドレスか通知オプションを変えてください。\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "自己紹介: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "%s へ投稿のための新しいメールアドレス" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, fuzzy, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5766,21 +6163,31 @@ msgstr "" "忠実である、あなたのもの、\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s の状態" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS確認" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "この電話番号は確認待ちです。" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "あなたは %s に合図されています" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, fuzzy, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5807,12 +6214,14 @@ msgstr "" "敬具\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "%s からの新しいプライベートメッセージ" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, fuzzy, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5845,12 +6254,14 @@ msgstr "" "敬具\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, fuzzy, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5888,12 +6299,22 @@ msgstr "" "忠実である、あなたのもの、\n" "%6%s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) はあなた宛てにつぶやきを送りました" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5906,17 +6327,19 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"%1$s (@%9$s) はあなた宛てに(@-返信) %2$s でつぶやきを送りました。\n" -"\n" -"つぶやきはここ:\n" -"\n" -"%3$s\n" -"\n" -"これを読む:\n" -"\n" -"%4$s\n" -"\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5931,7 +6354,7 @@ msgstr "" "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの" "メッセージを送ることができます。" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "from" @@ -6065,52 +6488,56 @@ msgstr "" "すみません、あなたの位置を検索するのが予想より長くかかっています、後でもう一" "度試みてください" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 #, fuzzy msgid "N" msgstr "北" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 #, fuzzy msgid "S" msgstr "南" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 #, fuzzy msgid "E" msgstr "東" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 #, fuzzy msgid "W" msgstr "西" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "at" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "このつぶやきへ返信" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "返信" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "つぶやきを繰り返しました" @@ -6134,6 +6561,10 @@ msgstr "プロファイル追加エラー" msgid "Error inserting avatar" msgstr "アバター追加エラー" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "リモートプロファイル更新エラー" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "リモートプロファイル追加エラー" @@ -6183,7 +6614,7 @@ msgstr "%s のつぶやきのタグ" msgid "Unknown" msgstr "不明" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "フォロー" @@ -6191,31 +6622,32 @@ msgstr "フォロー" msgid "All subscriptions" msgstr "すべてのフォロー" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "フォローされている" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "すべてのフォローされている" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ユーザＩＤ" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "利用開始日" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "全てのグループ" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "return-to 引数がありません。" - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "未実装のメソッド。" @@ -6239,10 +6671,18 @@ msgstr "フィーチャーされた" msgid "Popular" msgstr "人気" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "return-to 引数がありません。" + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "このつぶやきを繰り返しますか?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Yes" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "このつぶやきを繰り返す" @@ -6252,7 +6692,7 @@ msgstr "このつぶやきを繰り返す" msgid "Revoke the \"%s\" role from this user" msgstr "このグループからこのユーザをブロック" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "single-user　モードのためのシングルユーザが定義されていません。" @@ -6378,93 +6818,112 @@ msgstr "この利用者からのフォローを解除する" msgid "Unsubscribe" msgstr "フォロー解除" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "ユーザはプロフィールをもっていません。" + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "アバターを編集する" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "利用者アクション" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "プロファイル設定編集" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "編集" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "この利用者にダイレクトメッセージを送る" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "メッセージ" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 #, fuzzy msgid "Moderate" msgstr "管理" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "ユーザプロファイル" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "管理者" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 #, fuzzy msgctxt "role" msgid "Moderator" msgstr "管理" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "数秒前" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "約 1 分前" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "約 %d 分前" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "約 1 時間前" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "約 %d 時間前" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "約 1 日前" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "約 %d 日前" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "約 1 ヵ月前" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "約 %d ヵ月前" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "約 1 年前" @@ -6478,7 +6937,7 @@ msgstr "%sは有効な色ではありません!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 69bf4efb93..8411920419 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Korean # +# Author@translatewiki.net: Twkang # -- # This file is distributed under the same license as the StatusNet package. # @@ -7,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:22+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:43+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -20,65 +21,63 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 -#, fuzzy +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" -msgstr "수락" +msgstr "접근" #. TRANS: Page notice #: actions/accessadminpanel.php:67 -#, fuzzy msgid "Site access settings" -msgstr "아바타 설정" +msgstr "사이트 접근 설정" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 -#, fuzzy msgid "Registration" -msgstr "회원가입" +msgstr "등록" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" +msgstr "로그인하지 않은 익명 이용자의 사이트 보기 금지" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" -msgstr "개인정보 취급방침" +msgstr "비공개" #. TRANS: Checkbox instructions for admin setting "Invite only" #: actions/accessadminpanel.php:174 msgid "Make registration invitation only." -msgstr "" +msgstr "초대받은 경우만 등록허용" #. TRANS: Checkbox label for configuring site as invite only. #: actions/accessadminpanel.php:176 -#, fuzzy msgid "Invite only" -msgstr "초대" +msgstr "초대 전용" #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations) #: actions/accessadminpanel.php:183 msgid "Disable new registrations." -msgstr "" +msgstr "신규회원등록 기능차단" #. TRANS: Checkbox label for disabling new user registrations. #: actions/accessadminpanel.php:185 -#, fuzzy msgid "Closed" -msgstr "차단하기" +msgstr "폐쇄" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "아바타 설정" +msgstr "접근 설정을 저장" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "저장" @@ -86,9 +85,8 @@ msgstr "저장" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -#, fuzzy -msgid "No such page" -msgstr "그러한 태그가 없습니다." +msgid "No such page." +msgstr "해당하는 페이지 없음" #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -98,9 +96,9 @@ msgstr "그러한 태그가 없습니다." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -108,24 +106,23 @@ msgstr "그러한 태그가 없습니다." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." -msgstr "그러한 사용자는 없습니다." +msgstr "해당하는 이용자 없음" #. TRANS: Page title. %1$s is user nickname, %2$d is page number #: actions/all.php:86 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "%s 와 친구들, %d 페이지" +msgstr "%s 및 친구들, %d 페이지" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -133,28 +130,28 @@ msgstr "%s 및 친구들" #. TRANS: %1$s is user nickname #: actions/all.php:103 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "%s의 친구들을 위한 피드" +msgstr "%s의 친구들에 대한 피드 (RSS 1.0)" #. TRANS: %1$s is user nickname #: actions/all.php:112 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "%s의 친구들을 위한 피드" +msgstr "%s의 친구들에 대한 피드 (RSS 2.0)" #. TRANS: %1$s is user nickname #: actions/all.php:121 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "%s의 친구들을 위한 피드" +msgstr "%s의 친구들에 대한 피드 (Atom)" #. TRANS: %1$s is user nickname #: actions/all.php:134 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." -msgstr "" +msgstr "%s 및 친구들의 타임라인이지만, 아직 아무도 글을 작성하지 않았습니다." #: actions/all.php:139 #, php-format @@ -162,6 +159,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"더 많은 사람들을 구독해 보거나, [그룹에 참가](%%action.groups%%) 또는 직접 뭔" +"가 글을 써보세요." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" #: actions/all.php:142 @@ -180,15 +179,16 @@ msgstr "" #. TRANS: H1 text #: actions/all.php:178 -#, fuzzy msgid "You and friends" -msgstr "%s 및 친구들" +msgstr "당신 및 친구들" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" -msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!" +msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 @@ -200,21 +200,20 @@ msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -#, fuzzy +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." -msgstr "API 메서드를 찾을 수 없습니다." +msgstr "API 메서드 발견 안 됨." #: actions/apiaccountupdatedeliverydevice.php:85 #: actions/apiaccountupdateprofile.php:89 @@ -225,41 +224,39 @@ msgstr "API 메서드를 찾을 수 없습니다." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." -msgstr "이 메서드는 등록을 요구합니다." +msgstr "이 메서드는 POST를 요구합니다." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 -#, fuzzy msgid "Could not update user." -msgstr "사용자를 업데이트 할 수 없습니다." +msgstr "이용자를 업데이트 할 수 없습니다." #: actions/apiaccountupdateprofile.php:112 #: actions/apiaccountupdateprofilebackgroundimage.php:194 #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "이용자가 프로필을 가지고 있지 않습니다." #: actions/apiaccountupdateprofile.php:147 -#, fuzzy msgid "Could not save profile." msgstr "프로필을 저장 할 수 없습니다." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -267,6 +264,8 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"현재 설정으로 인해 너무 많은 POST 데이터(%s 바이트)는 서버에서 처리할 수 없습" +"니다." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 @@ -275,33 +274,30 @@ msgstr "" #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy msgid "Unable to save your design settings." -msgstr "트위터 환경설정을 저장할 수 없습니다." +msgstr "디자인 설정을 저장할 수 없습니다." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." -msgstr "사용자를 업데이트 할 수 없습니다." +msgstr "디자인을 업데이트 할 수 없습니다." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "사용자를 업데이트 할 수 없습니다." +msgstr "자기 자신은 차단할 수 없습니다." #: actions/apiblockcreate.php:126 msgid "Block user failed." -msgstr "사용자 차단에 실패했습니다." +msgstr "이용자 차단에 실패했습니다." #: actions/apiblockdestroy.php:114 msgid "Unblock user failed." -msgstr "사용자 차단 해제에 실패했습니다." +msgstr "이용자 차단 해제에 실패했습니다." #: actions/apidirectmessage.php:89 -#, fuzzy, php-format +#, php-format msgid "Direct messages from %s" -msgstr "%s에게 직접 메시지" +msgstr "%s으로부터 직접 메시지" #: actions/apidirectmessage.php:93 #, php-format @@ -323,9 +319,9 @@ msgid "No message text!" msgstr "메시지 내용이 없습니다!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "메시지가 너무 길어요. 최대로 140자까지 입력하실 수 있습니다." +msgstr "너무 깁니다. 최대 메시지 길이는 %d 자까지입니다." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -341,55 +337,49 @@ msgid "No status found with that ID." msgstr "그 ID로 발견된 상태가 없습니다." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite." -msgstr "이 게시글은 이미 좋아하는 게시글입니다." +msgstr "이 소식은 이미 관심소식으로 등록되어 있습니다." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." -msgstr "좋아하는 게시글을 생성할 수 없습니다." +msgstr "관심소식을 생성할 수 없습니다." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite." -msgstr "이 메시지는 favorite이 아닙니다." +msgstr "이 소식은 관심소식이 아닙니다." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." -msgstr "favorite을 삭제할 수 없습니다." +msgstr "관심소식을 삭제할 수 없습니다." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." -msgstr "따라가실 수 없습니다 : 사용자가 없습니다." +msgstr "팔로우할 수 없습니다: 이용자 없음." #: actions/apifriendshipscreate.php:118 #, php-format msgid "Could not follow user: %s is already on your list." -msgstr "따라가실 수 없습니다 : %s 님은 이미 리스트에 있습니다." +msgstr "팔로우할 수 없습니다 : %s 님은 이미 리스트에 있습니다." #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "따라가실 수 없습니다 : 사용자가 없습니다." +msgstr "언팔로우할 수 없습니다: 이용자 없음." #: actions/apifriendshipsdestroy.php:120 -#, fuzzy msgid "You cannot unfollow yourself." -msgstr "사용자를 업데이트 할 수 없습니다." +msgstr "자기 자신을 언팔로우할 수 없습니다." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." msgstr "두 개의 사용자 ID나 대화명을 입력해야 합니다." #: actions/apifriendshipsshow.php:134 -#, fuzzy msgid "Could not determine source user." -msgstr "공개 stream을 불러올 수 없습니다." +msgstr "소스 이용자를 확인할 수 없습니다." #: actions/apifriendshipsshow.php:142 -#, fuzzy msgid "Could not find target user." -msgstr "어떠한 상태도 찾을 수 없습니다." +msgstr "타겟 이용자를 찾을 수 없습니다." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 @@ -426,9 +416,9 @@ msgstr "실명이 너무 깁니다. (최대 255글자)" #: actions/apigroupcreate.php:215 actions/editapplication.php:190 #: actions/newapplication.php:172 -#, fuzzy, php-format +#, php-format msgid "Description is too long (max %d chars)." -msgstr "설명이 너무 길어요. (최대 140글자)" +msgstr "설명이 너무 깁니다. (최대 %d 글자)" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 @@ -442,17 +432,16 @@ msgstr "위치가 너무 깁니다. (최대 255글자)" msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, fuzzy, php-format -msgid "Invalid alias: \"%s\"" -msgstr "유효하지 않은태그: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "사용할 수 없는 별명 : \"%s\"" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 -#, fuzzy, php-format +#, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오." +msgstr "별명 \"%s\" 이 이미 사용중 입니다. 다른 별명을 시도해 보십시오." #: actions/apigroupcreate.php:288 actions/editgroup.php:238 #: actions/newgroup.php:178 @@ -463,25 +452,23 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy -msgid "Group not found!" -msgstr "API 메서드를 찾을 수 없습니다." +msgid "Group not found." +msgstr "그룹을 찾을 수 없습니다." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 -#, fuzzy msgid "You are already a member of that group." msgstr "당신은 이미 이 그룹의 멤버입니다." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" #: actions/apigroupjoin.php:138 actions/joingroup.php:134 -#, fuzzy, php-format +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "그룹 %s에 %s는 가입할 수 없습니다." +msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다." #: actions/apigroupleave.php:114 -#, fuzzy msgid "You are not a member of this group." msgstr "당신은 해당 그룹의 멤버가 아닙니다." @@ -490,20 +477,29 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다." msgid "Could not remove user %1$s from group %2$s." msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다." -#: actions/apigrouplist.php:95 -#, fuzzy, php-format +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 +#, php-format msgid "%s's groups" -msgstr "%s 그룹" +msgstr "%s의 그룹들" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%s 그룹들은 의 멤버입니다." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s 그룹" -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format +#: actions/apigrouplistall.php:95 +#, php-format msgid "groups on %s" -msgstr "그룹 행동" +msgstr "%s 상의 그룹들" #: actions/apioauthauthorize.php:101 msgid "No oauth_token parameter provided." @@ -515,17 +511,17 @@ msgid "Invalid token." msgstr "옳지 않은 크기" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -538,14 +534,12 @@ msgid "Invalid nickname / password!" msgstr "사용자 이름이나 비밀 번호가 틀렸습니다." #: actions/apioauthauthorize.php:159 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "사용자 세팅 오류" +msgstr "OAuth 응용프로그램 사용자 삭제 중 데이터베이스 오류" #: actions/apioauthauthorize.php:185 -#, fuzzy msgid "Database error inserting OAuth application user." -msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s" +msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류" #: actions/apioauthauthorize.php:214 #, php-format @@ -559,22 +553,25 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "잘못된 폼 제출" #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" -msgstr "" +msgstr "응용 프로그램이 계정에 연결하려고 할 것입니다." #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" -msgstr "" +msgstr "접근 허용 또는 거부" #: actions/apioauthauthorize.php:292 #, php-format @@ -583,40 +580,44 @@ msgid "" "the ability to %3$s your %4$s account data. You should only " "give access to your %4$s account to third parties you trust." msgstr "" +"%2$s의 응용 프로그램 %1$s이 %4$s 계정 정보" +"에 대해 %3$s 할 수 있습니다 .믿을 수 있는 써드파티에게만 %4" +"$s 계정의 접근을 허용해야 합니다." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "계정" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "별명" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "비밀 번호" #: actions/apioauthauthorize.php:328 msgid "Deny" -msgstr "" +msgstr "거부" #: actions/apioauthauthorize.php:334 -#, fuzzy msgid "Allow" -msgstr "모든 것" +msgstr "허용" #: actions/apioauthauthorize.php:351 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "계정 정보에 대한 접근을 허용 또는 거부합니다." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." -msgstr "이 메서드는 등록 또는 삭제를 요구합니다." +msgstr "이 메서드는 POST 또는 DELETE를 요구합니다." #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." @@ -628,50 +629,46 @@ msgid "No such notice." msgstr "그러한 통지는 없습니다." #: actions/apistatusesretweet.php:83 -#, fuzzy msgid "Cannot repeat your own notice." -msgstr "알림을 켤 수 없습니다." +msgstr "자기 자신의 소식은 재전송할 수 없습니다." #: actions/apistatusesretweet.php:91 -#, fuzzy msgid "Already repeated that notice." -msgstr "이 게시글 삭제하기" +msgstr "이미 재전송된 소식입니다." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "아바타가 업데이트 되었습니다." +msgstr "삭제된 소식입니다." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." msgstr "발견된 ID의 상태가 없습니다." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "너무 깁니다. 통지의 최대 길이는 140글자 입니다." +msgstr "너무 깁니다. 통지의 최대 길이는 %d 글자 입니다." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "찾지 못함" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "찾을 수가 없습니다." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." -msgstr "" +msgstr "소식의 최대 길이는 첨부 URL을 포함하여 %d 글자입니다." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 -#, fuzzy msgid "Unsupported format." -msgstr "지원하지 않는 그림 파일 형식입니다." +msgstr "지원하지 않는 형식입니다." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / %s의 좋아하는 글들" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s." @@ -681,17 +678,17 @@ msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / %2$s에게 답신 업데이트" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s 공개 타임라인" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "모두로부터의 업데이트 %s개!" @@ -706,24 +703,19 @@ msgstr "%s에 답신" msgid "Repeats of %s" msgstr "%s에 답신" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "%s 태그된 통지" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "찾을 수가 없습니다." - #: actions/attachment.php:73 -#, fuzzy msgid "No such attachment." -msgstr "그러한 문서는 없습니다." +msgstr "해당하는 첨부파일이 없습니다." #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84 @@ -740,20 +732,22 @@ msgstr "사이즈가 없습니다." msgid "Invalid size." msgstr "옳지 않은 크기" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "아바타" #: actions/avatarsettings.php:78 -#, fuzzy, php-format +#, php-format msgid "You can upload your personal avatar. The maximum file size is %s." -msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다." +msgstr "당신의 개인 아바타를 업로드할 수 있습니다. 최대 파일 크기는 %s 입니다." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." msgstr "프로필 매칭이 없는 사용자" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -772,7 +766,7 @@ msgid "Preview" msgstr "미리보기" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "삭제" @@ -784,33 +778,36 @@ msgstr "올리기" msgid "Crop" msgstr "자르기" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "프로필을 지정하지 않았습니다." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "당신의 아바타가 될 이미지영역을 지정하세요." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "파일 데이터를 잃어버렸습니다." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "아바타가 업데이트 되었습니다." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "아바타 업데이트 실패" -#: actions/avatarsettings.php:393 -#, fuzzy +#: actions/avatarsettings.php:397 msgid "Avatar deleted." -msgstr "아바타가 업데이트 되었습니다." +msgstr "아바타가 삭제되었습니다." #: actions/block.php:69 -#, fuzzy msgid "You already blocked that user." -msgstr "당신은 이미 이 사용자를 차단하고 있습니다." +msgstr "이미 차단된 이용자입니다." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "사용자를 차단합니다." @@ -820,29 +817,47 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" +"정말 이용자를 차단하시겠습니까? 차단된 이용자는 구독해제되고, 이후 당신을 구" +"독할 수 없으며, 차단된 이용자로부터 @-답장의 통보를 받지 않게 됩니다." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "아니오" -#: actions/block.php:143 actions/deleteuser.php:150 -#, fuzzy +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" -msgstr "이 사용자를 차단해제합니다." +msgstr "이용자를 차단하지 않는다." -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "네, 맞습니다." -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "이 사용자 차단하기" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "정보차단을 저장하는데 실패했습니다." @@ -855,8 +870,8 @@ msgstr "정보차단을 저장하는데 실패했습니다." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "그러한 그룹이 없습니다." @@ -876,9 +891,8 @@ msgid "A list of the users blocked from joining this group." msgstr "이 그룹의 회원리스트" #: actions/blockedfromgroup.php:288 -#, fuzzy msgid "Unblock user from group" -msgstr "사용자 차단 해제에 실패했습니다." +msgstr "그룹 이용자는 차단해제" #: actions/blockedfromgroup.php:320 lib/unblockform.php:69 msgid "Unblock" @@ -888,9 +902,10 @@ msgstr "차단해제" msgid "Unblock this user" msgstr "이 사용자를 차단해제합니다." -#: actions/bookmarklet.php:50 -#, fuzzy -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" msgstr "사진" #: actions/confirmaddress.php:75 @@ -905,34 +920,43 @@ msgstr "인증 코드가 없습니다." msgid "That confirmation code is not for you!" msgstr "그 인증 코드는 귀하의 것이 아닙니다!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "인식되지않은 주소유형 %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "그 주소는 이미 승인되었습니다." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "사용자를 업데이트 할 수 없습니다." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "이메일 승인을 삭제 할 수 없습니다." -#: actions/confirmaddress.php:144 -#, fuzzy +#: actions/confirmaddress.php:146 msgid "Confirm address" -msgstr "주소 인증" +msgstr "주소 확인" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "\"%s\" 는 귀하의 계정으로 승인되었습니다." @@ -943,7 +967,7 @@ msgid "Conversation" msgstr "인증 코드" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "통지" @@ -965,14 +989,13 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "당신의 세션토큰관련 문제가 있습니다." #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 -#, fuzzy msgid "Delete application" -msgstr "그러한 통지는 없습니다." +msgstr "응용프로그램 삭제" #: actions/deleteapplication.php:149 msgid "" @@ -981,17 +1004,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "이 통지를 지울 수 없습니다." -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "이 게시글 삭제하기" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1022,12 +1047,14 @@ msgstr "통지 삭제" msgid "Are you sure you want to delete this notice?" msgstr "정말로 통지를 삭제하시겠습니까?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 #, fuzzy msgid "Do not delete this notice" msgstr "이 통지를 지울 수 없습니다." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "이 게시글 삭제하기" @@ -1042,9 +1069,8 @@ msgid "You can only delete local users." msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다." #: actions/deleteuser.php:110 actions/deleteuser.php:133 -#, fuzzy msgid "Delete user" -msgstr "삭제" +msgstr "이용자 삭제" #: actions/deleteuser.php:136 msgid "" @@ -1052,136 +1078,134 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 #, fuzzy msgid "Delete this user" msgstr "이 게시글 삭제하기" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." -msgstr "" +msgstr "이 StatusNet 사이트에 대한 디자인 설정" -#: actions/designadminpanel.php:275 -#, fuzzy +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." -msgstr "옳지 않은 크기" +msgstr "잘못된 로고 URL 입니다." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" -msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." +msgid "Theme not available: %s." +msgstr "테마를 이용할 수 없습니다: %s" -#: actions/designadminpanel.php:375 -#, fuzzy +#: actions/designadminpanel.php:376 msgid "Change logo" -msgstr "비밀번호 바꾸기" +msgstr "로고 변경" -#: actions/designadminpanel.php:380 -#, fuzzy +#: actions/designadminpanel.php:381 msgid "Site logo" -msgstr "초대" +msgstr "사이트 로고" -#: actions/designadminpanel.php:387 -#, fuzzy +#: actions/designadminpanel.php:388 msgid "Change theme" -msgstr "변환" - -#: actions/designadminpanel.php:404 -#, fuzzy -msgid "Site theme" -msgstr "사이트 공지" +msgstr "테마 바꾸기" #: actions/designadminpanel.php:405 -#, fuzzy +msgid "Site theme" +msgstr "사이트 테마" + +#: actions/designadminpanel.php:406 msgid "Theme for the site." -msgstr "이 사이트로부터 로그아웃" +msgstr "사이트에 대한 테마" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" -msgstr "" +msgstr "배경 이미지 바꾸기" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" -msgstr "" +msgstr "배경" -#: actions/designadminpanel.php:427 -#, fuzzy, php-format +#: actions/designadminpanel.php:428 +#, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." -msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다." +msgstr "" +"사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" -msgstr "" +msgstr "켜기" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" -msgstr "" +msgstr "끄기" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." -msgstr "" +msgstr "배경 이미지를 켜거나 끈다." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" -msgstr "" +msgstr "배경 이미지를 반복 나열" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 -#, fuzzy +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" -msgstr "비밀번호 바꾸기" +msgstr "색상 변경" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "연결" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "검색" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "문자" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "로그인" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "저장" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1199,14 +1223,12 @@ msgid "No such document \"%s\"" msgstr "그러한 문서는 없습니다." #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" -msgstr "다른 옵션들" +msgstr "응용 프로그램 수정" #: actions/editapplication.php:66 -#, fuzzy msgid "You must be logged in to edit an application." -msgstr "그룹을 만들기 위해서는 로그인해야 합니다." +msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다." #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166 #: actions/showapplication.php:87 @@ -1253,9 +1275,8 @@ msgid "Organization is required." msgstr "" #: actions/editapplication.php:206 actions/newapplication.php:191 -#, fuzzy msgid "Organization is too long (max 255 chars)." -msgstr "위치가 너무 깁니다. (최대 255글자)" +msgstr "기관명이 너무 깁니다. (최대 255글자)" #: actions/editapplication.php:209 actions/newapplication.php:194 msgid "Organization homepage is required." @@ -1285,7 +1306,6 @@ msgstr "그룹을 만들기 위해서는 로그인해야 합니다." #: actions/editgroup.php:107 actions/editgroup.php:172 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109 -#, fuzzy msgid "You must be an admin to edit the group." msgstr "관리자만 그룹을 편집할 수 있습니다." @@ -1294,15 +1314,20 @@ msgid "Use this form to edit the group." msgstr "다음 양식을 이용해 그룹을 편집하십시오." #: actions/editgroup.php:205 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "설명이 너무 길어요. (최대 140글자)" +msgstr "설명이 너무 길어요. (최대 %d글자)" + +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "사용할 수 없는 별명 : \"%s\"" #: actions/editgroup.php:258 msgid "Could not update group." msgstr "그룹을 업데이트 할 수 없습니다." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "좋아하는 게시글을 생성할 수 없습니다." @@ -1311,32 +1336,43 @@ msgstr "좋아하는 게시글을 생성할 수 없습니다." msgid "Options saved." msgstr "옵션들이 저장되었습니다." -#: actions/emailsettings.php:60 -#, fuzzy +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" -msgstr "이메일 세팅" +msgstr "이메일 설정" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "%%site.name%%에서 어떻게 이메일을 받을지 정하십시오." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "주소" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "이메일 주소" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "확인된 최신의 이메일 계정" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "삭제" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1344,108 +1380,142 @@ msgstr "" "이 주소는 인증 대기중입니다. 수신함(또는 스팸함)을 확인하셔서 지침을 확인해 " "주시기 바랍니다." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "취소" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "이메일 주소" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "\"UserName@example.org\" 와 같은 이메일 계정" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "추가" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "받은 이메일" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "새로운 통지를 올리려면 이 주소로 메일을 보내십시오/" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "포스팅을 위한 새 이메일 계정의 생성; 전 이메일 계정은 취소." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "새로운" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "설정" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "새로운 예약 구독의 통지를 이메일로 보내주세요." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "누군가 내 글을 좋아하는 게시글로 추가했을때, 이메일을 보냅니다." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "누군가 내게 비밀메시지를 보냈을때, 이메일을 보냅니다." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 #, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." msgstr "누군가 내게 비밀메시지를 보냈을때, 이메일을 보냅니다." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "친구들이 내게 이메일이나 쪽지를 보낼 수 있도록 허용합니다." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "이메일로 통보를 포스트 하길 원합니다." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "이메일 주소를 위한 MicroID의 생성" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "설정이 저장되었습니다." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." +msgstr "싱크설정이 저장되었습니다." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "이메일이 추가 되지 않았습니다." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "그 이메일 주소를 정규화 할 수 없습니다." -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "유효한 이메일 주소가 아닙니다." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "그 이메일 주소는 이미 귀하의 것입니다." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "그 이메일 주소는 이미 다른 사용자의 소유입니다." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "확인 코드를 추가 할 수 없습니다." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1453,43 +1523,56 @@ msgstr "" "추가한 이메일로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코드" "와 사용법을 확인하여 주시기 바랍니다." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "취소 할 대기중인 인증이 없습니다." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "옳지 않은 메신저 계정 입니다." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "인증 취소" -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "그 이메일 주소는 귀하의 것이 아닙니다." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "주소가 삭제되었습니다." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "이메일 주소가 없습니다." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "사용자 기록을 업데이트 할 수 없습니다." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "받은 이메일 계정 삭제" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "새로운 이메일 주소가 추가 되었습니다." @@ -1569,9 +1652,8 @@ msgid "No notice." msgstr "새로운 통지" #: actions/file.php:42 -#, fuzzy msgid "No attachments." -msgstr "그러한 문서는 없습니다." +msgstr "첨부문서 없음" #: actions/file.php:51 #, fuzzy @@ -1610,19 +1692,18 @@ msgstr "리퀘스트 토큰을 엑세스 토큰으로 변환 할 수 없습니 msgid "Remote service uses unknown version of OMB protocol." msgstr "OMB 프로토콜의 알려지지 않은 버전" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "리모트 프로필 업데이트 오류" #: actions/getfile.php:79 -#, fuzzy msgid "No such file." -msgstr "그러한 통지는 없습니다." +msgstr "해당하는 파일이 없습니다." #: actions/getfile.php:83 -#, fuzzy msgid "Cannot read file." -msgstr "파일을 잃어버렸습니다." +msgstr "파일을 읽을 수 없습니다." #: actions/grantrole.php:62 actions/revokerole.php:62 #, fuzzy @@ -1675,12 +1756,12 @@ msgstr "회원이 당신을 차단해왔습니다." msgid "User is not a member of group." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 #, fuzzy msgid "Block user from group" msgstr "사용자를 차단합니다." -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1688,17 +1769,19 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 #, fuzzy msgid "Do not block this user from this group" msgstr "이 그룹의 회원리스트" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 #, fuzzy msgid "Block this user from this group" msgstr "이 그룹의 회원리스트" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1725,9 +1808,8 @@ msgstr "" #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 -#, fuzzy msgid "Couldn't update your design." -msgstr "사용자를 업데이트 할 수 없습니다." +msgstr "디자인을 수정할 수 없습니다." #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231 #, fuzzy @@ -1744,15 +1826,9 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다." -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "프로필 매칭이 없는 사용자" - #: actions/grouplogo.php:365 -#, fuzzy msgid "Pick a square area of the image to be the logo." -msgstr "당신의 아바타가 될 이미지영역을 지정하세요." +msgstr "이미지에서 로고로 사용할 사각 영역을 지정하세요." #: actions/grouplogo.php:399 msgid "Logo updated." @@ -1780,36 +1856,40 @@ msgstr "이 그룹의 회원리스트" msgid "Admin" msgstr "관리자" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "차단하기" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 #, fuzzy msgid "Make user an admin of the group" msgstr "관리자만 그룹을 편집할 수 있습니다." -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 #, fuzzy msgid "Make Admin" msgstr "관리자" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" -msgstr "" +msgstr "이 이용자를 관리자로 만듦" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s 타임라인" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "그룹" @@ -1829,7 +1909,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "새 그룹을 만듭니다." @@ -1879,12 +1959,16 @@ msgstr "회원이 당신을 차단해왔습니다." msgid "Error removing the block." msgstr "차단 제거 에러!" -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "메신저 설정" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1893,16 +1977,25 @@ msgstr "" "당신은 Jabber나 구글토크(%%doc.im%%)를 통해 메시지를 주고받을 수 있습니다. 아" "래 당신의 주소와 환경설정을 조정하세요." -#: actions/imsettings.php:89 -#, fuzzy +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." -msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." +msgstr "인스턴트 메신저를 사용할 수 없습니다." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "메신저 주소" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "확인된 최신의 Jabber/GTalk 계정" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1911,12 +2004,9 @@ msgstr "" "이 주소는 인증 대기 중입니다. Jabber/Gtalk로 메시지를 확인해 주십시오.(%s 항" "목을 추가하셨습니까?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "메신저 주소" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1925,44 +2015,66 @@ msgstr "" "\"UserName@example.org\" 와 같은 Jabber 또는 GTalk 계정은 귀하의 메신저나 " "GTalk 친구목록에 반드시 %s 주소를 추가하여 주십시오." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "설정" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Jabber/GTalk 로 통지를 보내주세요." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Jabber/GTalk의 상태가 변경되었을 때 통지를 보냅니다." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "내가 구독하지 않는 사람으로 부터의 답장을 Jabber/GTalk을 통해 보내주세요." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "설정이 저장되었습니다." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Jabber ID가 아닙니다." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "그 Jabbar ID를 정규화 할 수 없습니다." -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "유효한 Jabber ID가 아닙니다." -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "그 Jabber ID는 이미 귀하의 것입니다." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber ID가 이미 다른 사용자에 의하여 사용되고 있습니다." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1971,10 +2083,35 @@ msgstr "" "추가한 메신저 주소로 인증 코드를 보냈습니다. %s 사용자를 허락해야 메시지를 전" "달할 수 있습니다." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "옳지 않은 메신저 계정 입니다." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "이메일 승인을 삭제 할 수 없습니다." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "인증 취소" + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "그 Jabber ID는 귀하의 것이 아닙니다." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "주소가 삭제되었습니다." + #: actions/inbox.php:59 #, fuzzy, php-format msgid "Inbox for %1$s - page %2$d" @@ -1994,8 +2131,8 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "로그인을 해야 다른 사용자를 %s에 초대할 수 있습니다." #: actions/invite.php:72 @@ -2015,7 +2152,9 @@ msgstr "새 사용자를 초대" msgid "You are already subscribed to these users:" msgstr "당신은 다음 사용자를 이미 구독하고 있습니다." -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2065,12 +2204,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "보내기" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s님이 귀하를 %2$s에 초대하였습니다." -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2131,7 +2272,9 @@ msgstr "그룹가입을 위해서는 로그인이 필요합니다." msgid "No nickname or ID." msgstr "별명이 없습니다." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s 는 그룹 %s에 가입했습니다." @@ -2140,11 +2283,13 @@ msgstr "%s 는 그룹 %s에 가입했습니다." msgid "You must be logged in to leave a group." msgstr "그룹을 떠나기 위해서는 로그인해야 합니다." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s가 그룹%s를 떠났습니다." @@ -2190,10 +2335,14 @@ msgstr "" "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "사용자 이름과 비밀번호로 로그인" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "귀하의 계정과 비밀 번호로 로그인 하세요. 계정이 아직 없으세요? [가입](%%" "action.register%%) 새 계정을 생성 또는 [OpenID](%%action.openidlogin%%)를 사" @@ -2219,13 +2368,13 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "관리자만 그룹을 편집할 수 있습니다." #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "현재 상태가 없습니다." #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" -msgstr "그러한 통지는 없습니다." +msgstr "신규 응용 프로그램" #: actions/newapplication.php:64 #, fuzzy @@ -2258,12 +2407,12 @@ msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요." msgid "New message" msgstr "새로운 메시지입니다." -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "내용이 없습니다!" @@ -2271,7 +2420,7 @@ msgstr "내용이 없습니다!" msgid "No recipient specified." msgstr "수신자를 지정하지 않았습니다." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2287,7 +2436,7 @@ msgstr "메시지" msgid "Direct message to %s sent." msgstr "%s에게 보낸 직접 메시지" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax 에러입니다." @@ -2295,7 +2444,7 @@ msgstr "Ajax 에러입니다." msgid "New notice" msgstr "새로운 통지" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "게시글이 등록되었습니다." @@ -2380,7 +2529,7 @@ msgstr "" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." -msgstr "" +msgstr "다음 응용 프로그램이 계정에 접근하도록 허용되어 있습니다." #: actions/oauthconnectionssettings.php:175 #, fuzzy @@ -2388,11 +2537,11 @@ msgid "You are not a user of that application." msgstr "당신은 해당 그룹의 멤버가 아닙니다." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2401,25 +2550,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "통지에 프로필이 없습니다." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s의 상태 (%2$s에서)" -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "연결" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -2529,7 +2683,7 @@ msgid "6 or more characters" msgstr "6글자 이상" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "인증" @@ -2557,7 +2711,7 @@ msgstr "기존 비밀 번호가 틀렸습니다" msgid "Error saving user; invalid." msgstr "사용자 저장 오류; 무효한 사용자" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "새 비밀번호를 저장 할 수 없습니다." @@ -2566,7 +2720,7 @@ msgid "Password saved." msgstr "비밀 번호 저장" #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2576,23 +2730,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "아바타 디렉토리에 쓸 수 없습니다 : %s" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "아바타 디렉토리에 쓸 수 없습니다 : %s" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2639,7 +2793,7 @@ msgstr "" #: actions/pathsadminpanel.php:259 msgid "Theme" -msgstr "" +msgstr "테마" #: actions/pathsadminpanel.php:264 msgid "Theme server" @@ -2710,7 +2864,7 @@ msgstr "" #: actions/pathsadminpanel.php:329 msgid "Use SSL" -msgstr "" +msgstr "SSL 사용" #: actions/pathsadminpanel.php:330 msgid "When to use SSL" @@ -2743,18 +2897,19 @@ msgstr "" msgid "People search" msgstr "사람 찾기" -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "유효한 태그가 아닙니다: %s" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "이용자 셀프 테크 %s - %d 페이지" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "옳지 않은 통지 내용" #: actions/postnotice.php:101 @@ -2782,13 +2937,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다." #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "실명" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "홈페이지" @@ -2811,9 +2967,9 @@ msgid "Bio" msgstr "자기소개" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "위치" @@ -2827,7 +2983,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "태그" @@ -2899,7 +3055,7 @@ msgstr "설정 저장" #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -2936,6 +3092,7 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"%%site.name%% 의 공개 타임라인이지만, 아직 아무도 글을 쓰지 않았습니다." #: actions/public.php:191 msgid "Be the first to post!" @@ -2982,7 +3139,7 @@ msgstr "" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "글을 올린 첫번째 사람이 되세요!" #: actions/publictagcloud.php:75 #, php-format @@ -3057,7 +3214,7 @@ msgstr "비밀 번호 초기화" msgid "Recover password" msgstr "비밀 번호 복구" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "비밀 번호 복구가 요청되었습니다." @@ -3077,41 +3234,41 @@ msgstr "초기화" msgid "Enter a nickname or email address." msgstr "별명이나 이메일 계정을 입력하십시오." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "그러한 이메일 주소나 계정을 가진 사용자는 없습니다." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "그 사용자는 등록된 메일주소가 없습니다." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "주소 확인 저장 에러" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "잘못된 비밀 번호 지정" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "비밀 번호는 6자 이상이어야 합니다." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "비밀 번호가 일치하지 않습니다." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "사용자 세팅 오류" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" "새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다." @@ -3129,7 +3286,7 @@ msgstr "확인 코드 오류" msgid "Registration successful" msgstr "회원 가입이 성공적입니다." -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "회원가입" @@ -3151,7 +3308,7 @@ msgstr "사용자 이름이나 비밀 번호가 틀렸습니다." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3169,8 +3326,9 @@ msgstr "6글자 이상이 필요합니다." msgid "Same as password above. Required." msgstr "위와 같은 비밀 번호. 필수 사항." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "이메일" @@ -3183,21 +3341,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "더욱 긴 이름을 요구합니다." #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "나의 글과 파일의 라이선스는 다음과 같습니다 " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호" -#: actions/register.php:538 +#: actions/register.php:542 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3230,7 +3380,7 @@ msgstr "" "\n" "다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3275,7 +3425,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "구독" @@ -3309,24 +3459,21 @@ msgid "No notice specified." msgstr "프로필을 지정하지 않았습니다." #: actions/repeat.php:76 -#, fuzzy msgid "You can't repeat your own notice." -msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다." +msgstr "자신의 글은 재전송할 수 없습니다." #: actions/repeat.php:90 #, fuzzy msgid "You already repeated that notice." msgstr "당신은 이미 이 사용자를 차단하고 있습니다." -#: actions/repeat.php:114 lib/noticelist.php:674 -#, fuzzy +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" -msgstr "생성" +msgstr "재전송됨" #: actions/repeat.php:119 -#, fuzzy msgid "Repeated!" -msgstr "생성" +msgstr "재전송됨!" #: actions/replies.php:126 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -3396,9 +3543,8 @@ msgid "StatusNet" msgstr "아바타가 업데이트 되었습니다." #: actions/sandbox.php:65 actions/unsandbox.php:65 -#, fuzzy msgid "You cannot sandbox users on this site." -msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다." +msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다." #: actions/sandbox.php:72 #, fuzzy @@ -3407,7 +3553,7 @@ msgstr "회원이 당신을 차단해왔습니다." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3447,28 +3593,32 @@ msgstr "그룹을 떠나기 위해서는 로그인해야 합니다." msgid "Application profile" msgstr "통지에 프로필이 없습니다." -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "별명" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "페이지수" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "설명" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "통계" @@ -3579,68 +3729,68 @@ msgstr "%s 그룹" msgid "%1$s group, page %2$d" msgstr "%s 그룹 회원, %d페이지" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "그룹 프로필" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "설명" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "그룹 행동" -#: actions/showgroup.php:337 -#, fuzzy, php-format +#: actions/showgroup.php:338 +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "%s 그룹을 위한 공지피드" +msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)" -#: actions/showgroup.php:343 -#, fuzzy, php-format +#: actions/showgroup.php:344 +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "%s 그룹을 위한 공지피드" +msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)" -#: actions/showgroup.php:349 -#, fuzzy, php-format +#: actions/showgroup.php:350 +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "%s 그룹을 위한 공지피드" +msgstr "%s 그룹을 위한 공지피드 (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "%s의 보낸쪽지함" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "회원" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(없습니다.)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "모든 회원" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 #, fuzzy msgid "Created" msgstr "생성" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3650,7 +3800,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3661,7 +3811,7 @@ msgstr "" "**%s** 는 %%%%site.name%%%% [마이크로블로깅)(http://en.wikipedia.org/wiki/" "Micro-blogging)의 사용자 그룹입니다. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 #, fuzzy msgid "Admins" msgstr "관리자" @@ -3734,6 +3884,8 @@ msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"최근에 재미있는 일들이 있었나요? 아직 올린 글이 없느데, 지금 시작해 보면 어떨" +"까요. :)" #: actions/showstream.php:207 #, php-format @@ -3795,11 +3947,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3894,7 +4046,7 @@ msgid "Unable to save site notice." msgstr "트위터 환경설정을 저장할 수 없습니다." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3911,48 +4063,78 @@ msgstr "" msgid "Save site notice" msgstr "사이트 공지" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "SMS 세팅" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" "당신은 %%site.name%% 로부터 이메일을 통해 SMS메시지를 받을 수 있습니다." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "메신저 주소" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "확인된 최신의 SMS가 가능한 휴대폰 번호" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "이 전화 번호는 인증 대기중입니다." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "인증 코드" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "휴대폰으로 받으신 인증번호를 입력하십시오." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "인증" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 #, fuzzy msgid "SMS phone number" msgstr "SMS 휴대폰 번호" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "지역번호와 함께 띄어쓰기 없이 번호를 적어 주세요." -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "설정" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3960,23 +4142,34 @@ msgstr "" "통지를 SMS로 보내주세요; 물론 통신사로부터 바가지 요금을 문다는 것은 알고 있" "습니다." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "설정이 저장되었습니다." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "휴대폰 번호가 없습니다." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "통신회사가 선택 되지 않았습니다." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "그 휴대폰 번호는 이미 귀하의 것입니다." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "그 휴대폰 번호는 이미 다른 사용자의 것입니다." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " @@ -3985,36 +4178,56 @@ msgstr "" "추가한 휴대폰으로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코" "드와 사용법을 확인하여 주시기 바랍니다." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "옳지 않은 인증 번호 입니다." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "인증 취소" + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "그 휴대폰 번호는 귀하의 것이 아닙니다." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "SMS 휴대폰 번호" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "휴대전화 사업자" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "통신 회사를 선택 하세요." -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "귀하의 휴대폰의 통신회사는 무엇입니까?" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "코드가 입력 되지 않았습니다." #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -4036,7 +4249,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4076,8 +4289,7 @@ msgstr "아바타 설정" msgid "You are not subscribed to that profile." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "구독을 저장할 수 없습니다." @@ -4170,11 +4382,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%1$s 는 지금 듣고 있습니다." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4208,12 +4420,12 @@ msgstr "id 인자가 없습니다." msgid "Tag %s" msgstr "태그 %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "이용자 프로필" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "사진" @@ -4267,7 +4479,8 @@ msgid "User is not silenced." msgstr "이용자가 프로필을 가지고 있지 않습니다." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +#, fuzzy +msgid "No profile ID in request." msgstr "요청한 프로필id가 없습니다." #: actions/unsubscribe.php:98 @@ -4304,7 +4517,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "프로필" @@ -4473,28 +4687,34 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "%s 그룹 회원, %d페이지" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 #, fuzzy msgid "Search for more groups" msgstr "프로필이나 텍스트 검색" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, fuzzy, php-format msgid "%s is not a member of any group." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" @@ -4542,36 +4762,35 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 -#, fuzzy +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" -msgstr "개인적인" +msgstr "버젼" #: actions/version.php:197 msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" #: classes/Group_member.php:41 -#, fuzzy msgid "Group join failed." -msgstr "그룹 프로필" +msgstr "그룹에 가입하지 못했습니다." #: classes/Group_member.php:53 #, fuzzy @@ -4589,9 +4808,9 @@ msgid "Could not update local group." msgstr "그룹을 업데이트 할 수 없습니다." #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "OpenID를 작성 할 수 없습니다 : %s" +msgstr "%s 에 대한 로그인 토큰을 만들 수 없습니다." #: classes/Message.php:45 #, fuzzy @@ -4606,28 +4825,29 @@ msgstr "메시지를 삽입할 수 없습니다." msgid "Could not update message with new URI." msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다." -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "게시글 저장문제. 알려지지않은 회원" -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:256 +#: classes/Notice.php:260 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4636,238 +4856,254 @@ msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "이 회원은 구독으로부터 당신을 차단해왔다." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "회원이 당신을 차단해왔습니다." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "구독하고 있지 않습니다!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/User.php:373 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%2$s에서 %1$s까지 메시지" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "새 그룹을 만들 수 없습니다." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "그룹 맴버십을 세팅할 수 없습니다." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "그룹 맴버십을 세팅할 수 없습니다." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "구독을 저장할 수 없습니다." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "프로필 세팅 바꾸기" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "아바타를 업로드하세요." -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "비밀번호 바꾸기" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "이메일 처리 변경" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "이용자 프로필" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "기타" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "다른 옵션들" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "기타" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%1$s (%2$s)" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "제목없는 페이지" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "주 사이트 네비게이션" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 #, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "개인 프로필과 친구 타임라인" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "개인적인" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 -#, fuzzy +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "당신의 이메일, 아바타, 비밀 번호, 프로필을 변경하세요." #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "서버에 재접속 할 수 없습니다 : %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "연결" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "주 사이트 네비게이션" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "관리자" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다." -#: lib/action.php:456 -#, fuzzy +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "초대" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 #, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "이 사이트로부터 로그아웃" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "로그아웃" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "계정 만들기" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "회원가입" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 #, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "이 사이트 로그인" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "로그인" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "도움이 필요해!" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "도움말" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 #, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "프로필이나 텍스트 검색" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4875,74 +5111,88 @@ msgstr "검색" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "사이트 공지" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "로컬 뷰" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "페이지 공지" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "보조 사이트 네비게이션" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "도움말" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "정보" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "자주 묻는 질문" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "개인정보 취급방침" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "소스 코드" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "연락하기" -#: lib/action.php:771 +#: lib/action.php:784 #, fuzzy msgid "Badge" msgstr "찔러 보기" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "라코니카 소프트웨어 라이선스" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 " "마이크로블로깅서비스입니다." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4953,70 +5203,84 @@ msgstr "" "을 사용합니다. StatusNet는 [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "라코니카 소프트웨어 라이선스" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "모든 것" +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "라이선스" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "페이지수" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "뒷 페이지" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "앞 페이지" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 #, fuzzy msgid "You cannot make changes to this site." msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 #, fuzzy msgid "Changes to that panel are not allowed." msgstr "가입이 허용되지 않습니다." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 #, fuzzy msgid "showForm() not implemented." @@ -5028,167 +5292,205 @@ msgstr "명령이 아직 실행되지 않았습니다." msgid "saveSettings() not implemented." msgstr "명령이 아직 실행되지 않았습니다." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 #, fuzzy msgid "Unable to delete design setting." msgstr "트위터 환경설정을 저장할 수 없습니다." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "이메일 주소 확인서" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "초대" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "SMS 인증" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "개인적인" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "SMS 인증" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "이용자" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "SMS 인증" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "SMS 인증" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "SMS 인증" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "사이트 공지" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "SMS 인증" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "140글자로 그룹이나 토픽 설명하기" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "140글자로 그룹이나 토픽 설명하기" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "소스 코드" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "소스 코드" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "취소" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "삭제" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 #, fuzzy msgid "Provider" msgstr "프로필" @@ -5211,37 +5513,57 @@ msgstr "비밀번호 변경" msgid "Password changing is not allowed" msgstr "비밀번호 변경" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "실행결과" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "실행 완료" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "실행 실패" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "죄송합니다. 이 명령은 아직 실행되지 않았습니다." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "해당 id의 프로필이 없습니다." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "이용자의 지속적인 게시글이 없습니다." + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "죄송합니다. 이 명령은 아직 실행되지 않았습니다." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "찔러 보기를 보냈습니다." -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5249,200 +5571,204 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "해당 id의 프로필이 없습니다." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "이용자의 지속적인 게시글이 없습니다." - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "게시글이 좋아하는 글로 지정되었습니다." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "당신은 이미 이 그룹의 멤버입니다." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "그룹 %s에 %s는 가입할 수 없습니다." +msgid "Could not join user %1$s to group %2$s" +msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다." -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s 는 그룹 %s에 가입했습니다." - -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다." -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s가 그룹%s를 떠났습니다." - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "전체이름: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "위치: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "홈페이지: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "자기소개: %s" -#: lib/command.php:349 +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." -#: lib/command.php:367 +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "%s에게 보낸 직접 메시지" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "직접 메시지 보내기 오류." -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "알림을 켤 수 없습니다." -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "이 게시글 삭제하기" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "게시글이 등록되었습니다." -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: lib/command.php:482 +#: lib/command.php:562 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "이 게시글에 대해 답장하기" -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "구독하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "그러한 사용자는 없습니다." +#: lib/command.php:628 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "%s에게 구독되었습니다." -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "%s에서 구독을 해제했습니다." -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "명령이 아직 실행되지 않았습니다." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "알림끄기." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "알림을 끌 수 없습니다." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "알림이 켜졌습니다." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "알림을 켤 수 없습니다." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "%s에서 구독을 해제했습니다." -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다." -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5484,20 +5810,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "확인 코드가 없습니다." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "이 사이트 로그인" @@ -5674,53 +6000,54 @@ msgstr "가장 많은 게시글이 있는 그룹들" msgid "Tags in %s group's notices" msgstr "%s 그룹 게시글의 태그" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "지원하지 않는 그림 파일 형식입니다." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "불완전한 업로드." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "파일을 올리는데 시스템 오류 발생" -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "그림 파일이 아니거나 손상된 파일 입니다." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "지원하지 않는 그림 파일 형식입니다." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "파일을 잃어버렸습니다." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "알 수 없는 종류의 파일입니다" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5741,11 +6068,13 @@ msgstr "사용자 이름과 비밀번호로 로그인" msgid "Sign up for a new account" msgstr "새 계정을 위한 회원가입" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "이메일 주소 확인서" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5762,12 +6091,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5786,19 +6117,22 @@ msgstr "" "\n" "그럼 이만,%4$s.\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "소개: %s\n" "\n" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "%s에 포스팅 할 새로운 이메일 주소" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5813,21 +6147,31 @@ msgstr "" "포스팅 주소는 %1$s입니다.새 메시지를 등록하려면 %2$ 주소로 이메일을 보내십시" "오.이메일 사용법은 %3$s 페이지를 보십시오.안녕히,%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s 상태" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS 인증" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "이 전화 번호는 인증 대기중입니다." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "%s 사용자가 찔러 봤습니다." -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5843,12 +6187,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다." -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5867,12 +6213,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s님이 당신의 게시글을 좋아하는 글로 추가했습니다." -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5893,12 +6241,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5911,6 +6269,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5923,7 +6293,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 #, fuzzy msgid "from" msgstr "다음에서:" @@ -6053,51 +6423,55 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 #, fuzzy msgid "N" msgstr "아니오" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 #, fuzzy msgid "in context" msgstr "내용이 없습니다!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "생성" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "이 게시글에 대해 답장하기" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "답장하기" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "게시글이 등록되었습니다." @@ -6122,6 +6496,10 @@ msgstr "새 프로필 추가 오류" msgid "Error inserting avatar" msgstr "아바타 추가 오류" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "리모트 프로필 업데이트 오류" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "리모트 프로필 추가 오류" @@ -6173,7 +6551,7 @@ msgstr "%s의 게시글의 태그" msgid "Unknown" msgstr "알려지지 않은 행동" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "구독" @@ -6181,33 +6559,33 @@ msgstr "구독" msgid "All subscriptions" msgstr "모든 예약 구독" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "구독자" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "모든 구독자" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 #, fuzzy msgid "User ID" msgstr "이용자" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "가입한 때" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "모든 그룹" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "id 인자가 없습니다." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6231,11 +6609,20 @@ msgstr "피쳐링됨" msgid "Popular" msgstr "인기있는" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "id 인자가 없습니다." + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "이 게시글에 대해 답장하기" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "네, 맞습니다." + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6246,7 +6633,7 @@ msgstr "이 게시글에 대해 답장하기" msgid "Revoke the \"%s\" role from this user" msgstr "이 그룹의 회원리스트" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6380,93 +6767,112 @@ msgstr "이 사용자로부터 구독취소합니다." msgid "Unsubscribe" msgstr "구독 해제" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "이용자가 프로필을 가지고 있지 않습니다." + +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "아바타" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "사용자 동작" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 #, fuzzy msgid "Edit profile settings" msgstr "프로필 세팅" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "이 회원에게 직접 메시지를 보냅니다." -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "메시지" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "이용자 프로필" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "관리자" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "몇 초 전" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "1분 전" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "%d분 전" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "1시간 전" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "%d시간 전" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "하루 전" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "%d일 전" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "1달 전" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "%d달 전" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "1년 전" @@ -6480,7 +6886,7 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 74b9cb2280..76cd8f711f 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:24+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:47+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -22,7 +22,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Пристап" @@ -74,7 +74,13 @@ msgstr "Затворен" msgid "Save access settings" msgstr "Зачувај нагодувања на пристап" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Зачувај" @@ -82,8 +88,8 @@ msgstr "Зачувај" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "Нема таква страница" +msgid "No such page." +msgstr "Нема таква страница." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -93,9 +99,9 @@ msgstr "Нема таква страница" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -103,11 +109,9 @@ msgstr "Нема таква страница" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Нема таков корисник." @@ -119,8 +123,9 @@ msgstr "%1$s и пријателите, стр. %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -187,8 +192,10 @@ msgstr "" msgid "You and friends" msgstr "Вие и пријателите" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Подновувања од %1$s и пријатели на %2$s!" @@ -203,18 +210,18 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API методот не е пронајден." @@ -227,18 +234,18 @@ msgstr "API методот не е пронајден." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Овој метод бара POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" "Мора да назначите параметар со име 'device' со една од следниве вредности: " -"sms, im, none" +"sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -249,7 +256,7 @@ msgstr "Не можев да го подновам корисникот." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Корисникот нема профил." @@ -259,9 +266,9 @@ msgid "Could not save profile." msgstr "Не може да се зачува профил." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -346,7 +353,7 @@ msgstr "Нема пронајдено статус со таков ID." msgid "This status is already a favorite." msgstr "Овој статус веќе Ви е омилен." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Не можам да создадам омилина забелешка." @@ -438,11 +445,10 @@ msgstr "Локацијата е предолга (максимумот е 255 з msgid "Too many aliases! Maximum %d." msgstr "Премногу алијаси! Дозволено е највеќе %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Неважечки алијас: „%s“" +msgid "Invalid alias: \"%s\"." +msgstr "Неважечки алијас: „%s“." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -458,14 +464,14 @@ msgstr "Алијасот не може да биде ист како прека #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Групата не е пронајдена!" +msgid "Group not found." +msgstr "Групата не е пронајдена." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Веќе членувате во таа група." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Блокирани сте од таа група од администраторот." @@ -483,17 +489,26 @@ msgstr "Не членувате во оваа група." msgid "Could not remove user %1$s from group %2$s." msgstr "Не можев да го отстранам корисникот %1$s од групата %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "%s групи" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%1$s групи кадешто членува %2$s." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s групи" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "групи на %s" @@ -507,17 +522,17 @@ msgid "Invalid token." msgstr "Погрешен жетон." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -550,12 +565,15 @@ msgstr "Жетонот на барањето %s е одобрен. Замене msgid "The request token %s has been denied and revoked." msgstr "Жетонот на барањето %s е одбиен и поништен." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Неочекувано поднесување на образец." @@ -578,20 +596,22 @@ msgstr "" "%3$s податоците за Вашата %4$s сметка. Треба да дозволувате " "пристап до Вашата %4$s сметка само на трети страни на кои им верувате." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Сметка" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Прекар" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Лозинка" @@ -636,17 +656,17 @@ msgstr "Статусот е избришан." msgid "No status with that ID found." msgstr "Нема пронајдено статус со тој ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ова е предолго. Максималната дозволена должина изнесува %d знаци." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Не е пронајдено" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Не е пронајдено." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -657,12 +677,12 @@ msgstr "" msgid "Unsupported format." msgstr "Неподдржан формат." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Омилени од %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Подновувања на %1$s омилени на %2$s / %2$s." @@ -672,17 +692,17 @@ msgstr "Подновувања на %1$s омилени на %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Подновувања кои споменуваат %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Јавна историја на %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s подновуввања од сите!" @@ -697,20 +717,16 @@ msgstr "Повторено за %s" msgid "Repeats of %s" msgstr "Повторувања на %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Забелешки означени со %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Подновувањата се означени со %1$s на %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Не е пронајдено." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Нема таков прилог." @@ -730,8 +746,9 @@ msgstr "Нема големина." msgid "Invalid size." msgstr "Погрешна големина." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Аватар" @@ -743,10 +760,10 @@ msgstr "" "податотеката изнесува %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Корисник без соодветен профил" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Корисник без соодветен профил." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -764,7 +781,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Бриши" @@ -776,23 +793,27 @@ msgstr "Подигни" msgid "Crop" msgstr "Отсечи" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Нема подигнато податотека." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Одберете квадратна површина од сликата за аватар" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Податоците за податотеката се изгубени." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватарот е подновен." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Подновата на аватарот не успеа." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватарот е избришан." @@ -800,7 +821,7 @@ msgstr "Аватарот е избришан." msgid "You already blocked that user." msgstr "Веќе го имате блокирано тој корисник." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Блокирај корисник" @@ -815,27 +836,42 @@ msgstr "" "претплати на Вас во иднина, и нема да бидете известени ако имате @-одговори " "од корисникот." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Не" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Не го блокирај корисников" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Да" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Блокирај го корисников" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Не можев да ги снимам инофрмациите за блокот." @@ -848,8 +884,8 @@ msgstr "Не можев да ги снимам инофрмациите за б #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Нема таква група." @@ -879,9 +915,11 @@ msgstr "Одблокирај" msgid "Unblock this user" msgstr "Одблокирај го овој корсник" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Објави во " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Објави во %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -895,33 +933,43 @@ msgstr "Кодот за потврда не е пронајден." msgid "That confirmation code is not for you!" msgstr "Овој код за потврда не е за Вас!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Непознат тип на адреса %s" +msgid "Unrecognized address type %s." +msgstr "Непознат тип на адреса %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Оваа адреса веќе е потврдена." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Не можев да го подновам корисникот." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Не можев да ја избришам потврдата по е-пошта." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Потврди адреса" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Адресата \"%s\" е потврдена за Вашата сметка." @@ -931,7 +979,7 @@ msgid "Conversation" msgstr "Разговор" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Забелешки" @@ -950,7 +998,7 @@ msgstr "Не сте сопственик на овој програм." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Се појави проблем со Вашиот сесиски жетон." @@ -968,15 +1016,17 @@ msgstr "" "избрише сите податоци за програмот од базата, вклучувајќи ги сите постоечки " "поврзувања." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Не го бриши овој програм" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Избриши го програмов" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1007,11 +1057,13 @@ msgstr "Бриши забелешка" msgid "Are you sure you want to delete this notice?" msgstr "Дали сте сигурни дека сакате да ја избришете оваа заблешка?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Не ја бриши оваа забелешка" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Бриши ја оваа забелешка" @@ -1035,58 +1087,61 @@ msgstr "" "Дали се сигурни дека сакате да го избришете овој корисник? Ова воедно ќе ги " "избрише сите податоци за корисникот од базата, без да може да се вратат." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Избриши овој корисник" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Изглед" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Нагодувања на изгледот на оваа StatusNet веб-страница." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "Погрешен URL на лого." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Непосточка тема: %s" +msgid "Theme not available: %s." +msgstr "Темата е недостапна: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Промени лого" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Лого на веб-страницата" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Промени тема" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Тема на веб-страницата" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Тема за веб-страницата." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Промена на слика на позадина" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Позадина" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1095,67 +1150,68 @@ msgstr "" "Може да подигнете позадинска слика за оваа веб-страница. Максималната " "големина на податотеката е %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Вкл." -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Искл." -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Вклучи или исклучи позадинска слика." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Позадината во квадрати" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Промена на бои" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Содржина" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Странична лента" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Текст" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Врски" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Користи по основно" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Врати основно-зададени нагодувања" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Врати по основно" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Зачувај" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Зачувај изглед" @@ -1260,11 +1316,16 @@ msgstr "ОБразецов служи за уредување на групат msgid "description is too long (max %d chars)." msgstr "описот е предолг (максимум %d знаци)" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Неважечки алијас: „%s“" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Не можев да ја подновам групата." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Не можеше да се создадат алијаси." @@ -1272,31 +1333,42 @@ msgstr "Не можеше да се создадат алијаси." msgid "Options saved." msgstr "Нагодувањата се зачувани." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Нагодувања за е-пошта" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Раководење со начинот на кој добивате е-пошта од %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Адреса" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Е-поштенска адреса" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Тековна потврдена е-поштенска адреса." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Отстрани" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1304,109 +1376,139 @@ msgstr "" "Очекувам потврда за оваа адреса. Проверете си го приемното сандаче (а и " "сандачето за спам!). Во писмото ќе следат понатамошни напатствија." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Откажи" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Е-поштенска адреса" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Е-пошта, од обликот „UserName@example.org“" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Додај" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Приемна пошта" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Испраќајте е-пошта на оваа адреса за да објавувате нови забелешки." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" "Создај нова е-поштенска адреса за примање објави; ја заменува старата адреса." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" -msgstr "Ново" +msgstr "Нова" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Нагодувања" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Нагодувања за е-пошта" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Испраќај ми известувања за нови претплати по е-пошта." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Испраќај ми е-пошта кога некој ќе додаде моја забелешка како омилена." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Испраќај ми е-пошта кога некој ќе ми испрати приватна порака." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Испраќај ми е-пошта кога некој ќе ми испрати „@-одговор“" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" "Дозволи им на пријателите да можат да ме подбуцнуваат и да ми испраќаат е-" "пошта." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Сакам да објавувам забелешки по е-пошта." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Објави MicroID за мојата е-поштенска адреса." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Нагодувањата се зачувани." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Нагодувањата за е-пошта се зачувани." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Нема е-поштенска адреса." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Неможам да ја нормализирам таа е-поштенска адреса" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Неправилна адреса за е-пошта." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Оваа е-поштенска адреса е веќе Ваша." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Таа е-поштенска адреса е веќе зафатена од друг корисник." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Кодот за потврда не може да се внесе." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1415,43 +1517,53 @@ msgstr "" "сандачето за добиени писма (а и сандачето за спам!) за да го видите кодот и " "напатствијата за негово користење." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Нема потврди кои може да се откажат." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Ова е погрешната IM адреса." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Ова е погрешна е-поштенска адреса." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Потврдата е откажана" +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Потврдата на е-пошта е откажана." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Ова не е Вашата е-поштенска адреса." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Адресата е отстранета." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "Е-поштенската адреса е отстранета." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Нема приемна е-поштенска адреса." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Не можев да ја подновам корисничката евиденција." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Приемната е-поштенска адреса е отстранета." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Додадена е нова влезна е-поштенска адреса." @@ -1568,11 +1680,11 @@ msgstr "Не можев да ги претворам жетоните за ба #: actions/finishremotesubscribe.php:118 msgid "Remote service uses unknown version of OMB protocol." -msgstr "Оддалечената служба користи непозната верзија на OMB протокол." +msgstr "Далечинската служба користи непозната верзија на OMB протокол." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Грешка во подновувањето на оддалечениот профил" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Грешка во подновувањето на далечинскиот профил." #: actions/getfile.php:79 msgid "No such file." @@ -1627,11 +1739,11 @@ msgstr "Корисникот е веќе блокиран од оваа груп msgid "User is not a member of group." msgstr "Корисникот не членува во групата." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Блокирај корисник од група" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1642,15 +1754,17 @@ msgstr "" "$s“? Корисникот ќе биде отстранет од групата, и во иднина нема да може да " "објавува во таа група и да се претплаќа на неа." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Не го блокирај овој корисник од оваа група" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Блокирај го овој корисник од оваа група" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" "Се појави грешка во базата наподатоци при блокирањето на корисникот од " @@ -1697,10 +1811,6 @@ msgstr "" "Можете да подигнете слика за логото на Вашата група. Максималната дозволена " "големина на податотеката е %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Корисник без соодветен профил." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Одберете квадратен простор на сликата за лого." @@ -1731,34 +1841,38 @@ msgstr "Листа на корисниците на овааг група." msgid "Admin" msgstr "Администратор" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Блокирај" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Направи го корисникот администратор на групата" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Направи го/ја администратор" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Направи го корисникот администратор" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Историја на %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Подновувања од членови на %1$s на %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Групи" @@ -1784,7 +1898,7 @@ msgstr "" "[ја пронајдете](%%%%action.groupsearch%%%%) или [започнете своја!](%%%%" "action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Создај нова група" @@ -1836,11 +1950,15 @@ msgstr "Корисникот не е блокиран од групата." msgid "Error removing the block." msgstr "Грешка при отстранување на блокот." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Нагодувања за IM" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1849,15 +1967,24 @@ msgstr "" "Можете да примате и праќате забелешки преку Jabber/GTalk [брзи пораки](%%doc." "im%%). Подолу " -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "IM е недостапно." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "IM адреса" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Моментално потврдена Jabber/GTalk адреса." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1867,11 +1994,9 @@ msgstr "" "порака со понатамошни инструкции. (Дали го додадовте %s на Вашата листа со " "пријатели?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "IM адреса" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1880,44 +2005,65 @@ msgstr "" "Jabber или GTalk адреса како „ime@example.org“. Но прво додајте го %s во " "Вашата контакт листа во Вашиот IM клиент или GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "IM нагодувања" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Испраќај ми забелешки преку Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Објавувај забелешка кога мојот статус на Jabber/GTalk ќе се промени." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Испраќај ми одговори преку Jabber/GTalk од луѓе на кои не сум претплатен." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Објави MicroID за мојата адреса на Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Нагодувањата се зачувани." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Нема JabberID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Ова JabberID не може да се нормализира." -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Неправилен JabberID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Ова веќе е Вашиот Jabber ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Ова Jabber ID му припаѓа на друг корисник." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1926,10 +2072,32 @@ msgstr "" "Испративме код за потврда на IM адресата што ја додадовте. Мора да го " "одобрите %S за да ви испраќа пораки." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Ова е погрешната IM адреса." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Не можев да ја избришам потврдата на IM." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Потврдата на IM е откажана." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Ова не е Вашиот Jabber ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "IM-адресата е отстранета." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1952,9 +2120,9 @@ msgstr "Поканите се оневозможени." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" +msgid "You must be logged in to invite other users to use %s." msgstr "" -"Мора да сте најавени за да можете да каните други корисници да користат %s" +"Мора да сте најавени за да можете да каните други корисници да користат %s." #: actions/invite.php:72 #, php-format @@ -1973,7 +2141,9 @@ msgstr "Покани нови корисници" msgid "You are already subscribed to these users:" msgstr "Веќе сте претплатени на овие корисници:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2025,12 +2195,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Испрати" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s ве покани да се придружите на %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2095,7 +2267,9 @@ msgstr "Мора да сте најавени за да можете да се msgid "No nickname or ID." msgstr "Нема прекар или ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s се зачлени во групата %2$s" @@ -2104,11 +2278,13 @@ msgstr "%1$s се зачлени во групата %2$s" msgid "You must be logged in to leave a group." msgstr "Мора да сте најавени за да можете да ја напуштите групата." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Не членувате во таа група." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s ја напушти групата %2$s" @@ -2156,13 +2332,15 @@ msgstr "" "име и лозинка пред да ги смените Вашите нагодувања." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Најавете се со корисничко име и лозинка." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Најавете се со Вашето корисничко име и лозинка. Сè уште немате корисничко " -"име? [Регистрирајте](%%action.register%%) нова сметка." +"Сè уште немате корисничко име? [Направете](%%action.register%%) нова сметка." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2184,8 +2362,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Не можам да го направам корисникот %1$s администратор на групата %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Нема тековен статус" +msgid "No current status." +msgstr "Нема тековен статус." #: actions/newapplication.php:52 msgid "New Application" @@ -2219,12 +2397,12 @@ msgstr "Овој образец служи за создавање нова гр msgid "New message" msgstr "Нова порака" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Не можете да испратите порака до овојо корисник." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Нема содржина!" @@ -2232,7 +2410,7 @@ msgstr "Нема содржина!" msgid "No recipient specified." msgstr "Нема назначено примач." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2248,7 +2426,7 @@ msgstr "Пораката е испратена" msgid "Direct message to %s sent." msgstr "Директната порака до %s е испратена." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax-грешка" @@ -2256,7 +2434,7 @@ msgstr "Ajax-грешка" msgid "New notice" msgstr "Ново забелешка" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Забелешката е објавена" @@ -2352,11 +2530,11 @@ msgid "You are not a user of that application." msgstr "Не сте корисник на тој програм." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "Не можам да му го одземам пристапот на програмот: " +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Не можам да му го одземам пристапот на програмот: %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "Му немате дозволено пристап до Вашата сметка на ниеден програм." @@ -2366,24 +2544,29 @@ msgstr "" "Развивачите можат да ги нагодат регистрациските поставки за нивните програми " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Забелешката нема профил" +msgid "Notice has no profile." +msgstr "Забелешката нема профил." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s статус на %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "тип на содржини " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Содржините од типот %s не се поддржани." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Само " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Ве молиме користете само %s URL-адреси врз прост HTTP-код." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Ова не е поддржан формат на податотека." @@ -2488,7 +2671,7 @@ msgid "6 or more characters" msgstr "6 или повеќе знаци" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Потврди" @@ -2516,7 +2699,7 @@ msgstr "Неточна стара лозинка" msgid "Error saving user; invalid." msgstr "Грешка во зачувувањето на корисникот; неправилен." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Не можам да ја зачувам новата лозинка." @@ -2525,7 +2708,7 @@ msgid "Password saved." msgstr "Лозинката е зачувана." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Патеки" @@ -2535,23 +2718,23 @@ msgstr "Нагодувања за патеки и сервери за оваа S #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Директориумот на темата е нечитлив: %s" +msgid "Theme directory not readable: %s." +msgstr "Директориумот на темата е нечитлив: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Директориумот на аватарот е недостапен за пишување: %s" +msgid "Avatar directory not writable: %s." +msgstr "Директориумот на аватарот е недостапен за запишување: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Директориумот на позадината е нечитлив: %s" +msgid "Background directory not writable: %s." +msgstr "Директориумот на позадината е нечитлив: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Директориумот на локалите е нечитлив: %s" +msgid "Locales directory not readable: %s." +msgstr "Директориумот на локалите е нечитлив: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2691,19 +2874,19 @@ msgstr "" msgid "People search" msgstr "Пребарување на луѓе" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Не е важечка ознака за луѓе: %s" +msgid "Not a valid people tag: %s." +msgstr "Не е важечка ознака за луѓе: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Користници самоозначени со %1$s - стр. %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Неважечка содржина на забелешката" +msgid "Invalid notice content." +msgstr "Неважечка содржина на забелешката." #: actions/postnotice.php:101 #, php-format @@ -2732,13 +2915,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места." #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Цело име" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Домашна страница" @@ -2760,9 +2944,9 @@ msgid "Bio" msgstr "Биографија" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Локација" @@ -2776,7 +2960,7 @@ msgstr "Сподели ја мојата тековна локација при #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Ознаки" @@ -2851,8 +3035,8 @@ msgstr "Нагодувањата се зачувани" #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Надминато е ограничувањето на страницата (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Надминато е ограничувањето на страницата (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3021,7 +3205,7 @@ msgstr "Рестетирај ја лозинката" msgid "Recover password" msgstr "Пронаоѓање на лозинка" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Побарано е пронаоѓање на лозинката" @@ -3041,19 +3225,19 @@ msgstr "Врати одново" msgid "Enter a nickname or email address." msgstr "Внесете прекар или е-пошта" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Нема корисник со таа е-поштенска адреса или корисничко име." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Нема регистрирана адреса за е-пошта за тој корисник." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Грешка при зачувувањето на потврдата за адреса." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3061,23 +3245,23 @@ msgstr "" "Упатството за пронаоѓање на Вашата лозинка е испратено до адресата за е-" "пошта што е регистрирана со Вашата сметка." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Неочекувано подновување на лозинката." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Лозинката мора да биде од најмалку 6 знаци." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Двете лозинки не се совпаѓаат." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Грешка во поставувањето на корисникот." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Новата лозинка е успешно зачувана. Сега сте најавени." @@ -3093,7 +3277,7 @@ msgstr "Жалиме, неважечки код за поканата." msgid "Registration successful" msgstr "Регистрацијата е успешна" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрирај се" @@ -3115,7 +3299,7 @@ msgstr "Погрешно име или лозинка." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Со овој образец можете да создадете нова сметка. Потоа ќе можете да " @@ -3135,8 +3319,9 @@ msgstr "Барем 6 знаци. Задолжително поле." msgid "Same as password above. Required." msgstr "Исто што и лозинката погоре. Задолжително поле." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Е-пошта" @@ -3149,22 +3334,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Подолго име, по можност Вашето вистинско име и презиме" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Мојот текст и податотеки се достапни под " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Наведи извор 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -" освен овие приватни податоци: лозинка, е-пошта, IM-адреса и телефонски " -"број." +"Мојот текст и податотеки се достапни под %s, освен следниве приватни " +"податоци: лозинка, е-пошта, IM-адреса и телефонски број." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3198,7 +3376,7 @@ msgstr "" "Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа " "служба." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3224,7 +3402,7 @@ msgstr "Оддалечена претплата" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "Претплати се на оддалечен корисник" +msgstr "Претплати се на далечински корисник" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -3243,7 +3421,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL на Вашиот профил на друга компатибилна служба за микроблогирање." #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Претплати се" @@ -3281,7 +3459,7 @@ msgstr "Не можете да повторувате сопствена заб msgid "You already repeated that notice." msgstr "Веќе ја имате повторено таа забелешка." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Повторено" @@ -3369,7 +3547,7 @@ msgstr "Корисникот е веќе во песочен режим." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Сесии" @@ -3406,26 +3584,30 @@ msgstr "Мора да сте најавени за да можете да го msgid "Application profile" msgstr "Профил на програмот" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Икона" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Име" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Организација" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Опис" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Статистики" @@ -3547,67 +3729,67 @@ msgstr "Група %s" msgid "%1$s group, page %2$d" msgstr "Група %1$s, стр. %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Профил на група" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Забелешка" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Алијаси" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Групни дејства" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Канал со забелешки за групата %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Канал со забелешки за групата %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Канал со забелешки за групата%s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF за групата %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Членови" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Нема)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Сите членови" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Создадено" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3623,7 +3805,7 @@ msgstr "" "се](%%%%action.register%%%%) за да станете дел од оваа група и многу повеќе! " "([Прочитајте повеќе](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3636,7 +3818,7 @@ msgstr "" "слободната програмска алатка [StatusNet](http://status.net/). Нејзините " "членови си разменуваат кратки пораки за нивниот живот и интереси. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Администратори" @@ -3775,11 +3957,11 @@ msgid "Unknown language \"%s\"." msgstr "Непознат јазик „%s“" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "Минималното ограничување на текстот изнесува 140 знаци." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Минималниот дозволен текст изнесува 0 (неограничено)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "Ограничувањето на дуплирањето мора да изнесува барем 1 секунда." #: actions/siteadminpanel.php:221 @@ -3873,8 +4055,8 @@ msgid "Unable to save site notice." msgstr "Не можам да ја зачувам објавата за веб-страницата." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "Објавата за цела веб-страница не треба да има повеќе од 255 знаци" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "Објавата за цела веб-страница не треба да содржи повеќе од 255 знаци." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -3890,45 +4072,72 @@ msgstr "" msgid "Save site notice" msgstr "Зачувај ја објавава" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Нагодувања за СМС" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Можете да примате СМС пораки по е-пошта од %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "СМС-пораките се недостапни." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "СМС адреса" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Тековен потврден телефонски број со можност за СМС." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Очекувам потврда за овој телефонски број." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Потврден код" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Внесете го кодот што го добивте по телефон." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Потврди" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Телефонски број за СМС" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" "Телефонски број, без интерпункциски знаци и празни места, со повикувачки код" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "СМС нагодувања" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3936,23 +4145,33 @@ msgstr "" "Испраќај ми забелешки по СМС; разбрам дека ова може да доведе до прекумерни " "трошоци." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "СМС нагодувањата се зачувани." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Нема телефонски број." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Немате избрано оператор." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Ова и сега е Вашиот телефонски број." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Тој телефонски број е веќе во употреба од друг корисник." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3960,23 +4179,40 @@ msgstr "" "На телефонскиот број што го додадовте е испратен потврден код. Проверете си " "го телефонот за да го видите кодот, заедно со напатствија за негова употреба." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Ова е погрешен потврден број." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Потврдата за СМС е откажана." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Тоа не е Вашиот телефонски број." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Телефонскиот број за СМС е отстранет." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Мобилен оператор" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Изберете оператор" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3985,13 +4221,14 @@ msgstr "" "Мобилен оператор за телефонот. Ако знаете оператор што прифаќа СМС преку е-" "пошта, но не фигурира овде, известете нè на %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Нема внесено код" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Снимки" @@ -4012,7 +4249,7 @@ msgid "Invalid snapshot report URL." msgstr "Неважечки URL за извештај од снимката." #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "По случајност во текот на посета" #: actions/snapshotadminpanel.php:201 @@ -4051,8 +4288,7 @@ msgstr "Зачувај поставки за снимки" msgid "You are not subscribed to that profile." msgstr "Не сте претплатени на тој профил." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Не можев да ја зачувам претплатата." @@ -4067,7 +4303,7 @@ msgstr "Нема таков профил." #: actions/subscribe.php:117 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." msgstr "" -"Не можете да се претплатите на OMB 0.1 оддалечен профил со ова дејство." +"Не можете да се претплатите на OMB 0.1 далечински профил со ова дејство." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4153,11 +4389,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s не следи никого." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "СМС" @@ -4190,12 +4426,12 @@ msgstr "Нема ID-аргумент." msgid "Tag %s" msgstr "Означи %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Кориснички профил" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Фото" @@ -4247,8 +4483,8 @@ msgid "User is not silenced." msgstr "Корисникот не е замолчен." #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "Во барањето нема id на профилот." +msgid "No profile ID in request." +msgstr "!Во барањето нема ID на профилот." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4285,7 +4521,8 @@ msgstr "НЕважечки текст за добредојде. Дозволе msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Неважечки опис по основно: „%1$s“ не е корисник." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" @@ -4448,29 +4685,35 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Добар апетит!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "Групи %1$s, стр. %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Пребарај уште групи" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s не членува во ниедна група." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Обидете се со [пребарување на групи](%%action.groupsearch%%) и придружете им " "се." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Подновувања од %1$s на %2$s!" @@ -4530,7 +4773,8 @@ msgstr "" msgid "Plugins" msgstr "Приклучоци" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Верзија" @@ -4538,7 +4782,7 @@ msgstr "Верзија" msgid "Author(s)" msgstr "Автор(и)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4547,13 +4791,13 @@ msgstr "" "Ниедна податотека не смее да биде поголема од %d бајти, а подаотеката што ја " "испративте содржи %d бајти. Подигнете помала верзија." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Волку голема податотека ќе ја надмине Вашата корисничка квота од %d бајти." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "ВОлку голема податотека ќе ја надмине Вашата месечна квота од %d бајти" @@ -4591,27 +4835,28 @@ msgstr "Не можев да ја испратам пораката." msgid "Could not update message with new URI." msgstr "Не можев да ја подновам пораката со нов URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" -msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознака: %s" +msgid "Database error inserting hashtag: %s" +msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознаката: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Проблем со зачувувањето на белешката. Премногу долго." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Проблем со зачувувањето на белешката. Непознат корисник." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Премногу забелњшки за прекратко време; здивнете малку и продолжете за " "неколку минути." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4619,288 +4864,320 @@ msgstr "" "Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за " "неколку минути." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Забрането Ви е да објавувате забелешки на оваа веб-страница." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Проблем во зачувувањето на белешката." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Проблем при зачувувањето на групното приемно сандаче." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Блокирани сте од претплаќање." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Веќе претплатено!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Корисникот Ве има блокирано." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Не сте претплатени!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Не можам да ја избришам самопретплатата." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Не можете да го избришете OMB-жетонот за претплата." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Претплата не може да се избрише." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добредојдовте на %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Не можев да ја создадам групата." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Не можев да поставам URI на групата." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Не можев да назначам членство во групата." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Не можев да ги зачувам информациите за локалните групи." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Смени профилни нагодувања" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Подигни аватар" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Смени лозинка" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Смени ракување со е-пошта" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Наместете изглед на Вашиот профил" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Друго" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Други нагодувања" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Друго" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Страница без наслов" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Главна навигација" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Личен профил и хронологија на пријатели" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Лично" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Промена на е-пошта, аватар, лозинка, профил" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Поврзи се со услуги" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Поврзи се" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Промена на поставките на веб-страницата" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Админ" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Поканете пријатели и колеги да Ви се придружат на %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Покани" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Одјава" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Одјава" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Создај сметка" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Регистрација" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Најава" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Најава" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Напомош!" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Помош" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Пребарајте луѓе или текст" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Барај" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Напомена за веб-страницата" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Локални прегледи" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Напомена за страницата" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Споредна навигација" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Помош" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "За" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "ЧПП" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "Услови" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Приватност" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Изворен код" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Контакт" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Значка" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Лиценца на програмот StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" -"**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"**%%site.name%%** е услуга за микроблогирање обозможена од [%%site.broughtby%" +"%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** е сервис за микроблогирање." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4911,71 +5188,85 @@ msgstr "" "верзија %s, достапен пд [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Лиценца на содржините на веб-страницата" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Содржината и податоците на %1$s се лични и доверливи." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Авторските права на содржината и податоците се во сопственост на %1$s. Сите " "права задржани." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Авторските права на содржината и податоците им припаѓаат на учесниците. Сите " "права задржани." -#: lib/action.php:847 -msgid "All " -msgstr "Сите " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "Сите содржини и податоци на %1$s се достапни под лиценцата %2$s." -#: lib/action.php:853 -msgid "license." -msgstr "лиценца." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Прелом на страници" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "По" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Пред" -#: lib/activity.php:453 -msgid "Can't handle remote content yet." -msgstr "Сè уште не е поддржана обработката на оддалечена содржина." +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Се очекува коренски каналски елемент, но добив цел XML документ." -#: lib/activity.php:481 +#: lib/activityutils.php:208 +msgid "Can't handle remote content yet." +msgstr "Сè уште не е поддржана обработката на далечинска содржина." + +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Сè уште не е поддржана обработката на XML содржина." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Сè уште не е достапна обработката на вметната Base64 содржина." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Не можете да ја менувате оваа веб-страница." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Менувањето на тој алатник не е дозволено." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() не е имплементирано." @@ -4985,154 +5276,192 @@ msgstr "showForm() не е имплементирано." msgid "saveSettings() not implemented." msgstr "saveSettings() не е имплементирано." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Не можам да ги избришам нагодувањата за изглед." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Основни нагодувања на веб-страницата" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Веб-страница" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Конфигурација на изгледот" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Изглед" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Конфигурација на корисник" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Корисник" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Конфигурација на пристапот" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Конфигурација на патеки" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Конфигурација на сесиите" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 msgid "Edit site notice" msgstr "Уреди објава за веб-страницата" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" msgstr "Поставки за снимки" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-ресурсот бара да може и да чита и да запишува, а вие можете само да " "читате." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "Неуспешен обид за API-заверка, прекар = %1$s, прокси = %2$s, IP = %3$s" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Уреди програм" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Икона за овој програм" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Опишете го програмот со %d знаци" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Опишете го Вашиот програм" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "Изворна URL-адреса" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "URL на страницата на програмот" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "Изворна URL-адреса" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Организацијата одговорна за овој програм" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "URL на страницата на организацијата" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "URL за пренасочување по заверката" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Прелистувач" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Работна површина" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Тип на програм, прелистувач или работна површина" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Само читање" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Читање-пишување" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Основно-зададен пристап за овој програм: само читање, или читање-пишување" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Откажи" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "читање-пишување" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "само читање" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Одобрено %1$s - „%2$s“ пристап." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Одземи" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Прилози" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Автор" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Обезбедувач" @@ -5152,37 +5481,56 @@ msgstr "Менувањето на лозинката не успеа" msgid "Password changing is not allowed" msgstr "Менувањето на лозинка не е дозволено" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Резултати од наредбата" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Наредбата е завршена" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Наредбата не успеа" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Жалиме, оваа наредба сè уште не е имплементирана." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Не постои забелешка со таков id" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Корисникот нема последна забелешка" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Не можев да пронајдам корисник со прекар %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Не можев да пронајдам локален корисник со прекар %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Жалиме, оваа наредба сè уште не е имплементирана." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Нема баш логика да се подбуцнувате сами себеси." -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Испратено подбуцнување на %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5193,198 +5541,204 @@ msgstr "" "Претплатници: %2$s\n" "Забелешки: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Не постои забелешка со таков id" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Корисникот нема последна забелешка" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Забелешката е обележана како омилена." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Веќе членувате во таа група" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Не можев да го зачленам корисникот %s во групата %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "Не можев да го зачленам корисникот %1$s во групата %2$s" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%s се зачлени во групата %s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Не можев да го отстранам корисникот %1$s од групата %2$s." -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Не можев да го отстранам корисникот %s од групата %s" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s ја напушти групата %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Име и презиме: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Локација: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Домашна страница: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "За: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -"Пораката е предолга - дозволени се највеќе %d знаци, а вие испративте %d" +"%s е далечински профил; можете да праќате директни пораки само до корисници " +"на истиот сервер." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Директната порака до %s е испратена" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Грашка при испаќањето на директната порака." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Не можете да повторувате сопствени забалешки" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Оваа забелешка е веќе повторена" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Забелешката од %s е повторена" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Грешка при повторувањето на белешката." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Забелешката е предолга - треба да нема повеќе од %d знаци, а Вие испративте %" "d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Одговорот на %s е испратен" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Грешка при зачувувањето на белешката." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Назначете го името на корисникот на којшто сакате да се претплатите" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Нема таков корисник" +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Не можете да се претплаќате на OMB профили по наредба." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Претплатено на %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Назначете го името на корисникот од кого откажувате претплата." -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Претплатата на %s е откажана" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Наредбата сè уште не е имплементирана." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Известувањето е исклучено." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Не можам да исклучам известување." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Известувањето е вклучено." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Не можам да вклучам известување." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "Наредбата за најава е оневозможена" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "Откажана претплата на %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Не сте претплатени никому." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Никој не е претплатен на Вас." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Оддалечена претплата" msgstr[1] "Оддалечена претплата" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Не членувате во ниедна група." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5463,19 +5817,19 @@ msgstr "" "tracks - сè уште не е имплементирано.\n" "tracking - сè уште не е имплементирано.\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Нема пронајдено конфигурациска податотека. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Побарав конфигурациони податотеки на следниве места: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Препорачуваме да го пуштите инсталатерот за да го поправите ова." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Оди на инсталаторот." @@ -5649,53 +6003,54 @@ msgstr "Групи со највеќе објави" msgid "Tags in %s group's notices" msgstr "Ознаки во забелешките на групата %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате." -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Неподдржан фомрат на слики." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ова е предолго. Максималната должина е 140 знаци." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Делумно подигање." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системска грешка при подигањето на податотеката." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Не е слика или податотеката е пореметена." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Неподдржан фомрат на слики." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Податотеката е изгубена." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Непознат тип на податотека" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "МБ" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "кб" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Непознат извор на приемна пошта %d." @@ -5716,11 +6071,13 @@ msgstr "Најава со корисничко име и лозинка" msgid "Sign up for a new account" msgstr "Создај нова сметка" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Потврдување на адресата" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5750,12 +6107,14 @@ msgstr "" "Ви благодариме за потрошеното време, \n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s сега ги следи Вашите забелешки на %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5781,17 +6140,20 @@ msgstr "" "Изменете си ја е-поштенската адреса или ги нагодувањата за известувања на %8" "$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Биографија: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Нова е-поштенска адреса за објавување на %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5812,21 +6174,31 @@ msgstr "" "Со искрена почит,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Статус на %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Потврда за СМС" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "%s: потврдете го како свој телефонскиов број со следниов код:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "%s Ве подбуцна" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5853,12 +6225,14 @@ msgstr "" "Со почит,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Нова приватна порака од %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5891,12 +6265,14 @@ msgstr "" "Со почит,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) додаде Ваша забелешка како омилена" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5934,12 +6310,25 @@ msgstr "" "Со искрена почит,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"Целиот разговор може да се проследи тука:\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) Ви испрати забелешка што сака да ја прочитате" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5952,18 +6341,42 @@ msgid "" "\n" "\t%4$s\n" "\n" -msgstr "" -"%1$s (@%9$s) штотуку Ви испрати забелешка што сака да ја видите („@-" -"одговор“) на %2$s.\n" +"%5$sYou can reply back here:\n" "\n" -"Забелешката ќе ја најдете тука:\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" +msgstr "" +"%1$s (@%9$s) штотуку Ви даде на знаење за забелешката ('@-одговор') на %2" +"$s.\n" +"\n" +"Еве ја забелешката:\n" "\n" "%3$s\n" "\n" -"Гласи:\n" +"Таа гласи:\n" "\n" "%4$s\n" "\n" +"%5$sМожете да одговорите на неа тука:\n" +"\n" +"%6$s\n" +"\n" +"Еве листа за сите @-одговори за вас:\n" +"\n" +"%7$s\n" +"\n" +"Со почит,\n" +"%2$s\n" +"\n" +"П.С. Можете да ги исклучите овие известувања по е-пошта тука: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5978,7 +6391,7 @@ msgstr "" "впуштите во разговор со други корисници. Луѓето можат да ви испраќаат пораки " "што ќе можете да ги видите само Вие." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "од" @@ -6093,7 +6506,7 @@ msgstr "Приложи" #: lib/noticeform.php:196 msgid "Attach a file" -msgstr "Прикажи податотека" +msgstr "Приложи податотека" #: lib/noticeform.php:212 msgid "Share my location" @@ -6111,48 +6524,52 @@ msgstr "" "Жалиме, но добивањето на Вашата местоположба трае подолго од очекуваното. " "Обидете се подоцна." -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "С" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "Ј" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "И" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "З" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "во" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "во контекст" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Повторено од" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Одговори на забелешкава" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Одговор" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Забелешката е повторена" @@ -6176,9 +6593,13 @@ msgstr "Грешка во внесувањето на новиот профил" msgid "Error inserting avatar" msgstr "Грешка во внесувањето на аватарот" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Грешка во подновувањето на далечинскиот профил" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" -msgstr "Грешка во внесувањето на оддалечениот профил" +msgstr "Грешка во внесувањето на далечинскиот профил" #: lib/oauthstore.php:345 msgid "Duplicate notice" @@ -6225,7 +6646,7 @@ msgstr "Ознаки во забелешките на %s" msgid "Unknown" msgstr "Непознато" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Претплати" @@ -6233,31 +6654,32 @@ msgstr "Претплати" msgid "All subscriptions" msgstr "Сите претплати" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Претплатници" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Сите претплатници" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "Кориснички ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Член од" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Дневен просек" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Сите групи" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Нема return-to аргументи." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Неимплементиран метод." @@ -6281,10 +6703,18 @@ msgstr "Избрани" msgid "Popular" msgstr "Популарно" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Нема return-to аргументи." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Да ја повторам белешкава?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Да" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Повтори ја забелешкава" @@ -6294,7 +6724,7 @@ msgstr "Повтори ја забелешкава" msgid "Revoke the \"%s\" role from this user" msgstr "Одземи му ја улогата „%s“ на корисников" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "Не е зададен корисник за еднокорисничкиот режим." @@ -6420,89 +6850,108 @@ msgstr "Откажи претплата од овој корсиник" msgid "Unsubscribe" msgstr "Откажи ја претплатата" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "Корисникот %s (%d) нема профилен запис." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Уреди аватар" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Кориснички дејства" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Бришењето на корисникот е во тек..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Уреди нагодувања на профилот" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Уреди" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Испрати му директна порака на корисников" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Порака" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Модерирај" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 msgid "User role" msgstr "Корисничка улога" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "Администратор" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "Модератор" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "пред неколку секунди" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "пред еден час" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "пред %d часа" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "пред еден месец" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "пред %d месеца" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "пред една година" @@ -6516,7 +6965,7 @@ msgstr "%s не е важечка боја!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s не е важечка боја! Користете 3 или 6 шеснаесетни (hex) знаци." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index b687e445e2..4ac3bff575 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-08 21:11:29+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:50+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63415); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -22,7 +22,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Tilgang" @@ -72,7 +72,13 @@ msgstr "Lukket" msgid "Save access settings" msgstr "Lagre tilgangsinnstillinger" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Lagre" @@ -80,8 +86,8 @@ msgstr "Lagre" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "Ingen slik side" +msgid "No such page." +msgstr "Ingen slik side." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -91,9 +97,9 @@ msgstr "Ingen slik side" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -101,11 +107,9 @@ msgstr "Ingen slik side" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Ingen slik bruker" @@ -117,8 +121,9 @@ msgstr "%1$s og venner, side %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -183,8 +188,10 @@ msgstr "" msgid "You and friends" msgstr "Du og venner" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Oppdateringer fra %1$s og venner på %2$s!" @@ -199,18 +206,18 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API-metode ikke funnet!" @@ -224,16 +231,16 @@ msgstr "API-metode ikke funnet!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Denne metoden krever en POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" -msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none" +"none." +msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 #, fuzzy @@ -245,7 +252,7 @@ msgstr "Klarte ikke å oppdatere bruker." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Brukeren har ingen profil." @@ -256,9 +263,9 @@ msgid "Could not save profile." msgstr "Klarte ikke å lagre profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -343,7 +350,7 @@ msgstr "Fant ingen status med den ID-en." msgid "This status is already a favorite." msgstr "Denne statusen er allerede en favoritt." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Kunne ikke opprette favoritt." @@ -433,11 +440,10 @@ msgstr "Plassering er for lang (maks 255 tegn)." msgid "Too many aliases! Maximum %d." msgstr "For mange alias! Maksimum %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Ugyldig alias: «%s»" +msgid "Invalid alias: \"%s\"." +msgstr "Ugyldig alias: «%s»." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -453,14 +459,14 @@ msgstr "Alias kan ikke være det samme som kallenavn." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Gruppe ikke funnet!" +msgid "Group not found." +msgstr "Gruppe ikke funnet." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Du er allerede medlem av den gruppen." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Du har blitt blokkert fra den gruppen av administratoren." @@ -478,17 +484,26 @@ msgstr "Du er ikke et medlem av denne gruppen." msgid "Could not remove user %1$s from group %2$s." msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "%s sine grupper" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%1$s grupper %2$s er et medlem av." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s grupper" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "grupper på %s" @@ -502,17 +517,17 @@ msgid "Invalid token." msgstr "Ugyldig symbol." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -543,12 +558,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Uventet skjemainnsending." @@ -571,20 +589,22 @@ msgstr "" "%3$s dine %4$s-kontodata. Du bør bare gi tilgang til din %4" "$s-konto til tredjeparter du stoler på." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Nick" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Passord" @@ -629,17 +649,17 @@ msgstr "Status slettet." msgid "No status with that ID found." msgstr "Ingen status med den ID-en funnet." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt. Maks notisstørrelse er %d tegn." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Ikke funnet" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Ikke funnet." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL." @@ -648,12 +668,12 @@ msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL." msgid "Unsupported format." msgstr "Formatet støttes ikke." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritter fra %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s." @@ -663,17 +683,17 @@ msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Oppdateringer som nevner %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s offentlig tidslinje" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s oppdateringer fra alle sammen!" @@ -688,20 +708,16 @@ msgstr "Gjentatt til %s" msgid "Repeats of %s" msgstr "Repetisjoner av %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notiser merket med %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Oppdateringer merket med %1$s på %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Ikke funnet." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Ingen slike vedlegg." @@ -721,8 +737,9 @@ msgstr "Ingen størrelse." msgid "Invalid size." msgstr "Ugyldig størrelse" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Brukerbilde" @@ -732,10 +749,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Du kan laste opp en personlig avatar. Maks filstørrelse er %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Bruker uten samsvarende profil" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Bruker uten samsvarende profil." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -745,7 +762,7 @@ msgstr "Avatarinnstillinger" #: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:202 actions/grouplogo.php:262 msgid "Original" -msgstr "Original" +msgstr "Opprinnelig" #: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:213 actions/grouplogo.php:274 @@ -753,7 +770,7 @@ msgid "Preview" msgstr "Forhåndsvis" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Slett" @@ -765,23 +782,27 @@ msgstr "Last opp" msgid "Crop" msgstr "Beskjær" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Ingen fil lastet opp." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Velg et kvadratisk utsnitt av bildet som din avatar." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Mistet våre fildata." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Brukerbildet har blitt oppdatert." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Oppdatering av avatar mislyktes." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar slettet." @@ -789,7 +810,7 @@ msgstr "Avatar slettet." msgid "You already blocked that user." msgstr "Du har allerede blokkert den brukeren." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Blokker brukeren" @@ -803,27 +824,42 @@ msgstr "" "lenger abbonere på deg, vil ikke kunne abbonere på deg i fremtiden og du vil " "ikke bli varslet om @-svar fra dem." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Nei" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Ikke blokker denne brukeren" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Ja" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blokker denne brukeren" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Kunne ikke lagre blokkeringsinformasjon." @@ -836,8 +872,8 @@ msgstr "Kunne ikke lagre blokkeringsinformasjon." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Ingen slik gruppe." @@ -867,9 +903,11 @@ msgstr "Opphev blokkering" msgid "Unblock this user" msgstr "Opphev blokkering av denne brukeren" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Post til " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Post til %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -883,33 +921,43 @@ msgstr "Fant ikke bekreftelseskode." msgid "That confirmation code is not for you!" msgstr "Den bekreftelseskoden er ikke til deg." -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Ukjent adressetype %s" +msgid "Unrecognized address type %s." +msgstr "Ukjent adressetype %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Den adressen har allerede blitt bekreftet." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Klarte ikke å oppdatere bruker." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Kunne ikke slette e-postbekreftelse." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Bekreft adresse" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Adressen «%s» har blitt bekreftet for din konto." @@ -919,7 +967,7 @@ msgid "Conversation" msgstr "Samtale" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notiser" @@ -938,7 +986,7 @@ msgstr "Du er ikke eieren av dette programmet." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -956,15 +1004,17 @@ msgstr "" "data om programmet fra databasen, inkludert alle eksisterende " "brukertilkoblinger." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Ikke slett dette programmet" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Slett dette programmet" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -995,11 +1045,13 @@ msgstr "Slett notis" msgid "Are you sure you want to delete this notice?" msgstr "Er du sikker på at du vil slette denne notisen?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Ikke slett denne notisen" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -1023,58 +1075,61 @@ msgstr "" "Er du sikker på at du vil slette denne brukeren? Dette vil slette alle data " "om brukeren fra databasen, uten sikkerhetskopi." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Slett denne brukeren" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" -msgstr "" +msgstr "Utseende" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." -msgstr "" +msgstr "Utseendeinnstillinger for dette StatusNet-nettstedet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "Ugyldig logo-URL." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Tema ikke tilgjengelig: %s" +msgid "Theme not available: %s." +msgstr "Tema ikke tilgjengelig: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Endre logo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Nettstedslogo" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Endre tema" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Nettstedstema" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Tema for nettstedet." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Endre bakgrunnsbilde" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Bakgrunn" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1082,70 +1137,70 @@ msgid "" msgstr "" "Du kan laste opp et bakgrunnsbilde for nettstedet. Maks filstørrelse er %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "På" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Av" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Slå på eller av bakgrunnsbilde." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Gjenta bakgrunnsbildet" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Endre farger" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Innhold" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 -#, fuzzy +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" -msgstr "Søk" +msgstr "Sidelinje" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Tekst" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Lenker" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Bruk standard" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" -msgstr "" +msgstr "Gjenopprett standardutseende" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Tilbakestill til standardverdier" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Lagre" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" -msgstr "" +msgstr "Lagre utseende" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" @@ -1215,11 +1270,11 @@ msgstr "Hjemmeside for organisasjon kreves." #: actions/editapplication.php:218 actions/newapplication.php:206 msgid "Callback is too long." -msgstr "" +msgstr "Anrop er for langt." #: actions/editapplication.php:225 actions/newapplication.php:215 msgid "Callback URL is not valid." -msgstr "" +msgstr "Anrops-URL er ikke gyldig." #: actions/editapplication.php:258 msgid "Could not update application." @@ -1248,11 +1303,16 @@ msgstr "Bruk dette skjemaet for å redigere gruppen." msgid "description is too long (max %d chars)." msgstr "beskrivelse er for lang (maks %d tegn)" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Ugyldig alias: «%s»" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Kunne ikke oppdatere gruppe." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Kunne ikke opprette alias." @@ -1260,31 +1320,42 @@ msgstr "Kunne ikke opprette alias." msgid "Options saved." msgstr "Lagret valg." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "E-postinnstillinger" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Velg hvordan du mottar e-post fra %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adresse" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "E-postadresse" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Nåværende bekreftede e-postadresse" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Fjern" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1292,106 +1363,136 @@ msgstr "" "Venter på bekreftelse av adressen. Sjekk innboksen din (og søppelboksen) for " "melding med videre veiledning." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Avbryt" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "E-postadresse" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "E-postadresse («brukernavn@eksempel.org»)" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Legg til" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "innkommende e-post" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Send e-post til denne adressen for å poste nye notiser." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Angi en ny e-postadresse for å poste til; fjerner den gamle." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Ny" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Innstillinger" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "E-postinnstillinger" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." -msgstr "" +msgstr "Send meg varsler om nye abonnementer gjennom e-post." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Send meg en e-post når noen legger min notis til som favoritt." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Send meg en e-post når noen sender meg en privat melding." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Send meg en e-post når noen sender meg et «@-svar»." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." -msgstr "" +msgstr "Tillat venner å knuffe meg og sende meg en e-post." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Jeg vil poste notiser med e-post." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publiser en MicroID for min e-postadresse." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Innstillinger lagret." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "E-postinnstillinger lagret." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Ingen e-postadresse." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Klarer ikke normalisere epostadressen" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Ugyldig e-postadresse." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Det er allerede din e-postadresse." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Den e-postadressen tilhører allerede en annen bruker." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Kunne ikke sette inn bekreftelseskode." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1399,43 +1500,53 @@ msgstr "" "En bekreftelseskode ble sendt til epostadressen du la til. Sjekk innboksen " "din (og søppelboksen) for koden, og hvordan du skal bruke den." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." -msgstr "" +msgstr "Ingen ventende bekreftelse å avbryte." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Det er feil IM-adresse." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Dette er feil e-postadresse." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Bekreftelse avbrutt." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "E-postbekreftelse avbrutt." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Det er ikke din e-postadresse." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Adressen ble fjernet." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "E-postadressen ble fjernet." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Ingen innkommende e-postadresse." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." -msgstr "" +msgstr "Kunne ikke oppdatere brukeroppføring." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." -msgstr "" +msgstr "Inkommende e-postadresse fjernet." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Ny innkommende e-postadresse lagt til." @@ -1459,17 +1570,21 @@ msgstr "Populære notiser, side %d" #: actions/favorited.php:79 msgid "The most popular notices on the site right now." -msgstr "" +msgstr "De mest populære notisene på nettstedet akkurat nå." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Favorittnotiser vises på denne siden, men det er ingen som har noen " +"favoritter ennå." #: actions/favorited.php:153 msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" +"Vær den første til å legge en notis til dine favoritter ved å klikke på " +"favoritt-knappen ved siden av notisen du liker." #: actions/favorited.php:156 #, php-format @@ -1477,32 +1592,34 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første " +"til å legge notisen til dine favoritter." #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 #, php-format msgid "%s's favorite notices" -msgstr "" +msgstr "%s sine favorittnotiser" #: actions/favoritesrss.php:115 #, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "" +msgstr "Oppdateringer markert som favoritt av %1$s på %2$s!" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" -msgstr "" +msgstr "Profilerte brukere" #: actions/featured.php:71 #, php-format msgid "Featured users, page %d" -msgstr "" +msgstr "Profilerte brukere, side %d" #: actions/featured.php:99 #, php-format msgid "A selection of some great users on %s" -msgstr "" +msgstr "Et utvalg av noen store brukere på %s" #: actions/file.php:34 msgid "No notice ID." @@ -1522,19 +1639,19 @@ msgstr "Ingen opplastede vedlegg." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" -msgstr "" +msgstr "Forventet ikke denne responsen!" #: actions/finishremotesubscribe.php:80 msgid "User being listened to does not exist." -msgstr "" +msgstr "Brukeren som lyttes til finnes ikke." #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" -msgstr "" +msgstr "Du kan bruke det lokale abonnementet!" #: actions/finishremotesubscribe.php:99 msgid "That user has blocked you from subscribing." -msgstr "" +msgstr "Brukeren har blokkert deg fra å abonnere." #: actions/finishremotesubscribe.php:110 msgid "You are not authorized." @@ -1546,11 +1663,11 @@ msgstr "" #: actions/finishremotesubscribe.php:118 msgid "Remote service uses unknown version of OMB protocol." -msgstr "" +msgstr "Fjerntjeneste bruker ukjent versjon av OMB-protokollen." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Feil ved oppdatering av fjernprofil." #: actions/getfile.php:79 msgid "No such file." @@ -1595,40 +1712,44 @@ msgstr "Ingen gruppe oppgitt." #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "Bare en admin kan blokkere gruppemedlemmer." #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "Du er allerede logget inn!" +msgstr "Bruker er allerede blokkert fra gruppe." #: actions/groupblock.php:100 msgid "User is not a member of group." msgstr "Bruker er ikke et medlem av gruppa." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Blokker bruker fra gruppe" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" +"Er du sikker på at du vil blokkere brukeren «%1$s» fra gruppen «%2$s»? De vil " +"bli fjernet fra gruppen, kan ikke poste og kan ikke abonnere på gruppen i " +"fremtiden." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Ikke blokker denne brukeren fra denne gruppa" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" -msgstr "" +msgstr "Blokker denne brukeren fra denne gruppen" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." -msgstr "" +msgstr "Databasefeil ved blokkering av bruker fra gruppe." #: actions/groupbyid.php:74 actions/userbyid.php:70 msgid "No ID." @@ -1636,27 +1757,28 @@ msgstr "Ingen ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." -msgstr "" +msgstr "Du må være logget inn for å redigere en gruppe." #: actions/groupdesignsettings.php:144 msgid "Group design" -msgstr "" +msgstr "Gruppeutseende" #: actions/groupdesignsettings.php:155 msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" +"Tilpass hvordan gruppen din ser ut med et bakgrunnsbilde og en fargepalett " +"av ditt valg." #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 -#, fuzzy msgid "Couldn't update your design." -msgstr "Klarte ikke å oppdatere bruker." +msgstr "Kunne ikke oppdatere utseende." #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231 msgid "Design preferences saved." -msgstr "" +msgstr "Utseende lagret." #: actions/grouplogo.php:142 actions/grouplogo.php:195 msgid "Group logo" @@ -1666,16 +1788,11 @@ msgstr "Gruppelogo" #, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." -msgstr "" - -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "Brukeren har ingen profil." +msgstr "Du kan laste opp en logo for gruppen din. Maks filstørrelse er %s." #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." -msgstr "" +msgstr "Velg et kvadratisk område av bildet som skal bli logoen." #: actions/grouplogo.php:399 msgid "Logo updated." @@ -1703,34 +1820,38 @@ msgstr "En liste over brukerne i denne gruppen." msgid "Admin" msgstr "Administrator" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Blokkér" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Gjør brukeren til en administrator for gruppen" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Gjør til administrator" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Gjør denne brukeren til administrator" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s tidslinje" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Oppdateringer fra medlemmer av %1$s på %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupper" @@ -1749,8 +1870,13 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" +"%%%%site.name%%%%-grupper lar deg finne og snakke med mennesker med lignende " +"interesser. Etter at du blir med i en gruppe kan du sende meldinger til alle " +"andre medlemmer med syntaksen «!gruppenavn». Ser du ikke en gruppe du liker? " +"Prøv å [søke etter en](%%%%action.groupsearch%%%%) eller [start din egen.](%%" +"%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Opprett en ny gruppe" @@ -1760,6 +1886,8 @@ msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" +"Søk etter grupper på %%site.name%% etter navn, lokasjon eller beskrivelse. " +"Skill nøkkelord med mellomrom; de må være minst 3 tegn eller lengre." #: actions/groupsearch.php:58 msgid "Group search" @@ -1776,6 +1904,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"Om du ikke finner gruppen du søker etter kan du [opprette den](%%action." +"newgroup%%) selv." #: actions/groupsearch.php:85 #, php-format @@ -1783,40 +1913,56 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"Hvorfor ikke [registrere en konto](%%action.register%%) og [opprette gruppen]" +"(%%action.newgroup%%) selv!" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Bare en admin kan oppheve blokkering av gruppemedlemmer." #: actions/groupunblock.php:95 msgid "User is not blocked from group." -msgstr "" +msgstr "Bruker er ikke blokkert fra gruppe." #: actions/groupunblock.php:128 actions/unblock.php:86 msgid "Error removing the block." msgstr "Feil under oppheving av blokkering." -#: actions/imsettings.php:59 -#, fuzzy +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" -msgstr "Innstillinger for IM" +msgstr "Innstillinger for direktemeldinger" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" +"Du kan sende og motta notiser gjennom Jabber/GTalk [direktemeldinger](%%doc." +"im%%). Konfigurer adresse og innstillinger under." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." -msgstr "" +msgstr "Direktemeldinger ikke tilgjengelig." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Direktemeldingsadresse" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Nåværende bekreftede Jabber/GTak-adresse." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1825,55 +1971,75 @@ msgstr "" "Venter på godkjenning. Sjekk din Jabber/GTalk-konto for en melding med " "instruksjoner (la du %s til vennelisten din?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "IM-adresse" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" +"Jabber- og GTalk-adresse, som «brukernavn@example.org». Husk å legge %s til " +"vennelisten din i direktemeldingsklienten din eller på GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Direktemeldingsinnstillinger" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." -msgstr "" +msgstr "Send meg notiser gjennom Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." -msgstr "" +msgstr "Post en notis når min Jabber/Gtalk-status endres." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." -msgstr "" +msgstr "Send meg svar gjennom Jabber/GTalk fra personer jeg ikke abonnerer på." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Innstillinger lagret." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Ingen Jabber ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Klarer ikke normalisere Jabber-IDen" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Ugyldig Jabber ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Det er allerede din Jabber ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." -msgstr "" +msgstr "Jabber-ID tilhører allerede en annen bruker." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1882,10 +2048,32 @@ msgstr "" "En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Du må " "godkjenne %s for å sende meldinger til deg." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Det er feil IM-adresse." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Kunne ikke slette direktemeldingsbekreftelse." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Direktemeldingsbekreftelse avbrutt." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Det er ikke din Jabber ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "Direktemeldingsadressen ble fjernet." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1899,6 +2087,7 @@ msgstr "Innboks for %s" #: actions/inbox.php:115 msgid "This is your inbox, which lists your incoming private messages." msgstr "" +"Dette er innboksen din som innholder dine innkommende private meldinger." #: actions/invite.php:39 msgid "Invites have been disabled." @@ -1906,8 +2095,8 @@ msgstr "Invitasjoner har blitt deaktivert." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "" +msgid "You must be logged in to invite other users to use %s." +msgstr "Du må være innlogget for å invitere andre brukere til å bruke %s." #: actions/invite.php:72 #, php-format @@ -1924,9 +2113,11 @@ msgstr "Inviter nye brukere" #: actions/invite.php:128 msgid "You are already subscribed to these users:" -msgstr "" +msgstr "Du abonnerer allerede på disse brukerne:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1935,6 +2126,7 @@ msgstr "%1$s (%2$s)" msgid "" "These people are already users and you were automatically subscribed to them:" msgstr "" +"Disse personene er allerede brukere og du ble automatisk abonnent på dem:" #: actions/invite.php:144 msgid "Invitation(s) sent to the following people:" @@ -1945,11 +2137,15 @@ msgid "" "You will be notified when your invitees accept the invitation and register " "on the site. Thanks for growing the community!" msgstr "" +"Du vil bli varslet når dine inviterte aksepterer invitasjonen og registrerer " +"seg på nettstedet. Takk for at du hjelper oss å vokse!" #: actions/invite.php:162 msgid "" "Use this form to invite your friends and colleagues to use this service." msgstr "" +"Bruk dette skjemaet for å invitere dine venner og kollegaer til å bruke " +"denne tjenesten." #: actions/invite.php:187 msgid "Email addresses" @@ -1965,7 +2161,7 @@ msgstr "Personlig melding" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." -msgstr "" +msgstr "Om du vil kan du legge til en personlig melding i invitasjonen." #. TRANS: Send button for inviting friends #: actions/invite.php:198 @@ -1973,12 +2169,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Send" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s har invitert deg til %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2038,20 +2236,24 @@ msgstr "Du må være innlogget for å bli med i en gruppe." msgid "No nickname or ID." msgstr "ngen kallenavn eller ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" -msgstr "" +msgstr "%1$s ble med i gruppen %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." -msgstr "" +msgstr "Du må være innlogget for å forlate en gruppe." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." -msgstr "" +msgstr "Du er ikke et medlem av den gruppen." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s forlot gruppe %2$s" @@ -2065,9 +2267,8 @@ msgid "Incorrect username or password." msgstr "Feil brukernavn eller passord" #: actions/login.php:132 actions/otp.php:120 -#, fuzzy msgid "Error setting user. You are probably not authorized." -msgstr "Ikke autorisert." +msgstr "Feil ved innstilling av bruker. Du er mest sannsynlig kke autorisert." #: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 msgid "Login" @@ -2075,7 +2276,7 @@ msgstr "Logg inn" #: actions/login.php:227 msgid "Login to site" -msgstr "" +msgstr "Logg inn på nettstedet" #: actions/login.php:236 actions/register.php:478 msgid "Remember me" @@ -2095,58 +2296,62 @@ msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" +"Av sikkerhetsmessige årsaker, skriv inn brukernavn og passord på nytt før du " +"endrer innstillingene dine." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Logg inn med brukernavn og passord." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" +"Har du ikke et brukernavn ennå? [Opprett](%%action.register%%) en ny konto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." -msgstr "" +msgstr "Bare en administrator kan gjøre en annen bruker til administrator." #: actions/makeadmin.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "Du er allerede logget inn!" +msgstr "%1$s er allerede en administrator for gruppen «%2$s»." #: actions/makeadmin.php:133 -#, fuzzy, php-format +#, php-format msgid "Can't get membership record for %1$s in group %2$s." -msgstr "Klarte ikke å oppdatere bruker." +msgstr "Kan ikke hente medlemsoppføring for %$1s i gruppen %2$s." #: actions/makeadmin.php:146 -#, fuzzy, php-format +#, php-format msgid "Can't make %1$s an admin for group %2$s." -msgstr "Gjør brukeren til en administrator for gruppen" +msgstr "Kan ikke gjøre %1$s til administrator for gruppen %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Ingen nåværende status" +msgid "No current status." +msgstr "Ingen nåværende status." #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" -msgstr "Ingen slik side" +msgstr "Nytt program" #: actions/newapplication.php:64 msgid "You must be logged in to register an application." -msgstr "" +msgstr "Du må være logget inn for å registrere et program." #: actions/newapplication.php:143 msgid "Use this form to register a new application." -msgstr "" +msgstr "Bruk dette skjemaet for å registrere et nytt program." #: actions/newapplication.php:176 msgid "Source URL is required." -msgstr "" +msgstr "Nettadresse til kilde kreves." #: actions/newapplication.php:258 actions/newapplication.php:267 -#, fuzzy msgid "Could not create application." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke opprette program." #: actions/newgroup.php:53 msgid "New group" @@ -2160,12 +2365,12 @@ msgstr "Bruk dette skjemaet for å opprette en ny gruppe." msgid "New message" msgstr "Ny melding" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Du kan ikke sende en melding til denne brukeren." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Inget innhold." @@ -2173,21 +2378,22 @@ msgstr "Inget innhold." msgid "No recipient specified." msgstr "Ingen mottaker oppgitt." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" +"Ikke send en melding til degselv; bare hvisk det stille til degselv istedet." #: actions/newmessage.php:181 msgid "Message sent" msgstr "Melding sendt" #: actions/newmessage.php:185 -#, fuzzy, php-format +#, php-format msgid "Direct message to %s sent." -msgstr "Direktemeldinger til %s" +msgstr "Direktemelding til %s sendt." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax-feil" @@ -2195,7 +2401,7 @@ msgstr "Ajax-feil" msgid "New notice" msgstr "Ny notis" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Notis postet" @@ -2205,15 +2411,17 @@ msgid "" "Search for notices on %%site.name%% by their contents. Separate search terms " "by spaces; they must be 3 characters or more." msgstr "" +"Søk i notiser på %%site.name%% etter deres innhold. Separer nøkkelord med " +"mellomrom; de må være minst 3 tegn lange." #: actions/noticesearch.php:78 msgid "Text search" msgstr "Tekst-søk" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Søkestrøm for «%s»" +msgstr "Søkeresultat for «%1$s» på %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2221,6 +2429,8 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" #: actions/noticesearch.php:124 #, php-format @@ -2228,21 +2438,26 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"Hvorfor ikke [registrere en konto](%%%%action.register%%%%) og vær den " +"første til å [poste om dette emnet](%%%%action.newnotice%%%%?status_textarea=" +"%s)!" #: actions/noticesearchrss.php:96 #, php-format msgid "Updates with \"%s\"" -msgstr "" +msgstr "Oppdateringer med «%s»" #: actions/noticesearchrss.php:98 -#, fuzzy, php-format +#, php-format msgid "Updates matching search term \"%1$s\" on %2$s!" -msgstr "Alle oppdateringer for søket: «%s»" +msgstr "Oppdateringer som samsvarer søkestrengen «%1$s» på %2$s." #: actions/nudge.php:85 msgid "" "This user doesn't allow nudges or hasn't confirmed or set his email yet." msgstr "" +"Denne brukeren tillater ikke knuffing eller har ikke bekreftet eller angitt " +"sin e-post ennå." #: actions/nudge.php:94 msgid "Nudge sent" @@ -2254,76 +2469,80 @@ msgstr "Knuff sendt!" #: actions/oauthappssettings.php:59 msgid "You must be logged in to list your applications." -msgstr "" +msgstr "Du må være logget inn for å liste opp programmene dine." #: actions/oauthappssettings.php:74 msgid "OAuth applications" -msgstr "" +msgstr "OAuth-program" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "Program du har registrert" #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "Du har ikke registrert noen program ennå." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" -msgstr "" +msgstr "Tilkoblede program" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." -msgstr "" +msgstr "Du har tillatt følgende programmer å få tilgang til den konto." #: actions/oauthconnectionssettings.php:175 -#, fuzzy msgid "You are not a user of that application." -msgstr "Du er allerede logget inn!" +msgstr "Du er ikke bruker av dette programmet." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "" +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Kunne ikke tilbakekalle tilgang for programmet: %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "Du har ikke tillatt noen programmer å bruke din konto." #: actions/oauthconnectionssettings.php:211 msgid "Developers can edit the registration settings for their applications " -msgstr "" +msgstr "Utviklere kan redigere registreringsinnstillingene for sine program " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "" +msgid "Notice has no profile." +msgstr "Notisen har ingen profil." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s sin status på %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "innholdstype " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Innholdstypen %s støttes ikke." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Bare " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Bare %s-nettadresser over vanlig HTTP." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." -msgstr "" +msgstr "Ikke et støttet dataformat." #: actions/opensearch.php:64 msgid "People Search" -msgstr "" +msgstr "Personsøk" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "" +msgstr "Notissøk" #: actions/othersettings.php:60 msgid "Other settings" @@ -2331,7 +2550,7 @@ msgstr "Andre innstillinger" #: actions/othersettings.php:71 msgid "Manage various other options." -msgstr "" +msgstr "Håndter diverse andre alternativ." #: actions/othersettings.php:108 msgid " (free service)" @@ -2339,29 +2558,27 @@ msgstr " (gratis tjeneste)" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "Forkort nettadresser med" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "" +msgstr "Automatisk fortkortelsestjeneste å bruke." #: actions/othersettings.php:122 msgid "View profile designs" -msgstr "" +msgstr "Vis profilutseender" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "" +msgstr "Vis eller skjul profilutseender." #: actions/othersettings.php:153 -#, fuzzy msgid "URL shortening service is too long (max 50 chars)." -msgstr "Bioen er for lang (max 140 tegn)" +msgstr "Navnet på nettadresseforkortelsestjenesten er for lang (maks 50 tegn)." #: actions/otp.php:69 -#, fuzzy msgid "No user ID specified." -msgstr "Nytt nick" +msgstr "Ingen bruker-ID spesifisert." #: actions/otp.php:83 #, fuzzy @@ -2420,7 +2637,7 @@ msgid "6 or more characters" msgstr "6 eller flere tegn" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Bekreft" @@ -2446,9 +2663,9 @@ msgstr "Feil gammelt passord" #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." -msgstr "" +msgstr "Feil ved lagring av bruker; ugyldig." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Klarer ikke å lagre nytt passord." @@ -2457,41 +2674,41 @@ msgid "Password saved." msgstr "Passordet ble lagret" #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" -msgstr "" +msgstr "Stier" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." -msgstr "" +msgstr "Sti- og tjenerinnstillinger for dette StatusNet-nettstedet." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "" +msgid "Theme directory not readable: %s." +msgstr "Temamappe ikke lesbar: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +msgid "Avatar directory not writable: %s." +msgstr "Avatarmappe ikke skrivbar: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "" +msgid "Background directory not writable: %s." +msgstr "Bakgrunnsmappe ikke skrivbar: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "" +msgid "Locales directory not readable: %s." +msgstr "Lokaliseringsmappe ikke lesbar: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." -msgstr "" +msgstr "Ugyldig SSL-tjener. Maks lengde er 255 tegn." #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 msgid "Site" -msgstr "" +msgstr "Nettsted" #: actions/pathsadminpanel.php:238 msgid "Server" @@ -2499,83 +2716,79 @@ msgstr "Tjener" #: actions/pathsadminpanel.php:238 msgid "Site's server hostname." -msgstr "" +msgstr "Vertsnavn for nettstedets tjener." #: actions/pathsadminpanel.php:242 msgid "Path" -msgstr "" +msgstr "Sti" #: actions/pathsadminpanel.php:242 msgid "Site path" -msgstr "" +msgstr "Nettstedssti" #: actions/pathsadminpanel.php:246 msgid "Path to locales" -msgstr "" +msgstr "Lokaliseringssti" #: actions/pathsadminpanel.php:246 msgid "Directory path to locales" -msgstr "" +msgstr "Lokaliseringsmappesti" #: actions/pathsadminpanel.php:250 msgid "Fancy URLs" -msgstr "" +msgstr "Pyntede nettadresser" #: actions/pathsadminpanel.php:252 msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" +msgstr "Bruk pyntede (mer lesbare og lettere å huske) nettadresser?" #: actions/pathsadminpanel.php:259 msgid "Theme" -msgstr "" +msgstr "Tema" #: actions/pathsadminpanel.php:264 msgid "Theme server" -msgstr "" +msgstr "Tematjener" #: actions/pathsadminpanel.php:268 msgid "Theme path" -msgstr "" +msgstr "Temasti" #: actions/pathsadminpanel.php:272 msgid "Theme directory" -msgstr "" +msgstr "Temamappe" #: actions/pathsadminpanel.php:279 -#, fuzzy msgid "Avatars" -msgstr "Brukerbilde" +msgstr "Avatarer" #: actions/pathsadminpanel.php:284 -#, fuzzy msgid "Avatar server" -msgstr "Innstillinger for IM" +msgstr "Avatartjener" #: actions/pathsadminpanel.php:288 -#, fuzzy msgid "Avatar path" -msgstr "Brukerbildet har blitt oppdatert." +msgstr "Avatarsti" #: actions/pathsadminpanel.php:292 -#, fuzzy msgid "Avatar directory" -msgstr "Brukerbildet har blitt oppdatert." +msgstr "Avatarmappe" #: actions/pathsadminpanel.php:301 msgid "Backgrounds" -msgstr "" +msgstr "Bakgrunner" #: actions/pathsadminpanel.php:305 msgid "Background server" -msgstr "" +msgstr "Bakgrunnstjener" #: actions/pathsadminpanel.php:309 msgid "Background path" -msgstr "" +msgstr "Bakgrunnssti" #: actions/pathsadminpanel.php:313 msgid "Background directory" -msgstr "" +msgstr "Bakgrunnsmappe" #: actions/pathsadminpanel.php:320 msgid "SSL" @@ -2599,20 +2812,19 @@ msgstr "Bruk SSL" #: actions/pathsadminpanel.php:330 msgid "When to use SSL" -msgstr "" +msgstr "Når SSL skal brukes" #: actions/pathsadminpanel.php:335 -#, fuzzy msgid "SSL server" -msgstr "Gjenopprett" +msgstr "SSL-tjener" #: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" -msgstr "" +msgstr "Tjener SSL-forespørsler skal vises til" #: actions/pathsadminpanel.php:352 msgid "Save paths" -msgstr "" +msgstr "Lagre stier" #: actions/peoplesearch.php:52 #, php-format @@ -2620,55 +2832,60 @@ msgid "" "Search for people on %%site.name%% by their name, location, or interests. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" +"Søk etter personer på %%site.name%% etter deres navn, lokasjon eller " +"interesser. Skill nøkkelord med mellomrom; de må være 3 tegn eller lengre." #: actions/peoplesearch.php:58 msgid "People search" -msgstr "" +msgstr "Personsøk" -#: actions/peopletag.php:70 -#, fuzzy, php-format -msgid "Not a valid people tag: %s" -msgstr "Ugyldig e-postadresse" +#: actions/peopletag.php:68 +#, php-format +msgid "Not a valid people tag: %s." +msgstr "Ikke en gyldig personmerkelapp: %s." -#: actions/peopletag.php:144 -#, fuzzy, php-format +#: actions/peopletag.php:142 +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Mikroblogg av %s" +msgstr "Brukere som har merket seg selv med %1$s - side %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "" +msgid "Invalid notice content." +msgstr "Ugyldig notisinnhold." #: actions/postnotice.php:101 #, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." -msgstr "" +msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’." #: actions/profilesettings.php:60 msgid "Profile settings" -msgstr "" +msgstr "Profilinnstillinger" #: actions/profilesettings.php:71 msgid "" "You can update your personal profile info here so people know more about you." msgstr "" +"Du kan oppdater din personlige profilinformasjon slik at personer får vite " +"mer om deg." #: actions/profilesettings.php:99 msgid "Profile information" -msgstr "" +msgstr "Profilinformasjon" #: actions/profilesettings.php:108 lib/groupeditform.php:154 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullt navn" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Hjemmesiden" @@ -2677,37 +2894,36 @@ msgid "URL of your homepage, blog, or profile on another site" msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside." #: actions/profilesettings.php:122 actions/register.php:461 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "Beskriv degselv og dine interesser med 140 tegn" +msgstr "Beskriv degselv og dine interesser med %d tegn" #: actions/profilesettings.php:125 actions/register.php:464 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Beskriv degselv og dine interesser med 140 tegn" +msgstr "Beskriv degselv og dine interesser" #: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Om meg" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" -msgstr "" +msgstr "Plassering" #: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "" +msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "Del min nåværende plassering når jeg poster notiser" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Tagger" @@ -2715,6 +2931,8 @@ msgstr "Tagger" msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" +"Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma " +"eller mellomrom" #: actions/profilesettings.php:151 msgid "Language" @@ -2752,63 +2970,60 @@ msgid "Language is too long (max 50 chars)." msgstr "Språk er for langt (maks 50 tegn)." #: actions/profilesettings.php:253 actions/tagother.php:178 -#, fuzzy, php-format +#, php-format msgid "Invalid tag: \"%s\"" -msgstr "Ugyldig hjemmeside '%s'" +msgstr "Ugyldig merkelapp: «%s»" #: actions/profilesettings.php:306 msgid "Couldn't update user for autosubscribe." -msgstr "" +msgstr "Kunne ikke oppdatere bruker for autoabonnering." #: actions/profilesettings.php:363 -#, fuzzy msgid "Couldn't save location prefs." -msgstr "Klarte ikke å lagre profil." +msgstr "Kunne ikke lagre plasseringsinnstillinger." #: actions/profilesettings.php:375 msgid "Couldn't save profile." msgstr "Klarte ikke å lagre profil." #: actions/profilesettings.php:383 -#, fuzzy msgid "Couldn't save tags." -msgstr "Klarte ikke å lagre profil." +msgstr "Kunne ikke lagre merkelapper." #. TRANS: Message after successful saving of administrative settings. #: actions/profilesettings.php:391 lib/adminpanelaction.php:141 msgid "Settings saved." -msgstr "" +msgstr "Innstillinger lagret." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "" +msgid "Beyond the page limit (%s)." +msgstr "Over sidegrensen (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." -msgstr "" +msgstr "Kunne ikke hente offentlig strøm." #: actions/public.php:130 #, php-format msgid "Public timeline, page %d" -msgstr "" +msgstr "Offentlig tidslinje, side %d" #: actions/public.php:132 lib/publicgroupnav.php:79 msgid "Public timeline" -msgstr "" +msgstr "Offentlig tidslinje" #: actions/public.php:160 msgid "Public Stream Feed (RSS 1.0)" -msgstr "" +msgstr "Offentlig strømmating (RSS 1.0)" #: actions/public.php:164 msgid "Public Stream Feed (RSS 2.0)" -msgstr "" +msgstr "Offentlig strømmating (RSS 2.0)" #: actions/public.php:168 -#, fuzzy msgid "Public Stream Feed (Atom)" -msgstr "%s offentlig strøm" +msgstr "Offentlig strømmating (Atom)" #: actions/public.php:188 #, php-format @@ -2816,16 +3031,20 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Dette er den offentlige tidslinjen for %%site.name%% men ingen har postet " +"noe ennå." #: actions/public.php:191 msgid "Be the first to post!" -msgstr "" +msgstr "Vær den første til å poste!" #: actions/public.php:195 #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" +"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første " +"til å poste!" #: actions/public.php:242 #, php-format @@ -2835,6 +3054,10 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Dette er %%site.name%%, en [mikroblogg](http://no.wikipedia.org/wiki/" +"Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]" +"(http://status.net). [Bli med nå](%%action.register%%) for å dele notiser om " +"degselv med venner, familie og kollegaer! ([Les mer](%%doc.help%%))" #: actions/public.php:247 #, php-format @@ -2843,15 +3066,18 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"Dette er %%site.name%%, en [mikroblogg](http://no.wikipedia.org/wiki/" +"Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]" +"(http://status.net)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" -msgstr "" +msgstr "Offentlig merkelappsky" #: actions/publictagcloud.php:63 #, php-format msgid "These are most popular recent tags on %s " -msgstr "" +msgstr "Dette er de siste mest populære merkelappene på %s " #: actions/publictagcloud.php:69 #, php-format @@ -2860,7 +3086,7 @@ msgstr "" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Vær den første til å poste en!" #: actions/publictagcloud.php:75 #, php-format @@ -2868,10 +3094,12 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første " +"til å poste en!" #: actions/publictagcloud.php:134 msgid "Tag cloud" -msgstr "" +msgstr "Merkelappsky" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2879,23 +3107,23 @@ msgstr "Du er allerede logget inn!" #: actions/recoverpassword.php:62 msgid "No such recovery code." -msgstr "" +msgstr "Ingen slik gjenopprettingskode." #: actions/recoverpassword.php:66 msgid "Not a recovery code." -msgstr "" +msgstr "Ikke en gjenopprettingskode." #: actions/recoverpassword.php:73 msgid "Recovery code for unknown user." -msgstr "" +msgstr "Gjenopprettingskode for ukjent bruker." #: actions/recoverpassword.php:86 msgid "Error with confirmation code." -msgstr "" +msgstr "Bekreftelseskodefeil." #: actions/recoverpassword.php:97 msgid "This confirmation code is too old. Please start again." -msgstr "" +msgstr "Denne bekreftelseskoden er for gammel. Start på nytt." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." @@ -2906,22 +3134,24 @@ msgid "" "If you have forgotten or lost your password, you can get a new one sent to " "the email address you have stored in your account." msgstr "" +"Om du har glemt eller mistet passordet ditt kan du få et nytt tilsendt på e-" +"postadressen du har lagret på kontoen din." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Du har blitt identifisert. Skriv inn et nytt passord nedenfor. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Passordgjenoppretting" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Kallenavn eller e-postadresse" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." -msgstr "" +msgstr "Ditt kallenavn på denne tjeneren eller din registrerte e-postadresse." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" @@ -2929,19 +3159,19 @@ msgstr "Gjenopprett" #: actions/recoverpassword.php:208 msgid "Reset password" -msgstr "" +msgstr "Tilbakestill passord" #: actions/recoverpassword.php:209 msgid "Recover password" -msgstr "" +msgstr "Gjenopprett passord" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" -msgstr "" +msgstr "Passordgjenoppretting forespurt" #: actions/recoverpassword.php:213 msgid "Unknown action" -msgstr "" +msgstr "Ukjent handling" #: actions/recoverpassword.php:236 msgid "6 or more characters, and don't forget it!" @@ -2953,21 +3183,21 @@ msgstr "Nullstill" #: actions/recoverpassword.php:252 msgid "Enter a nickname or email address." -msgstr "" +msgstr "Skriv inn et kallenavn eller en e-postadresse." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." -msgstr "" +msgstr "Ingen bruker med den e-postadressen eller det kallenavnet." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." -msgstr "" +msgstr "Ingen registrert e-postadresse for den brukeren." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." -msgstr "" +msgstr "Feil ved lagring av adressebekreftelse." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -2975,49 +3205,49 @@ msgstr "" "Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt " "til din registrerte e-postadresse." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." -msgstr "" +msgstr "Uventet tilbakestilling av passord." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Passordet må bestå av 6 eller flere tegn." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." -msgstr "" +msgstr "Passord og bekreftelse samsvarer ikke." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." -msgstr "" +msgstr "Feil ved innstilling av bruker." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." -msgstr "" +msgstr "Nytt passord ble lagret. Du er nå logget inn." #: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." -msgstr "" +msgstr "Beklager, kun inviterte personer kan registrere seg." #: actions/register.php:92 msgid "Sorry, invalid invitation code." -msgstr "" +msgstr "Beklager, ugyldig invitasjonskode." #: actions/register.php:112 msgid "Registration successful" -msgstr "" +msgstr "Registrering vellykket" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" -msgstr "" +msgstr "Registrer" #: actions/register.php:135 msgid "Registration not allowed." -msgstr "" +msgstr "Registrering ikke tillatt." #: actions/register.php:198 msgid "You can't register if you don't agree to the license." -msgstr "" +msgstr "Du kan ikke registrere deg om du ikke godtar lisensvilkårene." #: actions/register.php:212 msgid "Email address already exists." @@ -3029,9 +3259,11 @@ msgstr "Ugyldig brukernavn eller passord" #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" +"Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og " +"knytte deg til venner og kollegaer. " #: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -3046,36 +3278,30 @@ msgstr "6 eller flere tegn. Påkrevd." msgid "Same as password above. Required." msgstr "Samme som passord over. Kreves." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-post" #: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" -msgstr "" +msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting" #: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Lengre navn, helst ditt \"ekte\" navn" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Teksten og filene mine er tilgjengelig under " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Navngivelse 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -" utenom disse private dataene: passord, e-postadresse, lynmeldingsadresse " -"og telefonnummer." +"Mine tekster og filer er tilgjengelig under %s med unntak av disse private " +"dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3108,7 +3334,7 @@ msgstr "" "\n" "Takk for at du registrerte deg og vi håper du kommer til å like tjenesten." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3123,47 +3349,54 @@ msgid "" "register%%) a new account. If you already have an account on a [compatible " "microblogging site](%%doc.openmublog%%), enter your profile URL below." msgstr "" +"For å abonnere kan du [logge inn](%%action.login%%) eller [registrere](%%" +"action.register%%) en ny konto. Om du allerede har en konto på et " +"[kompatibelt mikrobloggingsnettsted](%%doc.openmublog%%), skriv inn " +"profilnettadressen din nedenfor." #: actions/remotesubscribe.php:112 msgid "Remote subscribe" -msgstr "" +msgstr "Fjernabonner" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "" +msgstr "Abonner på en fjernbruker" #: actions/remotesubscribe.php:129 msgid "User nickname" -msgstr "" +msgstr "Brukerens kallenavn" #: actions/remotesubscribe.php:130 msgid "Nickname of the user you want to follow" -msgstr "" +msgstr "Kallenavn på brukeren du vil følge" #: actions/remotesubscribe.php:133 msgid "Profile URL" -msgstr "" +msgstr "Profilnettadresse" #: actions/remotesubscribe.php:134 msgid "URL of your profile on another compatible microblogging service" msgstr "" +"Nettadresse til profilen din på en annen kompatibel mikrobloggingstjeneste" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" -msgstr "" +msgstr "Abonner" #: actions/remotesubscribe.php:159 msgid "Invalid profile URL (bad format)" -msgstr "" +msgstr "Ugyldig profilnettadresse (dårlig format)" #: actions/remotesubscribe.php:168 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "" +"Ikke en gyldig profilnettadresse (inget YADIS-dokument eller ugyldig XRDS " +"definert)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "Det er en lokal profil! Logg inn for å abonnere." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." @@ -3171,23 +3404,21 @@ msgstr "" #: actions/repeat.php:57 msgid "Only logged-in users can repeat notices." -msgstr "" +msgstr "Bare innloggede brukere kan repetere notiser." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "Nytt nick" +msgstr "Ingen notis spesifisert." #: actions/repeat.php:76 msgid "You can't repeat your own notice." -msgstr "" +msgstr "Du kan ikke gjenta din egen notis." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Du er allerede logget inn!" +msgstr "Du har allerede gjentatt den notisen." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Gjentatt" @@ -3222,11 +3453,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Svarstrøm for %s (Atom)" #: actions/replies.php:199 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." -msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda." +msgstr "" +"Dette er tidslinjen som viser svar til %1$s men %2$s har ikke mottat en " +"notis for hans oppmerksomhet ennå." #: actions/replies.php:204 #, php-format @@ -3234,16 +3467,17 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Du kan engasjere andre brukere i en samtale, abonnere på flere personer " +"eller [bli med i grupper](%%action.groups%%)." #: actions/replies.php:206 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Du kan prøve å [knuffe %s](../%s) fra dennes profil eller [post noe for å få " -"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%" -"s)." +"Du kan prøve å [knuffe %1$s](../%2$s) eller [post noe for å få hans eller " +"hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -3251,89 +3485,88 @@ msgid "Replies to %1$s on %2$s!" msgstr "Svar til %1$s på %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Du er allerede logget inn!" +msgstr "Du kan ikke trekke tilbake brukerroller på dette nettstedet." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Brukeren har ingen profil." +msgstr "Brukeren har ikke denne rollen." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" msgstr "StatusNet" #: actions/sandbox.php:65 actions/unsandbox.php:65 -#, fuzzy msgid "You cannot sandbox users on this site." -msgstr "Du er allerede logget inn!" +msgstr "Du kan ikke flytte brukere til sandkassen på dette nettstedet." #: actions/sandbox.php:72 -#, fuzzy msgid "User is already sandboxed." -msgstr "Du er allerede logget inn!" +msgstr "Brukeren er allerede i sandkassen." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" -msgstr "" +msgstr "Økter" #: actions/sessionsadminpanel.php:65 msgid "Session settings for this StatusNet site." -msgstr "" +msgstr "Øktinnstillinger for dette StatusNet-nettstedet." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" -msgstr "" +msgstr "Håndter økter" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Hvorvidt økter skal håndteres av oss selv." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" -msgstr "" +msgstr "Øktfeilsøking" #: actions/sessionsadminpanel.php:183 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "Slå på feilsøkingsutdata for økter." #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 #: actions/useradminpanel.php:294 -#, fuzzy msgid "Save site settings" -msgstr "Innstillinger for IM" +msgstr "Lagre nettstedsinnstillinger" #: actions/showapplication.php:82 msgid "You must be logged in to view an application." -msgstr "" +msgstr "Du må være innlogget for å se et program." #: actions/showapplication.php:157 msgid "Application profile" -msgstr "" +msgstr "Programprofil" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Ikon" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Navn" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organisasjon" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beskrivelse" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statistikk" @@ -3344,23 +3577,23 @@ msgstr "Opprettet av %1$s - %2$s standardtilgang - %3$d brukere" #: actions/showapplication.php:213 msgid "Application actions" -msgstr "" +msgstr "Programhandlinger" #: actions/showapplication.php:236 msgid "Reset key & secret" -msgstr "" +msgstr "Tilbakestill nøkkel & hemmelighet" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Programinformasjon" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Forbrukernøkkel" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Forbrukerhemmelighet" #: actions/showapplication.php:273 msgid "Request token URL" @@ -3379,41 +3612,45 @@ msgid "" "Note: We support HMAC-SHA1 signatures. We do not support the plaintext " "signature method." msgstr "" +"Merk: Vi støtter HMAC-SHA1-signaturer. Vi støtter ikke metoden for " +"klartekstsignatur." #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "Er du sikker på at du vil slette denne notisen?" +msgstr "" +"Er du sikker på at du vil tilbakestille din forbrukernøkkel og -hemmelighet?" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "%s og venner" +msgstr "%1$s sine favorittnotiser, side %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." -msgstr "" +msgstr "Kunne ikke hente favorittnotiser." #: actions/showfavorites.php:171 -#, fuzzy, php-format +#, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Feed for %s sine venner" +msgstr "Mating for favoritter av %s (RSS 1.0)" #: actions/showfavorites.php:178 -#, fuzzy, php-format +#, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Feed for %s sine venner" +msgstr "Mating for favoritter av %s (RSS 2.0)" #: actions/showfavorites.php:185 -#, fuzzy, php-format +#, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Feed for %s sine venner" +msgstr "Mating for favoritter av %s (Atom)" #: actions/showfavorites.php:206 msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"Du har ikke valgt en favorittnotis ennå. Klikk på favorittknappen på notiser " +"du liker for å bokmerke dem for senere eller for å kaste et søkelys på dem." #: actions/showfavorites.php:208 #, php-format @@ -3421,6 +3658,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s har ikke lagt til noen notiser til sine favoritter ennå. Post noe " +"interessant som de vil legge til sine favoritter :)" #: actions/showfavorites.php:212 #, php-format @@ -3429,85 +3668,85 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s har ikke lagt noen notiser til sine favoritter ennå. Hvorfor ikke " +"[registrere en konto](%%%%action.register%%%%) og post noe interessant som " +"de vil legge til sine favoritter :)" #: actions/showfavorites.php:243 msgid "This is a way to share what you like." -msgstr "" +msgstr "Dette er en måte å dele det du liker." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" -msgstr "" +msgstr "%s gruppe" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "Alle abonnementer" +msgstr "%1$s gruppe, side %2$d" -#: actions/showgroup.php:226 -#, fuzzy +#: actions/showgroup.php:227 msgid "Group profile" -msgstr "Klarte ikke å lagre profil." +msgstr "Gruppeprofil" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" -msgstr "" +msgstr "Nettadresse" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" -msgstr "" +msgstr "Merk" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "Alias" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" -msgstr "" +msgstr "Gruppehandlinger" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "" +msgstr "Notismating for %s gruppe (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "" +msgstr "Notismating for %s gruppe (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" -msgstr "" +msgstr "Notismating for %s gruppe (Atom)" -#: actions/showgroup.php:354 -#, fuzzy, php-format +#: actions/showgroup.php:355 +#, php-format msgid "FOAF for %s group" -msgstr "Klarte ikke å lagre profil." +msgstr "FOAF for gruppen %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 -#, fuzzy +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" -msgstr "Medlem siden" +msgstr "Medlemmer" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" -msgstr "" +msgstr "(Ingen)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" -msgstr "" +msgstr "Alle medlemmer" -#: actions/showgroup.php:441 -#, fuzzy +#: actions/showgroup.php:447 msgid "Created" -msgstr "Opprett" +msgstr "Opprettet" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3516,8 +3755,14 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** er en brukergruppe på %%%%site.name%%%%, en [mikrobloggingstjeneste]" +"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie " +"programvareverktøyet [StatusNet](http://status.net/). Dets medlemmer deler " +"korte meldinger om deres liv og interesser. [Bli med nå](%%%%action.register%" +"%%%) for å bli medlem av denne gruppen og mange fler. ([Les mer](%%%%doc.help" +"%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3525,88 +3770,93 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" +"**%s** er en brukergruppe på %%%%site.name%%%%, en [mikrobloggingstjeneste]" +"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie " +"programvareverktøyet [StatusNet](http://status.net/). Dets medlemmer deler " +"korte meldinger om deres liv og interesser. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" -msgstr "" +msgstr "Administratorer" #: actions/showmessage.php:81 msgid "No such message." -msgstr "" +msgstr "Ingen slik melding." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." -msgstr "" +msgstr "Kun senderen og mottakeren kan lese denne meldingen." #: actions/showmessage.php:108 #, php-format msgid "Message to %1$s on %2$s" -msgstr "" +msgstr "Melding til %1$s på %2$s" #: actions/showmessage.php:113 #, php-format msgid "Message from %1$s on %2$s" -msgstr "" +msgstr "Melding fra %1$s på %2$s" #: actions/shownotice.php:90 msgid "Notice deleted." -msgstr "" +msgstr "Notis slettet." #: actions/showstream.php:73 -#, fuzzy, php-format +#, php-format msgid " tagged %s" -msgstr "Tagger" +msgstr " merket %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%s og venner" +msgstr "%1$s, side %2$d" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Feed for taggen %s" +msgstr "Notismating for %1$s merket %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "" +msgstr "Notismating for %s (RSS 1.0)" #: actions/showstream.php:136 #, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "" +msgstr "Notismating for %s (RSS 2.0)" #: actions/showstream.php:143 #, php-format msgid "Notice feed for %s (Atom)" -msgstr "" +msgstr "Notismating for %s (Atom)" #: actions/showstream.php:148 -#, fuzzy, php-format +#, php-format msgid "FOAF for %s" -msgstr "Feed for taggen %s" +msgstr "FOAF for %s" #: actions/showstream.php:200 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda." +msgstr "Dette er tidslinjen for %1$s men %2$s har ikke postet noe ennå." #: actions/showstream.php:205 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"Sett noe interessant nylig? Du har ikke postet noen notiser ennå, så hvorfor " +"ikke begynne nå? :)" #: actions/showstream.php:207 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"Du kan prøve å [knuffe %s](../%s) fra dennes profil eller [post noe for å få " -"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%" -"s)." +"Du kan prøve å knuffe %1$s eller [poste noe for å få hans eller hennes " +"oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:243 #, php-format @@ -3616,6 +3866,11 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** har en konto på %%%%site.name%%%%, en [mikrobloggingstjeneste] " +"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie " +"programvareverktøyet [StatusNet](http://status.net/). [Bli med nå](%%%%" +"action.register%%%%) for å følge **%s** og mange flere sine notiser. ([Les " +"mer](%%%%doc.help%%%%))" #: actions/showstream.php:248 #, php-format @@ -3624,58 +3879,59 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" +"**%s** har en konto på %%%%site.name%%%%, en [mikrobloggingstjeneste] " +"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie " +"programvareverktøyet [StatusNet](http://status.net/). " #: actions/showstream.php:305 -#, fuzzy, php-format +#, php-format msgid "Repeat of %s" -msgstr "Svar til %s" +msgstr "Repetisjon av %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." -msgstr "" +msgstr "Du kan ikke bringe brukere til taushet på dette nettstedet." #: actions/silence.php:72 -#, fuzzy msgid "User is already silenced." -msgstr "Du er allerede logget inn!" +msgstr "Bruker er allerede brakt til taushet." #: actions/siteadminpanel.php:69 msgid "Basic settings for this StatusNet site" -msgstr "" +msgstr "Grunninnstillinger for dette StatusNet-nettstedet" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." -msgstr "" +msgstr "Nettstedsnavnet må være minst ett tegn langt." #: actions/siteadminpanel.php:141 -#, fuzzy msgid "You must have a valid contact email address." -msgstr "Ugyldig e-postadresse" +msgstr "Du må ha en gyldig e-postadresse." #: actions/siteadminpanel.php:159 #, php-format msgid "Unknown language \"%s\"." -msgstr "" +msgstr "Ukjent språk «%s»." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "" +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Minste tekstgrense er 0 (ubegrenset)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 msgid "General" -msgstr "" +msgstr "Generell" #: actions/siteadminpanel.php:224 msgid "Site name" -msgstr "" +msgstr "Nettstedsnavn" #: actions/siteadminpanel.php:225 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "Navnet på nettstedet ditt, for eksempel «Foretaksnavn mikroblogg»" #: actions/siteadminpanel.php:229 msgid "Brought by" @@ -3695,24 +3951,23 @@ msgstr "" #: actions/siteadminpanel.php:239 msgid "Contact email address for your site" -msgstr "" +msgstr "Kontakte-postadresse for nettstedet ditt" #: actions/siteadminpanel.php:245 msgid "Local" -msgstr "" +msgstr "Lokal" #: actions/siteadminpanel.php:256 msgid "Default timezone" -msgstr "" +msgstr "Standard tidssone" #: actions/siteadminpanel.php:257 msgid "Default timezone for the site; usually UTC." -msgstr "" +msgstr "Standard tidssone for nettstedet; vanligvis UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Foretrukket språk" +msgstr "Standardspråk" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3720,28 +3975,28 @@ msgstr "" #: actions/siteadminpanel.php:271 msgid "Limits" -msgstr "" +msgstr "Grenser" #: actions/siteadminpanel.php:274 msgid "Text limit" -msgstr "" +msgstr "Tekstgrense" #: actions/siteadminpanel.php:274 msgid "Maximum number of characters for notices." -msgstr "" +msgstr "Maks antall tegn for notiser." #: actions/siteadminpanel.php:278 msgid "Dupe limit" -msgstr "" +msgstr "Duplikatsgrense" #: actions/siteadminpanel.php:278 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" +"Hvor lenge en bruker må vente (i sekund) for å poste den samme tingen igjen." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Notiser" +msgstr "Nettstedsnotis" #: actions/sitenoticeadminpanel.php:67 msgid "Edit site-wide message" @@ -3753,123 +4008,178 @@ msgid "Unable to save site notice." msgstr "Kunne ikke lagre dine innstillinger for utseende." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Slett notis" +msgstr "Tekst for nettstedsnotis" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Innstillinger for IM" +msgstr "Lagre nettstedsnotis" -#: actions/smssettings.php:58 -#, fuzzy +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" -msgstr "Innstillinger for SMS" +msgstr "SMS-innstillinger" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." -msgstr "" +msgstr "Du kan motta SMS-meldinger gjennom e-post fra %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." -msgstr "" +msgstr "SMS er ikke tilgjengelig." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "SMS-adresse" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Venter på bekreftelse for dette telefonnummeret." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Bekreftelseskode" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." -msgstr "" +msgstr "Skriv inn koden du mottok på telefonen din." -#: actions/smssettings.php:138 -#, fuzzy +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Bekreft" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Telefonnummer for SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "SMS-innstillinger" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" +"Send meg notiser via SMS; jeg forstår at dette kan føre til kostnader fra " +"min teleoperatør." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "SMS-innstillinger lagret." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." -msgstr "" +msgstr "Ingen telefonnummer." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." -msgstr "" +msgstr "Ingen operatør valgt." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Det er allerede din ditt telefonnummer." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." -msgstr "" +msgstr "Telefonnummeret tilhører allerede en annen bruker." -#: actions/smssettings.php:347 -#, fuzzy +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen " -"din for koden, og hvordan du skal bruke den." +"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk telefonen " +"din for koden og hvordan du skal bruke den." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." -msgstr "" +msgstr "Dette er feil bekreftelsesnummer." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "SMS-bekreftelse avbrutt." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Det er ikke ditt telefonnummer." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Telefonnummeret for SMS ble fjernet." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" -msgstr "" +msgstr "Mobiloperatør" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" -msgstr "" +msgstr "Velg en operatør" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" +"Mobiloperatør for din telefon. Om du kjenner til en operatør som kan motta " +"SMS via e-post men som ikke er listet opp her, send en e-post til %s og " +"fortell oss." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" -msgstr "" +msgstr "Ingen kode skrevet inn" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3890,7 +4200,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3907,7 +4217,7 @@ msgstr "" #: actions/snapshotadminpanel.php:217 msgid "Frequency" -msgstr "" +msgstr "Frekvens" #: actions/snapshotadminpanel.php:218 msgid "Snapshots will be sent once every N web hits" @@ -3930,8 +4240,7 @@ msgstr "Innstillinger for IM" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Klarte ikke å lagre avatar-informasjonen" @@ -3941,9 +4250,8 @@ msgid "This action only accepts POST requests." msgstr "" #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "Ingen slik fil." +msgstr "Ingen slik profil." #: actions/subscribe.php:117 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." @@ -4020,18 +4328,17 @@ msgid "" msgstr "" #: actions/subscriptions.php:128 actions/subscriptions.php:132 -#, fuzzy, php-format +#, php-format msgid "%s is not listening to anyone." -msgstr "%1$s lytter nå til dine notiser på %2$s." +msgstr "%s lytter ikke til noen." -#: actions/subscriptions.php:199 -#, fuzzy +#: actions/subscriptions.php:208 msgid "Jabber" -msgstr "Ingen Jabber ID." +msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" -msgstr "" +msgstr "SMS" #: actions/tag.php:69 #, fuzzy, php-format @@ -4041,17 +4348,17 @@ msgstr "Mikroblogg av %s" #: actions/tag.php:87 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" +msgstr "Notismating for merkelapp %s (RSS 1.0)" #: actions/tag.php:93 #, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "" +msgstr "Notismating for merkelapp %s (RSS 2.0)" #: actions/tag.php:99 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Feed for taggen %s" +msgstr "Notismating for merkelapp %s (Atom)" #: actions/tagother.php:39 msgid "No ID argument." @@ -4062,15 +4369,14 @@ msgstr "" msgid "Tag %s" msgstr "Tagger" -#: actions/tagother.php:77 lib/userprofile.php:75 -#, fuzzy +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" -msgstr "Klarte ikke å lagre profil." +msgstr "Brukerprofil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" -msgstr "" +msgstr "Foto" #: actions/tagother.php:141 #, fuzzy @@ -4089,9 +4395,8 @@ msgid "" msgstr "" #: actions/tagother.php:200 -#, fuzzy msgid "Could not save tags." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke lagre merkelapper." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." @@ -4106,9 +4411,8 @@ msgid "API method under construction." msgstr "API-metode under utvikling." #: actions/unblock.php:59 -#, fuzzy msgid "You haven't blocked that user." -msgstr "Du er allerede logget inn!" +msgstr "Du har ikke blokkert den brukeren." #: actions/unsandbox.php:72 msgid "User is not sandboxed." @@ -4119,8 +4423,9 @@ msgid "User is not silenced." msgstr "" #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "" +#, fuzzy +msgid "No profile ID in request." +msgstr "Ingen profil med den ID'en." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4136,74 +4441,70 @@ msgstr "" #: actions/useradminpanel.php:59 msgctxt "TITLE" msgid "User" -msgstr "" +msgstr "Bruker" #: actions/useradminpanel.php:70 msgid "User settings for this StatusNet site." -msgstr "" +msgstr "Brukerinnstillinger for dette StatusNet-nettstedet." #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." -msgstr "" +msgstr "Ugyldig biografigrense. Må være numerisk." #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." -msgstr "" +msgstr "Ugyldig velkomsttekst. Maks lengde er 255 tegn." #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "" +msgstr "Ugyldig standardabonnement: '%1$s' er ikke bruker." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "Biografigrense" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "Maks lengde på en profilbiografi i tegn." #: actions/useradminpanel.php:231 -#, fuzzy msgid "New users" -msgstr "slett" +msgstr "Nye brukere" #: actions/useradminpanel.php:235 msgid "New user welcome" -msgstr "" +msgstr "Velkomst av ny bruker" #: actions/useradminpanel.php:236 msgid "Welcome text for new users (Max 255 chars)." -msgstr "" +msgstr "Velkomsttekst for nye brukere (Maks 255 tegn)." #: actions/useradminpanel.php:241 -#, fuzzy msgid "Default subscription" -msgstr "Alle abonnementer" +msgstr "Standardabonnement" #: actions/useradminpanel.php:242 -#, fuzzy msgid "Automatically subscribe new users to this user." -msgstr "" -"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)" +msgstr "Legger automatisk til et abonnement på denne brukeren til nye brukere." #: actions/useradminpanel.php:251 -#, fuzzy msgid "Invitations" -msgstr "Bekreftelseskode" +msgstr "Invitasjoner" #: actions/useradminpanel.php:256 msgid "Invitations enabled" -msgstr "" +msgstr "Invitasjoner aktivert" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "Hvorvidt brukere tillates å invitere nye brukere." #: actions/userauthorization.php:105 msgid "Authorize subscription" @@ -4218,7 +4519,7 @@ msgstr "" #: actions/userauthorization.php:196 actions/version.php:165 msgid "License" -msgstr "" +msgstr "Lisens" #: actions/userauthorization.php:217 msgid "Accept" @@ -4227,16 +4528,15 @@ msgstr "Godta" #: actions/userauthorization.php:218 lib/subscribeform.php:115 #: lib/subscribeform.php:139 msgid "Subscribe to this user" -msgstr "" +msgstr "Abonner på denne brukeren" #: actions/userauthorization.php:219 msgid "Reject" -msgstr "" +msgstr "Avvis" #: actions/userauthorization.php:220 -#, fuzzy msgid "Reject this subscription" -msgstr "Alle abonnementer" +msgstr "Avvis dette abonnementet" #: actions/userauthorization.php:232 msgid "No authorization request!" @@ -4290,9 +4590,9 @@ msgid "Avatar URL ‘%s’ is not valid." msgstr "" #: actions/userauthorization.php:350 -#, fuzzy, php-format +#, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "Kan ikke lese brukerbilde-URL «%s»" +msgstr "Kan ikke lese avatar-URL ‘%s’" #: actions/userauthorization.php:355 #, php-format @@ -4312,37 +4612,43 @@ msgstr "" #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" -msgstr "" +msgstr "Bon appétit." -#: actions/usergroups.php:64 -#, fuzzy, php-format +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 +#, php-format msgid "%1$s groups, page %2$d" -msgstr "Alle abonnementer" +msgstr "%1$s grupper, side %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" -msgstr "" +msgstr "Søk etter flere grupper" -#: actions/usergroups.php:157 -#, fuzzy, php-format +#: actions/usergroups.php:159 +#, php-format msgid "%s is not a member of any group." -msgstr "Du er allerede logget inn!" +msgstr "%s er ikke medlem av noen gruppe." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." -msgstr "" +msgstr "Prøv å [søke etter grupper](%%action.groupsearch%%) og bli med i dem." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Oppdateringar fra %1$s på %2$s!" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Statistikk" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -4350,10 +4656,12 @@ msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" +"Dette nettstedet drives av %1$s versjon %2$s, Copyright 2008-2010 StatusNet, " +"Inc. og andre bidragsytere." #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Bidragsytere" #: actions/version.php:168 msgid "" @@ -4380,30 +4688,30 @@ msgstr "" #: actions/version.php:189 msgid "Plugins" -msgstr "" +msgstr "Programtillegg" -#: actions/version.php:196 lib/action.php:767 -#, fuzzy +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" -msgstr "Personlig" +msgstr "Versjon" #: actions/version.php:197 msgid "Author(s)" -msgstr "" +msgstr "Forfatter(e)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4439,329 +4747,354 @@ msgstr "" #: classes/Message.php:61 msgid "Could not insert message." -msgstr "" +msgstr "Kunne ikke sette inn melding." #: classes/Message.php:71 msgid "Could not update message with new URI." -msgstr "" +msgstr "Kunne ikke oppdatere melding med ny nettadresse." -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" - -#: classes/Notice.php:241 -msgid "Problem saving notice. Too long." -msgstr "" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" +msgstr "Databasefeil ved innsetting av bruker i programmet OAuth." #: classes/Notice.php:245 -msgid "Problem saving notice. Unknown user." -msgstr "" +msgid "Problem saving notice. Too long." +msgstr "Problem ved lagring av notis. For lang." -#: classes/Notice.php:250 +#: classes/Notice.php:249 +msgid "Problem saving notice. Unknown user." +msgstr "Problem ved lagring av notis. Ukjent bruker." + +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." -msgstr "" +msgstr "Problem ved lagring av notis." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." -msgstr "" +msgstr "Problem ved lagring av gruppeinnboks." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" -msgstr "" +msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." -msgstr "" +msgstr "Bruker har blokkert deg." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Alle abonnementer" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Klarte ikke å lagre avatar-informasjonen" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Klarte ikke å lagre avatar-informasjonen" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "" +msgstr "Velkommen til %1$s, @%2$s." -#: classes/User_group.php:477 -#, fuzzy +#: classes/User_group.php:480 msgid "Could not create group." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke opprette gruppe." -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke stille inn gruppe-URI." -#: classes/User_group.php:507 -#, fuzzy +#: classes/User_group.php:510 msgid "Could not set group membership." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke stille inn gruppemedlemskap." -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke lagre lokal gruppeinformasjon." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Endre profilinnstillingene dine" -#: lib/accountsettingsaction.php:112 -msgid "Upload an avatar" -msgstr "" - +#. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:116 +msgid "Upload an avatar" +msgstr "Last opp en avatar" + +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Endre passordet ditt" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Endre eposthåndtering" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "Klarte ikke å lagre profil." -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" -msgstr "" +msgstr "Andre valg" -#: lib/action.php:144 -#, fuzzy, php-format +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Andre" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s sin status på %2$s" +msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" -msgstr "" +msgstr "Side uten tittel" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 -#, fuzzy +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Personlig" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 -#, fuzzy +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Endre passordet ditt" +msgstr "Endre e-posten, avateren, passordet og profilen din" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 -#, fuzzy +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "Koble til" +msgstr "Koble til tjenester" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Koble til" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "" +msgstr "Endre nettstedskonfigurasjon" -#: lib/action.php:449 -#, fuzzy +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Administrator" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "" +msgstr "Inviter venner og kollegaer til å bli med deg på %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Inviter" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Logg ut fra nettstedet" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Logg ut" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Opprett en konto" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Registrer" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Log inn på nettstedet" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Logg inn" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Hjelp meg." -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Hjelp" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Søk etter personer eller tekst" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Søk" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" -msgstr "" +msgstr "Nettstedsnotis" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" -msgstr "" +msgstr "Lokale visninger" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" -msgstr "" +msgstr "Sidenotis" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Hjelp" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Om" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "OSS/FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Kilde" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" -msgstr "" +msgstr "Programvarelisens for StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" -"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site." -"broughtbyurl%%). " +"**%%site.name%%** er en mikrobloggingtjeneste brakt til deg av [%%site." +"broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** er en mikrobloggingtjeneste. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** er en mikrobloggingtjeneste." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4769,485 +5102,550 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "Alle " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "lisens." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Etter" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Før" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Du kan ikke gjøre endringer på dette nettstedet." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." -msgstr "" +msgstr "showForm() ikke implementert." #. TRANS: Client error message #: lib/adminpanelaction.php:259 msgid "saveSettings() not implemented." -msgstr "" +msgstr "saveSettings() ikke implementert." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 -#, fuzzy +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" -msgstr "Nettstedslogo" +msgstr "Nettsted" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 -#, fuzzy +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" -msgstr "Personlig" +msgstr "Utseende" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" -msgstr "" +msgstr "Brukerkonfigurasjon" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" -msgstr "" +msgstr "Bruker" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" -msgstr "" +msgstr "Tilgangskonfigurasjon" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" -msgstr "" +msgstr "Stikonfigurasjon" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 -#, fuzzy +#: lib/adminpanelaction.php:397 msgid "Edit site notice" -msgstr "Slett notis" +msgstr "Rediger nettstedsnotis" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" msgstr "" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" -msgstr "" +msgstr "Rediger program" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Ikon for dette programmet" -#: lib/applicationeditform.php:204 -#, fuzzy, php-format +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 +#, php-format msgid "Describe your application in %d characters" -msgstr "Beskriv degselv og dine interesser med 140 tegn" +msgstr "Beskriv programmet ditt med %d tegn" -#: lib/applicationeditform.php:207 -#, fuzzy +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" -msgstr "Beskriv degselv og dine interesser med 140 tegn" - -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Kilde" - -#: lib/applicationeditform.php:218 -#, fuzzy -msgid "URL of the homepage of this application" -msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside." +msgstr "Beskriv programmet ditt" +#. TRANS: Form input field instructions. #: lib/applicationeditform.php:224 +msgid "URL of the homepage of this application" +msgstr "Nettadresse til hjemmesiden for dette programmet" + +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "Nettadresse til kilde" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 -#, fuzzy +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" -msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside." +msgstr "URL til organisasjonens hjemmeside" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" -msgstr "" +msgstr "Nettleser" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" -msgstr "" - -#: lib/applicationeditform.php:275 -msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Skrivebord" +#. TRANS: Form guide. #: lib/applicationeditform.php:297 +msgid "Type of application, browser or desktop" +msgstr "Type program, nettleser eller skrivebord" + +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" -msgstr "" +msgstr "Skrivebeskyttet" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" -msgstr "" +msgstr "Les og skriv" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" +"Standardtilgang for dette programmet: skrivebeskyttet eller lese- og " +"skrivetilgang" -#: lib/applicationlist.php:154 -#, fuzzy -msgid "Revoke" -msgstr "Fjern" +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Avbryt" -#: lib/attachmentlist.php:87 -msgid "Attachments" +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "les og skriv" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "skrivebeskyttet" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." msgstr "" +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" +msgid "Revoke" +msgstr "Tilbakekall" + +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 +msgid "Attachments" +msgstr "Vedlegg" + +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" -msgstr "" +msgstr "Forfatter" -#: lib/attachmentlist.php:278 -#, fuzzy +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" -msgstr "Profil" +msgstr "Leverandør" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Notiser hvor dette vedlegget forekommer" #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" msgstr "" #: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 -#, fuzzy msgid "Password changing failed" -msgstr "Passordet ble lagret" +msgstr "Endring av passord mislyktes" #: lib/authenticationplugin.php:235 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Passordet ble lagret" +msgstr "Endring av passord er ikke tillatt" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" -msgstr "" +msgstr "Kommandoresultat" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" -msgstr "" +msgstr "Kommando fullført" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" -msgstr "" +msgstr "Kommando feilet" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Notis med den id'en finnes ikke" -#: lib/command.php:88 -#, fuzzy, php-format +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Bruker har ingen siste notis" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 +#, php-format msgid "Could not find a user with nickname %s" -msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post." +msgstr "Fant ingen bruker med kallenavn %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Fant ingen lokal bruker med kallenavn %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Beklager, denne kommandoen er ikke implementert ennå." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "Det gir ikke så mye mening å knuffe seg selv." -#: lib/command.php:99 -#, fuzzy, php-format +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 +#, php-format msgid "Nudge sent to %s" -msgstr "Svar til %s" +msgstr "Knuff sendt til %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Abonnement: %1$s\n" +"Abonnenter: %2$s\n" +"Notiser: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "Brukeren har ingen profil." - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." -msgstr "" +msgstr "Notis markert som favoritt." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Du er allerede medlem av den gruppen." -#: lib/command.php:231 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "Klarte ikke å oppdatere bruker." +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 +#, php-format +msgid "Could not join user %1$s to group %2$s" +msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s." -#: lib/command.php:236 -#, fuzzy, php-format -msgid "%s joined group %s" -msgstr "%1$s sin status på %2$s" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, php-format +msgid "Could not remove user %1$s from group %2$s" +msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s" -#: lib/command.php:275 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "Klarte ikke å oppdatere bruker." - -#: lib/command.php:280 -#, fuzzy, php-format -msgid "%s left group %s" -msgstr "%1$s sin status på %2$s" - -#: lib/command.php:309 -#, fuzzy, php-format +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 +#, php-format msgid "Fullname: %s" -msgstr "Fullt navn" +msgstr "Fullt navn: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" -msgstr "" +msgstr "Posisjon: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" -msgstr "" +msgstr "Hjemmeside: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" -msgstr "" +msgstr "Om: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 -#, fuzzy, php-format +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 +#, php-format msgid "Direct message to %s sent" -msgstr "Direktemeldinger til %s" +msgstr "Direktemelding til %s sendt" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." -msgstr "" +msgstr "Feil ved sending av direktemelding." -#: lib/command.php:413 -#, fuzzy +#: lib/command.php:514 msgid "Cannot repeat your own notice" -msgstr "Kan ikke slette notisen." +msgstr "Kan ikke gjenta din egen notis" -#: lib/command.php:418 -#, fuzzy +#: lib/command.php:519 msgid "Already repeated that notice" -msgstr "Kan ikke slette notisen." +msgstr "Allerede gjentatt den notisen" -#: lib/command.php:426 -#, fuzzy, php-format +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 +#, php-format msgid "Notice from %s repeated" -msgstr "Nytt nick" +msgstr "Notis fra %s repetert" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." -msgstr "" +msgstr "Feil ved repetering av notis." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "" +msgstr "Notis for lang - maks er %d tegn, du sendte %d" -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:571 +#, php-format msgid "Reply to %s sent" -msgstr "Svar til %s" +msgstr "Svar til %s sendt" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." -msgstr "" +msgstr "Feil ved lagring av notis." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -#, fuzzy -msgid "No such user" -msgstr "Ingen slik bruker" +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Svar til %s" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Ikke autorisert." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ikke autorisert." msgstr[1] "Ikke autorisert." -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "Svar til %s" -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Svar til %s" msgstr[1] "Svar til %s" -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er allerede logget inn!" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er allerede logget inn!" msgstr[1] "Du er allerede logget inn!" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5289,20 +5687,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 -#, fuzzy +#: lib/common.php:135 msgid "No configuration file found. " -msgstr "Fant ikke bekreftelseskode." +msgstr "Ingen konfigurasjonsfil funnet. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "Jeg så etter konfigurasjonfiler på følgende seter: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5316,12 +5713,11 @@ msgstr "" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "" +msgstr "Oppdatert med SMS" #: lib/connectsettingsaction.php:120 -#, fuzzy msgid "Connections" -msgstr "Koble til" +msgstr "Tilkoblinger" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" @@ -5329,12 +5725,11 @@ msgstr "" #: lib/dberroraction.php:60 msgid "Database error" -msgstr "" +msgstr "Databasefeil" #: lib/designsettings.php:105 -#, fuzzy msgid "Upload file" -msgstr "Last opp" +msgstr "Last opp fil" #: lib/designsettings.php:109 msgid "" @@ -5359,23 +5754,23 @@ msgstr "" #: lib/feed.php:85 msgid "RSS 1.0" -msgstr "" +msgstr "RSS 1.0" #: lib/feed.php:87 msgid "RSS 2.0" -msgstr "" +msgstr "RSS 2.0" #: lib/feed.php:89 msgid "Atom" -msgstr "" +msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "Venn av en venn" #: lib/feedlist.php:64 msgid "Export data" -msgstr "" +msgstr "Eksporter data" #: lib/galleryaction.php:121 #, fuzzy @@ -5384,7 +5779,7 @@ msgstr "Feed for taggen %s" #: lib/galleryaction.php:131 msgid "All" -msgstr "" +msgstr "Alle" #: lib/galleryaction.php:139 msgid "Select tag to filter" @@ -5401,12 +5796,12 @@ msgstr "" #: lib/galleryaction.php:143 msgid "Go" -msgstr "" +msgstr "Gå" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Innvilg denne brukeren rollen «%s»" #: lib/groupeditform.php:163 #, fuzzy @@ -5478,53 +5873,54 @@ msgstr "Grupper med flest innlegg" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Bildefilformatet støttes ikke." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Filen er for stor. Maks filstørrelse er %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Delvis opplasting." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfeil ved opplasting av fil." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Ikke et bilde eller en korrupt fil." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Bildefilformatet støttes ikke." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Mistet filen vår." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Ukjent filtype" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Ukjent innbokskilde %d." @@ -5545,11 +5941,13 @@ msgstr "Logg inn med brukernavn og passord" msgid "Sign up for a new account" msgstr "Registrer deg for en ny konto" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Bekreftelse av e-postadresse" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5578,12 +5976,14 @@ msgstr "" "Takk for tiden din,\n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s lytter nå til dine notiser på %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5608,17 +6008,20 @@ msgstr "" "----\n" "Endre e-postadressen din eller dine varslingsvalg på %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Biografi: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Ny e-postadresse for posting til %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5639,21 +6042,31 @@ msgstr "" "Vennlig hilsen,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s status" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS-bekreftelse" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "%s: bekreft telefonnummeret ditt med denne koden:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Du har blitt knuffet av %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5680,12 +6093,14 @@ msgstr "" "Med vennlig hilsen,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Ny privat melding fra %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5718,12 +6133,14 @@ msgstr "" "Med vennlig hilsen,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s /@%s) la din notis til som en favoritt" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5760,12 +6177,22 @@ msgstr "" "Vennlig hilsen,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) sendte en notis for din oppmerksomhet" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5778,18 +6205,42 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"%1$s (@%9$s) sendte deg akkurat en notis for din oppmerksomhet (et '@-svar') " +"%1$s (@%9$s) sendte deg akkurat varsel for din oppmerksomhet (et '@-svar') " "på %2$s.\n" "\n" "Notisen er her:\n" "\n" "%3$s\n" "\n" -"Den lyder:\n" +"Det lyder:\n" "\n" "%4$s\n" "\n" +"%5$sDu kan svare her:\n" +"\n" +"%6$s\n" +"\n" +"Listen over alle @-svar til deg finner du her:\n" +"\n" +"%7$s\n" +"\n" +"Vennlig hilsen,\n" +"%2$s\n" +"\n" +"P.S. Du kan slå av disse e-postvarslene her: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5804,7 +6255,7 @@ msgstr "" "engasjere andre brukere i en samtale. Personer kan sende deg meldinger som " "bare du kan se." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "fra" @@ -5931,48 +6382,52 @@ msgstr "" "Beklager, henting av din geoposisjon tar lenger tid enn forventet, prøv " "igjen senere" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "S" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "Ø" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "V" #: lib/noticelist.php:438 -msgid "at" -msgstr "" +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:566 +#: lib/noticelist.php:447 +msgid "at" +msgstr "på" + +#: lib/noticelist.php:567 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Repetert av" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Svar" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Notis repetert" @@ -5996,6 +6451,10 @@ msgstr "" msgid "Error inserting avatar" msgstr "" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "" @@ -6045,7 +6504,7 @@ msgstr "" msgid "Unknown" msgstr "Ukjent" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnement" @@ -6053,31 +6512,32 @@ msgstr "Abonnement" msgid "All subscriptions" msgstr "Alle abonnementer" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnenter" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Alle abonnenter" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "Bruker-ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Medlem siden" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Daglig gjennomsnitt" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Alle grupper" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "" - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Ikke-implementert metode." @@ -6102,10 +6562,18 @@ msgstr "" msgid "Popular" msgstr "" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "" + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Repeter denne notisen?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Ja" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Repeter denne notisen" @@ -6115,7 +6583,7 @@ msgstr "Repeter denne notisen" msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6245,90 +6713,109 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Brukeren har ingen profil." + +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Brukerbilde" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Endre profilinnstillinger" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Rediger" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Send en direktemelding til denne brukeren" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Melding" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Moderer" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 msgid "User role" msgstr "Brukerrolle" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "Moderator" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "noen få sekunder siden" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "omtrent én måned siden" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "omtrent %d måneder siden" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "omtrent ett år siden" @@ -6342,7 +6829,7 @@ msgstr "%s er ikke en gyldig farge." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s er ikke en gyldig farge. Bruk 3 eller 6 heksadesimale tegn." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d." diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index c73771f84a..cef426ff5a 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:33+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:57+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -23,7 +23,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Toegang" @@ -73,7 +73,13 @@ msgstr "Gesloten" msgid "Save access settings" msgstr "Toegangsinstellingen opslaan" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Opslaan" @@ -81,8 +87,8 @@ msgstr "Opslaan" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "Deze pagina bestaat niet" +msgid "No such page." +msgstr "Deze pagina bestaat niet." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -92,9 +98,9 @@ msgstr "Deze pagina bestaat niet" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -102,11 +108,9 @@ msgstr "Deze pagina bestaat niet" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Onbekende gebruiker." @@ -118,8 +122,9 @@ msgstr "%1$s en vrienden, pagina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -186,8 +191,10 @@ msgstr "" msgid "You and friends" msgstr "U en vrienden" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates van %1$s en vrienden op %2$s." @@ -202,18 +209,18 @@ msgstr "Updates van %1$s en vrienden op %2$s." #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "De API-functie is niet aangetroffen." @@ -226,18 +233,18 @@ msgstr "De API-functie is niet aangetroffen." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Deze methode vereist een POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" "U moet een parameter met de naam \"device\" opgeven met een van de volgende " -"waardes: sms, im, none" +"waardes: sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -248,7 +255,7 @@ msgstr "Het was niet mogelijk de gebruiker bij te werken." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Deze gebruiker heeft geen profiel." @@ -258,9 +265,9 @@ msgid "Could not save profile." msgstr "Het was niet mogelijk het profiel op te slaan." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -346,7 +353,7 @@ msgstr "Er is geen status gevonden met dit ID." msgid "This status is already a favorite." msgstr "Deze mededeling staat al in uw favorietenlijst." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Het was niet mogelijk een favoriet aan te maken." @@ -442,11 +449,10 @@ msgstr "Locatie is te lang (maximaal 255 tekens)." msgid "Too many aliases! Maximum %d." msgstr "Te veel aliassen! Het maximale aantal is %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Ongeldige alias: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Ongeldige alias: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -462,14 +468,14 @@ msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "De groep is niet aangetroffen!" +msgid "Group not found." +msgstr "De groep is niet aangetroffen." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "U bent al lid van die groep." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep." @@ -487,17 +493,26 @@ msgstr "U bent geen lid van deze groep." msgid "Could not remove user %1$s from group %2$s." msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Groepen van %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Groepen op de site %1$s waar %2$s lid van is." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s groepen" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "groepen op %s" @@ -511,17 +526,17 @@ msgid "Invalid token." msgstr "Ongeldig token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -560,12 +575,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "Het verzoektoken %s is geweigerd en ingetrokken." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Het formulier is onverwacht ingezonden." @@ -588,20 +606,22 @@ msgstr "" "van het type \"%3$s tot uw gebruikersgegevens. Geef alleen " "toegang tot uw gebruiker bij %4$s aan derde partijen die u vertrouwt." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Gebruiker" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Gebruikersnaam" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Wachtwoord" @@ -646,17 +666,17 @@ msgstr "De status is verwijderd." msgid "No status with that ID found." msgstr "Er is geen status gevonden met dit ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "De mededeling is te lang. Gebruik maximaal %d tekens." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Niet gevonden" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Niet aangetroffen." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -667,12 +687,12 @@ msgstr "" msgid "Unsupported format." msgstr "Niet-ondersteund bestandsformaat." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favorieten van %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s" @@ -682,17 +702,17 @@ msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Updates over %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s publieke tijdlijn" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s updates van iedereen" @@ -707,20 +727,16 @@ msgstr "Herhaald naar %s" msgid "Repeats of %s" msgstr "Herhaald van %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Mededelingen met het label %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Updates met het label %1$s op %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Niet aangetroffen." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Deze bijlage bestaat niet." @@ -740,8 +756,9 @@ msgstr "Geen afmeting." msgid "Invalid size." msgstr "Ongeldige afmetingen." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -752,10 +769,10 @@ msgstr "" "U kunt een persoonlijke avatar uploaden. De maximale bestandsgrootte is %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Gebruiker zonder bijbehorend profiel" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Gebruiker zonder bijbehorend profiel." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -773,7 +790,7 @@ msgid "Preview" msgstr "Voorvertoning" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Verwijderen" @@ -785,24 +802,28 @@ msgstr "Uploaden" msgid "Crop" msgstr "Uitsnijden" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Er is geen bestand geüpload." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Selecteer een vierkant in de afbeelding om deze als uw avatar in te stellen" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Ons bestand is verloren gegaan." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "De avatar is bijgewerkt." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Het bijwerken van de avatar is mislukt." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "De avatar is verwijderd." @@ -810,7 +831,7 @@ msgstr "De avatar is verwijderd." msgid "You already blocked that user." msgstr "U hebt deze gebruiker reeds geblokkeerd." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Gebruiker blokkeren" @@ -824,27 +845,42 @@ msgstr "" "niet meer volgen en u wordt niet op de hoogte gebracht van \"@\"-antwoorden " "van deze gebruiker." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Nee" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Gebruiker niet blokkeren" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Ja" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Deze gebruiker blokkeren" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan." @@ -857,8 +893,8 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "De opgegeven groep bestaat niet." @@ -888,9 +924,11 @@ msgstr "Deblokkeer" msgid "Unblock this user" msgstr "Deblokkeer deze gebruiker." -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Verzenden naar " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Verzenden naar %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -904,33 +942,43 @@ msgstr "De bevestigingscode niet gevonden." msgid "That confirmation code is not for you!" msgstr "Dit is niet uw bevestigingscode!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Onbekend adrestype %s" +msgid "Unrecognized address type %s." +msgstr "Onbekend adrestype %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Dit adres is al bevestigd." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "De gebruiker kon gebruiker niet bijwerkt worden." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "De e-mailbevestiging kon niet verwijderd worden." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Adres bevestigen" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Het adres \"%s\" is voor uw gebruiker bevestigd." @@ -940,7 +988,7 @@ msgid "Conversation" msgstr "Dialoog" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Mededelingen" @@ -959,7 +1007,7 @@ msgstr "U bent niet de eigenaar van deze applicatie." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Er is een probleem met uw sessietoken." @@ -977,15 +1025,17 @@ msgstr "" "worden alle gegevens van deze applicatie uit de database verwijderd, " "inclusief alle bestaande gebruikersverbindingen." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Deze applicatie niet verwijderen" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Deze applicatie verwijderen" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1016,11 +1066,13 @@ msgstr "Mededeling verwijderen" msgid "Are you sure you want to delete this notice?" msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Deze mededeling niet verwijderen" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Deze mededeling verwijderen" @@ -1045,58 +1097,61 @@ msgstr "" "worden alle gegevens van deze gebruiker uit de database verwijderd. Het is " "niet mogelijk ze terug te zetten." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Gebruiker verwijderen" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Uiterlijk" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Instellingen voor de vormgeving van deze StatusNet-website." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "De logo-URL is ongeldig." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "De vormgeving is niet beschikbaar: %s" +msgid "Theme not available: %s." +msgstr "De vormgeving is niet beschikbaar: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Logo wijzigen" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Websitelogo" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Vormgeving wijzigen" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Vormgeving website" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Mogelijke vormgevingen voor deze website." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Achtergrondafbeelding wijzigen" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Achtergrond" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1105,67 +1160,68 @@ msgstr "" "Hier kunt u een achtergrondafbeelding voor de website uploaden. De maximale " "bestandsgrootte is %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Aan" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Uit" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Achtergrondafbeelding inschakelen of uitschakelen." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Achtergrondafbeelding naast elkaar" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Kleuren wijzigen" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Inhoud" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Menubalk" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Tekst" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Verwijzingen" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Standaardinstellingen gebruiken" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Standaardontwerp toepassen" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Standaardinstellingen toepassen" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Opslaan" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Ontwerp opslaan" @@ -1270,11 +1326,16 @@ msgstr "Gebruik dit formulier om de groep te bewerken." msgid "description is too long (max %d chars)." msgstr "de beschrijving is te lang (maximaal %d tekens)" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Ongeldige alias: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Het was niet mogelijk de groep bij te werken." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Het was niet mogelijk de aliassen aan te maken." @@ -1282,31 +1343,42 @@ msgstr "Het was niet mogelijk de aliassen aan te maken." msgid "Options saved." msgstr "De instellingen zijn opgeslagen." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "E-mailvoorkeuren" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Uw e-mailinstellingen op %%site.name%% beheren." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adres" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "E-mailadres" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Huidige bevestigde e-mailadres" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Verwijderen" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1314,108 +1386,138 @@ msgstr "" "Er wordt gewacht op bevestiging van dit adres. Controleer uw inbox (en uw " "ongewenste berichten/spam) voor een bericht met nadere instructies." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Annuleren" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "E-mailadres" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "E-mailadres, zoals \"gebruikersnaam@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Toevoegen" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Inkomende e-mail" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Stuur een email naar dit adres om een nieuw bericht te posten" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" "Stelt een nieuw e-mailadres in voor het ontvangen van berichten. Het " "bestaande e-mailadres wordt verwijderd." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Nieuw" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Voorkeuren" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "E-mailvoorkeuren" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Mij e-mailen bij nieuwe abonnementen." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Mij e-mailen als iemand mijn mededeling als favoriet instelt." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Mij e-mailen als iemand mij een privébericht zendt." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Mij e-mailen als iemand mij een antwoord met \"@\" erin stuurt." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Vrienden mogen me porren en e-mailen." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Ik wil mededelingen per e-mail plaatsen." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Een MicroID voor mijn e-mailadres publiceren." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Uw voorkeuren zijn opgeslagen." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "De e-mailvoorkeuren zijn opgeslagen." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Geen e-mailadres" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Kan het emailadres niet normaliseren" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Geen geldig e-mailadres." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "U hebt dit e-mailadres als ingesteld als uw e-mailadres." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "De bevestigingscode kon niet ingevoegd worden." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1424,43 +1526,53 @@ msgstr "" "toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies " "hoe het te gebruiken." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Dat is het verkeerde IM-adres." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Dat is het verkeerde e-mailadres." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Bevestiging geannuleerd." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "E-mailbevestiging geannuleerd." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Dit is niet uw e-mailadres." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Het adres is verwijderd." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "Het e-mailadres is verwijderd." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Geen binnenkomend e-mailadres" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Kan de gebruikersgegevens niet vernieuwen" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Het e-mailadres voor inkomende mail is verwijderd." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd." @@ -1583,8 +1695,8 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "" "De diensten op afstand gebruiken een onbekende versie van het OMB-protocol." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." msgstr "" "Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand." @@ -1641,11 +1753,11 @@ msgstr "Deze gebruiker is al de toegang tot de groep ontzegd." msgid "User is not a member of group." msgstr "De gebruiker is geen lid van de groep." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Gebruiker toegang tot de groep blokkeren" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1656,15 +1768,17 @@ msgstr "" "gebruiker wordt dan uit de groep verwijderd, kan er geen berichten meer " "plaatsen en kan zich in de toekomst ook niet meer op de groep abonneren." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Deze gebruiker de toegang tot deze groep ontzeggen" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" "Er is een databasefout opgetreden bij het uitsluiten van de gebruiker van de " @@ -1711,10 +1825,6 @@ msgstr "" "Hier kunt u een logo voor uw groep uploaden. De maximale bestandsgrootte is %" "s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Gebruiker zonder bijbehorend profiel." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Selecteer een vierkant uit de afbeelding die het logo wordt." @@ -1745,34 +1855,38 @@ msgstr "Ledenlijst van deze groep" msgid "Admin" msgstr "Beheerder" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Blokkeren" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Deze gebruiker groepsbeheerder maken" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Beheerder maken" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Deze gebruiker beheerder maken" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s tijdlijn" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Updates voor leden van %1$s op %2$s." -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Groepen" @@ -1798,7 +1912,7 @@ msgstr "" "[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een " "groep!](%%%%action.newgroup%%%%)." -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Nieuwe groep aanmaken" @@ -1851,11 +1965,15 @@ msgstr "De gebruiker is niet de toegang tot de groep ontzegd." msgid "Error removing the block." msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "IM-instellingen" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1864,15 +1982,24 @@ msgstr "" "U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"onmiddellijke " "berichten\"](%%doc.im%%). Maak hieronder uw instellingen." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "IM is niet beschikbaar." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "IM-adres" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Huidige bevestigde Jabber/GTalk adres." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1882,11 +2009,9 @@ msgstr "" "gebruiker op een bericht met nadere instructies. Hebt u %s aan uw " "contactenlijst toegevoegd?" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "IM-adres" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1895,45 +2020,66 @@ msgstr "" "Jabber-ID of GTalk-adres, zoals \"gebruiker@example.org\". Zorg ervoor dat u " "%s eerst aan uw contactenlijst in uw IM-programma of in GTalk toevoegt." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "IM-voorkeuren" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Mij berichten sturen via Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Een mededeling versturen als mijn Jabber/GTalk-status wijzigt." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Mij antwoorden sturen via Jabber/GTalk van gebruikers op wie ik niet " "geabonneerd ben." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Een MicroID voor mijn Jabber/GTalk-adres publiceren." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Uw voorkeuren zijn opgeslagen." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Geen Jabber-ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Het was niet mogelijk om het Jabber-ID te normaliseren" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Geen geldige Jabber-ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "U hebt dit al ingesteld als uw Jabber-ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Het Jabber-ID wordt al gebruikt door een andere gebruiker." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1942,10 +2088,32 @@ msgstr "" "Er is een bevestigingscode verstuurd naar het opgegeven IM-adres. U moet " "ermee akkoord gaan dat %s berichten aan u verzendt." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Dat is het verkeerde IM-adres." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "De IM-bevestiging kon niet verwijderd worden." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "IM-bevestiging geannuleerd." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Dit is niet uw Jabber-ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "Het IM-adres is verwijderd." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1966,9 +2134,10 @@ msgstr "Het is niet mogelijk uitnodigingen te verzenden." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" +msgid "You must be logged in to invite other users to use %s." msgstr "" -"U moet aangemeld zijn om anderen te kunnen uitnodigen gebruik te maken van %s" +"U moet aangemeld zijn om anderen te kunnen uitnodigen gebruik te maken van %" +"s." #: actions/invite.php:72 #, php-format @@ -1987,7 +2156,9 @@ msgstr "Nieuwe gebruikers uitnodigen" msgid "You are already subscribed to these users:" msgstr "U bent als geabonneerd op deze gebruikers:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2041,12 +2212,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Verzenden" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s heeft u uitgenodigd voor %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2111,7 +2284,9 @@ msgstr "U moet aangemeld zijn om lid te worden van een groep." msgid "No nickname or ID." msgstr "Geen gebruikersnaam of ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s is lid geworden van de groep %2$s" @@ -2120,11 +2295,13 @@ msgstr "%1$s is lid geworden van de groep %2$s" msgid "You must be logged in to leave a group." msgstr "U moet aangemeld zijn om een groep te kunnen verlaten." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "U bent geen lid van deze groep" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s heeft de groep %2$s verlaten" @@ -2172,13 +2349,16 @@ msgstr "" "invoeren alvorens u uw instellingen kunt wijzigen." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Aanmelden met uw gebruikersnaam en wachtwoord." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Meld u aan met uw gebruikersnaam en wachtwoord. Hebt u nog geen " -"gebruikersnaam? [Registreer een nieuwe gebruiker](%%action.register%%)." +"Hebt u nog geen gebruikersnaam? [Registreer een nieuwe gebruiker](%%action." +"register%%)." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2200,8 +2380,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Het is niet mogelijk %1$s beheerder te maken van de groep %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Geen huidige status" +msgid "No current status." +msgstr "Geen huidige status." #: actions/newapplication.php:52 msgid "New Application" @@ -2235,12 +2415,12 @@ msgstr "Gebruik dit formulier om een nieuwe groep aan te maken." msgid "New message" msgstr "Nieuw bericht" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "U kunt geen bericht naar deze gebruiker zenden." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Geen inhoud!" @@ -2248,7 +2428,7 @@ msgstr "Geen inhoud!" msgid "No recipient specified." msgstr "Er is geen ontvanger aangegeven." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd." @@ -2262,7 +2442,7 @@ msgstr "Bericht verzonden." msgid "Direct message to %s sent." msgstr "Het directe bericht aan %s is verzonden." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Er is een Ajax-fout opgetreden" @@ -2270,7 +2450,7 @@ msgstr "Er is een Ajax-fout opgetreden" msgid "New notice" msgstr "Nieuw bericht" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "De mededeling is verzonden" @@ -2368,12 +2548,13 @@ msgid "You are not a user of that application." msgstr "U bent geen gebruiker van die applicatie." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" -"Het was niet mogelijk de toegang te ontzeggen voor de volgende applicatie: " +"Het was niet mogelijk de toegang te ontzeggen voor de volgende applicatie: %" +"s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" "U hebt geen enkele applicatie geautoriseerd voor toegang tot uw " @@ -2385,24 +2566,29 @@ msgstr "" "Ontwikkelaars kunnen de registratiegegevens voor hun applicaties bewerken " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Mededeling heeft geen profiel" +msgid "Notice has no profile." +msgstr "Mededeling heeft geen profiel." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Status van %1$s op %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "inhoudstype " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Inhoudstype %s wordt niet ondersteund." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Alleen " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Alleen URL's voor %s via normale HTTP alstublieft." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -2505,7 +2691,7 @@ msgid "6 or more characters" msgstr "Zes of meer tekens" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Bevestigen" @@ -2533,7 +2719,7 @@ msgstr "Het oude wachtwoord is onjuist" msgid "Error saving user; invalid." msgstr "Fout bij opslaan gebruiker; ongeldig." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan." @@ -2542,7 +2728,7 @@ msgid "Password saved." msgstr "Het wachtwoord is opgeslagen." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Paden" @@ -2552,23 +2738,23 @@ msgstr "Pad- en serverinstellingen voor de StatusNet-website." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Er kan niet uit de vormgevingmap gelezen worden: %s" +msgid "Theme directory not readable: %s." +msgstr "Er kan niet uit de vormgevingmap gelezen worden: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Er kan niet in de avatarmap geschreven worden: %s" +msgid "Avatar directory not writable: %s." +msgstr "Er kan niet in de avatarmap geschreven worden: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Er kan niet in de achtergrondmap geschreven worden: %s" +msgid "Background directory not writable: %s." +msgstr "Er kan niet in de achtergrondmap geschreven worden: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Er kan niet uit de talenmap gelezen worden: %s" +msgid "Locales directory not readable: %s." +msgstr "Er kan niet uit de talenmap gelezen worden: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2708,19 +2894,19 @@ msgstr "" msgid "People search" msgstr "Gebruikers zoeken" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Geen geldig gebruikerslabel: %s" +msgid "Not a valid people tag: %s." +msgstr "Geen geldig gebruikerslabel: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Gebruikers die zichzelf met %1$s hebben gelabeld - pagina %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Ongeldige mededelinginhoud" +msgid "Invalid notice content." +msgstr "Ongeldige mededelinginhoud." #: actions/postnotice.php:101 #, php-format @@ -2749,13 +2935,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Volledige naam" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Thuispagina" @@ -2777,9 +2964,9 @@ msgid "Bio" msgstr "Beschrijving" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Locatie" @@ -2793,7 +2980,7 @@ msgstr "Mijn huidige locatie weergeven bij het plaatsen van mededelingen" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Labels" @@ -2870,8 +3057,8 @@ msgstr "De instellingen zijn opgeslagen." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Meer dan de paginalimiet (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Meer dan de paginalimiet (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3042,7 +3229,7 @@ msgstr "Wachtwoord herstellen" msgid "Recover password" msgstr "Wachtwoord herstellen" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Wachtwoordherstel aangevraagd" @@ -3062,21 +3249,21 @@ msgstr "Herstellen" msgid "Enter a nickname or email address." msgstr "Voer een gebruikersnaam of e-mailadres in." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" "Er bestaat geen gebruiker met het opgegeven e-mailadres of de opgegeven " "gebruikersnaam." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Die gebruiker heeft geen e-mailadres geregistreerd." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Er is een fout opgetreden bij het opslaan van de adresbevestiging." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3084,23 +3271,23 @@ msgstr "" "De instructies om uw wachtwoord te herstellen zijn verstuurd naar het e-" "mailadres dat voor uw gebruiker is geregistreerd." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Het wachtwoord is onverwacht opnieuw ingesteld." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Het wachtwoord moet uit zes of meer tekens bestaan." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Het wachtwoord en de bevestiging komen niet overeen." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld." @@ -3116,7 +3303,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig." msgid "Registration successful" msgstr "De registratie is voltooid" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registreren" @@ -3138,7 +3325,7 @@ msgstr "Ongeldige gebruikersnaam of wachtwoord." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u " @@ -3156,8 +3343,9 @@ msgstr "Zes of meer tekens. Verplicht" msgid "Same as password above. Required." msgstr "Gelijk aan het wachtwoord hierboven. Verplicht" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mail" @@ -3170,22 +3358,16 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Een langere naam, mogelijk uw echte naam" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Mijn teksten en bestanden zijn beschikbaar onder " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Naamsvermelding 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -" behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, " +"Mijn teksten en bestanden zijn beschikbaar onder %s, \n" +"behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, " "telefoonnummer." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3219,7 +3401,7 @@ msgstr "" "Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u " "ervan verwacht." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3264,7 +3446,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Abonneren" @@ -3302,7 +3484,7 @@ msgstr "U kunt uw eigen mededeling niet herhalen." msgid "You already repeated that notice." msgstr "U hent die mededeling al herhaald." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Herhaald" @@ -3390,7 +3572,7 @@ msgstr "Deze gebruiker is al in de zandbak geplaatst." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sessies" @@ -3427,26 +3609,30 @@ msgstr "U moet aangemeld zijn om een applicatie te kunnen bekijken." msgid "Application profile" msgstr "Applicatieprofiel" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Icoon" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Naam" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organisatie" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beschrijving" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statistieken" @@ -3568,67 +3754,67 @@ msgstr "%s groep" msgid "%1$s group, page %2$d" msgstr "Groep %1$s, pagina %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Groepsprofiel" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Opmerking" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliassen" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Groepshandelingen" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Mededelingenfeed voor groep %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Mededelingenfeed voor groep %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Mededelingenfeed voor groep %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Vriend van een vriend voor de groep %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Leden" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(geen)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Alle leden" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Aangemaakt" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3644,7 +3830,7 @@ msgstr "" "lid te worden van deze groep en nog veel meer! [Meer lezen...](%%%%doc.help%%" "%%)" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3657,7 +3843,7 @@ msgstr "" "[StatusNet](http://status.net/). De leden wisselen korte mededelingen uit " "over hun ervaringen en interesses. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Beheerders" @@ -3798,11 +3984,11 @@ msgid "Unknown language \"%s\"." msgstr "De taal \"%s\" is niet bekend." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "De minimale tekstlimiet is 140 tekens." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "De minimale tekstlimiet is 0 tekens (ongelimiteerd)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "De duplicaatlimiet moet één of meer seconden zijn." #: actions/siteadminpanel.php:221 @@ -3898,8 +4084,8 @@ msgid "Unable to save site notice." msgstr "Het was niet mogelijk om de websitebrede mededeling op te slaan." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "De maximale lengte voor de websitebrede aankondiging is 255 tekens" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "De maximale lengte voor de websitebrede aankondiging is 255 tekens." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -3915,44 +4101,71 @@ msgstr "" msgid "Save site notice" msgstr "Websitebrede mededeling opslaan" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "SMS-instellingen" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "U kunt SMS-berichten per e-mail ontvangen van %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "SMS is niet beschikbaar." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "SMS-adres" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Huidige bevestigde telefoonnummer met SMS-functie." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Er wordt gewacht op bevestiging van dit telefoonnummer." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Bevestigingscode" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Voer de code in die u via uw telefoon hebt ontvangen." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Bevestigen" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "SMS-nummer" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Telefoonnummer zonder spaties of leestekens, met netnummer" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "SMS-voorkeuren" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3960,23 +4173,33 @@ msgstr "" "Mij mededelingen via SMS sturen. Ik begrijp dat dit exorbitante rekeningen " "van mijn provider kan opleveren." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Uw SMS-voorkeuren zijn opgeslagen." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Geen telefoonnummer." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Er is geen provider geselecteerd." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "U hebt dit al ingesteld als uw telefoonnummer." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Dit telefoonnummer is al geregistrerd door een andere gebruiker." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3984,23 +4207,40 @@ msgstr "" "Er is een bevestigingscode verzonden naar het telefoonnummer dat u hebt " "toegevoegd. Op uw telefoon vindt u de code en de instructies." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Dit is het verkeerde bevestigingsnummer." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "SMS-bevestiging geannuleerd." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Dit is niet uw telefoonnummer." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Het SMS-nummer is verwijderd." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Mobiele aanbieder" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Selecteer een provider" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -4010,13 +4250,14 @@ msgstr "" "SMS ondersteunt, maar nog niet in de lijst is opgenomen, laat dit ons dan " "via e-mail weten op het e-mailadres %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Er is geen code ingevoerd" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Snapshots" @@ -4037,7 +4278,7 @@ msgid "Invalid snapshot report URL." msgstr "De rapportage-URL voor snapshots is ongeldig." #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "Willekeurig tijdens een websitehit" #: actions/snapshotadminpanel.php:201 @@ -4077,8 +4318,7 @@ msgstr "Snapshotinstellingen opslaan" msgid "You are not subscribed to that profile." msgstr "U bent niet geabonneerd op dat profiel." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Het was niet mogelijk het abonnement op te slaan." @@ -4181,11 +4421,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s volgt niemand." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4218,12 +4458,12 @@ msgstr "Geen ID-argument." msgid "Tag %s" msgstr "Label %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Gebruikersprofiel" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -4277,7 +4517,7 @@ msgid "User is not silenced." msgstr "Deze gebruiker is niet gemuilkorfd." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Het profiel-ID was niet aanwezig in het verzoek." #: actions/unsubscribe.php:98 @@ -4315,7 +4555,8 @@ msgstr "Ongeldige welkomsttekst. De maximale lengte is 255 tekens." msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiel" @@ -4479,28 +4720,34 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Geniet van uw hotdog!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "Groepen voor %1$s, pagina %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Meer groepen zoeken" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s is van geen enkele groep lid." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "U kunt [naar groepen zoeken](%%action.groupsearch%%) en daar lid van worden." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Updates van %1$s op %2$s." @@ -4560,7 +4807,8 @@ msgstr "" msgid "Plugins" msgstr "Plug-ins" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Versie" @@ -4568,7 +4816,7 @@ msgstr "Versie" msgid "Author(s)" msgstr "Auteur(s)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4577,13 +4825,13 @@ msgstr "" "Bestanden mogen niet groter zijn dan %d bytes, en uw bestand was %d bytes. " "Probeer een kleinere versie te uploaden." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Een bestand van deze grootte overschijdt uw gebruikersquota van %d bytes." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4622,31 +4870,32 @@ msgstr "Het was niet mogelijk het bericht in te voegen." msgid "Could not update message with new URI." msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "" "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te " "lang." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "" "Er was een probleem bij het opslaan van de mededeling. De gebruiker is " "onbekend." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer " "het over enige tijd weer." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4654,291 +4903,323 @@ msgstr "" "Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en " "plaats over een aantal minuten pas weer een bericht." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" "Er is een probleem opgetreden bij het opslaan van het Postvak IN van de " "groep." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "U mag zich niet abonneren." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "U bent al gebonneerd!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Deze gebruiker negeert u." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Niet geabonneerd!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "" "Het was niet mogelijk om het OMB-token voor het abonnement te verwijderen." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Kon abonnement niet verwijderen." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Het was niet mogelijk de groep aan te maken." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Het was niet mogelijk de groeps-URI in te stellen." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Het was niet mogelijk de lokale groepsinformatie op te slaan." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Uw profielgegevens wijzigen" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Avatar uploaden" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Uw wachtwoord wijzigen" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "E-mailafhandeling wijzigen" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Uw profiel ontwerpen" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Overige" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Overige instellingen" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Overige" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Naamloze pagina" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Primaire sitenavigatie" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Persoonlijk profiel en tijdlijn van vrienden" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Persoonlijk" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Met andere diensten koppelen" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Koppelen" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Websiteinstellingen wijzigen" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Beheer" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Uitnodigingen" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Gebruiker afmelden" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Afmelden" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Gebruiker aanmaken" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Registreren" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Gebruiker aanmelden" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Aanmelden" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Help me!" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Help" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Naar gebruikers of tekst zoeken" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Zoeken" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Mededeling van de website" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Lokale weergaven" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Mededeling van de pagina" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Secundaire sitenavigatie" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Help" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Over" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "Veel gestelde vragen" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "Gebruiksvoorwaarden" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Privacy" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Broncode" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Contact" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Widget" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Licentie van de StatusNet-software" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site." -"broughtbyurl%%). " +"broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** is een microblogdienst. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** is een microblogdienst." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4949,71 +5230,86 @@ msgstr "" "versie %s, beschikbaar onder de [GNU Affero General Public License](http://" "www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Licentie voor siteinhoud" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Auteursrechten op inhoud en gegevens rusten bij %1$s. Alle rechten " "voorbehouden." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Auteursrechten op inhoud en gegevens rusten bij de respectievelijke " "gebruikers. Alle rechten voorbehouden." -#: lib/action.php:847 -msgid "All " -msgstr "Alle " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" +"Alle inhoud en gegevens van %1$s zijn beschikbaar onder de licentie %2$s." -#: lib/action.php:853 -msgid "license." -msgstr "licentie." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Later" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Eerder" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Het is nog niet mogelijk inhoud uit andere omgevingen te verwerken." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Het is nog niet mogelijk ingebedde XML-inhoud te verwerken" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Het is nog niet mogelijk ingebedde Base64-inhoud te verwerken" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "U mag geen wijzigingen maken aan deze website." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Wijzigingen aan dat venster zijn niet toegestaan." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() is niet geïmplementeerd." @@ -5023,155 +5319,192 @@ msgstr "showForm() is niet geïmplementeerd." msgid "saveSettings() not implemented." msgstr "saveSettings() is nog niet geïmplementeerd." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Het was niet mogelijk om de ontwerpinstellingen te verwijderen." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Basisinstellingen voor de website" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Website" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Instellingen vormgeving" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Uiterlijk" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Gebruikersinstellingen" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Gebruiker" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Toegangsinstellingen" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Padinstellingen" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Sessieinstellingen" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 msgid "Edit site notice" msgstr "Websitebrede mededeling opslaan" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" msgstr "Snapshotinstellingen" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen " "maar leestoegang." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" -"De API-authenticatie is mislukt. nickname = %1$s, proxy - %2$s, ip = %3$s" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Applicatie bewerken" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Icoon voor deze applicatie" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Beschrijf uw applicatie in %d tekens" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Beschrijf uw applicatie" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "Bron-URL" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "De URL van de homepage van deze applicatie" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "Bron-URL" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Organisatie verantwoordelijk voor deze applicatie" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "De URL van de homepage van de organisatie" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "URL om naar door te verwijzen na authenticatie" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Browser" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Desktop" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Type applicatie; browser of desktop" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Alleen-lezen" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Lezen en schrijven" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Standaardtoegang voor deze applicatie: alleen-lezen of lezen en schrijven" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Annuleren" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "lezen en schrijven" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "alleen-lezen" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Goedgekeurd op %1$s met toegang \"%2$s\"." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Intrekken" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Bijlagen" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Auteur" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Provider" @@ -5191,37 +5524,56 @@ msgstr "Wachtwoord wijzigen is mislukt" msgid "Password changing is not allowed" msgstr "Wachtwoord wijzigen is niet toegestaan" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Commandoresultaten" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Het commando is uitgevoerd" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Het uitvoeren van het commando is mislukt" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Dit commando is nog niet geïmplementeerd." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Er bestaat geen mededeling met dat ID" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Deze gebruiker heeft geen laatste mededeling" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "De gebruiker %s is niet aangetroffen" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "De lokale gebruiker %s is niet aangetroffen" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Dit commando is nog niet geïmplementeerd." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Het heeft niet zoveel zin om uzelf te porren..." -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "De por naar %s is verzonden" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5232,202 +5584,209 @@ msgstr "" "Abonnees: %2$s\n" "Mededelingen: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Er bestaat geen mededeling met dat ID" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Deze gebruiker heeft geen laatste mededeling" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "De mededeling is op de favorietenlijst geplaatst." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "U bent al lid van deze groep" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "" +"Het was niet mogelijk om de gebruiker %1$s toe te voegen aan de groep %2$s" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%s is lid geworden van de groep %s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen." -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "De gebruiker %s kon niet uit de groep %s verwijderd worden" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s heeft de groep %s verlaten" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Volledige naam: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Locatie: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Thuispagina: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Over: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -"Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw " -"bericht was %d" +"%s is een profiel op afstand. U kunt alle privéberichten verzenden aan " +"gebruikers op dezelfde server." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw " +"bericht was %2$d." + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Het directe bericht aan %s is verzonden" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "U kunt uw eigen mededelingen niet herhalen." -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "U hebt die mededeling al herhaald." -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "De mededeling van %s is herhaald" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Er is een fout opgetreden bij het herhalen van de mededeling." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling " "bevatte %d tekens" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Het antwoord aan %s is verzonden" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Er is een fout opgetreden bij het opslaan van de mededeling." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "De opgegeven gebruiker bestaat niet" +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Abonneren op OMB-profielen op commando is niet mogelijk." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Geabonneerd op %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" "Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Uw abonnement op %s is opgezegd" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Dit commando is nog niet geïmplementeerd." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notificaties uitgeschakeld." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Het is niet mogelijk de mededelingen uit te schakelen." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notificaties ingeschakeld." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Het is niet mogelijk de notificatie uit te schakelen." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "Het aanmeldcommando is uitgeschakeld" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten " "geldig: %s" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "Het abonnement van %s is opgeheven" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "U bent op geen enkele gebruiker geabonneerd." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "U bent geabonneerd op deze gebruiker:" msgstr[1] "U bent geabonneerd op deze gebruikers:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Niemand heeft een abonnenment op u." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Deze gebruiker is op u geabonneerd:" msgstr[1] "Deze gebruikers zijn op u geabonneerd:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "U bent lid van geen enkele groep." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "U bent lid van deze groep:" msgstr[1] "U bent lid van deze groepen:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5509,20 +5868,20 @@ msgstr "" "tracks - nog niet beschikbaar\n" "tracking - nog niet beschikbaar\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Er is geen instellingenbestand aangetroffen. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" "U kunt proberen de installer uit te voeren om dit probleem op te lossen." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Naar het installatieprogramma gaan." @@ -5696,53 +6055,54 @@ msgstr "Groepen met de meeste berichten" msgid "Tags in %s group's notices" msgstr "Labels in de groepsmededelingen van %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Deze pagina is niet beschikbaar in een mediatype dat u accepteert" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Niet ondersteund beeldbestandsformaat." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Gedeeltelijke upload." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Het bestand is geen afbeelding of het bestand is beschadigd." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Niet ondersteund beeldbestandsformaat." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Het bestand is zoekgeraakt." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Onbekend bestandstype" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Onbekende bron Postvak IN %d." @@ -5763,11 +6123,13 @@ msgstr "Aanmelden met gebruikersnaam en wachtwoord" msgid "Sign up for a new account" msgstr "Nieuwe gebruiker aanmaken" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "E-mailadresbevestiging" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5797,12 +6159,14 @@ msgstr "" "Dank u wel voor uw tijd.\n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s volgt nu uw berichten %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5827,17 +6191,20 @@ msgstr "" "----\n" "Wijzig uw e-mailadres of instellingen op %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Beschrijving: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Nieuw e-mailadres om e-mail te versturen aan %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5858,21 +6225,31 @@ msgstr "" "Met vriendelijke groet,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s status" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS-bevestiging" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "%s: bevestig dat u deze telefoon bezit met deze code:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "%s heeft u gepord" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5900,12 +6277,14 @@ msgstr "" "Met vriendelijke groet,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "U hebt een nieuw privébericht van %s." -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5939,12 +6318,14 @@ msgstr "" "Met vriendelijke groet,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) heeft uw mededeling als favoriet toegevoegd" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5982,12 +6363,25 @@ msgstr "" "Met vriendelijke groet,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"Het volledige gesprek is hier te lezen:\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) heeft u een mededeling gestuurd" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6000,10 +6394,23 @@ msgid "" "\n" "\t%4$s\n" "\n" -msgstr "" -"%1$s (@%9$s) heeft u een bericht gezonden (een antwoord met \"@\") op %2$s.\n" +"%5$sYou can reply back here:\n" "\n" -"De mededeling staat hier:\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" +msgstr "" +"%1$s (@%9$s) heeft u zojuist een mededeling gezonden (een '@-antwoord') op %2" +"$s.\n" +"\n" +"De mededeling is hier te vinden:\n" "\n" "%3$s\n" "\n" @@ -6011,6 +6418,18 @@ msgstr "" "\n" "%4$s\n" "\n" +"%5$sHier kunt u antwoorden:\n" +"\n" +"%6$s\n" +"\n" +"De lijst met alle @-antwoorden aan u:\n" +"\n" +"%7$s\n" +"\n" +"Groet,\n" +"%2$s\n" +"\n" +"Ps. U kunt de e-mailmeldingen hier uitschakelen: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6024,7 +6443,7 @@ msgstr "" "U hebt geen privéberichten. U kunt privéberichten verzenden aan andere " "gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "van" @@ -6157,48 +6576,52 @@ msgstr "" "Het ophalen van uw geolocatie duurt langer dan verwacht. Probeer het later " "nog eens" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "Z" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "O" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "W" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "op" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "in context" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Herhaald door" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Op deze mededeling antwoorden" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Antwoorden" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Mededeling herhaald" @@ -6222,6 +6645,11 @@ msgstr "Er is een fout opgetreden tijdens het invoegen van een nieuw profiel" msgid "Error inserting avatar" msgstr "Er is een fout opgetreden bij het toevoegen van de avatar" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "" +"Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand." + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "" @@ -6272,7 +6700,7 @@ msgstr "Labels in de mededelingen van %s" msgid "Unknown" msgstr "Onbekend" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnementen" @@ -6280,31 +6708,32 @@ msgstr "Abonnementen" msgid "All subscriptions" msgstr "Alle abonnementen" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnees" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Alle abonnees" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "Gebruikers-ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Lid sinds" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Dagelijks gemiddelde" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Alle groepen" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Er zijn geen \"terug naar\"-parameters opgegeven." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Methode niet geïmplementeerd." @@ -6328,10 +6757,18 @@ msgstr "Uitgelicht" msgid "Popular" msgstr "Populair" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Er zijn geen \"terug naar\"-parameters opgegeven." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Deze mededeling herhalen?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Ja" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Deze mededeling herhalen" @@ -6341,7 +6778,7 @@ msgstr "Deze mededeling herhalen" msgid "Revoke the \"%s\" role from this user" msgstr "De gebruikersrol \"%s\" voor deze gebruiker intrekken" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "Er is geen gebruiker gedefinieerd voor single-usermodus." @@ -6467,89 +6904,108 @@ msgstr "Uitschrijven van deze gebruiker" msgid "Unsubscribe" msgstr "Abonnement opheffen" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "Gebruiker %s (%d) heeft geen profielrecord." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Avatar bewerken" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Gebruikershandelingen" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Bezig met het verwijderen van de gebruiker..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Profielinstellingen bewerken" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Bewerken" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Deze gebruiker een direct bericht zenden" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Bericht" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Modereren" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 msgid "User role" msgstr "Gebruikersrol" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "Beheerder" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "Moderator" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "ongeveer een jaar geleden" @@ -6563,7 +7019,7 @@ msgstr "%s is geen geldige kleur." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index a16e156496..6a2a705d75 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Norwegian Nynorsk # +# Author@translatewiki.net: Nghtwlkr # -- # This file is distributed under the same license as the StatusNet package. # @@ -7,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:30+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:17:54+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -20,7 +21,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 #, fuzzy msgid "Access" msgstr "Godta" @@ -77,7 +78,13 @@ msgstr "Blokkér" msgid "Save access settings" msgstr "Avatar-innstillingar" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -87,7 +94,7 @@ msgstr "Lagra" #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy -msgid "No such page" +msgid "No such page." msgstr "Dette emneord finst ikkje." #: actions/all.php:75 actions/allrss.php:68 @@ -98,9 +105,9 @@ msgstr "Dette emneord finst ikkje." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -108,11 +115,9 @@ msgstr "Dette emneord finst ikkje." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Brukaren finst ikkje." @@ -124,8 +129,9 @@ msgstr "%s med vener, side %d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -184,8 +190,10 @@ msgstr "" msgid "You and friends" msgstr "%s med vener" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Oppdateringar frå %1$s og vener på %2$s!" @@ -200,18 +208,18 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Fann ikkje API-metode." @@ -225,15 +233,15 @@ msgstr "Fann ikkje API-metode." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Dette krev ein POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -246,7 +254,7 @@ msgstr "Kan ikkje oppdatera brukar." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Brukaren har inga profil." @@ -257,9 +265,9 @@ msgid "Could not save profile." msgstr "Kan ikkje lagra profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -345,7 +353,7 @@ msgstr "Fann ingen status med den ID-en." msgid "This status is already a favorite." msgstr "Denne notisen er alt ein favoritt!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Kunne ikkje lagre favoritt." @@ -440,10 +448,9 @@ msgstr "Plassering er for lang (maksimalt 255 teikn)." msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, fuzzy, php-format -msgid "Invalid alias: \"%s\"" +msgid "Invalid alias: \"%s\"." msgstr "Ugyldig merkelapp: %s" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -461,7 +468,7 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy -msgid "Group not found!" +msgid "Group not found." msgstr "Fann ikkje API-metode." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 @@ -469,7 +476,7 @@ msgstr "Fann ikkje API-metode." msgid "You are already a member of that group." msgstr "Du er allereie medlem av den gruppa" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -488,17 +495,26 @@ msgstr "Du er ikkje medlem av den gruppa." msgid "Could not remove user %1$s from group %2$s." msgstr "Kunne ikkje fjerne %s fra %s gruppa " -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, fuzzy, php-format msgid "%s's groups" msgstr "%s grupper" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Grupper %s er medlem av" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s grupper" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, fuzzy, php-format msgid "groups on %s" msgstr "Gruppe handlingar" @@ -513,17 +529,17 @@ msgid "Invalid token." msgstr "Ugyldig storleik." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -557,12 +573,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Uventa skjemasending." @@ -582,20 +601,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Kallenamn" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Passord" @@ -644,17 +665,17 @@ msgstr "Lasta opp brukarbilete." msgid "No status with that ID found." msgstr "Fann ingen status med den ID-en." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Fann ikkje" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Finst ikkje." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -664,12 +685,12 @@ msgstr "" msgid "Unsupported format." msgstr "Støttar ikkje bileteformatet." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Favorittar frå %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s oppdateringar favorisert av %s / %s." @@ -679,17 +700,17 @@ msgstr "%s oppdateringar favorisert av %s / %s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Oppdateringar som svarar til %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s offentleg tidsline" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s oppdateringar frå alle saman!" @@ -704,20 +725,16 @@ msgstr "Svar til %s" msgid "Repeats of %s" msgstr "Svar til %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notisar merka med %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Finst ikkje." - #: actions/attachment.php:73 #, fuzzy msgid "No such attachment." @@ -738,8 +755,9 @@ msgstr "Ingen storleik." msgid "Invalid size." msgstr "Ugyldig storleik." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Brukarbilete" @@ -749,9 +767,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Du kan laste opp ein personleg avatar." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." msgstr "Kan ikkje finne brukar" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -770,7 +789,7 @@ msgid "Preview" msgstr "Forhandsvis" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Slett" @@ -782,23 +801,28 @@ msgstr "Last opp" msgid "Crop" msgstr "Skaler" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Ingen vald profil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Velg eit utvalg av bildet som vil blir din avatar." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Fant ikkje igjen fil data." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Lasta opp brukarbilete." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Feil ved oppdatering av brukarbilete." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Lasta opp brukarbilete." @@ -808,7 +832,7 @@ msgstr "Lasta opp brukarbilete." msgid "You already blocked that user." msgstr "Du har allereie blokkert denne brukaren." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Blokker brukaren" @@ -819,28 +843,45 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "Nei" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Lås opp brukaren" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "Jau" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blokkér denne brukaren" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Lagring av informasjon feila." @@ -853,8 +894,8 @@ msgstr "Lagring av informasjon feila." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Denne gruppa finst ikkje." @@ -886,9 +927,10 @@ msgstr "Lås opp" msgid "Unblock this user" msgstr "Lås opp brukaren" -#: actions/bookmarklet.php:50 -#, fuzzy -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" msgstr "Bilete" #: actions/confirmaddress.php:75 @@ -903,34 +945,44 @@ msgstr "Fann ikkje stadfestingskode." msgid "That confirmation code is not for you!" msgstr "Den godkjenningskoden er ikkje for deg!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "Ukjend adressetype %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Den addressa har alt blitt bekrefta." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Kan ikkje oppdatera brukar." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Kan ikkje sletta e-postgodkjenning." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "Stadfest adresse" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Addressa \"%s\" har blitt bekrefta for din konto." @@ -941,7 +993,7 @@ msgid "Conversation" msgstr "Stadfestingskode" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notisar" @@ -963,7 +1015,7 @@ msgstr "Du er ikkje medlem av den gruppa." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Det var eit problem med sesjons billetten din." @@ -979,17 +1031,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "Kan ikkje sletta notisen." -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "Slett denne notisen" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1021,12 +1075,14 @@ msgstr "Slett notis" msgid "Are you sure you want to delete this notice?" msgstr "Sikker på at du vil sletta notisen?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 #, fuzzy msgid "Do not delete this notice" msgstr "Kan ikkje sletta notisen." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -1051,136 +1107,139 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 #, fuzzy msgid "Delete this user" msgstr "Slett denne notisen" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "Ugyldig storleik." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "Denne sida er ikkje tilgjengleg i eit" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "Endra passordet ditt" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 #, fuzzy msgid "Site logo" msgstr "Invitér" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "Endra" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "Statusmelding" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 #, fuzzy msgid "Theme for the site." msgstr "Logg ut or sida" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Du kan lasta opp ein logo for gruppa." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Endra passordet ditt" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 -#, fuzzy +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" -msgstr "Kopla til" +msgstr "Innhald" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Søk" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Tekst" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Logg inn" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Lagra" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1297,11 +1356,16 @@ msgstr "Bruk dette skjemaet for å redigere gruppa" msgid "description is too long (max %d chars)." msgstr "skildringa er for lang (maks 140 teikn)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Ugyldig merkelapp: %s" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Kann ikkje oppdatera gruppa." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Kunne ikkje lagre favoritt." @@ -1310,32 +1374,45 @@ msgstr "Kunne ikkje lagre favoritt." msgid "Options saved." msgstr "Lagra innstillingar." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "Epostinnstillingar" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Styr korleis du får epost frå %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adresse" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "Epostadresser" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Godkjent epostadresse." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "Fjern" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1343,109 +1420,143 @@ msgstr "" "Ventar på godkjenning. Sjekk innboksen (og søppelpostboksen) for ei melding " "med instruksjonar." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "Avbryt" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "Epostadresser" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Epostadresse («brukarnamn@example.org»)" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "Legg til" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Innkomande epost" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Send epost til denne addressa for å legge til nye notisar." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Vel ny epostadresse til å oppdatera med; fjerner den gamle." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "Ny" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "Brukarval" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Send meg ein notis ved nye tingingar på epost." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "Send meg ein epost når nokon legg til ein av mine notisar som favoritt." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Send meg ein epost når nokon sender meg ei privat melding." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 #, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Send meg ein epost når nokon sender meg ei privat melding." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Tillat vennar å sende meg ein epost." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Eg vil senda notisar med epost." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publiser ein MicroID for epost addressa mi." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Lagra brukarval." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." +msgstr "Synkroniserings innstillingar blei lagra." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Ingen epostadresse." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Klarar ikkje normalisera epostadressa" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Ikkje ei gyldig epostadresse." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Det er alt din epost addresse" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Den epost addressa er alt registrert hos ein annan brukar." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Kan ikkje leggja til godkjenningskode." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1453,43 +1564,56 @@ msgstr "" "Sendte godkjenningskode til epostadressa du la til. Sjekk innboksen (og " "søppelpostboksen) for koden og veiledning på korleis du nyttar han." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Ingen ventande stadfesting å avbryta." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "Det er feil lynmeldings addresse." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "Stadfesting avbrutt." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Det er ikkje din epost addresse." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "Addressa blei fjerna." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Ingen innkomande epostadresse." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Kan ikkje oppdatera brukarinformajon." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Fjerna innkomande epostadresse." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "La til ny innkomande epostadresse." @@ -1610,8 +1734,9 @@ msgstr "Kan ikkje konvertera spyrjebillett til tilgongsbillett." msgid "Remote service uses unknown version of OMB protocol." msgstr "Ukjend versjon av OMB-protokollen." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "Feil ved oppdatering av ekstern profil" #: actions/getfile.php:79 @@ -1675,12 +1800,12 @@ msgstr "Brukar har blokkert deg." msgid "User is not a member of group." msgstr "Du er ikkje medlem av den gruppa." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 #, fuzzy msgid "Block user from group" msgstr "Blokker brukaren" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1688,17 +1813,19 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 #, fuzzy msgid "Do not block this user from this group" msgstr "Ei liste over brukarane i denne gruppa." -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 #, fuzzy msgid "Block this user from this group" msgstr "Ei liste over brukarane i denne gruppa." -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1744,11 +1871,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "Du kan lasta opp ein logo for gruppa." -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "Kan ikkje finne brukar" - #: actions/grouplogo.php:365 #, fuzzy msgid "Pick a square area of the image to be the logo." @@ -1780,36 +1902,40 @@ msgstr "Ei liste over brukarane i denne gruppa." msgid "Admin" msgstr "Administrator" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Blokkér" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 #, fuzzy msgid "Make user an admin of the group" msgstr "Du må være administrator for å redigere gruppa" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 #, fuzzy msgid "Make Admin" msgstr "Administrator" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s tidsline" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupper" @@ -1829,7 +1955,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Opprett ei ny gruppe" @@ -1879,12 +2005,16 @@ msgstr "Brukar har blokkert deg." msgid "Error removing the block." msgstr "Feil ved fjerning av blokka." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "Ljonmeldinginnstillingar" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1893,16 +2023,26 @@ msgstr "" "Du kan sende og motta meldingar gjennom Jabber/GTalk [direktemeldingar](%%" "doc.im%%). Set opp adressa og innstillingar under." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 #, fuzzy msgid "IM is not available." msgstr "Denne sida er ikkje tilgjengleg i eit" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "Ljonmeldingadresse" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Stadfesta Jabber/Gtalk-adresse." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1911,12 +2051,9 @@ msgstr "" "Venter på godkjenning. Sjekk din Jabber/GTalk-konto for ei melding med " "instruksjonar (la du %s til venelista di?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "Ljonmeldingadresse" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1925,43 +2062,65 @@ msgstr "" "Jabber- eller GTalk-adresse, døme «brukarnamn@example.org». Hugs å fyrst " "leggja %s til venelista di i ljonmeldingsklienten din." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Brukarval" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Send meg ein notis via Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Legg til ein notis når min Jabber/GTalk status forandrar seg." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "Send meg svar via Jabber/GTalk fra folk eg ikkje abbonnerar på." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Lagra brukarval." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Nei Jabber-ID" -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Klarar ikkje normalisera Jabber-IDen" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Ikkje ein gyldig Jabber-ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Det er alt din Jabber ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber-ID tilhøyrer allereie ein annan brukar." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1970,10 +2129,35 @@ msgstr "" "Sendte godkjenningskode til ljonmeldingsadressa du la til. Du må godtaka %s " "for å senda meldinger til deg." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Det er feil lynmeldings addresse." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Kan ikkje sletta e-postgodkjenning." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "Stadfesting avbrutt." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Det er ikkje din Jabber ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Addressa blei fjerna." + #: actions/inbox.php:59 #, fuzzy, php-format msgid "Inbox for %1$s - page %2$d" @@ -1993,8 +2177,8 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "Du må verta logga inn for å invitera andre brukarar til %s" #: actions/invite.php:72 @@ -2014,7 +2198,9 @@ msgstr "Invitér nye brukarar" msgid "You are already subscribed to these users:" msgstr "Du tingar allereie oppdatering frå desse brukarane:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2067,12 +2253,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Send" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s har invitert deg til %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2133,7 +2321,9 @@ msgstr "Du må være logga inn for å bli med i ei gruppe." msgid "No nickname or ID." msgstr "Ingen kallenamn." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s blei medlem av gruppe %s" @@ -2142,11 +2332,13 @@ msgstr "%s blei medlem av gruppe %s" msgid "You must be logged in to leave a group." msgstr "Du må være innlogga for å melde deg ut av ei gruppe." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Du er ikkje medlem av den gruppa." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s forlot %s gruppa" @@ -2193,10 +2385,14 @@ msgstr "" "tryggleiksomsyn)." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Log inn med brukarnamn og passord." + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Logg inn med brukarnamn og passord. Har du ikkje brukarnamn endå? [Opprett](%" "%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%" @@ -2222,7 +2418,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Du må være administrator for å redigere gruppa" #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "Ingen status" #: actions/newapplication.php:52 @@ -2261,12 +2458,12 @@ msgstr "Bruk dette skjemaet for å lage ein ny gruppe." msgid "New message" msgstr "Ny melding" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Du kan ikkje sende melding til denne brukaren." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Ingen innhald." @@ -2274,7 +2471,7 @@ msgstr "Ingen innhald." msgid "No recipient specified." msgstr "Ingen mottakar spesifisert." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2291,7 +2488,7 @@ msgstr "Melding" msgid "Direct message to %s sent." msgstr "Direkte melding til %s sendt" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax feil" @@ -2299,7 +2496,7 @@ msgstr "Ajax feil" msgid "New notice" msgstr "Ny notis" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Melding lagra" @@ -2393,11 +2590,11 @@ msgid "You are not a user of that application." msgstr "Du er ikkje medlem av den gruppa." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2406,25 +2603,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "Notisen har ingen profil" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s sin status på %2$s" -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "Kopla til" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -2534,7 +2736,7 @@ msgid "6 or more characters" msgstr "6 eller fleire teikn" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Godta" @@ -2562,7 +2764,7 @@ msgstr "Det gamle passordet stemmer ikkje" msgid "Error saving user; invalid." msgstr "Feil ved lagring av brukar; fungerer ikkje." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Klarar ikkje lagra nytt passord." @@ -2571,7 +2773,7 @@ msgid "Password saved." msgstr "Lagra passord." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2581,23 +2783,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "Denne sida er ikkje tilgjengleg i eit" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Denne sida er ikkje tilgjengleg i eit" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "Denne sida er ikkje tilgjengleg i eit" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "Denne sida er ikkje tilgjengleg i eit" #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2609,9 +2811,8 @@ msgid "Site" msgstr "Invitér" #: actions/pathsadminpanel.php:238 -#, fuzzy msgid "Server" -msgstr "Gjenopprett" +msgstr "Tenar" #: actions/pathsadminpanel.php:238 msgid "Site's server hostname." @@ -2748,18 +2949,19 @@ msgstr "" msgid "People search" msgstr "Søk etter folk" -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "Ikkje gyldig merkelapp: %s" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Brukarar sjølv-merka med %s, side %d" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "Ugyldig notisinnhald" #: actions/postnotice.php:101 @@ -2788,13 +2990,14 @@ msgstr "" "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullt namn" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Heimeside" @@ -2817,9 +3020,9 @@ msgid "Bio" msgstr "Om meg" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Plassering" @@ -2833,7 +3036,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Merkelappar" @@ -2908,7 +3111,7 @@ msgstr "Lagra innstillingar." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -3066,7 +3269,7 @@ msgstr "Tilbakestill passord" msgid "Recover password" msgstr "Hent fram passord" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Passord opphenting etterspurt" @@ -3086,19 +3289,19 @@ msgstr "Avbryt" msgid "Enter a nickname or email address." msgstr "Skriv inn kallenamn eller epostadresse." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Ingen brukar med den epostadressa eller det brukarnamnet." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Ingen registrert epostadresse for den brukaren." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Feil med lagring av adressestadfesting." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3106,23 +3309,23 @@ msgstr "" "Instruksjonar for å få att passordet ditt er send til epostadressa som er " "lagra i kontoen din." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Uventa passordnullstilling." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Passord må vera 6 tekn eller meir." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Passord og stadfesting stemmer ikkje." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Feil ved å setja brukar." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Lagra det nye passordet. Du er logga inn." @@ -3139,7 +3342,7 @@ msgstr "Feil med stadfestingskode." msgid "Registration successful" msgstr "Registreringa gikk bra" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrér" @@ -3161,7 +3364,7 @@ msgstr "Ugyldig brukarnamn eller passord." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3179,8 +3382,9 @@ msgstr "6 eller fleire teikn. Kravd." msgid "Same as password above. Required." msgstr "Samme som passord over. Påkrevd." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Epost" @@ -3194,23 +3398,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Teksten og filene mine er tilgjengeleg under " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og " "telefonnummer." -#: actions/register.php:538 +#: actions/register.php:542 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3242,7 +3438,7 @@ msgstr "" "\n" "Takk for at du blei med, og vi håpar du vil lika tenesta!" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3288,7 +3484,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste." #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Ting" @@ -3331,7 +3527,7 @@ msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen." msgid "You already repeated that notice." msgstr "Du har allereie blokkert denne brukaren." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "Lag" @@ -3420,7 +3616,7 @@ msgstr "Brukar har blokkert deg." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3460,28 +3656,32 @@ msgstr "Du må være innlogga for å melde deg ut av ei gruppe." msgid "Application profile" msgstr "Notisen har ingen profil" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "Kallenamn" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "Paginering" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beskriving" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statistikk" @@ -3592,68 +3792,68 @@ msgstr "%s gruppe" msgid "%1$s group, page %2$d" msgstr "%s medlemmar i gruppa, side %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Gruppe profil" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Merknad" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Gruppe handlingar" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Notisstraum for %s gruppa" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Notisstraum for %s gruppa" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Notisstraum for %s gruppa" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Utboks for %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Medlemmar" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Alle medlemmar" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 #, fuzzy msgid "Created" msgstr "Lag" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3663,7 +3863,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3674,7 +3874,7 @@ msgstr "" "**%s** er ei brukargruppe på %%%%site.name%%%%, ei [mikroblogging](http://en." "wikipedia.org/wiki/Micro-blogging)-teneste" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 #, fuzzy msgid "Admins" msgstr "Administrator" @@ -3808,11 +4008,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3907,7 +4107,7 @@ msgid "Unable to save site notice." msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3924,47 +4124,77 @@ msgstr "" msgid "Save site notice" msgstr "Statusmelding" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "SMS innstillingar" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Du kan motta SMS-meldingar gjennom e-post frå %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "Denne sida er ikkje tilgjengleg i eit" -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "Ljonmeldingadresse" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Godkjent mobiltelefonnummer." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Ventar på godkjenning for dette telefonnummeret." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Stadfestingskode" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Skriv inn koden du fekk på telefonen." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Godta" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 #, fuzzy msgid "SMS phone number" msgstr "SMS telefon nummer" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Telefonnummer, kun tall, med landskode" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Brukarval" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3972,23 +4202,34 @@ msgstr "" "Send meg ein notis via SMS; eg forstår at dette kan føre til kostnadar fra " "min tilbydar." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "Lagra brukarval." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Ingen telefonnummer." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Ingen mobiloperatør vald." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Det er alt ditt telefonnummer" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Det telefonnummeret er alt registrert hos ein annan brukar." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " @@ -3997,23 +4238,42 @@ msgstr "" "Sende godkjenningskode til telefonnummeret du la til. Sjekk innboksen for " "koden og veiledning på korleis du nyttar han." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Det er feil godkjennings nummer." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Stadfesting avbrutt." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Det er ikkje ditt telefonnummer" -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "SMS telefon nummer" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Telefontilbydar" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Velg ein tilbydar" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -4022,13 +4282,14 @@ msgstr "" "Mobiloperatøren din. Ta kontakt på %s viss du kjenner ein mobiloperatør som " "aksepterer SMS-over-epost, men ikkje vistast her." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Ingen innskriven kode" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -4050,7 +4311,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4090,8 +4351,7 @@ msgstr "Avatar-innstillingar" msgid "You are not subscribed to that profile." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Kunne ikkje lagra abonnement." @@ -4184,11 +4444,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%1$s høyrer no på" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4222,12 +4482,12 @@ msgstr "Manglar argumentet ID." msgid "Tag %s" msgstr "Merkelapp %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Brukarprofil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Bilete" @@ -4284,7 +4544,8 @@ msgid "User is not silenced." msgstr "Brukaren har inga profil." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +#, fuzzy +msgid "No profile ID in request." msgstr "Ingen profil-ID i førespurnaden." #: actions/unsubscribe.php:98 @@ -4321,7 +4582,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" @@ -4492,28 +4754,34 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "%s medlemmar i gruppa, side %d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 #, fuzzy msgid "Search for more groups" msgstr "Søk etter folk eller innhald" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, fuzzy, php-format msgid "%s is not a member of any group." msgstr "Du er ikkje medlem av den gruppa." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" @@ -4561,7 +4829,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Personleg" @@ -4570,19 +4839,19 @@ msgstr "Personleg" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4625,27 +4894,28 @@ msgstr "Kunne ikkje lagre melding." msgid "Could not update message with new URI." msgstr "Kunne ikkje oppdatere melding med ny URI." -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Feil ved lagring av notis. Ukjend brukar." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:256 +#: classes/Notice.php:260 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4653,238 +4923,256 @@ msgid "" msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Du kan ikkje lengre legge inn notisar på denne sida." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Brukaren tillet deg ikkje å tinga meldingane sine." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Brukar har blokkert deg." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Ikkje tinga." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Kan ikkje sletta tinging." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Kan ikkje sletta tinging." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Kan ikkje sletta tinging." -#: classes/User.php:373 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Melding til %1$s på %2$s" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Kunne ikkje laga gruppa." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Kunne ikkje bli med i gruppa." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Kunne ikkje bli med i gruppa." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Kunne ikkje lagra abonnement." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Endra profilinnstillingane dine" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Last opp ein avatar" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Endra passordet ditt" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Endra eposthandtering" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "Brukarprofil" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Anna" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Andre val" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Anna" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%1$s (%2$s)" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Ingen tittel" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Navigasjon for hovudsida" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 #, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Personleg profil og oversyn over vener" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Personleg" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Endra e-posten, avataren, passordet eller profilen" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Klarte ikkje å omdirigera til tenaren: %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Kopla til" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Navigasjon for hovudsida" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Administrator" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Inviter vennar og kollega til å bli med deg på %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Invitér" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 #, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Logg ut or sida" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Logg ut" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Opprett ny konto" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "Registrér" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 #, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Logg inn or sida" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "Logg inn" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Hjelp meg!" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "Hjelp" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 #, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Søk etter folk eller innhald" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4892,74 +5180,88 @@ msgstr "Søk" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Statusmelding" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Lokale syningar" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Sidenotis" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Andrenivås side navigasjon" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Hjelp" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Om" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "OSS" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Personvern" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Kjeldekode" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:771 +#: lib/action.php:784 #, fuzzy msgid "Badge" msgstr "Dult" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "StatusNets programvarelisens" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** er ei mikrobloggingteneste. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** er ei mikrobloggingteneste." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4970,70 +5272,84 @@ msgstr "" "%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "StatusNets programvarelisens" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "Alle" +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "lisens." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "« Etter" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Før »" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 #, fuzzy msgid "You cannot make changes to this site." msgstr "Du kan ikkje sende melding til denne brukaren." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 #, fuzzy msgid "Changes to that panel are not allowed." msgstr "Registrering ikkje tillatt." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 #, fuzzy msgid "showForm() not implemented." @@ -5045,167 +5361,205 @@ msgstr "Kommando ikkje implementert." msgid "saveSettings() not implemented." msgstr "Kommando ikkje implementert." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 #, fuzzy msgid "Unable to delete design setting." msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "Stadfesting av epostadresse" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "Invitér" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "SMS bekreftelse" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "Personleg" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "SMS bekreftelse" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Brukar" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "SMS bekreftelse" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "SMS bekreftelse" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "SMS bekreftelse" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "Statusmelding" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "SMS bekreftelse" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Beskriv gruppa eller emnet med 140 teikn" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "Beskriv gruppa eller emnet med 140 teikn" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Kjeldekode" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL til heimesida eller bloggen for gruppa eller emnet" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "Kjeldekode" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL til heimesida eller bloggen for gruppa eller emnet" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Avbryt" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "Fjern" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 #, fuzzy msgid "Provider" msgstr "Profil" @@ -5228,37 +5582,57 @@ msgstr "Endra passord" msgid "Password changing is not allowed" msgstr "Endra passord" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultat frå kommandoen" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Kommandoen utførd" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Kommandoen feila" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Orsak, men kommandoen er ikkje laga enno." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Fann ingen profil med den IDen." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Brukaren har ikkje siste notis" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Orsak, men kommandoen er ikkje laga enno." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Dytta!" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5266,203 +5640,207 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Fann ingen profil med den IDen." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Brukaren har ikkje siste notis" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Notis markert som favoritt." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Du er allereie medlem av den gruppa" -#: lib/command.php:231 -#, php-format -msgid "Could not join user %s to group %s" +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s" msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s blei medlem av gruppe %s" - -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" msgstr "Kunne ikkje fjerne %s fra %s gruppa " -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s forlot %s gruppa" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Fullt namn: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Stad: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Heimeside: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:349 +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" -#: lib/command.php:367 +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Direkte melding til %s sendt" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Ein feil oppstod ved sending av direkte melding." -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "Slett denne notisen" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Melding lagra" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:482 +#: lib/command.php:562 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar på denne notisen" -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Spesifer namnet til brukaren du vil tinge" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Brukaren finst ikkje." +#: lib/command.php:628 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Tingar %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Spesifer namnet til brukar du vil fjerne tinging på" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Tingar ikkje %s lengre" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Kommando ikkje implementert." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notifikasjon av." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Kan ikkje skru av notifikasjon." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notifikasjon på." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Tingar ikkje %s lengre" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:" msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Kan ikkje tinga andre til deg." msgstr[1] "Kan ikkje tinga andre til deg." -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er ikkje medlem av den gruppa." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er ikkje medlem av den gruppa." msgstr[1] "Du er ikkje medlem av den gruppa." -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5504,20 +5882,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Ingen stadfestingskode." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Logg inn or sida" @@ -5548,9 +5926,8 @@ msgid "Database error" msgstr "" #: lib/designsettings.php:105 -#, fuzzy msgid "Upload file" -msgstr "Last opp" +msgstr "Last opp fil" #: lib/designsettings.php:109 #, fuzzy @@ -5694,53 +6071,54 @@ msgstr "Grupper med flest innlegg" msgid "Tags in %s group's notices" msgstr "Merkelappar i %s gruppa sine notisar" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer." -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Støttar ikkje bileteformatet." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Du kan lasta opp ein logo for gruppa." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Hallvegs opplasta." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfeil ved opplasting av fil." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Korrupt bilete." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Støttar ikkje bileteformatet." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Mista fila vår." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Ukjend fil type" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5761,11 +6139,13 @@ msgstr "Log inn med brukarnamn og passord." msgid "Sign up for a new account" msgstr "Opprett ny konto" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Stadfesting av epostadresse" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5782,12 +6162,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s høyrer no på notisane dine på %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5808,19 +6190,22 @@ msgstr "" "Beste helsing,\n" "%4$s.\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Bio: %s\n" "\n" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Ny epostadresse for å oppdatera %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5840,21 +6225,31 @@ msgstr "" "\n" "Helsing frå %4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s status" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS bekreftelse" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "Ventar på godkjenning for dette telefonnummeret." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Du har blitt dulta av %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5870,12 +6265,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Ny privat melding fra %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5894,12 +6291,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s la til di melding som ein favoritt" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5920,12 +6319,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5938,6 +6347,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5950,7 +6371,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 #, fuzzy msgid "from" msgstr " frå " @@ -6080,51 +6501,55 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 #, fuzzy msgid "N" msgstr "Nei" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 #, fuzzy msgid "in context" msgstr "Ingen innhald." -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "Lag" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Svar" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "Melding lagra" @@ -6149,6 +6574,10 @@ msgstr "Feil med å henta inn ny profil" msgid "Error inserting avatar" msgstr "Feil med innhenting av brukarbilete." +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Feil ved oppdatering av ekstern profil" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Feil med å henta inn ekstern profil" @@ -6200,7 +6629,7 @@ msgstr "Merkelappar i %s sine notisar" msgid "Unknown" msgstr "Uventa handling." -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tingingar" @@ -6208,33 +6637,33 @@ msgstr "Tingingar" msgid "All subscriptions" msgstr "Alle tingingar" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Tingarar" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Tingarar" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 #, fuzzy msgid "User ID" msgstr "Brukar" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Medlem sidan" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Alle gruppar" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "Manglar argumentet ID." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6258,11 +6687,20 @@ msgstr "Framheva" msgid "Popular" msgstr "Populære" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "Manglar argumentet ID." + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "Svar på denne notisen" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Jau" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6273,7 +6711,7 @@ msgstr "Svar på denne notisen" msgid "Revoke the \"%s\" role from this user" msgstr "Ei liste over brukarane i denne gruppa." -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6407,93 +6845,112 @@ msgstr "Fjern tinging fra denne brukaren" msgid "Unsubscribe" msgstr "Fjern tinging" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Brukaren har inga profil." + +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Brukarbilete" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Brukarverkty" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 #, fuzzy msgid "Edit profile settings" msgstr "Profilinnstillingar" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Send ei direktemelding til denne brukaren" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Melding" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "Brukarprofil" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "omtrent ein månad sidan" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "~%d månadar sidan" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "omtrent eitt år sidan" @@ -6507,7 +6964,7 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 3a0bd39c32..cd23aea291 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -2,6 +2,7 @@ # # Author@translatewiki.net: McDutchie # Author@translatewiki.net: Raven +# Author@translatewiki.net: Sp5uhe # -- # Paweł Wilk , 2008. # Piotr Drąg , 2009. @@ -10,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:36+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:01+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -19,14 +20,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Dostęp" @@ -76,7 +77,13 @@ msgstr "Zamknięte" msgid "Save access settings" msgstr "Zapisz ustawienia dostępu" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Zapisz" @@ -84,8 +91,8 @@ msgstr "Zapisz" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "Nie ma takiej strony" +msgid "No such page." +msgstr "Nie ma takiej strony." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -95,9 +102,9 @@ msgstr "Nie ma takiej strony" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -105,11 +112,9 @@ msgstr "Nie ma takiej strony" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Brak takiego użytkownika." @@ -121,8 +126,9 @@ msgstr "%1$s i przyjaciele, strona %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -189,8 +195,10 @@ msgstr "" msgid "You and friends" msgstr "Ty i przyjaciele" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualizacje z %1$s i przyjaciół na %2$s." @@ -205,18 +213,18 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s." #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Nie odnaleziono metody API." @@ -229,17 +237,17 @@ msgstr "Nie odnaleziono metody API." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Ta metoda wymaga POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" -"Należy podać parametr o nazwie \"device\" z jedną z wartości: sms, im, none" +"Należy podać parametr o nazwie \"device\" z jedną z wartości: sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -250,7 +258,7 @@ msgstr "Nie można zaktualizować użytkownika." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Użytkownik nie posiada profilu." @@ -260,9 +268,9 @@ msgid "Could not save profile." msgstr "Nie można zapisać profilu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -348,7 +356,7 @@ msgstr "Nie odnaleziono stanów z tym identyfikatorem." msgid "This status is already a favorite." msgstr "Ten stan jest już ulubiony." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Nie można utworzyć ulubionego wpisu." @@ -439,11 +447,10 @@ msgstr "Położenie jest za długie (maksymalnie 255 znaków)." msgid "Too many aliases! Maximum %d." msgstr "Za dużo aliasów. Maksymalnie %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Nieprawidłowy alias: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Nieprawidłowy alias: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -459,14 +466,14 @@ msgstr "Alias nie może być taki sam jak pseudonim." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" +msgid "Group not found." msgstr "Nie odnaleziono grupy." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Jesteś już członkiem tej grupy." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Zostałeś zablokowany w tej grupie przez administratora." @@ -484,17 +491,26 @@ msgstr "Nie jesteś członkiem tej grupy." msgid "Could not remove user %1$s from group %2$s." msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Grupy użytkownika %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%2$s jest członkiem grup %1$s." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Grupy %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "grupy na %s" @@ -508,17 +524,17 @@ msgid "Invalid token." msgstr "Nieprawidłowy token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -550,12 +566,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "Token żądania %s został odrzucony lub unieważniony." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Nieoczekiwane wysłanie formularza." @@ -578,20 +597,22 @@ msgstr "" "uzyskać możliwość %3$s danych konta %4$s. Dostęp do konta %4" "$s powinien być udostępniany tylko zaufanym osobom trzecim." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Pseudonim" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Hasło" @@ -636,17 +657,17 @@ msgstr "Usunięto stan." msgid "No status with that ID found." msgstr "Nie odnaleziono stanów z tym identyfikatorem." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Nie odnaleziono" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Nie odnaleziono." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika." @@ -655,12 +676,12 @@ msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika msgid "Unsupported format." msgstr "Nieobsługiwany format." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s/ulubione wpisy od %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s." @@ -670,17 +691,17 @@ msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s/aktualizacje wspominające %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Publiczna oś czasu użytkownika %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Użytkownik %s aktualizuje od każdego." @@ -695,20 +716,16 @@ msgstr "Powtórzone dla %s" msgid "Repeats of %s" msgstr "Powtórzenia %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Wpisy ze znacznikiem %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aktualizacje ze znacznikiem %1$s na %2$s." -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Nie odnaleziono." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Nie ma takiego załącznika." @@ -728,8 +745,9 @@ msgstr "Brak rozmiaru." msgid "Invalid size." msgstr "Nieprawidłowy rozmiar." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Awatar" @@ -739,10 +757,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Można wysłać osobisty awatar. Maksymalny rozmiar pliku to %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Użytkownik bez odpowiadającego profilu" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Użytkownik bez odpowiadającego profilu." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -760,7 +778,7 @@ msgid "Preview" msgstr "Podgląd" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Usuń" @@ -772,23 +790,27 @@ msgstr "Wyślij" msgid "Crop" msgstr "Przytnij" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Nie wysłano pliku." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Wybierz kwadratowy obszar obrazu do awatara" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Utracono dane pliku." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Zaktualizowano awatar." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Zaktualizowanie awatara nie powiodło się." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Usunięto awatar." @@ -796,7 +818,7 @@ msgstr "Usunięto awatar." msgid "You already blocked that user." msgstr "Użytkownik jest już zablokowany." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Zablokuj użytkownika" @@ -810,27 +832,42 @@ msgstr "" "do ciebie zostanie usunięta, nie będzie mógł cię subskrybować w przyszłości " "i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Nie" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Nie blokuj tego użytkownika" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Tak" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Zablokuj tego użytkownika" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Zapisanie informacji o blokadzie nie powiodło się." @@ -843,8 +880,8 @@ msgstr "Zapisanie informacji o blokadzie nie powiodło się." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Nie ma takiej grupy." @@ -874,9 +911,11 @@ msgstr "Odblokuj" msgid "Unblock this user" msgstr "Odblokuj tego użytkownika" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Wyślij do " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Wyślij do %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -890,33 +929,43 @@ msgstr "Nie odnaleziono kodu potwierdzającego." msgid "That confirmation code is not for you!" msgstr "Ten kod potwierdzający nie jest przeznaczony dla ciebie." -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Nierozpoznany typ adresu %s" +msgid "Unrecognized address type %s." +msgstr "Nierozpoznany typ adresu %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Ten adres został już potwierdzony." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Nie można zaktualizować użytkownika." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Nie można usunąć potwierdzenia adresu e-mail." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Potwierdź adres" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Adres \"%s\" został potwierdzony dla twojego konta." @@ -926,7 +975,7 @@ msgid "Conversation" msgstr "Rozmowa" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Wpisy" @@ -945,7 +994,7 @@ msgstr "Nie jesteś właścicielem tej aplikacji." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Wystąpił problem z tokenem sesji." @@ -962,15 +1011,17 @@ msgstr "" "Na pewno usunąć tę aplikację? Wyczyści to wszystkie dane o aplikacji z bazy " "danych, w tym wszystkie istniejące połączenia użytkowników." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Nie usuwaj tej aplikacji" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Usuń tę aplikację" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1001,11 +1052,13 @@ msgstr "Usuń wpis" msgid "Are you sure you want to delete this notice?" msgstr "Jesteś pewien, że chcesz usunąć ten wpis?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Nie usuwaj tego wpisu" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Usuń ten wpis" @@ -1029,125 +1082,129 @@ msgstr "" "Na pewno usunąć tego użytkownika? Wyczyści to wszystkie dane o użytkowniku z " "bazy danych, bez utworzenia kopii zapasowej." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Usuń tego użytkownika" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Wygląd" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Ustawienia wyglądu tej witryny StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "Nieprawidłowy adres URL logo." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Motyw nie jest dostępny: %s" +msgid "Theme not available: %s." +msgstr "Motyw nie jest dostępny: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Zmień logo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Logo witryny" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Zmień motyw" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Motyw witryny" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Motyw witryny." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Zmień obraz tła" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Tło" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Można wysłać obraz tła dla witryny. Maksymalny rozmiar pliku to %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Włączone" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Wyłączone" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Włącz lub wyłącz obraz tła." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Kafelkowy obraz tła" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Zmień kolory" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Treść" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Panel boczny" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Tekst" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Odnośniki" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Użycie domyślnych" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Przywróć domyślny wygląd" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Przywróć domyślne ustawienia" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Zapisz" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Zapisz wygląd" @@ -1252,11 +1309,16 @@ msgstr "Użyj tego formularza, aby zmodyfikować grupę." msgid "description is too long (max %d chars)." msgstr "opis jest za długi (maksymalnie %d znaków)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Nieprawidłowy alias: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Nie można zaktualizować grupy." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Nie można utworzyć aliasów." @@ -1264,31 +1326,42 @@ msgstr "Nie można utworzyć aliasów." msgid "Options saved." msgstr "Zapisano opcje." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Ustawienia adresu e-mail" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Zarządzanie, jak otrzymywać wiadomości e-mail od %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adres" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Adres e-mail" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Obecnie potwierdzone adresy e-mail." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Usuń" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1297,106 +1370,136 @@ msgstr "" "(także w wiadomościach niechcianych), czy otrzymałeś wiadomość z dalszymi " "instrukcjami." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Anuluj" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Adres e-mail" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Dodaj" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Wiadomości przychodzące" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj poprzedni." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" -msgstr "Nowe" +msgstr "Nowy" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Preferencje" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Preferencje e-mail" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Wyślij wpisy nowych subskrypcji przez e-mail." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Wyślij wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle prywatną wiadomość." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle odpowiedź \"@\"." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mail." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Chcę wysyłać wpisy przez wiadomości e-mail." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Opublikuj MicroID adresu e-mail." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Zapisano preferencje." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Zapisano preferencje e-mail." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Brak adresu e-mail." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Nie można znormalizować tego adresu e-mail" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "To nie jest prawidłowy adres e-mail." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Ten adres e-mail jest już twój." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Ten adres e-mail należy już do innego użytkownika." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Nie można wprowadzić kodu potwierdzającego." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1405,43 +1508,53 @@ msgstr "" "skrzynce odbiorczej (także w wiadomościach niechcianych), czy otrzymałeś kod " "i instrukcje dotyczące jego użycia." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Brak oczekujących potwierdzeń do anulowania." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "To jest błędny adres komunikatora." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "To jest błędny adres e-mail." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Anulowano potwierdzenie." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Anulowano potwierdzenie e-mail." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "To nie jest twój adres e-mail." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Adres został usunięty." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "Adres e-mail został usunięty." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Brak przychodzącego adresu e-mail." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Nie można zaktualizować wpisu użytkownika." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Usunięto przychodzący adres e-mail." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Dodano nowy przychodzący adres e-mail." @@ -1560,9 +1673,9 @@ msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu." msgid "Remote service uses unknown version of OMB protocol." msgstr "Zdalna usługa używa nieznanej wersji protokołu OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Błąd podczas aktualizowania zdalnego profilu" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Błąd podczas aktualizowania zdalnego profilu." #: actions/getfile.php:79 msgid "No such file." @@ -1617,11 +1730,11 @@ msgstr "Użytkownik został już zablokował w grupie." msgid "User is not a member of group." msgstr "Użytkownik nie jest członkiem grupy." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Zablokuj użytkownika w grupie" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1632,15 +1745,17 @@ msgstr "" "Zostanie usunięty z grupy, nie będzie mógł wysyłać wpisów i subskrybować " "grupy w przyszłości." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Nie blokuj tego użytkownika w tej grupie" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Zablokuj tego użytkownika w tej grupie" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie." @@ -1681,10 +1796,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "Można wysłać obraz logo grupy. Maksymalny rozmiar pliku to %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Użytkownik bez odpowiadającego profilu." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Wybierz kwadratowy obszar obrazu, który będzie logo." @@ -1715,34 +1826,38 @@ msgstr "Lista użytkowników znajdujących się w tej grupie." msgid "Admin" msgstr "Administrator" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Zablokuj" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Uczyń użytkownika administratorem grupy" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Uczyń administratorem" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Uczyń tego użytkownika administratorem" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Oś czasu użytkownika %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Aktualizacje od członków %1$s na %2$s." -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupy" @@ -1767,7 +1882,7 @@ msgstr "" "która cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub " "[założyć własną.](%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Utwórz nową grupę" @@ -1819,11 +1934,15 @@ msgstr "Użytkownik nie został zablokowany w grupie." msgid "Error removing the block." msgstr "Błąd podczas usuwania blokady." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Ustawienia komunikatora" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1832,15 +1951,24 @@ msgstr "" "Można wysyłać i odbierać wpisy przez [komunikator](%%doc.im%%) Jabber/GTalk. " "Skonfiguruj adres i ustawienia poniżej." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "Komunikator nie jest dostępny." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Adres komunikatora" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Obecnie potwierdzone adresy Jabber/GTalk." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1850,11 +1978,9 @@ msgstr "" "czy otrzymałeś wiadomość z dalszymi instrukcjami (dodałeś %s do listy " "znajomych?)." -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "Adres komunikatora" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1863,44 +1989,65 @@ msgstr "" "Adres Jabber lub GTalk, taki jak \"NazwaUżytkownika@example.org\". Najpierw " "upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub na GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Preferencje komunikatora" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Wyślij mi wpisy przez Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Wyślij wpis, kiedy zmieni się mój stan na Jabber/GTalk." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Wyślij mi odpowiedzi przez Jabber/GTalk od osób, których nie subskrybuję." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Opublikuj MicroID adresu Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Zapisano preferencje." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Brak identyfikatora Jabbera." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Nie można znormalizować tego identyfikatora Jabbera" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "To nie jest prawidłowy identyfikator Jabbera" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Ten identyfikator Jabbera jest już twój." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Identyfikator Jabbera należy już do innego użytkownika." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1909,10 +2056,32 @@ msgstr "" "Kod potwierdzający został wysłany na dodany adres komunikatora. Należy " "zaakceptować otrzymywanie wiadomości od %s." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "To jest błędny adres komunikatora." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Nie można usunąć potwierdzenia komunikatora." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Anulowano potwierdzenie komunikatora." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "To nie jest twój identyfikator Jabbera." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "Adres komunikatora został usunięty." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1934,9 +2103,9 @@ msgstr "Zaproszenia zostały wyłączone." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" +msgid "You must be logged in to invite other users to use %s." msgstr "" -"Należy być zalogowanym, aby zapraszać innych użytkowników do używania %s" +"Należy być zalogowanym, aby zapraszać innych użytkowników do używania %s." #: actions/invite.php:72 #, php-format @@ -1955,7 +2124,9 @@ msgstr "Zaproś nowych użytkowników" msgid "You are already subscribed to these users:" msgstr "Jesteś już subskrybowany do tych użytkowników:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2007,12 +2178,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Wyślij" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s zapraszają cię, abyś dołączył do nich w %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2077,7 +2250,9 @@ msgstr "Musisz być zalogowany, aby dołączyć do grupy." msgid "No nickname or ID." msgstr "Brak pseudonimu lub identyfikatora." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "Użytkownik %1$s dołączył do grupy %2$s" @@ -2086,11 +2261,13 @@ msgstr "Użytkownik %1$s dołączył do grupy %2$s" msgid "You must be logged in to leave a group." msgstr "Musisz być zalogowany, aby opuścić grupę." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Nie jesteś członkiem tej grupy." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "Użytkownik %1$s opuścił grupę %2$s" @@ -2138,13 +2315,16 @@ msgstr "" "zmienianiem ustawień." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Logowanie za pomocą nazwy użytkownika i hasła." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? " -"[Zarejestruj](%%action.register%%) nowe konto." +"Nie masz jeszcze nazwy użytkownika? [Zarejestruj](%%action.register%%) nowe " +"konto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2166,8 +2346,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Nie można uczynić %1$s administratorem grupy %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Brak obecnego stanu" +msgid "No current status." +msgstr "Brak obecnego stanu." #: actions/newapplication.php:52 msgid "New Application" @@ -2201,12 +2381,12 @@ msgstr "Użyj tego formularza, aby utworzyć nową grupę." msgid "New message" msgstr "Nowa wiadomość" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Nie można wysłać wiadomości do tego użytkownika." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Brak treści." @@ -2214,7 +2394,7 @@ msgstr "Brak treści." msgid "No recipient specified." msgstr "Nie podano odbiorcy." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu." @@ -2228,7 +2408,7 @@ msgstr "Wysłano wiadomość" msgid "Direct message to %s sent." msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Błąd AJAX" @@ -2236,7 +2416,7 @@ msgstr "Błąd AJAX" msgid "New notice" msgstr "Nowy wpis" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Wysłano wpis" @@ -2332,11 +2512,11 @@ msgid "You are not a user of that application." msgstr "Nie jesteś użytkownikiem tej aplikacji." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "Nie można unieważnić dostępu dla aplikacji: " +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Nie można unieważnić dostępu dla aplikacji: %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "Nie upoważniono żadnych aplikacji do używania konta." @@ -2345,24 +2525,29 @@ msgid "Developers can edit the registration settings for their applications " msgstr "Programiści mogą zmodyfikować ustawienia rejestracji swoich aplikacji " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Wpis nie posiada profilu" +msgid "Notice has no profile." +msgstr "Wpis nie posiada profilu." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Stan użytkownika %1$s na %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "typ zawartości " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Typ zawartości %s jest nieobsługiwany." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Tylko " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -2465,7 +2650,7 @@ msgid "6 or more characters" msgstr "6 lub więcej znaków" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Potwierdź" @@ -2493,7 +2678,7 @@ msgstr "Niepoprawne poprzednie hasło" msgid "Error saving user; invalid." msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Nie można zapisać nowego hasła." @@ -2502,7 +2687,7 @@ msgid "Password saved." msgstr "Zapisano hasło." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Ścieżki" @@ -2512,23 +2697,23 @@ msgstr "Ustawienia ścieżki i serwera dla tej witryny StatusNet." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Katalog motywu jest nieczytelny: %s" +msgid "Theme directory not readable: %s." +msgstr "Nie można odczytać katalogu motywu: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Katalog awatara jest niezapisywalny: %s" +msgid "Avatar directory not writable: %s." +msgstr "Nie można zapisywać w katalogu awatarów: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Katalog tła jest niezapisywalny: %s" +msgid "Background directory not writable: %s." +msgstr "Nie można zapisywać w katalogu teł: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Katalog lokalizacji jest nieczytelny: %s" +msgid "Locales directory not readable: %s." +msgstr "Nie można odczytać katalogu lokalizacji: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2670,19 +2855,19 @@ msgstr "" msgid "People search" msgstr "Wyszukiwanie osób" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Nieprawidłowy znacznik osób: %s" +msgid "Not a valid people tag: %s." +msgstr "Nieprawidłowy znacznik osób: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Użytkownicy używający znacznika %1$s - strona %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Nieprawidłowa zawartość wpisu" +msgid "Invalid notice content." +msgstr "Nieprawidłowa treść wpisu." #: actions/postnotice.php:101 #, php-format @@ -2709,13 +2894,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Imię i nazwisko" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Strona domowa" @@ -2737,9 +2923,9 @@ msgid "Bio" msgstr "O mnie" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Położenie" @@ -2753,7 +2939,7 @@ msgstr "Podziel się swoim obecnym położeniem podczas wysyłania wpisów" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Znaczniki" @@ -2827,8 +3013,8 @@ msgstr "Zapisano ustawienia." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Poza ograniczeniem strony (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Poza ograniczeniem strony (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2995,7 +3181,7 @@ msgstr "Przywróć hasło" msgid "Recover password" msgstr "Przywróć hasło" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Zażądano przywracania hasła" @@ -3015,19 +3201,19 @@ msgstr "Przywróć" msgid "Enter a nickname or email address." msgstr "Podaj pseudonim lub adres e-mail." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Błąd podczas zapisywania potwierdzenia adresu." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3035,23 +3221,23 @@ msgstr "" "Instrukcje przywracania hasła zostały wysłane na adres e-mail zarejestrowany " "z twoim kontem." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Nieoczekiwane przywrócenie hasła." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Hasło musi mieć sześć lub więcej znaków." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Hasło i potwierdzenie nie pasują do siebie." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Błąd podczas ustawiania użytkownika." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany." @@ -3067,7 +3253,7 @@ msgstr "Nieprawidłowy kod zaproszenia." msgid "Registration successful" msgstr "Rejestracja powiodła się" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Zarejestruj się" @@ -3090,7 +3276,7 @@ msgstr "Nieprawidłowa nazwa użytkownika lub hasło." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać " @@ -3109,8 +3295,9 @@ msgstr "6 lub więcej znaków. Wymagane." msgid "Same as password above. Required." msgstr "Takie samo jak powyższe hasło. Wymagane." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mail" @@ -3123,22 +3310,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Moje teksty i pliki są dostępne na " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Uznanie autorstwa 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -" poza tymi prywatnymi danymi: hasło, adres e-mail, adres komunikatora i " -"numer telefonu." +"Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi " +"danymi: hasło, adres e-mail, adres komunikatora i numer telefonu." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3171,7 +3351,7 @@ msgstr "" "Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi " "sprawi ci przyjemność." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3216,7 +3396,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Subskrybuj" @@ -3254,7 +3434,7 @@ msgstr "Nie można powtórzyć własnego wpisu." msgid "You already repeated that notice." msgstr "Już powtórzono ten wpis." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Powtórzono" @@ -3342,7 +3522,7 @@ msgstr "Użytkownik jest już ograniczony." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sesje" @@ -3379,26 +3559,30 @@ msgstr "Musisz być zalogowany, aby wyświetlić aplikację." msgid "Application profile" msgstr "Profil aplikacji" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Ikona" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Nazwa" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organizacja" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Opis" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statystyki" @@ -3518,67 +3702,67 @@ msgstr "Grupa %s" msgid "%1$s group, page %2$d" msgstr "Grupa %1$s, strona %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Profil grupy" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "Adres URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Wpis" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliasy" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Działania grupy" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Kanał wpisów dla grupy %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Kanał wpisów dla grupy %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Kanał wpisów dla grupy %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF dla grupy %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Członkowie" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Brak)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Wszyscy członkowie" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Utworzono" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3594,7 +3778,7 @@ msgstr "" "action.register%%%%), aby stać się częścią tej grupy i wiele więcej. " "([Przeczytaj więcej](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3607,7 +3791,7 @@ msgstr "" "narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się " "krótkimi wiadomościami o swoim życiu i zainteresowaniach. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Administratorzy" @@ -3747,11 +3931,11 @@ msgid "Unknown language \"%s\"." msgstr "Nieznany język \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "Maksymalne ograniczenie tekstu to 14 znaków." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Minimalne ograniczenie tekstu to 0 (bez ograniczenia)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "Ograniczenie duplikatów musi wynosić jedną lub więcej sekund." #: actions/siteadminpanel.php:221 @@ -3843,8 +4027,8 @@ msgid "Unable to save site notice." msgstr "Nie można zapisać wpisu witryny." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "Maksymalna długość wpisu witryny to 255 znaków" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "Maksymalna długość wpisu witryny to 255 znaków." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -3859,44 +4043,71 @@ msgstr "" msgid "Save site notice" msgstr "Zapisz wpis witryny" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Ustawienia SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Można otrzymywać wiadomości SMS przez e-mail od %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "Wiadomości SMS nie są dostępne." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "Adres SMS" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Obecnie potwierdzone numery telefonów z włączoną usługą SMS." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Kod potwierdzający" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Podaj kod, który otrzymałeś na telefonie." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Potwierdź" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Numer telefonu SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "Preferencje SMS" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3904,23 +4115,33 @@ msgstr "" "Wyślij mi wpisy przez SMS. Rozumiem, że mogę otrzymywać większe rachunki od " "swojego operatora." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Zapisano preferencje SMS." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Brak numeru telefonu." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Nie wybrano operatora." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Ten numer telefonu jest już twój." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Ten numer telefonu należy już do innego użytkownika." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3928,23 +4149,40 @@ msgstr "" "Kod potwierdzający został wysłany na dodany numer telefonu. Sprawdź telefon, " "czy otrzymałeś kod i instrukcje jak go użyć." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "To jest błędny numer potwierdzenia." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Anulowano potwierdzenie SMS." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "To nie jest twój numer telefonu." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Numer telefonu SMS został usunięty." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Operator komórkowy" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Wybierz operatora" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3954,13 +4192,14 @@ msgstr "" "wiadomości SMS przez e-mail, a nie znajduje się na liście, wyślij wiadomość " "e-mail na %s (w języku angielskim), aby nam o tym powiedzieć." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Nie podano kodu" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Migawki" @@ -3981,7 +4220,7 @@ msgid "Invalid snapshot report URL." msgstr "Nieprawidłowy adres URL zgłaszania migawek." #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "Losowo podczas trafienia WWW" #: actions/snapshotadminpanel.php:201 @@ -4020,8 +4259,7 @@ msgstr "Zapisz ustawienia migawki" msgid "You are not subscribed to that profile." msgstr "Nie jesteś subskrybowany do tego profilu." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Nie można zapisać subskrypcji." @@ -4124,11 +4362,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "Użytkownik %s nie obserwuje nikogo." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4161,12 +4399,12 @@ msgstr "Brak parametru identyfikatora." msgid "Tag %s" msgstr "Znacznik %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Profil użytkownika" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Zdjęcie" @@ -4219,7 +4457,7 @@ msgid "User is not silenced." msgstr "Użytkownik nie jest wyciszony." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Brak identyfikatora profilu w żądaniu." #: actions/unsubscribe.php:98 @@ -4257,7 +4495,8 @@ msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków." msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" @@ -4417,27 +4656,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Smacznego hot-doga." -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "Grupy użytkownika %1$s, strona %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Wyszukaj więcej grup" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "Użytkownik %s nie jest członkiem żadnej grupy." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Aktualizacje z %1$s na %2$s." @@ -4499,7 +4744,8 @@ msgstr "" msgid "Plugins" msgstr "Wtyczki" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Wersja" @@ -4507,7 +4753,7 @@ msgstr "Wersja" msgid "Author(s)" msgstr "Autorzy" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4516,13 +4762,13 @@ msgstr "" "Żaden plik nie może być większy niż %d bajty, a wysłany plik miał %d bajty. " "Spróbuj wysłać mniejszą wersję." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Plik tej wielkości przekroczyłby przydział użytkownika wynoszący %d bajty." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4562,27 +4808,28 @@ msgstr "Nie można wprowadzić wiadomości." msgid "Could not update message with new URI." msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Problem podczas zapisywania wpisu. Za długi." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za " "kilka minut." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4590,287 +4837,319 @@ msgstr "" "Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i " "wyślij ponownie za kilka minut." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Zabroniono ci wysyłania wpisów na tej witrynie." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problem podczas zapisywania wpisu." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Zablokowano subskrybowanie." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Już subskrybowane." -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Użytkownik zablokował cię." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Niesubskrybowane." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Nie można usunąć autosubskrypcji." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Nie można usunąć tokenu subskrypcji OMB." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Nie można usunąć subskrypcji." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Witaj w %1$s, @%2$s." -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Nie można utworzyć grupy." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Nie można ustawić adresu URI grupy." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Nie można ustawić członkostwa w grupie." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Nie można zapisać informacji o lokalnej grupie." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Zmień ustawienia profilu" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Wyślij awatar" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Zmień hasło" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Zmień obsługę adresu e-mail" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Wygląd profilu" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Inne" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Inne opcje" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Inne" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Strona bez nazwy" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Główna nawigacja witryny" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Profil osobisty i oś czasu przyjaciół" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Osobiste" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Zmień adres e-mail, awatar, hasło, profil" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Połącz z serwisami" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Połącz" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Zmień konfigurację witryny" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Administrator" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Zaproś" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Wyloguj się z witryny" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Wyloguj się" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Utwórz konto" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Zarejestruj się" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Zaloguj się na witrynie" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Zaloguj się" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Pomóż mi." -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Pomoc" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Wyszukaj osoby lub tekst" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Wyszukaj" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Wpis witryny" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Lokalne widoki" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Wpis strony" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Druga nawigacja witryny" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Pomoc" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "O usłudze" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "TOS" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Prywatność" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Kod źródłowy" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Odznaka" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Licencja oprogramowania StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** jest usługą mikroblogowania. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** jest usługą mikroblogowania." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4881,71 +5160,87 @@ msgstr "" "status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU " "Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Licencja zawartości witryny" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Treść i dane %1$s są prywatne i poufne." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Prawa autorskie do treści i danych są własnością %1$s. Wszystkie prawa " "zastrzeżone." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie " "prawa zastrzeżone." -#: lib/action.php:847 -msgid "All " -msgstr "Wszystko " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" +"Wszystkie treści i dane na stronie %1$s są dostępne na warunkach licencji %2" +"$s." -#: lib/action.php:853 -msgid "license." -msgstr "licencja." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Paginacja" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Później" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Wcześniej" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Nie można jeszcze obsługiwać zdalnej treści." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści XML." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści Base64." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Nie można wprowadzić zmian witryny." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Zmiany w tym panelu nie są dozwolone." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() nie jest zaimplementowane." @@ -4955,156 +5250,192 @@ msgstr "showForm() nie jest zaimplementowane." msgid "saveSettings() not implemented." msgstr "saveSettings() nie jest zaimplementowane." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Nie można usunąć ustawienia wyglądu." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Podstawowa konfiguracja witryny" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Witryna" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Konfiguracja wyglądu" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Wygląd" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Konfiguracja użytkownika" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Użytkownik" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Konfiguracja dostępu" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Konfiguracja ścieżek" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Konfiguracja sesji" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 msgid "Edit site notice" msgstr "Zmodyfikuj wpis witryny" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" msgstr "Konfiguracja migawek" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko " "do odczytu." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" -"Próba uwierzytelnienia API nie powiodła się, pseudonim = %1$s, pośrednik = %2" -"$s, IP = %3$s" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Zmodyfikuj aplikację" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Ikona tej aplikacji" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Opisz aplikację w %d znakach" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Opisz aplikację" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "Źródłowy adres URL" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "Adres URL strony domowej tej aplikacji" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "Źródłowy adres URL" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Organizacja odpowiedzialna za tę aplikację" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "Adres URL strony domowej organizacji" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "Adres URL do przekierowania po uwierzytelnieniu" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Przeglądarka" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Pulpit" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Typ aplikacji, przeglądarka lub pulpit" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Tylko do odczytu" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Odczyt i zapis" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Domyślny dostęp do tej aplikacji: tylko do odczytu lub do odczytu i zapisu" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Anuluj" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "odczyt i zapis" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "tylko do odczytu" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Zaakceptowano %1$s - dostęp \"%2$s\"." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Unieważnij" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Załączniki" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Dostawca" @@ -5124,37 +5455,56 @@ msgstr "Zmiana hasła nie powiodła się" msgid "Password changing is not allowed" msgstr "Zmiana hasła nie jest dozwolona" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Wyniki polecenia" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Zakończono polecenie" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Polecenie nie powiodło się" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Te polecenie nie zostało jeszcze zaimplementowane." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Wpis z tym identyfikatorem nie istnieje." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Użytkownik nie posiada ostatniego wpisu." + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Nie można odnaleźć użytkownika z pseudonimem %s." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Nie można odnaleźć lokalnego użytkownika z pseudonimem %s." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Te polecenie nie zostało jeszcze zaimplementowane." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Szturchanie samego siebie nie ma zbyt wiele sensu." -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Wysłano szturchnięcie do użytkownika %s." -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5165,200 +5515,206 @@ msgstr "" "Subskrybenci: %2$s\n" "Wpisy: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Wpis z tym identyfikatorem nie istnieje." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Użytkownik nie posiada ostatniego wpisu." - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Zaznaczono wpis jako ulubiony." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Jesteś już członkiem tej grupy." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "Użytkownik %1$s dołączył do grupy %2$s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s." - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "Użytkownik %1$s opuścił grupę %2$s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Imię i nazwisko: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Położenie: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Strona domowa: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "O mnie: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d." +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" +"%s to zdalny profil; można wysyłać bezpośrednie wiadomości tylko do " +"użytkowników na tym samym serwerze." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s." -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Błąd podczas wysyłania bezpośredniej wiadomości." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Nie można powtórzyć własnego wpisu" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Już powtórzono ten wpis" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Powtórzono wpis od użytkownika %s" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Błąd podczas powtarzania wpisu." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d." -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Wysłano odpowiedź do %s." -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Błąd podczas zapisywania wpisu." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Podaj nazwę użytkownika do subskrybowania." -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Brak takiego użytkownika." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Nie można subskrybować profili OMB za pomocą polecenia." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Subskrybowano użytkownika %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji." -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Usunięto subskrypcję użytkownika %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Nie zaimplementowano polecenia." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Wyłączono powiadomienia." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Nie można wyłączyć powiadomień." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Włączono powiadomienia." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Nie można włączyć powiadomień." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "Polecenie logowania jest wyłączone" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Tego odnośnika można użyć tylko raz i będzie prawidłowy tylko przez dwie " "minuty: %s." -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "Usunięto subskrypcję użytkownika %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Nie subskrybujesz nikogo." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subskrybujesz tę osobę:" msgstr[1] "Subskrybujesz te osoby:" msgstr[2] "Subskrybujesz te osoby:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Nikt cię nie subskrybuje." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ta osoba cię subskrybuje:" msgstr[1] "Te osoby cię subskrybują:" msgstr[2] "Te osoby cię subskrybują:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Nie jesteś członkiem żadnej grupy." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Jesteś członkiem tej grupy:" msgstr[1] "Jesteś członkiem tych grup:" msgstr[2] "Jesteś członkiem tych grup:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5440,19 +5796,19 @@ msgstr "" "tracks - jeszcze nie zaimplementowano\n" "tracking - jeszcze nie zaimplementowano\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Nie odnaleziono pliku konfiguracji." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Szukano plików konfiguracji w następujących miejscach: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Należy uruchomić instalator, aby to naprawić." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Przejdź do instalatora." @@ -5626,53 +5982,54 @@ msgstr "Grupy z największą ilością wpisów" msgid "Tags in %s group's notices" msgstr "Znaczniki we wpisach grupy %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Ta strona jest niedostępna dla akceptowanego typu medium" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Nieobsługiwany format pliku obrazu." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Częściowo wysłano." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Błąd systemu podczas wysyłania pliku." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "To nie jest obraz lub lub plik jest uszkodzony." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Nieobsługiwany format pliku obrazu." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Utracono plik." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Nieznany typ pliku" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "KB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Nieznane źródło skrzynki odbiorczej %d." @@ -5693,11 +6050,13 @@ msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła" msgid "Sign up for a new account" msgstr "Załóż nowe konto" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Potwierdzenie adresu e-mail" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5727,12 +6086,14 @@ msgstr "" "Dziękujemy za twój czas, \n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5757,17 +6118,20 @@ msgstr "" "----\n" "Zmień adres e-mail lub opcje powiadamiania na %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "O mnie: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Nowy adres e-mail do wysyłania do %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5788,21 +6152,31 @@ msgstr "" "Z poważaniem,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Stan użytkownika %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Potwierdzenie SMS" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "%s: proszę potwierdzić własny numer telefonu za pomocą tego kodu:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Zostałeś szturchnięty przez %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5829,12 +6203,14 @@ msgstr "" "Z poważaniem,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Nowa prywatna wiadomość od użytkownika %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5867,12 +6243,14 @@ msgstr "" "Z poważaniem,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "Użytkownik %s (@%s) dodał twój wpis jako ulubiony" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5910,12 +6288,25 @@ msgstr "" "Z poważaniem,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"Pełną rozmowę można przeczytać tutaj:\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "Użytkownik %s (@%s) wysłał wpis wymagający twojej uwagi" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5928,18 +6319,42 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"Użytkownik %1$s (@%9$s) właśnie wysłał wpis wymagający twojej uwagi " -"(odpowiedź \"@\") na %2$s.\n" +"Użytkownik %1$s (@%9$s) właśnie wysłał wpis dla ciebie (odpowiedź \\\"@\\\") " +"na %2$s.\n" "\n" -"Wpis znajduje się tutaj:\n" +"Wpis:\n" "\n" -"\t%3$s\n" +"%3$s\n" "\n" -"Tekst wpisu:\n" +"O treści:\n" "\n" -"\t%4$s\n" +"%4$s\n" "\n" +"%5$sMożna odpowiedzieć tutaj:\n" +"\n" +"%6$s\n" +"\n" +"Lista wszystkich odpowiedzi \\\"@\\\" do ciebie znajduje się tutaj:\n" +"\n" +"%7$s\n" +"\n" +"Z poważaniem,\n" +"%2$s\n" +"\n" +"PS Można wyłączyć powiadomienia przez e-mail tutaj: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5954,7 +6369,7 @@ msgstr "" "rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla " "twoich oczu." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "z" @@ -6082,48 +6497,52 @@ msgstr "" "Pobieranie danych geolokalizacji trwa dłużej niż powinno, proszę spróbować " "ponownie później" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "Północ" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "Południe" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "Wschód" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "Zachód" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "w" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "w rozmowie" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Powtórzone przez" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Odpowiedz na ten wpis" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Odpowiedz" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Powtórzono wpis" @@ -6147,6 +6566,10 @@ msgstr "Błąd podczas wprowadzania nowego profilu" msgid "Error inserting avatar" msgstr "Błąd podczas wprowadzania awatara" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Błąd podczas aktualizowania zdalnego profilu" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Błąd podczas wprowadzania zdalnego profilu" @@ -6196,7 +6619,7 @@ msgstr "Znaczniki we wpisach użytkownika %s" msgid "Unknown" msgstr "Nieznane" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subskrypcje" @@ -6204,31 +6627,32 @@ msgstr "Subskrypcje" msgid "All subscriptions" msgstr "Wszystkie subskrypcje" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subskrybenci" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Wszyscy subskrybenci" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "Identyfikator użytkownika" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Członek od" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Dziennie średnio" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Wszystkie grupy" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Brak parametrów powrotu." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Niezaimplementowana metoda." @@ -6252,10 +6676,18 @@ msgstr "Znane" msgid "Popular" msgstr "Popularne" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Brak parametrów powrotu." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Powtórzyć ten wpis?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Tak" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Powtórz ten wpis" @@ -6265,7 +6697,7 @@ msgstr "Powtórz ten wpis" msgid "Revoke the \"%s\" role from this user" msgstr "Unieważnij rolę \"%s\" tego użytkownika" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" "Nie określono pojedynczego użytkownika dla trybu pojedynczego użytkownika." @@ -6392,89 +6824,108 @@ msgstr "Zrezygnuj z subskrypcji tego użytkownika" msgid "Unsubscribe" msgstr "Zrezygnuj z subskrypcji" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "Użytkownik %s (%d) nie posiada wpisu profilu." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Zmodyfikuj awatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Czynności użytkownika" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Trwa usuwanie użytkownika..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Zmodyfikuj ustawienia profilu" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Edycja" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Wiadomość" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Moderuj" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 msgid "User role" msgstr "Rola użytkownika" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "Moderator" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "około minutę temu" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "około %d minut temu" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "około godzinę temu" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "około %d godzin temu" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "blisko dzień temu" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "około %d dni temu" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "około miesiąc temu" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "około %d miesięcy temu" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "około rok temu" @@ -6490,7 +6941,7 @@ msgstr "" "%s nie jest prawidłowym kolorem. Użyj trzech lub sześciu znaków " "szesnastkowych." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d." diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 7041bea819..048664eb81 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Portuguese # +# Author@translatewiki.net: Gallaecio # Author@translatewiki.net: Hamilton Abreu # Author@translatewiki.net: Ipublicis # -- @@ -9,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:48+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:04+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -22,21 +23,19 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Acesso" #. TRANS: Page notice #: actions/accessadminpanel.php:67 -#, fuzzy msgid "Site access settings" -msgstr "Gravar configurações do site" +msgstr "Configurações de acesso ao site" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 -#, fuzzy msgid "Registration" -msgstr "Registar" +msgstr "Registo" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -45,7 +44,6 @@ msgstr "Proibir utilizadores anónimos (sem sessão iniciada) de ver o site?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Privado" @@ -72,12 +70,16 @@ msgstr "Fechado" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "Gravar configurações do site" +msgstr "Gravar configurações de acesso" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Gravar" @@ -85,8 +87,8 @@ msgstr "Gravar" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "Página não encontrada." +msgid "No such page." +msgstr "Página não foi encontrada." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -96,9 +98,9 @@ msgstr "Página não encontrada." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -106,24 +108,23 @@ msgstr "Página não encontrada." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." -msgstr "Utilizador não encontrado." +msgstr "Utilizador não foi encontrado." #. TRANS: Page title. %1$s is user nickname, %2$d is page number #: actions/all.php:86 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "Perfis bloqueados de %1$s, página %2$d" +msgstr "%1$s e amigos, página %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -188,8 +189,10 @@ msgstr "" msgid "You and friends" msgstr "Você e seus amigos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizações de %1$s e amigos no %2$s!" @@ -204,18 +207,18 @@ msgstr "Actualizações de %1$s e amigos no %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Método da API não encontrado." @@ -228,17 +231,17 @@ msgstr "Método da API não encontrado." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Este método requer um POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" -"Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none" +"Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -249,7 +252,7 @@ msgstr "Não foi possível actualizar o utilizador." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Utilizador não tem perfil." @@ -259,9 +262,9 @@ msgid "Could not save profile." msgstr "Não foi possível gravar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -346,7 +349,7 @@ msgstr "Nenhum estado encontrado com esse ID." msgid "This status is already a favorite." msgstr "Este estado já é um favorito." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Não foi possível criar o favorito." @@ -435,36 +438,35 @@ msgstr "Localidade demasiado longa (máx. 255 caracteres)." #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "Demasiados sinónimos (máx. %d)." +msgstr "Demasiados nomes alternativos! Máx. %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Sinónimo inválido: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Nome alternativo inválido: \"%s\"" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "Sinónimo \"%s\" já em uso. Tente outro." +msgstr "Nome alternativo \"%s\" já em uso. Tente outro." #: actions/apigroupcreate.php:288 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "Os sinónimos não podem ser iguais ao nome do utilizador." +msgstr "Um nome alternativo não pode ser igual ao nome do utilizador." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Grupo não foi encontrado!" +msgid "Group not found." +msgstr "Grupo não foi encontrado." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Já é membro desse grupo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Foi bloqueado desse grupo pelo gestor." @@ -482,42 +484,50 @@ msgstr "Não é membro deste grupo." msgid "Could not remove user %1$s from group %2$s." msgstr "Não foi possível remover %1$s do grupo %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Grupos de %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Grupos de %1$s de que %2$s é membro." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Grupos de %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "Grupos em %s" #: actions/apioauthauthorize.php:101 msgid "No oauth_token parameter provided." -msgstr "" +msgstr "Não foi fornecido o parâmetro oauth_token." #: actions/apioauthauthorize.php:106 -#, fuzzy msgid "Invalid token." -msgstr "Tamanho inválido." +msgstr "Chave inválida." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -525,48 +535,48 @@ msgid "There was a problem with your session token. Try again, please." msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente." #: actions/apioauthauthorize.php:135 -#, fuzzy msgid "Invalid nickname / password!" -msgstr "Nome de utilizador ou senha inválidos." +msgstr "Alcunha ou senha inválidos!" #: actions/apioauthauthorize.php:159 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "Erro ao configurar utilizador." +msgstr "Erro na base de dados ao apagar o utilizador da aplicação OAuth." #: actions/apioauthauthorize.php:185 -#, fuzzy msgid "Database error inserting OAuth application user." -msgstr "Erro na base de dados ao inserir a marca: %s" +msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth." #: actions/apioauthauthorize.php:214 #, php-format msgid "" "The request token %s has been authorized. Please exchange it for an access " "token." -msgstr "" +msgstr "A chave de pedido %s foi autorizada. Troque-a por uma chave de acesso." #: actions/apioauthauthorize.php:227 #, php-format msgid "The request token %s has been denied and revoked." -msgstr "" +msgstr "A chave de pedido %s foi negada e retirada." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Envio inesperado de formulário." #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" -msgstr "" +msgstr "Uma aplicação pretende ligar-se à sua conta" #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" -msgstr "" +msgstr "Permitir ou negar acesso" #: actions/apioauthauthorize.php:292 #, php-format @@ -575,37 +585,40 @@ msgid "" "the ability to %3$s your %4$s account data. You should only " "give access to your %4$s account to third parties you trust." msgstr "" +"A aplicação %1$s por %2$s solicita " +"permissão para %3$s os dados da sua conta %4$s. Só deve " +"permitir acesso à sua conta %4$s a terceiros da sua confiança." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Conta" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Utilizador" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Senha" #: actions/apioauthauthorize.php:328 -#, fuzzy msgid "Deny" -msgstr "Estilo" +msgstr "Negar" #: actions/apioauthauthorize.php:334 -#, fuzzy msgid "Allow" -msgstr "Todas" +msgstr "Permitir" #: actions/apioauthauthorize.php:351 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "Permitir ou negar acesso à informação da sua conta." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." @@ -618,7 +631,7 @@ msgstr "Não pode apagar o estado de outro utilizador." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 #: actions/deletenotice.php:52 actions/shownotice.php:92 msgid "No such notice." -msgstr "Nota não encontrada." +msgstr "Nota não foi encontrada." #: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." @@ -636,17 +649,17 @@ msgstr "Estado apagado." msgid "No status with that ID found." msgstr "Não foi encontrado um estado com esse ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Não encontrado" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Não encontrado." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo." @@ -655,12 +668,12 @@ msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo." msgid "Unsupported format." msgstr "Formato não suportado." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritas de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualizações preferidas por %2$s / %2$s." @@ -670,17 +683,17 @@ msgstr "%1$s actualizações preferidas por %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualizações que mencionam %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Notas públicas de %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s actualizações de todos!" @@ -693,32 +706,28 @@ msgstr "Repetida para %s" #: actions/apitimelineretweetsofme.php:114 #, php-format msgid "Repeats of %s" -msgstr "Repetências de %s" +msgstr "Repetições de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notas categorizadas com %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizações categorizadas com %1$s em %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Não encontrado." - #: actions/attachment.php:73 msgid "No such attachment." -msgstr "Anexo não encontrado." +msgstr "Anexo não foi encontrado." #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84 #: actions/grouplogo.php:86 actions/groupmembers.php:76 #: actions/grouprss.php:91 actions/showgroup.php:121 msgid "No nickname." -msgstr "Nenhuma utilizador." +msgstr "Alcunha não definida." #: actions/avatarbynickname.php:64 msgid "No size." @@ -728,8 +737,9 @@ msgstr "Tamanho não definido." msgid "Invalid size." msgstr "Tamanho inválido." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -739,10 +749,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Pode carregar o seu avatar pessoal. O tamanho máximo do ficheiro é %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Utilizador sem perfil correspondente" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Utilizador sem perfil correspondente." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -760,7 +770,7 @@ msgid "Preview" msgstr "Antevisão" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Apagar" @@ -772,23 +782,27 @@ msgstr "Carregar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Não foi carregado nenhum ficheiro." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Escolha uma área quadrada da imagem para ser o seu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Perdi os dados do nosso ficheiro." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualizado." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Falha ao actualizar avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar apagado." @@ -796,7 +810,7 @@ msgstr "Avatar apagado." msgid "You already blocked that user." msgstr "Já bloqueou esse utilizador." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquear utilizador" @@ -810,27 +824,42 @@ msgstr "" "subscrição por este utilizador será cancelada, ele não poderá subscrevê-lo " "de futuro e você não receberá notificações das @-respostas dele." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Não" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Não bloquear este utilizador" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Sim" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloquear este utilizador" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Não foi possível gravar informação do bloqueio." @@ -843,8 +872,8 @@ msgstr "Não foi possível gravar informação do bloqueio." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Grupo não foi encontrado." @@ -874,9 +903,11 @@ msgstr "Desbloquear" msgid "Unblock this user" msgstr "Desbloquear este utilizador" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Publicar em " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Publicar em %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -890,34 +921,43 @@ msgstr "Código de confirmação não encontrado" msgid "That confirmation code is not for you!" msgstr "Esse código de confirmação não é para si!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Tipo do endereço %s não reconhecido" +msgid "Unrecognized address type %s." +msgstr "Tipo do endereço %s não reconhecido." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Esse endereço já tinha sido confirmado." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Não foi possível actualizar o utilizador." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Não foi possível apagar a confirmação do endereço electrónico." -#: actions/confirmaddress.php:144 -#, fuzzy +#: actions/confirmaddress.php:146 msgid "Confirm address" -msgstr "Confirmar Endereço" +msgstr "Confirmar endereço" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "O endereço \"%s\" foi confirmado para a sua conta." @@ -927,58 +967,54 @@ msgid "Conversation" msgstr "Conversação" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notas" #: actions/deleteapplication.php:63 -#, fuzzy msgid "You must be logged in to delete an application." -msgstr "Precisa de iniciar sessão para editar um grupo." +msgstr "Tem de iniciar uma sessão para eliminar uma aplicação." #: actions/deleteapplication.php:71 -#, fuzzy msgid "Application not found." -msgstr "Nota não tem perfil" +msgstr "Aplicação não foi encontrada." #: actions/deleteapplication.php:78 actions/editapplication.php:77 #: actions/showapplication.php:94 -#, fuzzy msgid "You are not the owner of this application." -msgstr "Não é membro deste grupo." +msgstr "Não é o proprietário desta aplicação." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Ocorreu um problema com a sua sessão." #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 -#, fuzzy msgid "Delete application" -msgstr "Nota não encontrada." +msgstr "Apagar aplicação" #: actions/deleteapplication.php:149 -#, fuzzy msgid "" "Are you sure you want to delete this application? This will clear all data " "about the application from the database, including all existing user " "connections." msgstr "" -"Tem a certeza de que quer apagar este utilizador? Todos os dados do " -"utilizador serão eliminados da base de dados, sem haver cópias." +"Tem a certeza de que quer apagar esta aplicação? Todos os dados da aplicação " +"serão eliminados da base de dados, incluindo todas as ligações de " +"utilizadores em existência." -#: actions/deleteapplication.php:156 -#, fuzzy +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" -msgstr "Não apagar esta nota" +msgstr "Não apagar esta aplicação" -#: actions/deleteapplication.php:160 -#, fuzzy +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" -msgstr "Apagar esta nota" +msgstr "Apagar esta aplicação" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1009,11 +1045,13 @@ msgstr "Apagar nota" msgid "Are you sure you want to delete this notice?" msgstr "Tem a certeza de que quer apagar esta nota?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Não apagar esta nota" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Apagar esta nota" @@ -1037,58 +1075,61 @@ msgstr "" "Tem a certeza de que quer apagar este utilizador? Todos os dados do " "utilizador serão eliminados da base de dados, sem haver cópias." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Apagar este utilizador" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Estilo" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Configurações do estilo deste site StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "URL do logotipo inválida." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Tema não está disponível: %s" +msgid "Theme not available: %s." +msgstr "Tema não está disponível: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Alterar logotipo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Logotipo do site" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Alterar tema" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Tema do site" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "O tema para o site." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Alterar imagem de fundo" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Fundo" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1097,67 +1138,68 @@ msgstr "" "Pode carregar uma imagem de fundo para o site. O tamanho máximo do ficheiro " "é %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Ligar" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Desligar" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Ligar ou desligar a imagem de fundo." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Repetir imagem de fundo em mosaico" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Alterar cores" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Conteúdo" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Barra" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Texto" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Ligações" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Usar predefinições" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Repor estilos predefinidos" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Repor predefinição" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Gravar" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Gravar o estilo" @@ -1170,86 +1212,74 @@ msgid "Add to favorites" msgstr "Adicionar às favoritas" #: actions/doc.php:158 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Documento não encontrado." +msgstr "Documento \"%s\" não foi encontrado" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" -msgstr "Outras opções" +msgstr "Editar Aplicação" #: actions/editapplication.php:66 -#, fuzzy msgid "You must be logged in to edit an application." -msgstr "Precisa de iniciar sessão para editar um grupo." +msgstr "Tem de iniciar uma sessão para editar uma aplicação." #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166 #: actions/showapplication.php:87 -#, fuzzy msgid "No such application." -msgstr "Nota não encontrada." +msgstr "Aplicação não foi encontrada." #: actions/editapplication.php:161 -#, fuzzy msgid "Use this form to edit your application." -msgstr "Use este formulário para editar o grupo." +msgstr "Use este formulário para editar a sua aplicação." #: actions/editapplication.php:177 actions/newapplication.php:159 -#, fuzzy msgid "Name is required." -msgstr "Repita a senha acima. Obrigatório." +msgstr "Nome é obrigatório." #: actions/editapplication.php:180 actions/newapplication.php:165 -#, fuzzy msgid "Name is too long (max 255 chars)." -msgstr "Nome completo demasiado longo (máx. 255 caracteres)." +msgstr "Nome é demasiado longo (máx. 255 caracteres)." #: actions/editapplication.php:183 actions/newapplication.php:162 -#, fuzzy msgid "Name already in use. Try another one." -msgstr "Utilizador já é usado. Tente outro." +msgstr "Nome já é usado. Tente outro." #: actions/editapplication.php:186 actions/newapplication.php:168 -#, fuzzy msgid "Description is required." -msgstr "Descrição" +msgstr "Descrição é obrigatória." #: actions/editapplication.php:194 msgid "Source URL is too long." -msgstr "" +msgstr "URL de origem é demasiado longa." #: actions/editapplication.php:200 actions/newapplication.php:185 -#, fuzzy msgid "Source URL is not valid." -msgstr "A URL ‘%s’ do avatar é inválida." +msgstr "A URL de origem é inválida." #: actions/editapplication.php:203 actions/newapplication.php:188 msgid "Organization is required." -msgstr "" +msgstr "Organização é obrigatória." #: actions/editapplication.php:206 actions/newapplication.php:191 -#, fuzzy msgid "Organization is too long (max 255 chars)." -msgstr "Localidade demasiado longa (máx. 255 caracteres)." +msgstr "Organização é demasiado longa (máx. 255 caracteres)." #: actions/editapplication.php:209 actions/newapplication.php:194 msgid "Organization homepage is required." -msgstr "" +msgstr "Página da organização é obrigatória." #: actions/editapplication.php:218 actions/newapplication.php:206 msgid "Callback is too long." -msgstr "" +msgstr "Callback é demasiado longo." #: actions/editapplication.php:225 actions/newapplication.php:215 -#, fuzzy msgid "Callback URL is not valid." -msgstr "A URL ‘%s’ do avatar é inválida." +msgstr "A URL de callback é inválida." #: actions/editapplication.php:258 -#, fuzzy msgid "Could not update application." -msgstr "Não foi possível actualizar o grupo." +msgstr "Não foi possível actualizar a aplicação." #: actions/editgroup.php:56 #, php-format @@ -1274,43 +1304,59 @@ msgstr "Use este formulário para editar o grupo." msgid "description is too long (max %d chars)." msgstr "descrição é demasiada extensa (máx. %d caracteres)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Nome alternativo inválido: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Não foi possível actualizar o grupo." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." -msgstr "Não foi possível criar sinónimos." +msgstr "Não foi possível criar os nomes alternativos." #: actions/editgroup.php:280 msgid "Options saved." msgstr "Opções gravadas." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Configurações do correio electrónico" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Defina como receberá mensagens electrónicas de %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Endereço" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Endereço de correio electrónico" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Endereço de correio já confirmado." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Remover" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1318,111 +1364,141 @@ msgstr "" "A aguardar a confirmação deste endereço. Procure na sua caixa de entrada (ou " "na caixa de spam!) uma mensagem com mais instruções." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Cancelar" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Endereço de correio electrónico" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "" "Endereço de correio electrónico, por ex. \"nomedeutilizador@exemplo.pt\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Adicionar" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Correio recebido" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Envie mensagens electrónicas para este endereço para publicar notas." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Crie um endereço electrónico novo para publicações; cancela o antigo." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Novo" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Preferências" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Preferências de correio electrónico" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Enviem-me notificação electrónica das novas subscrições." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "Enviem-me notificação electrónica quando uma nota minha é adicionada às " "favoritas." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" "Enviem-me notificação electrónica quando me enviarem uma mensagem privada." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -"Enviem-me notificação electrónica quando me enviarem uma \"@-resposta\"." +"Enviem-me notificação electrónica quando me enviarem uma \"resposta-@\"." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Permitir que amigos me toquem e enviem mensagens electrónicas." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Quero publicar notas por correio electrónico." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publicar uma MicroID para o meu endereço electrónico." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Preferências gravadas." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Preferências de correio electrónico foram gravadas." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Sem endereço de correio electrónico." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Não é possível normalizar esse endereço electrónico" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Correio electrónico é inválido." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Esse já é o seu endereço electrónico." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Esse endereço electrónico já pertence a outro utilizador." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Não foi possível inserir o código de confirmação." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1431,43 +1507,53 @@ msgstr "" "forneceu. Procure na caixa de entrada (e na caixa de spam!) o código e as " "respectivas instruções de utilização." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Nenhuma confirmação pendente para cancelar." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Esse endereço de mensagens instantâneas está errado." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Esse endereço de correio electrónico está errado." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Confirmação cancelada." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Confirmação de correio electrónico cancelada." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Esse não é o seu endereço electrónico." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "O endereço foi removido." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "O endereço de correio electrónico foi removido." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Sem endereço electrónico de entrada." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Não foi possível actualizar o registo do utilizador." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Endereço electrónico de entrada foi removido." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Adicionado endereço electrónico de entrada novo." @@ -1585,9 +1671,9 @@ msgstr "Não foi possível converter a chave de pedido numa chave de acesso." msgid "Remote service uses unknown version of OMB protocol." msgstr "Serviço remoto usa uma versão desconhecida do protocolo OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Erro ao actualizar o perfil remoto" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Erro ao actualizar o perfil remoto." #: actions/getfile.php:79 msgid "No such file." @@ -1598,23 +1684,20 @@ msgid "Cannot read file." msgstr "Não foi possível ler o ficheiro." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Tamanho inválido." +msgstr "Função inválida." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Esta função está reservada e não pode ser activada." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Não pode impedir notas públicas neste site." +msgstr "Não pode atribuir funções aos utilizadores neste site." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "O utilizador já está silenciado." +msgstr "O utilizador já tem esta função." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1645,11 +1728,11 @@ msgstr "Acesso do utilizador ao grupo já foi bloqueado." msgid "User is not a member of group." msgstr "Utilizador não é membro do grupo." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Bloquear acesso do utilizador ao grupo" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1660,15 +1743,17 @@ msgstr "" "\"%2$s\"? Ele será removido do grupo, impossibilitado de publicar e " "impossibilitado de subscrever o grupo no futuro." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Não bloquear acesso deste utilizador a este grupo" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Bloquear acesso deste utilizador a este grupo" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "Erro na base de dados ao bloquear acesso do utilizador ao grupo." @@ -1678,7 +1763,7 @@ msgstr "Sem ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." -msgstr "Precisa de iniciar sessão para editar um grupo." +msgstr "Tem de iniciar uma sessão para editar um grupo." #: actions/groupdesignsettings.php:144 msgid "Group design" @@ -1713,10 +1798,6 @@ msgstr "" "Pode carregar uma imagem para logotipo do seu grupo. O tamanho máximo do " "ficheiro é %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Utilizador sem perfil correspondente." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Escolha uma área quadrada da imagem para ser o logotipo." @@ -1747,34 +1828,38 @@ msgstr "Uma lista dos utilizadores neste grupo." msgid "Admin" msgstr "Gestor" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Tornar utilizador o gestor do grupo" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Tornar Gestor" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Tornar este utilizador um gestor" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Notas de %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Actualizações dos membros de %1$s em %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupos" @@ -1799,7 +1884,7 @@ msgstr "" "encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%action." "groupsearch%%) ou [crie o seu!](%%action.newgroup%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Criar um grupo novo" @@ -1851,11 +1936,15 @@ msgstr "Acesso do utilizador ao grupo não foi bloqueado." msgid "Error removing the block." msgstr "Erro ao remover o bloqueio." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Configurações do IM" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1864,15 +1953,24 @@ msgstr "" "Pode enviar e receber notas através de [mensagens instantâneas](%%doc.im%%) " "Jabber/GTalk. Configure o seu endereço e outras definições abaixo." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "MI não está disponível." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Endereço IM" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Endereço do Jabber/GTalk já confirmado." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1882,11 +1980,9 @@ msgstr "" "enviadas para a sua conta de Jabber/GTalk. (Adicionou %s à sua lista de " "amigos?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "Endereço IM" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1896,43 +1992,64 @@ msgstr "" "Primeiro, certifique-se de que adicionou %s à sua lista de amigos no cliente " "MI ou no GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Preferências de MI" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Enviar-me notas via Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Publicar uma nota quando o meu estado no Jabber/GTalk se altera." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "Enviar-me via Jabber/GTalk respostas de pessoas que não subscrevo." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publicar uma MicroID para o meu endereço Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Preferências gravadas." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Não introduziu o Jabber ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Não é possível normalizar esse Jabber ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Jabber ID não é válido" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Esse já é o seu Jabber ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "O Jabber ID introduzido já pertence a outro utilizador." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1941,14 +2058,36 @@ msgstr "" "Um código de confirmação foi enviado para o endereço fornecido. Tem que " "aprovar que %s envie mensagens para si." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Esse endereço de mensagens instantâneas está errado." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Confirmação do mensageiro instantâneo cancelada." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Esse não é o seu Jabber ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "O endereço do mensageiro instantâneo foi removido." + #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Caixa de entrada de %s" +msgstr "Caixa de entrada de %s - página %2$d" #: actions/inbox.php:62 #, php-format @@ -1967,10 +2106,10 @@ msgstr "Convites foram desabilitados." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" +msgid "You must be logged in to invite other users to use %s." msgstr "" -"Precisa de iniciar uma sessão para convidar outros utilizadores a usarem o " -"site %s." +"Tem de iniciar uma sessão para convidar outros utilizadores a usarem o site %" +"s." #: actions/invite.php:72 #, php-format @@ -1989,7 +2128,9 @@ msgstr "Convidar novos utilizadores" msgid "You are already subscribed to these users:" msgstr "Já subscreveu estes utilizadores:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2036,17 +2177,18 @@ msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite" #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Enviar" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s convidou-o a juntar-se a ele no %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2104,27 +2246,30 @@ msgstr "" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." -msgstr "Precisa de iniciar uma sessão para se juntar a um grupo." +msgstr "Tem de iniciar uma sessão para se juntar a um grupo." #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Nenhuma utilizador." +msgstr "Nenhuma alcunha ou utilizador." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s juntou-se ao grupo %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." -msgstr "Precisa de iniciar uma sessão para deixar um grupo." +msgstr "Tem de iniciar uma sessão para deixar um grupo." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Não é um membro desse grupo." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s deixou o grupo %2$s" @@ -2172,13 +2317,14 @@ msgstr "" "senha antes de alterar as configurações." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Iniciar sessão com um nome de utilizador e senha." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." -msgstr "" -"Entrar com o seu nome de utilizador e senha. Ainda não está registado? " -"[Registe](%%action.register%%) uma conta." +"Don't have a username yet? [Register](%%action.register%%) a new account." +msgstr "Ainda não está registado? [Registe](%%action.register%%) uma conta." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2200,32 +2346,28 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Não é possível tornar %1$s administrador do grupo %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Sem estado actual" +msgid "No current status." +msgstr "Sem estado actual." #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" -msgstr "Nota não encontrada." +msgstr "Aplicação Nova" #: actions/newapplication.php:64 -#, fuzzy msgid "You must be logged in to register an application." -msgstr "Tem de iniciar uma sessão para criar o grupo." +msgstr "Tem de iniciar uma sessão para registar uma aplicação." #: actions/newapplication.php:143 -#, fuzzy msgid "Use this form to register a new application." -msgstr "Use este formulário para criar um grupo novo." +msgstr "Use este formulário para registar uma nova aplicação." #: actions/newapplication.php:176 msgid "Source URL is required." -msgstr "" +msgstr "É necessária a URL de origem." #: actions/newapplication.php:258 actions/newapplication.php:267 -#, fuzzy msgid "Could not create application." -msgstr "Não foi possível criar sinónimos." +msgstr "Não foi possível criar a aplicação." #: actions/newgroup.php:53 msgid "New group" @@ -2239,12 +2381,12 @@ msgstr "Use este formulário para criar um grupo novo." msgid "New message" msgstr "Mensagem nova" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Não pode enviar uma mensagem a este utilizador." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Sem conteúdo!" @@ -2252,7 +2394,7 @@ msgstr "Sem conteúdo!" msgid "No recipient specified." msgstr "Não especificou um destinatário." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio." @@ -2266,7 +2408,7 @@ msgstr "Mensagem enviada" msgid "Direct message to %s sent." msgstr "Mensagem directa para %s foi enviada." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Erro do Ajax" @@ -2274,7 +2416,7 @@ msgstr "Erro do Ajax" msgid "New notice" msgstr "Nota nova" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Nota publicada" @@ -2340,69 +2482,72 @@ msgid "Nudge sent!" msgstr "Toque enviado!" #: actions/oauthappssettings.php:59 -#, fuzzy msgid "You must be logged in to list your applications." -msgstr "Precisa de iniciar sessão para editar um grupo." +msgstr "Tem de iniciar uma sessão para listar as suas aplicações." #: actions/oauthappssettings.php:74 -#, fuzzy msgid "OAuth applications" -msgstr "Outras opções" +msgstr "Aplicações OAuth" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "Aplicações que registou" #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "Ainda não registou nenhuma aplicação." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" -msgstr "" +msgstr "Aplicações ligadas" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." -msgstr "" +msgstr "Permitiu que as seguintes aplicações acedam à sua conta." #: actions/oauthconnectionssettings.php:175 -#, fuzzy msgid "You are not a user of that application." -msgstr "Não é um membro desse grupo." +msgstr "Não é utilizador dessa aplicação." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "" +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Não foi possível retirar acesso da aplicação: %s" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "Não permitiu que nenhuma aplicação use a sua conta." #: actions/oauthconnectionssettings.php:211 msgid "Developers can edit the registration settings for their applications " msgstr "" +"Programadores podem editar as configurações de inscrição das suas aplicações " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Nota não tem perfil" +msgid "Notice has no profile." +msgstr "Nota não tem perfil." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Estado de %1$s em %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "tipo de conteúdo " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "O tipo de conteúdo %s não é suportado." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Apenas " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Só URLs %s sobre HTTP simples, por favor." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2415,9 +2560,8 @@ msgid "Notice Search" msgstr "Pesquisa de Notas" #: actions/othersettings.php:60 -#, fuzzy msgid "Other settings" -msgstr "Outras Configurações" +msgstr "Outras configurações" #: actions/othersettings.php:71 msgid "Manage various other options." @@ -2448,34 +2592,29 @@ msgid "URL shortening service is too long (max 50 chars)." msgstr "Serviço de encurtamento de URLs demasiado extenso (máx. 50 caracteres)" #: actions/otp.php:69 -#, fuzzy msgid "No user ID specified." -msgstr "Não foi especificado um grupo." +msgstr "Não foi especificado um ID de utilizador." #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "Nota não foi especificada." +msgstr "Chave de entrada não foi especificada." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "O pedido não tem a identificação do perfil." +msgstr "Chave de entrada não foi pedida." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "Chave inválida ou expirada." +msgstr "Chave de entrada especificada é inválida." #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "Iniciar sessão no site" +msgstr "Chave de entrada expirou." #: actions/outbox.php:58 -#, fuzzy, php-format +#, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "Caixa de saída de %s" +msgstr "Caixa de saída de %s - página %2$d" #: actions/outbox.php:61 #, php-format @@ -2512,7 +2651,7 @@ msgid "6 or more characters" msgstr "6 ou mais caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Confirmação" @@ -2540,7 +2679,7 @@ msgstr "Senha antiga incorrecta." msgid "Error saving user; invalid." msgstr "Erro ao guardar utilizador; inválido." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Não é possível guardar a nova senha." @@ -2549,7 +2688,7 @@ msgid "Password saved." msgstr "Senha gravada." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Localizações" @@ -2559,23 +2698,23 @@ msgstr "Configurações de localização e servidor deste site StatusNet." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Sem acesso de leitura do directório do tema: %s" +msgid "Theme directory not readable: %s." +msgstr "Sem acesso de leitura do directório do tema: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Sem acesso de escrita no directório do avatar: %s" +msgid "Avatar directory not writable: %s." +msgstr "Sem acesso de escrita no directório do avatar: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Sem acesso de escrita no directório do fundo: %s" +msgid "Background directory not writable: %s." +msgstr "Sem acesso de escrita no directório do fundo: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Sem acesso de leitura ao directório de idiomas: %s" +msgid "Locales directory not readable: %s." +msgstr "Sem acesso de leitura ao directório de idiomas: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2715,19 +2854,19 @@ msgstr "" msgid "People search" msgstr "Pesquisa de pessoas" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Categoria de pessoas inválida: %s" +msgid "Not a valid people tag: %s." +msgstr "Categoria de pessoas inválida: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Utilizadores auto-categorizados com %1$s - página %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Conteúdo da nota é inválido" +msgid "Invalid notice content." +msgstr "Conteúdo da nota é inválido." #: actions/postnotice.php:101 #, php-format @@ -2755,13 +2894,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome completo" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Página pessoal" @@ -2783,9 +2923,9 @@ msgid "Bio" msgstr "Biografia" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Localidade" @@ -2799,7 +2939,7 @@ msgstr "Compartilhar a minha localização presente ao publicar notas" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Categorias" @@ -2872,8 +3012,8 @@ msgstr "Configurações gravadas." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Além do limite de página (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Além do limite de página (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2982,7 +3122,7 @@ msgstr "Já tem uma sessão iniciada!" #: actions/recoverpassword.php:62 msgid "No such recovery code." -msgstr "Esse código de recuperação não existe." +msgstr "Código de recuperação não foi encontrado." #: actions/recoverpassword.php:66 msgid "Not a recovery code." @@ -3043,7 +3183,7 @@ msgstr "Reiniciar senha" msgid "Recover password" msgstr "Recuperar senha" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Solicitada recuperação da senha" @@ -3063,20 +3203,20 @@ msgstr "Reiniciar" msgid "Enter a nickname or email address." msgstr "Introduza uma utilizador ou um endereço de correio electrónico." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" "Não existe nenhum utilizador com esse correio electrónico nem com esse nome." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Nenhum endereço de email registado para esse utilizador." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Erro ao guardar confirmação do endereço." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3084,23 +3224,23 @@ msgstr "" "Instruções para recuperação da sua senha foram enviadas para o correio " "electrónico registado na sua conta." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Reinício inesperado da senha." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Senha tem de ter 6 ou mais caracteres." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "A senha e a confirmação não coincidem." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Erro ao configurar utilizador." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão." @@ -3116,7 +3256,7 @@ msgstr "Desculpe, código de convite inválido." msgid "Registration successful" msgstr "Registo efectuado" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registar" @@ -3138,7 +3278,7 @@ msgstr "Nome de utilizador ou senha inválidos." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Com este formulário pode criar uma conta nova. Poderá então publicar notas e " @@ -3157,8 +3297,9 @@ msgstr "6 ou mais caracteres. Obrigatório." msgid "Same as password above. Required." msgstr "Repita a senha acima. Obrigatório." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Correio" @@ -3171,22 +3312,16 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\"" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Os meus textos e ficheiros são disponibilizados nos termos da " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Atribuição 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -" excepto estes dados privados: senha, endereço de correio electrónico, " -"endereço de mensageiro instantâneo, número de telefone." +"Os meus textos e ficheiros são disponibilizados nos termos da %s excepto " +"estes dados privados: senha, endereço de correio electrónico, endereço de " +"mensageiro instantâneo, número de telefone." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3219,7 +3354,7 @@ msgstr "" "\n" "Obrigado por se ter registado e esperamos que se divirta usando este serviço." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3264,7 +3399,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL do seu perfil noutro serviço de microblogues compatível" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Subscrever" @@ -3302,7 +3437,7 @@ msgstr "Não pode repetir a sua própria nota." msgid "You already repeated that notice." msgstr "Já repetiu essa nota." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Repetida" @@ -3317,9 +3452,9 @@ msgid "Replies to %s" msgstr "Respostas a %s" #: actions/replies.php:128 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "Respostas a %1$s em %2$s!" +msgstr "Respostas a %1$s, página %2$d" #: actions/replies.php:145 #, php-format @@ -3369,14 +3504,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Respostas a %1$s em %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Não pode silenciar utilizadores neste site." +msgstr "Não pode retirar funções aos utilizadores neste site." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Utilizador sem perfil correspondente." +msgstr "O utilizador não tem esta função." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3392,14 +3525,13 @@ msgstr "Utilizador já está impedido de criar notas públicas." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sessões" #: actions/sessionsadminpanel.php:65 -#, fuzzy msgid "Session settings for this StatusNet site." -msgstr "Configurações do estilo deste site StatusNet." +msgstr "Configurações da sessão para este site StatusNet." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" @@ -3423,92 +3555,94 @@ msgid "Save site settings" msgstr "Gravar configurações do site" #: actions/showapplication.php:82 -#, fuzzy msgid "You must be logged in to view an application." -msgstr "Precisa de iniciar uma sessão para deixar um grupo." +msgstr "Tem de iniciar uma sessão para ver uma aplicação." #: actions/showapplication.php:157 -#, fuzzy msgid "Application profile" -msgstr "Nota não tem perfil" +msgstr "Perfil da aplicação" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" -msgstr "" +msgstr "Ícone" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Nome" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 -#, fuzzy +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" -msgstr "Paginação" +msgstr "Organização" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descrição" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Estatísticas" #: actions/showapplication.php:203 #, php-format msgid "Created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "Criado por %1$s - acesso por omissão %2$s - %3$d utilizadores" #: actions/showapplication.php:213 msgid "Application actions" -msgstr "" +msgstr "Operações da aplicação" #: actions/showapplication.php:236 msgid "Reset key & secret" -msgstr "" +msgstr "Reiniciar chave e segredo" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Informação da aplicação" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Chave do consumidor" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Segredo do consumidor" #: actions/showapplication.php:273 msgid "Request token URL" -msgstr "" +msgstr "URL da chave de pedido" #: actions/showapplication.php:278 msgid "Access token URL" -msgstr "" +msgstr "URL da chave de acesso" #: actions/showapplication.php:283 -#, fuzzy msgid "Authorize URL" -msgstr "Autor" +msgstr "Autorizar URL" #: actions/showapplication.php:288 msgid "" "Note: We support HMAC-SHA1 signatures. We do not support the plaintext " "signature method." msgstr "" +"Nota: Assinaturas HMAC-SHA1 são suportadas. O método de assinatura com texto " +"simples não é suportado." #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "Tem a certeza de que quer apagar esta nota?" +msgstr "" +"Tem a certeza de que quer reiniciar a sua chave e segredo de consumidor?" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "Notas favoritas de %s" +msgstr "Notas favoritas de %1$s, página %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3568,71 +3702,71 @@ msgid "%s group" msgstr "Grupo %s" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "Membros do grupo %1$s, página %2$d" +msgstr "Grupo %1$s, página %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Perfil do grupo" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Anotação" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" -msgstr "Sinónimos" +msgstr "Nomes alternativos" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Acções do grupo" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Fonte de notas do grupo %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Fonte de notas do grupo %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Fonte de notas do grupo %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF do grupo %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Membros" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nenhum)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Todos os membros" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Criado" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3648,7 +3782,7 @@ msgstr "" "[Registe-se agora](%%action.register%%) para se juntar a este grupo e a " "muitos mais! ([Saber mais](%%doc.help%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3661,7 +3795,7 @@ msgstr "" "programa de Software Livre [StatusNet](http://status.net/). Os membros deste " "grupo partilham mensagens curtas acerca das suas vidas e interesses. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Gestores" @@ -3693,14 +3827,14 @@ msgid " tagged %s" msgstr " categorizou %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "Perfis bloqueados de %1$s, página %2$d" +msgstr "%1$s, página %2$d" #: actions/showstream.php:122 #, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Feed de notas de %1$s com a categoria %2$s (RSS 1.0)" +msgstr "Fonte de notas de %1$s com a categoria %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3772,7 +3906,7 @@ msgstr "" #: actions/showstream.php:305 #, php-format msgid "Repeat of %s" -msgstr "Repetência de %s" +msgstr "Repetições de %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." @@ -3783,9 +3917,8 @@ msgid "User is already silenced." msgstr "O utilizador já está silenciado." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Configurações básicas para este site StatusNet." +msgstr "Configurações básicas para este site StatusNet" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." @@ -3801,12 +3934,12 @@ msgid "Unknown language \"%s\"." msgstr "Língua desconhecida \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "O valor mínimo de limite para o texto é 140 caracteres." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "O limite mínimo para o texto é 0 (sem limite)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." -msgstr "O limite de duplicados tem de ser 1 ou mais segundos." +msgid "Dupe limit must be one or more seconds." +msgstr "O limite de duplicados tem de ser um ou mais segundos." #: actions/siteadminpanel.php:221 msgid "General" @@ -3853,13 +3986,14 @@ msgid "Default timezone for the site; usually UTC." msgstr "Fuso horário por omissão, para o site; normalmente, UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" msgstr "Idioma do site, por omissão" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Idioma do site quando a sua detecção na configuração do browser não é " +"possível" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3884,76 +4018,98 @@ msgstr "" "mesma coisa outra vez." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Aviso do site" +msgstr "Aviso do Site" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Mensagem nova" +msgstr "Editar mensagem do site" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Não foi possível gravar as configurações do estilo." +msgstr "Não foi possível gravar o aviso do site." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "Tamanho máximo do aviso do site é 255 caracteres." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Aviso do site" +msgstr "Texto do aviso do site" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "Texto do aviso do site (máx. 255 caracteres; pode usar HTML)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Aviso do site" +msgstr "Gravar aviso do site" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Configurações de SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Pode receber SMSs do site %%site.name%% por correio electrónico." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "SMS não está disponível." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "Endereço SMS" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Número de telefone com serviço SMS activo já confirmado." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "A aguardar confirmação deste número de telefone." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Código de confirmação" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Introduza o código que recebeu no seu telefone." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Confirmar" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Número de telefone para SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Número de telefone, sem pontuação ou espaços, com código de área" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "Preferências de SMS" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3961,23 +4117,33 @@ msgstr "" "Enviem-me notas por SMS; compreendo que o meu operador poderá vir a facturar-" "me montantes exorbitantes." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Preferências de SMS gravadas." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Nenhum número de telefone." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Operador não foi seleccionado." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Esse já é o seu número de telefone." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Esse número de telefone já pertence a outro utilizador." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3986,23 +4152,40 @@ msgstr "" "no seu telefone se recebeu o código e as respectivas instruções de " "utilização." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Esse número de confirmação está errado." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Confirmação de SMS cancelada." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Esse número de telefone não é o seu." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Número de telefone para SMS foi removido." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Operador móvel" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Seleccione um operador" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -4012,20 +4195,20 @@ msgstr "" "electrónico mas não está listado, diga-nos enviando um correio electrónico " "para %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Nenhum código introduzido" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Instantâneos" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Alterar a configuração do site" +msgstr "Alterar a configuração do instantâneo" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -4040,7 +4223,7 @@ msgid "Invalid snapshot report URL." msgstr "URL para onde enviar instantâneos é inválida" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "Aleatoriamente, durante o acesso pela internet" #: actions/snapshotadminpanel.php:201 @@ -4072,32 +4255,28 @@ msgid "Snapshots will be sent to this URL" msgstr "Instantâneos serão enviados para esta URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Gravar configurações do site" +msgstr "Gravar configurações do instantâneo" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." msgstr "Não subscreveu esse perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Não foi possível gravar a subscrição." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "Esta operação só aceita pedidos POST." #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "Ficheiro não foi encontrado." +msgstr "Perfil não foi encontrado." #: actions/subscribe.php:117 -#, fuzzy msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "Não subscreveu esse perfil." +msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4184,18 +4363,18 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s não está a ouvir ninguém." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" #: actions/tag.php:69 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "Utilizadores auto-categorizados com %1$s - página %2$d" +msgstr "Notas categorizadas com %1$s, página %2$d" #: actions/tag.php:87 #, php-format @@ -4221,12 +4400,12 @@ msgstr "Argumento de identificação (ID) em falta." msgid "Tag %s" msgstr "Categoria %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Perfil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -4259,7 +4438,7 @@ msgstr "" #: actions/tagrss.php:35 msgid "No such tag." -msgstr "Categoria não existe." +msgstr "Categoria não foi encontrada." #: actions/twitapitrends.php:85 msgid "API method under construction." @@ -4278,7 +4457,7 @@ msgid "User is not silenced." msgstr "Utilizador não está silenciado." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "O pedido não tem a identificação do perfil." #: actions/unsubscribe.php:98 @@ -4295,7 +4474,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Utilizador" @@ -4317,7 +4495,8 @@ msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres." msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Subscrição predefinida é inválida: '%1$s' não é utilizador." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" @@ -4480,27 +4659,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Disfrute do seu cachorro-quente!" -#: actions/usergroups.php:64 -#, fuzzy, php-format +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 +#, php-format msgid "%1$s groups, page %2$d" -msgstr "Membros do grupo %1$s, página %2$d" +msgstr "Grupos de %1$s, página %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Procurar mais grupos" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s não é membro de nenhum grupo." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Tente [pesquisar grupos](%%action.groupsearch%%) e juntar-se a eles." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualizações de %1#s a %2$s!" @@ -4559,7 +4744,8 @@ msgstr "" msgid "Plugins" msgstr "Plugins" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Versão" @@ -4567,7 +4753,7 @@ msgstr "Versão" msgid "Author(s)" msgstr "Autores" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4576,36 +4762,32 @@ msgstr "" "Nenhum ficheiro pode ter mais de %d bytes e o que enviou tinha %d bytes. " "Tente carregar uma versão menor." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Um ficheiro desta dimensão excederia a sua quota de utilizador de %d bytes." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Um ficheiro desta dimensão excederia a sua quota mensal de %d bytes." #: classes/Group_member.php:41 -#, fuzzy msgid "Group join failed." -msgstr "Perfil do grupo" +msgstr "Entrada no grupo falhou." #: classes/Group_member.php:53 -#, fuzzy msgid "Not part of group." -msgstr "Não foi possível actualizar o grupo." +msgstr "Não faz parte do grupo." #: classes/Group_member.php:60 -#, fuzzy msgid "Group leave failed." -msgstr "Perfil do grupo" +msgstr "Saída do grupo falhou." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "Não foi possível actualizar o grupo." +msgstr "Não foi possível actualizar o grupo local." #: classes/Login_token.php:76 #, php-format @@ -4624,27 +4806,28 @@ msgstr "Não foi possível inserir a mensagem." msgid "Could not update message with new URI." msgstr "Não foi possível actualizar a mensagem com a nova URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" msgstr "Erro na base de dados ao inserir a marca: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Problema na gravação da nota. Demasiado longa." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Problema na gravação da nota. Utilizador desconhecido." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a " "alguns minutos." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4652,308 +4835,319 @@ msgstr "" "Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a " "publicar daqui a alguns minutos." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Está proibido de publicar notas neste site." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problema na gravação da nota." -#: classes/Notice.php:927 -#, fuzzy +#: classes/Notice.php:967 msgid "Problem saving group inbox." -msgstr "Problema na gravação da nota." +msgstr "Problema na gravação da caixa de entrada do grupo." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Foi bloqueado de fazer subscrições" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Já subscrito!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "O utilizador bloqueou-o." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Não subscrito!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Não foi possível apagar a auto-subscrição." -#: classes/Subscription.php:190 -#, fuzzy +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "Não foi possível apagar a subscrição." +msgstr "Não foi possível apagar a chave de subscrição OMB." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Não foi possível apagar a subscrição." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%1$s dá-lhe as boas-vindas, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Não foi possível criar o grupo." -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "Não foi possível configurar membros do grupo." +msgstr "Não foi possível configurar a URI do grupo." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Não foi possível configurar membros do grupo." -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "Não foi possível gravar a subscrição." +msgstr "Não foi possível gravar a informação do grupo local." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Modificar as suas definições de perfil" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Carregar um avatar" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Modificar a sua senha" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Alterar manuseamento de email" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Altere o estilo do seu perfil" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Outras" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Outras opções" -#: lib/action.php:144 -#, fuzzy, php-format -msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Outras" -#: lib/action.php:159 +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Página sem título" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Navegação primária deste site" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 -#, fuzzy +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e notas dos amigos" -#: lib/action.php:433 -#, fuzzy +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Pessoal" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 -#, fuzzy +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Altere o seu endereço electrónico, avatar, senha, perfil" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 -#, fuzzy +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Ligar aos serviços" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Ligar" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 -#, fuzzy +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Alterar a configuração do site" -#: lib/action.php:449 -#, fuzzy +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Gestor" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 -#, fuzzy, php-format +#: lib/action.php:455 +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Convidar amigos e colegas para se juntarem a si em %s" -#: lib/action.php:456 -#, fuzzy +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Convidar" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 -#, fuzzy +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Terminar esta sessão" -#: lib/action.php:465 -#, fuzzy +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Sair" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 -#, fuzzy +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Criar uma conta" -#: lib/action.php:473 -#, fuzzy +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Registar" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 -#, fuzzy +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Iniciar uma sessão" -#: lib/action.php:479 -#, fuzzy +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Entrar" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 -#, fuzzy +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Ajudem-me!" -#: lib/action.php:485 -#, fuzzy +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Ajuda" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 -#, fuzzy +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Procurar pessoas ou pesquisar texto" -#: lib/action.php:491 -#, fuzzy +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Pesquisa" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Aviso do site" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Vistas locais" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Aviso da página" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Navegação secundária deste site" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Ajuda" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Sobre" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "Termos" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Privacidade" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Código" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Contacto" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Emblema" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Licença de software do StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** é um serviço de microblogues. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** é um serviço de microblogues." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4964,67 +5158,89 @@ msgstr "" "disponibilizado nos termos da [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Licença de conteúdos do site" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "O conteúdo e dados do site %1$s são privados e confidenciais." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" +"Direitos de autor sobre o conteúdo e dados, detidos por %1$s. Todos os " +"direitos reservados." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. " +"Todos os direitos reservados." -#: lib/action.php:847 -msgid "All " -msgstr "Tudo " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" +"Todo o conteúdo e dados do site %1$s são disponibilizados nos termos da " +"licença %2$s." -#: lib/action.php:853 -msgid "license." -msgstr "licença." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Posteriores" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Anteriores" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" +"Era esperado um elemento raiz da fonte, mas foi recebido um documento XML " +"inteiro." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." -msgstr "" +msgstr "Ainda não é possível processar conteúdos remotos." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." -msgstr "" +msgstr "Ainda não é possível processar conteúdo XML embutido." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." -msgstr "" +msgstr "Ainda não é possível processar conteúdo Base64 embutido." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Não pode fazer alterações a este site." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Não são permitidas alterações a esse painel." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() não implementado." @@ -5034,163 +5250,189 @@ msgstr "showForm() não implementado." msgid "saveSettings() not implemented." msgstr "saveSettings() não implementado." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Não foi possível apagar a configuração do estilo." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Configuração básica do site" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 -#, fuzzy +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Site" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Configuração do estilo" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 -#, fuzzy +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Estilo" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 -#, fuzzy +#: lib/adminpanelaction.php:365 msgid "User configuration" -msgstr "Configuração das localizações" +msgstr "Configuração do utilizador" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Utilizador" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 -#, fuzzy +#: lib/adminpanelaction.php:373 msgid "Access configuration" -msgstr "Configuração do estilo" +msgstr "Configuração de acesso" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Configuração das localizações" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 -#, fuzzy +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" -msgstr "Configuração do estilo" +msgstr "Configuração das sessões" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 -#, fuzzy +#: lib/adminpanelaction.php:397 msgid "Edit site notice" -msgstr "Aviso do site" +msgstr "Editar aviso do site" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 -#, fuzzy +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "Configuração das localizações" +msgstr "Configuração dos instântaneos" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." -msgstr "" +msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" -msgstr "" +msgstr "Editar aplicação" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Ícone para esta aplicação" -#: lib/applicationeditform.php:204 -#, fuzzy, php-format +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 +#, php-format msgid "Describe your application in %d characters" -msgstr "Descreva o grupo ou o assunto em %d caracteres" +msgstr "Descreva a sua aplicação em %d caracteres" -#: lib/applicationeditform.php:207 -#, fuzzy +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" -msgstr "Descreva o grupo ou assunto" - -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Código" - -#: lib/applicationeditform.php:218 -#, fuzzy -msgid "URL of the homepage of this application" -msgstr "URL da página ou do blogue, deste grupo ou assunto" +msgstr "Descreva a sua aplicação" +#. TRANS: Form input field instructions. #: lib/applicationeditform.php:224 +msgid "URL of the homepage of this application" +msgstr "URL da página desta aplicação" + +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "URL de origem" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" -msgstr "" +msgstr "Organização responsável por esta aplicação" -#: lib/applicationeditform.php:230 -#, fuzzy +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" -msgstr "URL da página ou do blogue, deste grupo ou assunto" +msgstr "URL da página desta organização" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" -msgstr "" +msgstr "URL para onde reencaminhar após autenticação" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" -msgstr "" +msgstr "Browser" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" -msgstr "" - -#: lib/applicationeditform.php:275 -msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Desktop" +#. TRANS: Form guide. #: lib/applicationeditform.php:297 +msgid "Type of application, browser or desktop" +msgstr "Tipo da aplicação, browser ou desktop" + +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" -msgstr "" +msgstr "Leitura" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" -msgstr "" +msgstr "Leitura e escrita" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" -msgstr "" +msgstr "Acesso por omissão para esta aplicação: leitura ou leitura e escrita" -#: lib/applicationlist.php:154 -#, fuzzy +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Cancelar" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "leitura e escrita" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "leitura" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Aprovado a %1$s - acesso \"%2$s\"." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" -msgstr "Remover" +msgstr "Retirar" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Anexos" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Fornecedor" @@ -5210,37 +5452,56 @@ msgstr "Não foi possível mudar a palavra-chave" msgid "Password changing is not allowed" msgstr "Não é permitido mudar a palavra-chave" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultados do comando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando terminado" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Comando falhou" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Desculpe, este comando ainda não foi implementado." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Não existe nenhuma nota com essa identificação" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Utilizador não tem nenhuma última nota" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Não foi encontrado um utilizador com a alcunha %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Não foi encontrado um utilizador local com a alcunha %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Desculpe, este comando ainda não foi implementado." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Não faz muito sentido tocar-nos a nós mesmos!" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Cotovelada enviada a %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5251,199 +5512,203 @@ msgstr "" "Subscritores: %2$s\n" "Notas: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Não existe nenhuma nota com essa identificação" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Utilizador não tem nenhuma última nota" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Nota marcada como favorita." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Já é membro desse grupo" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Não foi possível juntar o utilizador %s ao grupo %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "Não foi possível juntar o utilizador %1$s ao grupo %2$s" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%s juntou-se ao grupo %s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Não foi possível remover %1$s do grupo %2$s" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Não foi possível remover o utilizador %s do grupo %s" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s deixou o grupo %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Localidade: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Página pessoal: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" +"%s é um perfil remoto; só pode enviar mensagens directas a utilizadores no " +"mesmo servidor." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Mensagem directa para %s enviada" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Erro no envio da mensagem directa." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Não pode repetir a sua própria nota" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Já repetiu essa nota" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Nota de %s repetida" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Erro ao repetir nota." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Resposta a %s enviada" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Erro ao gravar nota." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Introduza o nome do utilizador para subscrever" -#: lib/command.php:554 lib/command.php:589 -#, fuzzy -msgid "No such user" -msgstr "Utilizador não encontrado." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Não pode subscrever perfis OMB por comando." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Subscreveu %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Introduza o nome do utilizador para deixar de subscrever" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Deixou de subscrever %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Comando ainda não implementado." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Não foi possível desligar a notificação." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Não foi possível ligar a notificação." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "Comando para iniciar sessão foi desactivado" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %" "s" -#: lib/command.php:692 -#, fuzzy, php-format +#: lib/command.php:761 +#, php-format msgid "Unsubscribed %s" -msgstr "Deixou de subscrever %s" +msgstr "Deixou de subscrever %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Não subscreveu ninguém." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subscreveu esta pessoa:" msgstr[1] "Subscreveu estas pessoas:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Ninguém subscreve as suas notas." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Esta pessoa subscreve as suas notas:" msgstr[1] "Estas pessoas subscrevem as suas notas:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Não está em nenhum grupo." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Está no grupo:" msgstr[1] "Está nos grupos:" -#: lib/command.php:769 -#, fuzzy +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5496,6 +5761,7 @@ msgstr "" "d - mensagem directa para o utilizador\n" "get - receber última nota do utilizador\n" "whois - receber perfil do utilizador\n" +"lose - obrigar o utilizador a deixar de subscrevê-lo\n" "fav - adicionar última nota do utilizador às favoritas\n" "fav # - adicionar nota com esta identificação às favoritas\n" "repeat # - repetir uma nota com uma certa identificação\n" @@ -5522,19 +5788,19 @@ msgstr "" "tracks - ainda não implementado.\n" "tracking - ainda não implementado.\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Ficheiro de configuração não encontrado. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Procurei ficheiros de configuração nos seguintes sítios: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Talvez queira correr o instalador para resolver esta questão." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir para o instalador." @@ -5551,13 +5817,12 @@ msgid "Updates by SMS" msgstr "Actualizações por SMS" #: lib/connectsettingsaction.php:120 -#, fuzzy msgid "Connections" -msgstr "Ligar" +msgstr "Ligações" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "Aplicações ligadas autorizadas" #: lib/dberroraction.php:60 msgid "Database error" @@ -5637,7 +5902,7 @@ msgstr "Prosseguir" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Atribuir a este utilizador a função \"%s\"" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5708,56 +5973,57 @@ msgstr "Grupos com mais notas" msgid "Tags in %s group's notices" msgstr "Categorias nas notas do grupo %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Esta página não está disponível num formato que você aceite" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Formato do ficheiro da imagem não é suportado." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Esse ficheiro é demasiado grande. O tamanho máximo de ficheiro é %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Transferência parcial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Ocorreu um erro de sistema ao transferir o ficheiro." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Ficheiro não é uma imagem ou está corrompido." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato do ficheiro da imagem não é suportado." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Perdi o nosso ficheiro." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo do ficheiro é desconhecido" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 -#, fuzzy, php-format +#: lib/jabber.php:567 +#, php-format msgid "Unknown inbox source %d." -msgstr "Língua desconhecida \"%s\"." +msgstr "Origem da caixa de entrada desconhecida \"%s\"." #: lib/joinform.php:114 msgid "Join" @@ -5775,11 +6041,13 @@ msgstr "Iniciar sessão com um nome de utilizador e senha" msgid "Sign up for a new account" msgstr "Registar uma conta nova" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Confirmação do endereço electrónico" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5808,12 +6076,14 @@ msgstr "" "Obrigado pelo tempo que dedicou, \n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s está agora a ouvir as suas notas em %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5839,17 +6109,20 @@ msgstr "" "Altere o seu endereço de correio electrónico ou as opções de notificação em %" "8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Bio: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Novo endereço electrónico para publicar no site %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5870,21 +6143,31 @@ msgstr "" "Melhores cumprimentos,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Estado de %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Confirmação SMS" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "%s: confirme que este número de telefone é seu com este código:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "%s envia-lhe um toque" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5911,12 +6194,14 @@ msgstr "" "Graciosamente,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Nova mensagem privada de %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5949,12 +6234,14 @@ msgstr "" "Profusos cumprimentos,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) adicionou a sua nota às favoritas." -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5991,12 +6278,25 @@ msgstr "" "Sinceramente,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"O diálogo completo pode ser lido aqui:\n" +"\n" +"\t%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) enviou uma nota à sua atenção" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6009,18 +6309,42 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"%1$s (@%9$s) acaba de enviar uma nota à sua atenção (uma '@-resposta') em %2" +"%1$s (@%9$s) acaba de enviar uma nota à sua atenção (uma 'resposta-@') em %2" "$s.\n" "\n" -"a nota está aqui:\n" +"A nota está aqui:\n" "\n" -"%3$s\n" +"\t%3$s\n" "\n" -"E diz:\n" +"Diz:\n" "\n" -"%4$s\n" +"\t%4$s\n" "\n" +"%5$sPode responder aqui:\n" +"\n" +"\t%6$s\n" +"\n" +"A lista de todas as respostas-@ aqui:\n" +"\n" +"%7$s\n" +"\n" +"Atenciosamente,\n" +"%2$s\n" +"\n" +"P.S. Pode desligar estas notificações electrónicas aqui: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6035,7 +6359,7 @@ msgstr "" "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que " "só você terá acesso." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "de" @@ -6129,7 +6453,6 @@ msgid "Available characters" msgstr "Caracteres disponíveis" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Enviar" @@ -6156,58 +6479,63 @@ msgid "Share my location" msgstr "Partilhar a minha localização." #: lib/noticeform.php:215 -#, fuzzy msgid "Do not share my location" -msgstr "Não partilhar a minha localização." +msgstr "Não partilhar a minha localização" #: lib/noticeform.php:216 msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"A obtenção da sua geolocalização está a demorar mais do que o esperado; " +"tente novamente mais tarde" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "S" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "E" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "O" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "coords." -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "no contexto" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Responder a esta nota" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Nota repetida" @@ -6231,6 +6559,10 @@ msgstr "Erro ao inserir perfil novo" msgid "Error inserting avatar" msgstr "Erro ao inserir avatar" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Erro ao actualizar o perfil remoto" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Erro ao inserir perfil remoto" @@ -6280,7 +6612,7 @@ msgstr "Categorias nas notas de %s" msgid "Unknown" msgstr "Desconhecida" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscrições" @@ -6288,31 +6620,32 @@ msgstr "Subscrições" msgid "All subscriptions" msgstr "Todas as subscrições" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscritores" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Todos os subscritores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ID do utilizador" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Membro desde" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Média diária" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Todos os grupos" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Sem argumentos return-to." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Método não implementado." @@ -6336,22 +6669,30 @@ msgstr "Destaques" msgid "Popular" msgstr "Populares" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Sem argumentos return-to." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Repetir esta nota?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Sim" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Repetir esta nota" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Bloquear acesso deste utilizador a este grupo" +msgstr "Retirar a função \"%s\" a este utilizador" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." -msgstr "" +msgstr "Nenhum utilizador único definido para o modo de utilizador único." #: lib/sandboxform.php:67 msgid "Sandbox" @@ -6475,92 +6816,108 @@ msgstr "Deixar de subscrever este utilizador" msgid "Unsubscribe" msgstr "Abandonar" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "Utilizador %s (%d) não tem perfil." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Editar Avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Acções do utilizador" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "A apagar o utilizador..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Editar configurações do perfil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Editar" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Enviar mensagem directa a este utilizador" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Mensagem" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Moderar" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "Perfil" +msgstr "Função" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Gestores" +msgstr "Gestor" -#: lib/userprofile.php:355 -#, fuzzy +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "Moderar" +msgstr "Moderador" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "há alguns segundos" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "há cerca de um minuto" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "há cerca de %d minutos" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "há cerca de uma hora" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "há cerca de %d horas" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "há cerca de um dia" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "há cerca de %d dias" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "há cerca de um mês" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "há cerca de %d meses" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "há cerca de um ano" @@ -6574,7 +6931,7 @@ msgstr "%s não é uma cor válida!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d." diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 51d926ebab..4263dde6b5 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -2,6 +2,7 @@ # # Author@translatewiki.net: Aracnus # Author@translatewiki.net: Ewout +# Author@translatewiki.net: Luckas Blade # Author@translatewiki.net: McDutchie # Author@translatewiki.net: Vuln # -- @@ -11,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:51+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:12+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -24,7 +25,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Acesso" @@ -45,10 +46,9 @@ msgstr "Impedir usuários anônimos (não autenticados) de visualizar o site?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" -msgstr "Particular" +msgstr "Privado" #. TRANS: Checkbox instructions for admin setting "Invite only" #: actions/accessadminpanel.php:174 @@ -75,8 +75,13 @@ msgstr "Fechado" msgid "Save access settings" msgstr "Salvar as configurações de acesso" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Salvar" @@ -84,7 +89,7 @@ msgstr "Salvar" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +msgid "No such page." msgstr "Esta página não existe." #: actions/all.php:75 actions/allrss.php:68 @@ -95,9 +100,9 @@ msgstr "Esta página não existe." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -105,11 +110,9 @@ msgstr "Esta página não existe." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Este usuário não existe." @@ -121,8 +124,9 @@ msgstr "%1$s e amigos, pág. %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -189,8 +193,10 @@ msgstr "" msgid "You and friends" msgstr "Você e amigos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Atualizações de %1$s e amigos no %2$s!" @@ -205,18 +211,18 @@ msgstr "Atualizações de %1$s e amigos no %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "O método da API não foi encontrado!" @@ -229,18 +235,18 @@ msgstr "O método da API não foi encontrado!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Este método requer um POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" -"Você pode especificar um parâmetro denominado 'device', com um dos valores: " -"sms, im, none" +"Você tem que especificar um parâmetro denominado 'device', com um desses " +"valores: sms, im, none" #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -251,7 +257,7 @@ msgstr "Não foi possível atualizar o usuário." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "O usuário não tem perfil." @@ -261,9 +267,9 @@ msgid "Could not save profile." msgstr "Não foi possível salvar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -349,7 +355,7 @@ msgstr "Não foi encontrado nenhum status com esse ID." msgid "This status is already a favorite." msgstr "Esta mensagem já é favorita!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Não foi possível criar a favorita." @@ -441,11 +447,10 @@ msgstr "Localização muito extensa (máx. 255 caracteres)." msgid "Too many aliases! Maximum %d." msgstr "Muitos apelidos! O máximo são %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Apelido inválido: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Apelido inválido: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -461,14 +466,14 @@ msgstr "O apelido não pode ser igual à identificação." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "O grupo não foi encontrado!" +msgid "Group not found." +msgstr "O grupo não foi encontrado." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Você já é membro desse grupo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "O administrador desse grupo bloqueou sua inscrição." @@ -486,17 +491,26 @@ msgstr "Você não é membro deste grupo." msgid "Could not remove user %1$s from group %2$s." msgstr "Não foi possível remover o usuário %1$s do grupo %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Grupos de %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Grupos de %1$s nos quais %2$s é membro." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Grupos de %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "grupos no %s" @@ -510,17 +524,17 @@ msgid "Invalid token." msgstr "Token inválido." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -556,12 +570,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "O token %s solicitado foi negado e revogado." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Submissão inesperada de formulário." @@ -585,20 +602,22 @@ msgstr "" "fornecer acesso à sua conta %4$s somente para terceiros nos quais você " "confia." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Conta" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Usuário" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Senha" @@ -629,7 +648,7 @@ msgstr "Essa mensagem não existe." #: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." -msgstr "Você não pode repetria sua própria mensagem." +msgstr "Você não pode repetir a sua própria mensagem." #: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." @@ -643,17 +662,17 @@ msgstr "A mensagem foi excluída." msgid "No status with that ID found." msgstr "Não foi encontrada nenhuma mensagem com esse ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Está muito extenso. O tamanho máximo é de %s caracteres." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Não encontrado" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Não encontrado." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "O tamanho máximo da mensagem é de %s caracteres" @@ -662,12 +681,12 @@ msgstr "O tamanho máximo da mensagem é de %s caracteres" msgid "Unsupported format." msgstr "Formato não suportado." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritas de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s marcadas como favoritas por %2$s / %2$s." @@ -677,17 +696,17 @@ msgstr "%1$s marcadas como favoritas por %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Mensagens mencionando %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Mensagens públicas de %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s mensagens de todo mundo!" @@ -702,20 +721,16 @@ msgstr "Repetida para %s" msgid "Repeats of %s" msgstr "Repetições de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Mensagens etiquetadas como %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mensagens etiquetadas como %1$s no %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Não encontrado." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Este anexo não existe." @@ -735,8 +750,9 @@ msgstr "Sem tamanho definido." msgid "Invalid size." msgstr "Tamanho inválido." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -747,9 +763,9 @@ msgstr "" "Você pode enviar seu avatar pessoal. O tamanho máximo do arquivo é de %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." msgstr "Usuário sem um perfil correspondente" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -768,7 +784,7 @@ msgid "Preview" msgstr "Visualização" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Excluir" @@ -780,23 +796,27 @@ msgstr "Enviar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Não foi enviado nenhum arquivo." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Selecione uma área quadrada da imagem para ser seu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Os dados do nosso arquivo foram perdidos." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "O avatar foi atualizado." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Não foi possível atualizar o avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "O avatar foi excluído." @@ -804,7 +824,7 @@ msgstr "O avatar foi excluído." msgid "You already blocked that user." msgstr "Você já bloqueou esse usuário." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquear usuário" @@ -819,27 +839,42 @@ msgstr "" "nenhuma notificação acerca de qualquer citação (@usuário) que ele fizer de " "você." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Não" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Não bloquear este usuário" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Sim" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloquear este usuário" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Não foi possível salvar a informação de bloqueio." @@ -852,8 +887,8 @@ msgstr "Não foi possível salvar a informação de bloqueio." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Esse grupo não existe." @@ -883,9 +918,11 @@ msgstr "Desbloquear" msgid "Unblock this user" msgstr "Desbloquear este usuário" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Enviar para " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Publicar em %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -899,33 +936,43 @@ msgstr "O código de confirmação não foi encontrado." msgid "That confirmation code is not for you!" msgstr "Esse não é o seu código de confirmação!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Tipo de endereço desconhecido %s" +msgid "Unrecognized address type %s." +msgstr "Tipo de endereço %s não reconhecido." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Esse endereço já foi confirmado." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Não foi possível atualizar o usuário." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Não foi possível excluir a confirmação de e-mail." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Confirme o endereço" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "O endereço \"%s\" foi confirmado para sua conta." @@ -935,7 +982,7 @@ msgid "Conversation" msgstr "Conversa" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Mensagens" @@ -954,7 +1001,7 @@ msgstr "Você não é o dono desta aplicação." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Ocorreu um problema com o seu token de sessão." @@ -972,15 +1019,17 @@ msgstr "" "desta aplicação do banco de dados, incluindo todas as conexões existentes " "com os usuários." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Não excluir esta aplicação" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Excluir esta aplicação" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1011,11 +1060,13 @@ msgstr "Excluir a mensagem" msgid "Are you sure you want to delete this notice?" msgstr "Tem certeza que deseja excluir esta mensagem?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Não excluir esta mensagem." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Excluir esta mensagem" @@ -1039,58 +1090,61 @@ msgstr "" "Tem certeza que deseja excluir este usuário? Isso eliminará todos os dados " "deste usuário do banco de dados, sem cópia de segurança." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Excluir este usuário" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Aparência" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Configurações da aparência deste site StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "A URL da logo é inválida." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Tema não disponível: %s" +msgid "Theme not available: %s." +msgstr "Tema não disponível: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Alterar a logo" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Logo do site" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Alterar o tema" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Tema do site" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Tema para o site." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Alterar imagem do fundo" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Fundo" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1099,67 +1153,68 @@ msgstr "" "Você pode enviar uma imagem de fundo para o site. O tamanho máximo do " "arquivo é de %1 $s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Ativado" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Desativado" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Ativar/desativar a imagem de fundo." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Ladrilhar a imagem de fundo" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Alterar a cor" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Conteúdo" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Barra lateral" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Texto" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Links" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Usar o padrão|" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Restaura a aparência padrão" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Restaura de volta ao padrão" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Salvar" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Salvar a aparência" @@ -1264,11 +1319,16 @@ msgstr "Use esse formulário para editar o grupo." msgid "description is too long (max %d chars)." msgstr "descrição muito extensa (máximo %d caracteres)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Apelido inválido: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Não foi possível atualizar o grupo." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Não foi possível criar os apelidos." @@ -1276,31 +1336,42 @@ msgstr "Não foi possível criar os apelidos." msgid "Options saved." msgstr "As configurações foram salvas." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Configurações do e-mail" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Configure o recebimento de e-mails de %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Endereço" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Endereço de e-mail" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Endereço de e-mail já confirmado." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Remover" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1308,110 +1379,140 @@ msgstr "" "Aguardando a confirmação deste endereço. Procure em sua caixa de entrada (e " "de spam!) por uma mensagem com mais instruções." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Cancelar" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Endereço de e-mail" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Adicionar" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "E-mail de recebimento" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Envie e-mails para esse endereço para publicar novas mensagens." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Novo" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Preferências" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Preferências de e-mail" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Envie-me notificações de novos assinantes por e-mail." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "Envie-me um e-mail quando alguém adicionar alguma mensagem minha como " "favorita." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Envie-me um e-mail quando alguém me mandar uma mensagem particular." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" "Envie-me um e-mail quando alguém mandar uma mensagem citando meu nome " "(\"@nome\")." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Permita que meus amigos chamem minha atenção e enviem-me e-mails." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Eu quero publicar mensagens por e-mail." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publique um MicroID para meu endereço de e-mail." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "As preferências foram salvas." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "As configurações de e-mail foram salvas." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Nenhum endereço de e-mail." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Não foi possível normalizar este endereço de e-mail" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Não é um endereço de e-mail válido." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Esse já é seu endereço de e-mail." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Esse endereço de e-mail já pertence à outro usuário." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Não foi possível inserir o código de confirmação." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1420,43 +1521,55 @@ msgstr "" "informou. Verifique a sua caixa de entrada (e de spam!) para o código e " "instruções sobre como usá-lo." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Nenhuma confirmação pendente para cancelar." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Isso é um endereço de MI errado." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Esse é o endereço de e-mail errado." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "A confirmação foi cancelada." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Esse não é seu endereço de email." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "O endereço foi removido." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Nenhum endereço de e-mail para recebimentos." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Não foi possível atualizar o registro do usuário." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "O endereço de e-mail de recebimento foi removido." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" "Foi adicionado um novo endereço de e-mail para recebimento de mensagens." @@ -1576,8 +1689,9 @@ msgstr "Não foi possível converter o token de requisição para token de acess msgid "Remote service uses unknown version of OMB protocol." msgstr "O serviço remoto usa uma versão desconhecida do protocolo OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "Ocorreu um erro na atualização do perfil remoto" #: actions/getfile.php:79 @@ -1589,23 +1703,20 @@ msgid "Cannot read file." msgstr "Não foi possível ler o arquivo." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Token inválido." +msgstr "Papel inválido." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Este papel está reservado e não pode ser definido." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Você não pode colocar usuários deste site em isolamento." +msgstr "Você não pode definir papéis para os usuários neste site." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "O usuário já está silenciado." +msgstr "O usuário já possui este papel." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1636,11 +1747,11 @@ msgstr "O usuário já está bloqueado no grupo." msgid "User is not a member of group." msgstr "O usuário não é um membro do grupo" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Bloquear o usuário no grupo" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1651,15 +1762,17 @@ msgstr "" "será removido do grupo e impossibilitado de publicar e de se juntar ao grupo " "futuramente." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Não bloquear este usuário neste grupo" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Bloquear este usuário neste grupo" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" "Ocorreu um erro no banco de dados ao tentar bloquear o usuário no grupo." @@ -1705,10 +1818,6 @@ msgstr "" "Você pode enviar uma imagem de logo para o seu grupo. O tamanho máximo do " "arquivo é %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Usuário sem um perfil correspondente" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Selecione uma área quadrada da imagem para definir a logo" @@ -1739,34 +1848,38 @@ msgstr "Uma lista dos usuários deste grupo." msgid "Admin" msgstr "Admin" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Tornar o usuário um administrador do grupo" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Tornar administrador" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Torna este usuário um administrador" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Mensagens de %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Atualizações dos membros de %1$s no %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupos" @@ -1791,7 +1904,7 @@ msgstr "" "\". Não encontrou um grupo que lhe agrade? Experimente [procurar por um](%%%%" "action.groupsearch%%%%) ou [criar o seu próprio!](%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Criar um novo grupo" @@ -1843,11 +1956,15 @@ msgstr "O usuário não está bloqueado no grupo." msgid "Error removing the block." msgstr "Erro na remoção do bloqueio." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Configurações do MI" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1856,15 +1973,24 @@ msgstr "" "Você pode enviar e receber mensagens através dos [mensageiros instantâneos](%" "%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "MI não está disponível" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Endereço do MI" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Endereço de Jabber/GTalk já confirmado." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1874,11 +2000,9 @@ msgstr "" "GTalk por uma mensagem com mais instruções (Você adicionou %s à sua lista de " "contatos?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "Endereço do MI" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1888,45 +2012,67 @@ msgstr "" "certifique-se de adicionar %s à sua lista de contatos em seu cliente de MI " "ou no GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Preferências" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Envie-me mensagens via Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Envie-me respostas de pessoas que eu não estou assinando através do Jabber/" "GTalk." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "As preferências foram salvas." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Nenhuma ID de Jabber." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Não foi possível normalizar essa ID do Jabber" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Não é uma ID de Jabber válida" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Essa já é sua ID do Jabber." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Esta ID do Jabber já pertence à outro usuário." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1935,10 +2081,35 @@ msgstr "" "Um código de confirmação foi enviado para o endereço de IM que você " "informou. Você deve permitir que %s envie mensagens para você." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Isso é um endereço de MI errado." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Não foi possível excluir a confirmação de e-mail." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "A confirmação foi cancelada." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Essa não é sua ID do Jabber." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "O endereço foi removido." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1960,8 +2131,8 @@ msgid "Invites have been disabled." msgstr "Os convites foram desabilitados." #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "" "Você deve estar autenticado para convidar outros usuários para usar o %s" @@ -1982,7 +2153,9 @@ msgstr "Convidar novos usuários" msgid "You are already subscribed to these users:" msgstr "Você já está assinando esses usuários:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2029,17 +2202,18 @@ msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Enviar" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s convidou você para se juntar a %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2101,11 +2275,12 @@ msgid "You must be logged in to join a group." msgstr "Você deve estar autenticado para se associar a um grupo." #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Nenhuma identificação." +msgstr "Nenhum apelido ou identificação." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s associou-se ao grupo %2$s" @@ -2114,11 +2289,13 @@ msgstr "%1$s associou-se ao grupo %2$s" msgid "You must be logged in to leave a group." msgstr "Você deve estar autenticado para sair de um grupo." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Você não é um membro desse grupo." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s deixou o grupo %2$s" @@ -2167,10 +2344,14 @@ msgstr "" "senha antes de alterar suas configurações." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Autentique-se com um nome de usuário e uma senha" + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Digite seu nome de usuário e senha. Ainda não possui um usuário? [Registre](%" "%action.register%%) uma nova conta." @@ -2197,7 +2378,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Não foi possível tornar %1$s um administrador do grupo %2$s." #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "Nenhuma mensagem atual" #: actions/newapplication.php:52 @@ -2232,12 +2414,12 @@ msgstr "Utilize este formulário para criar um novo grupo." msgid "New message" msgstr "Nova mensagem" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Você não pode enviar mensagens para este usuário." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Nenhum conteúdo!" @@ -2245,7 +2427,7 @@ msgstr "Nenhum conteúdo!" msgid "No recipient specified." msgstr "Não foi especificado nenhum destinatário." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2261,7 +2443,7 @@ msgstr "A mensagem foi enviada" msgid "Direct message to %s sent." msgstr "A mensagem direta para %s foi enviada." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Erro no Ajax" @@ -2269,7 +2451,7 @@ msgstr "Erro no Ajax" msgid "New notice" msgstr "Nova mensagem" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "A mensagem foi publicada" @@ -2365,11 +2547,11 @@ msgid "You are not a user of that application." msgstr "Você não é um usuário dessa aplicação." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, fuzzy, php-format +msgid "Unable to revoke access for app: %s." msgstr "Não foi possível revogar o acesso para a aplicação: " #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "Você não autorizou nenhuma aplicação a usar a sua conta." @@ -2380,24 +2562,30 @@ msgstr "" "aplicações " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "A mensagem não está associada a nenhum perfil" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Mensagem de %1$s no %2$s" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "tipo de conteúdo " -#: actions/oembed.php:160 -msgid "Only " -msgstr "Apenas " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Não é um formato de dados suportado." @@ -2502,7 +2690,7 @@ msgid "6 or more characters" msgstr "No mínimo 6 caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Confirmar" @@ -2530,7 +2718,7 @@ msgstr "A senha anterior está errada" msgid "Error saving user; invalid." msgstr "Erro ao salvar usuário; inválido." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Não é possível salvar a nova senha." @@ -2539,7 +2727,7 @@ msgid "Password saved." msgstr "A senha foi salva." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Caminhos" @@ -2548,23 +2736,23 @@ msgid "Path and server settings for this StatusNet site." msgstr "Configurações dos caminhos e do servidor para este site StatusNet." #: actions/pathsadminpanel.php:157 -#, php-format -msgid "Theme directory not readable: %s" +#, fuzzy, php-format +msgid "Theme directory not readable: %s." msgstr "Sem permissão de leitura no diretório de temas: %s" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." msgstr "Sem permissão de escrita no diretório de avatares: %s" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" +#, fuzzy, php-format +msgid "Background directory not writable: %s." msgstr "Sem permissão de escrita no diretório de imagens de fundo: %s" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." msgstr "Sem permissão de leitura no diretório de locales: %s" #: actions/pathsadminpanel.php:183 @@ -2705,18 +2893,19 @@ msgstr "" msgid "People search" msgstr "Procurar pessoas" -#: actions/peopletag.php:70 -#, php-format -msgid "Not a valid people tag: %s" +#: actions/peopletag.php:68 +#, fuzzy, php-format +msgid "Not a valid people tag: %s." msgstr "Não é uma etiqueta de pessoa válida: %s" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "O conteúdo da mensagem é inválido" #: actions/postnotice.php:101 @@ -2745,13 +2934,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome completo" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Site" @@ -2773,9 +2963,9 @@ msgid "Bio" msgstr "Descrição" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Localização" @@ -2789,7 +2979,7 @@ msgstr "Compartilhe minha localização atual ao publicar mensagens" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Etiquetas" @@ -2862,8 +3052,8 @@ msgid "Settings saved." msgstr "As configurações foram salvas." #: actions/public.php:83 -#, php-format -msgid "Beyond the page limit (%s)" +#, fuzzy, php-format +msgid "Beyond the page limit (%s)." msgstr "Além do limite da página (%s)" #: actions/public.php:92 @@ -3032,7 +3222,7 @@ msgstr "Restaurar a senha" msgid "Recover password" msgstr "Recuperar a senha" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Foi solicitada a recuperação da senha" @@ -3052,21 +3242,21 @@ msgstr "Restaurar" msgid "Enter a nickname or email address." msgstr "Digite a identificação ou endereço de e-mail." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" "Não foi encontrado nenhum usuário com essa identificação ou endereço de " "email." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Nenhum endereço de e-mail registrado para esse usuário." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Erro ao salvar o endereço de confirmação." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3074,23 +3264,23 @@ msgstr "" "As instruções para recuperar a sua senha foram enviadas para o endereço de e-" "mail informado no seu cadastro." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Restauração inesperada da senha." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "A senha deve ter 6 ou mais caracteres." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "A senha e a confirmação não coincidem." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Erro na configuração do usuário." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" "A nova senha foi salva com sucesso. A partir de agora você já está " @@ -3108,7 +3298,7 @@ msgstr "Desculpe, mas o código do convite é inválido." msgid "Registration successful" msgstr "Registro realizado com sucesso" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrar-se" @@ -3129,8 +3319,9 @@ msgid "Invalid username or password." msgstr "Nome de usuário e/ou senha inválido(s)" #: actions/register.php:343 +#, fuzzy msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Através deste formulário você pode criar uma nova conta. A partir daí você " @@ -3149,8 +3340,9 @@ msgstr "No mínimo 6 caracteres. Obrigatório." msgid "Same as password above. Required." msgstr "Igual à senha acima. Obrigatório." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mail" @@ -3163,22 +3355,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, de preferência seu nome \"real\"" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Meus textos e arquivos estão disponíveis sob " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Attribution 3.0" - -#: actions/register.php:497 +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" " exceto estes dados particulares: senha, endereço de e-mail, endereço de MI " "e número de telefone." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3211,7 +3396,7 @@ msgstr "" "\n" "Obrigado por se registrar e esperamos que você aproveite o serviço." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3256,7 +3441,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL do seu perfil em outro serviço de microblog compatível" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Assinar" @@ -3293,7 +3478,7 @@ msgstr "Você não pode repetir sua própria mensagem." msgid "You already repeated that notice." msgstr "Você já repetiu essa mensagem." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Repetida" @@ -3361,14 +3546,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Respostas para %1$s no %2$s" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Você não pode silenciar os usuários neste site." +msgstr "Não é possível revogar os papéis dos usuários neste site." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Usuário sem um perfil correspondente" +msgstr "O usuário não possui este papel." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3384,7 +3567,7 @@ msgstr "O usuário já está em isolamento." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sessões" @@ -3398,7 +3581,7 @@ msgstr "Gerenciar sessões" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "Define se nós cuidamos do gerenciamento das sessões." +msgstr "Define se as sessões terão gerenciamento próprio." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" @@ -3421,26 +3604,30 @@ msgstr "Você deve estar autenticado para visualizar uma aplicação." msgid "Application profile" msgstr "Perfil da aplicação" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Ícone" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Nome" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organização" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descrição" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Estatísticas" @@ -3560,67 +3747,67 @@ msgstr "Grupo %s" msgid "%1$s group, page %2$d" msgstr "Grupo %1$s, pág. %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Perfil do grupo" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "Site" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Mensagem" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Apelidos" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Ações do grupo" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Fonte de mensagens do grupo %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Fonte de mensagens do grupo %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Fonte de mensagens do grupo %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF para o grupo %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Membros" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nenhum)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Todos os membros" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Criado" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3636,7 +3823,7 @@ msgstr "" "para se tornar parte deste grupo e muito mais! ([Saiba mais](%%%%doc.help%%%" "%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3649,7 +3836,7 @@ msgstr "" "[StatusNet](http://status.net/). Seus membros compartilham mensagens curtas " "sobre suas vidas e interesses. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Administradores" @@ -3773,7 +3960,6 @@ msgid "User is already silenced." msgstr "O usuário já está silenciado." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" msgstr "Configurações básicas para esta instância do StatusNet." @@ -3791,11 +3977,12 @@ msgid "Unknown language \"%s\"." msgstr "Idioma \"%s\" desconhecido." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "O comprimento máximo do texto é de 140 caracteres." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "O valor mínimo para o limite de texto é 0 (sem limites)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +#, fuzzy +msgid "Dupe limit must be one or more seconds." msgstr "O limite de duplicatas deve ser de um ou mais segundos." #: actions/siteadminpanel.php:221 @@ -3843,13 +4030,14 @@ msgid "Default timezone for the site; usually UTC." msgstr "Fuso horário padrão para o seu site; geralmente UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Idioma padrão do site" +msgstr "Idioma padrão" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Idioma do site quando as configurações de autodetecção a partir do navegador " +"não estiverem disponíveis" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3874,76 +4062,102 @@ msgstr "" "coisa novamente." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Mensagem do site" +msgstr "Avisos do site" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nova mensagem" +msgstr "Editar os avisos do site (exibidos em todas as páginas)" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Não foi possível salvar suas configurações de aparência." +msgstr "Não foi possível salvar os avisos do site." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +#, fuzzy +msgid "Max length for the site-wide notice is 255 chars." +msgstr "O tamanho máximo para os avisos é de 255 caracteres." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Mensagem do site" +msgstr "Texto dos avisos" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "Texto dos avisos do site (no máximo 255 caracteres; pode usar HTML)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Mensagem do site" +msgstr "Salvar os avisos do site" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Configuração do SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Você pode receber mensagens SMS de %%site.name%% através do e-mail." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "SMS não está disponível." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "Endereço do MI" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Número de telefone já habilitado para receber SMS." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Aguardando a confirmação deste número de telefone." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Código de confirmação" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Informe o código que você recebeu no seu telefone." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Confirmar" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Telefone para SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Número de telefone, sem pontuação ou espaços, com código de área" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Preferências" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3951,23 +4165,34 @@ msgstr "" "Envie-me mensagens via SMS. Eu compreendo que isso pode gerar cobranças " "exorbitantes da minha operadora." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "As preferências foram salvas." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Nenhum número de telefone." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Não foi selecionada nenhuma operadora." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Esse já é seu número de telefone." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Esse número de telefone já pertence à outro usuário." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3975,23 +4200,42 @@ msgstr "" "Um código de confirmação foi enviado para o número de telefone que você " "informou. Verifique no seu telefone o código e instruções sobre como usá-lo." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Isso é um número de confirmação errado." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "A confirmação foi cancelada." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Esse não é seu número de telefone." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "Telefone para SMS" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Operadora de celular" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Selecione uma operadora" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -4000,20 +4244,20 @@ msgstr "" "A operadora do seu celular. Se você conhece uma operadora que aceita SMS via " "e-mail que não está listada aqui, informe-nos enviando uma mensagem para %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Não foi digitado nenhum código" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Estatísticas" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Mude as configurações do site" +msgstr "Gerenciar as configurações das estatísticas" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -4028,7 +4272,8 @@ msgid "Invalid snapshot report URL." msgstr "A URL para o envio das estatísticas é inválida." #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +#, fuzzy +msgid "Randomly during web hit" msgstr "Aleatoriamente durante o funcionamento" #: actions/snapshotadminpanel.php:201 @@ -4060,32 +4305,28 @@ msgid "Snapshots will be sent to this URL" msgstr "As estatísticas serão enviadas para esta URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Salvar as configurações do site" +msgstr "Salvar as configurações de estatísticas" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." msgstr "Você não está assinando esse perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Não foi possível salvar a assinatura." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "Esta ação aceita somente requisições POST." #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "Esse arquivo não existe." +msgstr "Este perfil não existe." #: actions/subscribe.php:117 -#, fuzzy msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "Você não está assinando esse perfil." +msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4172,11 +4413,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s não está acompanhando ninguém." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4209,12 +4450,12 @@ msgstr "Nenhum argumento de ID." msgid "Tag %s" msgstr "Etiqueta %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Perfil do usuário" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Imagem" @@ -4266,7 +4507,8 @@ msgid "User is not silenced." msgstr "O usuário não está silenciado." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +#, fuzzy +msgid "No profile ID in request." msgstr "Nenhuma ID de perfil na requisição." #: actions/unsubscribe.php:98 @@ -4283,7 +4525,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Usuário" @@ -4306,7 +4547,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Assinatura padrão inválida: '%1$s' não é um usuário." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" @@ -4469,29 +4711,35 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Aproveite o seu cachorro-quente!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "Grupos de %1$s, pág. %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Procurar por outros grupos" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s não é membro de nenhum grupo." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Experimente [procurar por grupos](%%action.groupsearch%%) e associar-se à " "eles." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Mensagens de %1$s no %2$s!" @@ -4551,7 +4799,8 @@ msgstr "" msgid "Plugins" msgstr "Plugins" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Versão" @@ -4559,7 +4808,7 @@ msgstr "Versão" msgid "Author(s)" msgstr "Autor(es)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4568,12 +4817,12 @@ msgstr "" "Nenhum arquivo pode ser maior que %d bytes e o arquivo que você enviou " "possui %d bytes. Experimente enviar uma versão menor." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Um arquivo deste tamanho excederá a sua conta de %d bytes." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes." @@ -4591,9 +4840,8 @@ msgid "Group leave failed." msgstr "Não foi possível deixar o grupo." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "Não foi possível atualizar o grupo." +msgstr "Não foi possível atualizar o grupo local." #: classes/Login_token.php:76 #, php-format @@ -4612,27 +4860,28 @@ msgstr "Não foi possível inserir a mensagem." msgid "Could not update message with new URI." msgstr "Não foi possível atualizar a mensagem com a nova URI." -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" msgstr "Erro no banco de dados durante a inserção da hashtag: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Problema no salvamento da mensagem. Ela é muito extensa." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Problema no salvamento da mensagem. Usuário desconhecido." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4640,307 +4889,319 @@ msgstr "" "Muitas mensagens duplicadas em um período curto de tempo; dê uma respirada e " "publique novamente daqui a alguns minutos." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Você está proibido de publicar mensagens neste site." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problema no salvamento da mensagem." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problema no salvamento das mensagens recebidas do grupo." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Você está proibido de assinar." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Já assinado!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "O usuário bloqueou você." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Não assinado!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Não foi possível excluir a auto-assinatura." -#: classes/Subscription.php:190 -#, fuzzy +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "Não foi possível excluir a assinatura." +msgstr "Não foi possível excluir o token de assinatura OMB." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Não foi possível excluir a assinatura." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bem vindo(a) a %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Não foi possível criar o grupo." -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "Não foi possível configurar a associação ao grupo." +msgstr "Não foi possível definir a URI do grupo." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Não foi possível configurar a associação ao grupo." -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "Não foi possível salvar a assinatura." +msgstr "Não foi possível salvar a informação do grupo local." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Alterar as suas configurações de perfil" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Enviar um avatar" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Alterar a sua senha" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Configurações de uso do e-mail" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Mude a aparência do seu perfil" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Outras" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Outras opções" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Outras" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Página sem título" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Navegação primária no site" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 -#, fuzzy +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e fluxo de mensagens dos amigos" -#: lib/action.php:433 -#, fuzzy +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Pessoal" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 -#, fuzzy +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Mude seu e-mail, avatar, senha, perfil" +msgstr "Altere seu e-mail, avatar, senha, perfil" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 -#, fuzzy +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Conecte-se a outros serviços" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Conectar" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 -#, fuzzy +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "Mude as configurações do site" +msgstr "Altere as configurações do site" -#: lib/action.php:449 -#, fuzzy +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" -msgstr "Admin" +msgstr "Administrar" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 -#, fuzzy, php-format +#: lib/action.php:455 +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Convide seus amigos e colegas para unir-se a você no %s" -#: lib/action.php:456 -#, fuzzy +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Convidar" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 -#, fuzzy +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" -msgstr "Sai do site" +msgstr "Sair do site" -#: lib/action.php:465 -#, fuzzy +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Sair" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 -#, fuzzy +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" -msgstr "Cria uma conta" +msgstr "Criar uma conta" -#: lib/action.php:473 -#, fuzzy +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Registrar-se" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 -#, fuzzy +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Autentique-se no site" -#: lib/action.php:479 -#, fuzzy +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Entrar" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 -#, fuzzy +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Ajudem-me!" -#: lib/action.php:485 -#, fuzzy +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Ajuda" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 -#, fuzzy +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" -msgstr "Procura por pessoas ou textos" +msgstr "Procure por pessoas ou textos" -#: lib/action.php:491 -#, fuzzy +#: lib/action.php:493 msgctxt "MENU" msgid "Search" -msgstr "Procurar" +msgstr "Pesquisar" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Mensagem do site" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Visualizações locais" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Notícia da página" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Navegação secundária no site" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Ajuda" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Sobre" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "Termos de uso" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Privacidade" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Fonte" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Contato" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Mini-aplicativo" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Licença do software StatusNet" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** é um serviço de microblog disponibilizado por [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** é um serviço de microblog. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** é um serviço de microblog." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4951,69 +5212,85 @@ msgstr "" "versão %s, disponível sob a [GNU Affero General Public License] (http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Licença do conteúdo do site" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "O conteúdo e os dados de %1$s são privados e confidenciais." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Conteúdo e dados licenciados pelos colaboradores. Todos os direitos " "reservados." -#: lib/action.php:847 -msgid "All " -msgstr "Todas " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "licença." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Próximo" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Anterior" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" +"Era esperado um elemento raiz da fonte, mas foi obtido o documento XML " +"inteiro." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." -msgstr "" +msgstr "Ainda não é possível manipular conteúdo remoto." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." -msgstr "" +msgstr "Ainda não é possível manipular conteúdo XML incorporado." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." -msgstr "" +msgstr "Ainda não é possível manipular conteúdo Base64." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Você não pode fazer alterações neste site." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Não são permitidas alterações a esse painel." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() não implementado." @@ -5023,160 +5300,195 @@ msgstr "showForm() não implementado." msgid "saveSettings() not implemented." msgstr "saveSettings() não implementado." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Não foi possível excluir as configurações da aparência." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Configuração básica do site" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 -#, fuzzy +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Site" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Configuração da aparência" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 -#, fuzzy +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Aparência" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Configuração do usuário" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Usuário" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Configuração do acesso" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Configuração dos caminhos" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Configuração das sessões" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 -#, fuzzy +#: lib/adminpanelaction.php:397 msgid "Edit site notice" -msgstr "Mensagem do site" +msgstr "Editar os avisos do site" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 -#, fuzzy +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "Configuração dos caminhos" +msgstr "Configurações das estatísticas" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Os recursos de API exigem acesso de leitura e escrita, mas você possui " "somente acesso de leitura." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" -"A tentativa de autenticação na API falhou, identificação = %1$s, proxy = %2" -"$s, ip = %3$s" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Editar a aplicação" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Ícone para esta aplicação" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Descreva a sua aplicação em %d caracteres" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Descreva sua aplicação" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "URL da fonte" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "URL do site desta aplicação" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "URL da fonte" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Organização responsável por esta aplicação" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "URL para o site da organização" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "URL para o redirecionamento após a autenticação" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Navegador" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Desktop" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Tipo de aplicação: navegador ou desktop" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Somente leitura" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Leitura e escrita" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Acesso padrão para esta aplicação: somente leitura ou leitura e escrita" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Cancelar" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +#, fuzzy +msgid "read-write" +msgstr "Leitura e escrita" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +#, fuzzy +msgid "read-only" +msgstr "Somente leitura" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 +#, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "Revogar" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Anexos" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Operadora" @@ -5196,37 +5508,56 @@ msgstr "Não foi possível alterar a senha" msgid "Password changing is not allowed" msgstr "Não é permitido alterar a senha" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultados do comando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "O comando foi completado" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "O comando falhou" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Desculpe, mas esse comando ainda não foi implementado." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Não existe uma mensagem com essa id" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "O usuário não tem uma \"última mensagem\"" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Não foi possível encontrar um usuário com a identificação %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Não foi possível encontrar um usuário local com a identificação %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Desculpe, mas esse comando ainda não foi implementado." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Não faz muito sentido chamar a sua própria atenção!" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Foi enviada a chamada de atenção para %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5237,200 +5568,205 @@ msgstr "" "Assinantes: %2$s\n" "Mensagens: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Não existe uma mensagem com essa id" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "O usuário não tem uma \"última mensagem\"" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Mensagem marcada como favorita." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Você já é um membro desse grupo." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Não foi possível associar o usuário %s ao grupo %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s." -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s associou-se ao grupo %s" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" +msgstr "Não foi possível remover o usuário %1$s do grupo %2$s." -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Não foi possível remover o usuário %s do grupo %s" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s deixou o grupo %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Localização: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Site: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -"A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d" +"%s é um perfil remoto; você pode só pode enviar mensagens diretas para " +"usuários do mesmo servidor." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d." + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "A mensagem direta para %s foi enviada" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Ocorreu um erro durante o envio da mensagem direta." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Você não pode repetir sua própria mensagem" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Você já repetiu essa mensagem" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Mensagem de %s repetida" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Erro na repetição da mensagem." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "A resposta a %s foi enviada" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Erro no salvamento da mensagem." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Especifique o nome do usuário que será assinado" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Este usuário não existe." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Não é possível assinar perfis OMB com comandos." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Efetuada a assinatura de %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifique o nome do usuário cuja assinatura será cancelada" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Cancelada a assinatura de %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "O comando não foi implementado ainda." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Não é possível desligar a notificação." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Não é possível ligar a notificação." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "O comando para autenticação está desabilitado" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Este link é utilizável somente uma vez e é válido somente por dois minutos: %" "s" -#: lib/command.php:692 -#, fuzzy, php-format +#: lib/command.php:761 +#, php-format msgid "Unsubscribed %s" msgstr "Cancelada a assinatura de %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Você não está assinando ninguém." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Você já está assinando esta pessoa:" msgstr[1] "Você já está assinando estas pessoas:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Ninguém o assinou ainda." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Esta pessoa está assinando você:" msgstr[1] "Estas pessoas estão assinando você:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Você não é membro de nenhum grupo." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Você é membro deste grupo:" msgstr[1] "Você é membro destes grupos:" -#: lib/command.php:769 -#, fuzzy +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5481,8 +5817,9 @@ msgstr "" "subscribers - lista as pessoas que seguem você\n" "leave - deixa de assinar o usuário\n" "d - mensagem direta para o usuário\n" -"get - obtém a última mensagem do usuário\n" -"whois - obtém as informações do perfil do usuário\n" +"get - obtém a última mensagem do usuário\n" +"whois - obtém as informações do perfil do usuário\n" +"lose - obriga o usuário a deixar de segui-lo\n" "fav - adiciona a último mensagem do usuário como uma " "'favorita'\n" "fav # - adiciona a mensagem identificada como 'favorita'\n" @@ -5510,19 +5847,19 @@ msgstr "" "tracks - não implementado ainda\n" "tracking - não implementado ainda\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Não foi encontrado nenhum arquivo de configuração. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Você pode querer executar o instalador para corrigir isto." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir para o instalador." @@ -5623,7 +5960,7 @@ msgstr "Ir" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Associa o papel \"%s\" a este usuário" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5696,53 +6033,54 @@ msgstr "Grupos com mais mensagens" msgid "Tags in %s group's notices" msgstr "Etiquetas nas mensagens do grupo %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Esta página não está disponível em um tipo de mídia que você aceita" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Formato de imagem não suportado." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "O arquivo é muito grande. O tamanho máximo é de %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Envio parcial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Erro no sistema durante o envio do arquivo." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Imagem inválida ou arquivo corrompido." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato de imagem não suportado." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Nosso arquivo foi perdido." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo de arquivo desconhecido" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "Mb" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "Kb" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Fonte da caixa de entrada desconhecida %d." @@ -5763,11 +6101,13 @@ msgstr "Autentique-se com um nome de usuário e uma senha" msgid "Sign up for a new account" msgstr "Cadastre-se para uma nova conta" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Confirmação do endereço de e-mail" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5796,12 +6136,14 @@ msgstr "" "Obrigado pela sua atenção, \n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s agora está acompanhando suas mensagens no %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5826,17 +6168,20 @@ msgstr "" "----\n" "Altere seu endereço de e-mail e suas opções de notificação em %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Descrição: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Novo endereço de e-mail para publicar no %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5857,21 +6202,31 @@ msgstr "" "Atenciosamente,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "Mensagem de %s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Confirmação de SMS" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "Aguardando a confirmação deste número de telefone." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Você teve a atenção chamada por %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5898,12 +6253,14 @@ msgstr "" "Atenciosamente,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Nova mensagem particular de %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5936,12 +6293,14 @@ msgstr "" "Atenciosamente,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) marcou sua mensagem como favorita" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5978,12 +6337,22 @@ msgstr "" "Atenciosamente,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) enviou uma mensagem citando você" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5996,18 +6365,19 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"%1$s (@%9$s) acabou de enviar uma mensagem citando você ('@usuário') no %2" -"$s.\n" -"\n" -"A mensagem está aqui:\n" -"\n" -"\t%3$s\n" -"\n" -"Está escrito:\n" -"\n" -"\t%4$s\n" -"\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6022,7 +6392,7 @@ msgstr "" "privadas para envolver outras pessoas em uma conversa. Você também pode " "receber mensagens privadas." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "de" @@ -6118,7 +6488,6 @@ msgid "Available characters" msgstr "Caracteres disponíveis" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Enviar" @@ -6156,48 +6525,52 @@ msgstr "" "Desculpe, mas recuperar a sua geolocalização está demorando mais que o " "esperado. Por favor, tente novamente mais tarde." -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "S" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "L" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "O" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "em" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "no contexto" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Responder a esta mensagem" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Mensagem repetida" @@ -6221,6 +6594,10 @@ msgstr "Erro na inserção do novo perfil" msgid "Error inserting avatar" msgstr "Erro na inserção do avatar" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Ocorreu um erro na atualização do perfil remoto" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Erro na inserção do perfil remoto" @@ -6270,7 +6647,7 @@ msgstr "Etiquetas nas mensagens de %s" msgid "Unknown" msgstr "Desconhecido" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Assinaturas" @@ -6278,31 +6655,32 @@ msgstr "Assinaturas" msgid "All subscriptions" msgstr "Todas as assinaturas" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Assinantes" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Todos os assinantes" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ID do usuário" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Membro desde" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Média diária" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Todos os grupos" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Sem argumentos return-to." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Método não implementado." @@ -6326,20 +6704,28 @@ msgstr "Em destaque" msgid "Popular" msgstr "Popular" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Sem argumentos return-to." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Repetir esta mensagem?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Sim" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Repetir esta mensagem" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Bloquear este usuário neste grupo" +msgstr "Revoga o papel \"%s\" deste usuário" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "Nenhum usuário definido para o modo de usuário único." @@ -6465,92 +6851,108 @@ msgstr "Cancelar a assinatura deste usuário" msgid "Unsubscribe" msgstr "Cancelar" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "O usuário %s (%d) não tem nenhum registro do perfil." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Editar o avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Ações do usuário" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Exclusão do usuário em andamento..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Editar as configurações do perfil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Editar" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Enviar uma mensagem para este usuário." -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Mensagem" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Moderar" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "Perfil do usuário" +msgstr "Papel do usuário" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Administradores" +msgstr "Administrador" -#: lib/userprofile.php:355 -#, fuzzy +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "Moderar" +msgstr "Moderador" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "alguns segundos atrás" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "cerca de 1 minuto atrás" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "cerca de %d minutos atrás" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "cerca de 1 hora atrás" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "cerca de %d horas atrás" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "cerca de 1 dia atrás" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "cerca de %d dias atrás" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "cerca de 1 mês atrás" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "cerca de %d meses atrás" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "cerca de 1 ano atrás" @@ -6564,7 +6966,7 @@ msgstr "%s não é uma cor válida!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 03aaa074a2..7f697bd8d5 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:54+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:15+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -26,7 +26,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Принять" @@ -77,7 +77,13 @@ msgstr "Закрыта" msgid "Save access settings" msgstr "Сохранить настройки доступа" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Сохранить" @@ -85,8 +91,8 @@ msgstr "Сохранить" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "Нет такой страницы" +msgid "No such page." +msgstr "Нет такой страницы." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -96,9 +102,9 @@ msgstr "Нет такой страницы" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -106,11 +112,9 @@ msgstr "Нет такой страницы" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Нет такого пользователя." @@ -122,8 +126,9 @@ msgstr "%1$s и друзья, страница %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -188,8 +193,10 @@ msgstr "" msgid "You and friends" msgstr "Вы и друзья" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Обновлено от %1$s и его друзей на %2$s!" @@ -204,18 +211,18 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Метод API не найден." @@ -228,16 +235,18 @@ msgstr "Метод API не найден." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Этот метод требует POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" -msgstr "Укажите параметр с именем 'device' и значением sms, im или none." +"none." +msgstr "" +"Вы должны указать параметр с именем «device» и одним из значений: sms, im, " +"none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -248,7 +257,7 @@ msgstr "Не удаётся обновить пользователя." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "У пользователя нет профиля." @@ -258,9 +267,9 @@ msgid "Could not save profile." msgstr "Не удаётся сохранить профиль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -346,7 +355,7 @@ msgstr "Нет статуса с таким ID." msgid "This status is already a favorite." msgstr "Этот статус уже входит в число любимых." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Не удаётся создать любимую запись." @@ -441,11 +450,10 @@ msgstr "Слишком длинное месторасположение (мак msgid "Too many aliases! Maximum %d." msgstr "Слишком много алиасов! Максимальное число — %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Неверный алиас: «%s»" +msgid "Invalid alias: \"%s\"." +msgstr "Ошибочный псевдоним: «%s»." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -461,14 +469,14 @@ msgstr "Алиас не может совпадать с именем." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Группа не найдена!" +msgid "Group not found." +msgstr "Группа не найдена." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Вы уже являетесь членом этой группы." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Вы заблокированы из этой группы администратором." @@ -486,17 +494,26 @@ msgstr "Вы не являетесь членом этой группы." msgid "Could not remove user %1$s from group %2$s." msgstr "Не удаётся удалить пользователя %1$s из группы %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "Группы %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Группы %1$s, в которых состоит %2$s." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Группы %s" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "группы на %s" @@ -510,17 +527,17 @@ msgid "Invalid token." msgstr "Неправильный токен" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -552,12 +569,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "Запрос токена %s был запрещен и аннулирован." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Нетиповое подтверждение формы." @@ -581,20 +601,22 @@ msgstr "" "предоставлять разрешение на доступ к вашей учётной записи %4$s только тем " "сторонним приложениям, которым вы доверяете." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Настройки" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Имя" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Пароль" @@ -639,17 +661,17 @@ msgstr "Статус удалён." msgid "No status with that ID found." msgstr "Не найдено статуса с таким ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Слишком длинная запись. Максимальная длина — %d знаков." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Не найдено" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Не найдено." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Максимальная длина записи — %d символов, включая URL вложения." @@ -658,12 +680,12 @@ msgstr "Максимальная длина записи — %d символов msgid "Unsupported format." msgstr "Неподдерживаемый формат." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Любимое от %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Обновления %1$s, отмеченные как любимые %2$s / %2$s." @@ -673,17 +695,17 @@ msgstr "Обновления %1$s, отмеченные как любимые %2 msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Обновления, упоминающие %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Общая лента %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Обновления %s от всех!" @@ -698,20 +720,16 @@ msgstr "Повторено для %s" msgid "Repeats of %s" msgstr "Повторы за %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Записи с тегом %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Обновления с тегом %1$s на %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Не найдено." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Нет такого вложения." @@ -731,8 +749,9 @@ msgstr "Нет размера." msgid "Invalid size." msgstr "Неверный размер." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Аватара" @@ -743,10 +762,10 @@ msgstr "" "Вы можете загрузить свою аватару. Максимальный размер файла составляет %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Пользователь без соответствующего профиля" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Пользователь без соответствующего профиля." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -764,7 +783,7 @@ msgid "Preview" msgstr "Просмотр" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Удалить" @@ -776,23 +795,27 @@ msgstr "Загрузить" msgid "Crop" msgstr "Обрезать" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Файл не загружен." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Подберите нужный квадратный участок для вашей аватары" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Потеряна информация о файле." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватара обновлена." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Неудача при обновлении аватары." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватара удалена." @@ -800,7 +823,7 @@ msgstr "Аватара удалена." msgid "You already blocked that user." msgstr "Вы уже заблокировали этого пользователя." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Заблокировать пользователя." @@ -814,27 +837,42 @@ msgstr "" "будет отписан от вас без возможности подписаться в будущем, а вам не будут " "приходить уведомления об @-ответах от него." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Нет" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Не блокировать этого пользователя" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Да" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Заблокировать пользователя." -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Не удаётся сохранить информацию о блокировании." @@ -847,8 +885,8 @@ msgstr "Не удаётся сохранить информацию о блок #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Нет такой группы." @@ -878,9 +916,11 @@ msgstr "Разблокировать" msgid "Unblock this user" msgstr "Разблокировать пользователя." -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Отправить в " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Отправить в %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -894,33 +934,43 @@ msgstr "Код подтверждения не найден." msgid "That confirmation code is not for you!" msgstr "Это не Ваш код подтверждения!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Нераспознанный тип адреса %s" +msgid "Unrecognized address type %s." +msgstr "Нераспознанный тип адреса %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Этот адрес уже подтверждён." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Не удаётся обновить пользователя." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Не удаётся удалить подверждение по электронному адресу." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Подтвердить адрес" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Адрес «%s» подтверждён для вашего аккаунта." @@ -930,7 +980,7 @@ msgid "Conversation" msgstr "Дискуссия" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Записи" @@ -949,7 +999,7 @@ msgstr "Вы не являетесь владельцем этого прило #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста." @@ -967,15 +1017,17 @@ msgstr "" "применении из базы данных, включая все существующие подключения " "пользователей." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Не удаляйте это приложение" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Удалить это приложение" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1006,11 +1058,13 @@ msgstr "Удалить запись" msgid "Are you sure you want to delete this notice?" msgstr "Вы уверены, что хотите удалить эту запись?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Не удалять эту запись" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Удалить эту запись" @@ -1034,58 +1088,61 @@ msgstr "" "Вы действительно хотите удалить этого пользователя? Это повлечёт удаление " "всех данных о пользователе из базы данных без возможности восстановления." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Удалить этого пользователя" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Оформление" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Настройки оформления для этого сайта StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "Неверный URL логотипа." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Тема не доступна: %s" +msgid "Theme not available: %s." +msgstr "Тема не доступна: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Изменить логотип" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Логотип сайта" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Изменить тему" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Тема сайта" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Тема для сайта." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Изменение фонового изображения" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Фон" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1094,67 +1151,68 @@ msgstr "" "Вы можете загрузить фоновое изображение для сайта. Максимальный размер файла " "составляет %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Включить" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Отключить" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Включить или отключить показ фонового изображения." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Растянуть фоновое изображение" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Изменение цветовой гаммы" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Содержание" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Боковая панель" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Текст" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Ссылки" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Использовать значения по умолчанию" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Восстановить оформление по умолчанию" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Восстановить значения по умолчанию" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Сохранить" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Сохранить оформление" @@ -1259,11 +1317,16 @@ msgstr "Заполните информацию о группе в следую msgid "description is too long (max %d chars)." msgstr "Слишком длинное описание (максимум %d символов)" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Неверный алиас: «%s»" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Не удаётся обновить информацию о группе." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Не удаётся создать алиасы." @@ -1271,31 +1334,42 @@ msgstr "Не удаётся создать алиасы." msgid "Options saved." msgstr "Настройки сохранены." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Настройка почты" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Управление процессом получения электронной почты с %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Адрес" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Адрес эл. почты" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Подтверждённый в настоящее время электронный адрес." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" -msgstr "Убрать" +msgstr "Удалить" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1303,116 +1377,146 @@ msgstr "" "Ожидание подтверждения этого адреса. Проверьте свой почтовый ящик (и папку " "для спама!), там будут дальнейшие инструкции." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" -msgstr "Отменить" +msgstr "Отмена" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Адрес эл. почты" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Электронный адрес вида \"UserName@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Добавить" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Входящий электронный адрес" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" "Отправляйте электронные письма на этот адрес для отсылки новых записей." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" "Создать новый адрес электронной почты для отсылки сообщений; отменяет старый " "адрес." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Новый" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Предпочтения" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Настройки эл. почты" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Уведомлять меня о новых подписчиках по почте." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою " "запись в число любимых." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" "Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне " "приватное сообщение." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" "Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне «@-" "ответ»." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" "Разрешить друзьям «подталкивать» меня и посылать мне электронные сообщения." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Я хочу отправлять записи по электронной почте." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Опубликовать MicroID для моего электронного адреса." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Предпочтения сохранены." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Настройки эл. почты сохранены." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Нет электронного адреса." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Не удаётся стандартизировать этот электронный адрес" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Неверный электронный адрес." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Это уже Ваш электронный адрес." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Этот электронный адрес уже задействован другим пользователем." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Не удаётся вставить код подтверждения." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1421,43 +1525,53 @@ msgstr "" "папку входящей почты (а также папку спама!), чтобы найти этот кода и " "инструкции по его использованию." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Нет подтверждения отказа." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Это неверный IM-адрес." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Это неверный адрес эл. почты." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Подтверждение отменено." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Подтверждение эл. почты отменено." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Это не Ваш электронный адрес." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Адрес удалён." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "Адрес эл. почты удалён." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Нет входящего электронного адреса." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Не удаётся обновить пользовательскую запись." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Входящий электронный адрес удалён." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Новый входящий электронный адрес добавлен." @@ -1576,9 +1690,9 @@ msgstr "Не удаётся преобразовать ключ запроса msgid "Remote service uses unknown version of OMB protocol." msgstr "Удалённый сервис использует неизвестную версию протокола OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Ошибка обновления удалённого профиля" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Ошибка обновления удалённого профиля." #: actions/getfile.php:79 msgid "No such file." @@ -1633,11 +1747,11 @@ msgstr "Пользователь уже заблокирован из групп msgid "User is not a member of group." msgstr "Пользователь не является членом этой группы." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Заблокировать пользователя из группы." -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1648,15 +1762,17 @@ msgstr "" "Пользователь будет удалён из группы без возможности отправлять и " "подписываться на группу в будущем." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Не блокировать этого пользователя из этой группы" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Заблокировать этого пользователя из этой группы" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "Ошибка базы данных при блокировании пользователя из группы." @@ -1701,10 +1817,6 @@ msgstr "" "Здесь вы можете загрузить логотип для группы. Максимальный размер файла " "составляет %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Пользователь без соответствующего профиля." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Подберите нужный квадратный участок для вашего логотипа." @@ -1735,34 +1847,38 @@ msgstr "Список пользователей, являющихся члена msgid "Admin" msgstr "Настройки" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Блокировать" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Сделать пользователя администратором группы" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Сделать администратором" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Сделать этого пользователя администратором" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "Лента %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Обновления участников %1$s на %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Группы" @@ -1787,7 +1903,7 @@ msgstr "" "группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%" "%%%) или [создайте собственную](%%%%action.newgroup%%%%)!" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Создать новую группу" @@ -1839,11 +1955,15 @@ msgstr "Пользователь не заблокировал вас из гр msgid "Error removing the block." msgstr "Ошибка при удалении данного блока." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "IM-установки" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1852,15 +1972,24 @@ msgstr "" "Вы можете отправлять и получать записи через Jabber/GTalk [онлайн-мессенджер]" "(%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "IM не доступен." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "IM-адрес" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Подтверждённый в настоящее время Jabber/Gtalk - адрес." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1870,11 +1999,9 @@ msgstr "" "сообщения с дальнейшими инструкциями. (Вы включили %s в ваш список " "контактов?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "IM-адрес" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1884,44 +2011,65 @@ msgstr "" "убедитесь, что добавили %s в список Ваших корреспондентов на Вашем IM-" "мессенджере или в GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Настройки IM" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Посылать мне записи через Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Публиковать запись, когда мой Jabber/GTalk - статус изменяется." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Посылать мне реплики через Jabber/GTalk от людей, на которых я не подписан." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Предпочтения сохранены." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Не Jabber ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Не удаётся стандартизировать этот Jabber ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Неверный код Jabber ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Это уже Ваш Jabber ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Этот Jabber ID уже используется другим пользователем." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1930,10 +2078,32 @@ msgstr "" "Код подтверждения выслан на добавленный вами IM-адрес. Вы должны подтвердить " "%s для отправки вам сообщений." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Это неверный IM-адрес." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Не удаётся удалить подверждение IM." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Подтверждение IM отменено." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Это не Ваш Jabber ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "Адрес IM удалён." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1956,10 +2126,10 @@ msgstr "Приглашения отключены." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" +msgid "You must be logged in to invite other users to use %s." msgstr "" -"Вы должны авторизоваться, чтобы приглашать других пользователей следовать за " -"%s" +"Вы должны авторизоваться, чтобы приглашать других пользователей использовать " +"%s." #: actions/invite.php:72 #, php-format @@ -1978,7 +2148,9 @@ msgstr "Пригласить новых пользователей" msgid "You are already subscribed to these users:" msgstr "Вы уже подписаны на пользователя:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2029,12 +2201,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Отправить" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s пригласил вас присоединиться к нему на %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2099,7 +2273,9 @@ msgstr "Вы должны авторизоваться для вступлени msgid "No nickname or ID." msgstr "Нет имени или ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s вступил в группу %2$s" @@ -2108,11 +2284,13 @@ msgstr "%1$s вступил в группу %2$s" msgid "You must be logged in to leave a group." msgstr "Вы должны авторизоваться, чтобы покинуть группу." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Вы не являетесь членом этой группы." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s покинул группу %2$s" @@ -2158,13 +2336,16 @@ msgstr "" "изменять Ваши установки." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Войти с вашим именем участника и паролем." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Вход с вашим логином и паролем. Нет аккаунта? [Зарегистрируйте](%%action." -"register%%) новый аккаунт." +"У вас нет логина? [Зарегистрируйте](%%action.register%%) новую учётную " +"запись." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2187,8 +2368,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Невозможно сделать %1$s администратором группы %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Нет текущего статуса" +msgid "No current status." +msgstr "Нет текущего состояния." #: actions/newapplication.php:52 msgid "New Application" @@ -2222,12 +2403,12 @@ msgstr "Используйте эту форму для создания нов msgid "New message" msgstr "Новое сообщение" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Вы не можете послать сообщение этому пользователю." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Нет контента!" @@ -2235,7 +2416,7 @@ msgstr "Нет контента!" msgid "No recipient specified." msgstr "Нет адресата." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе." @@ -2249,7 +2430,7 @@ msgstr "Сообщение отправлено" msgid "Direct message to %s sent." msgstr "Прямое сообщение для %s послано." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ошибка AJAX" @@ -2257,7 +2438,7 @@ msgstr "Ошибка AJAX" msgid "New notice" msgstr "Новая запись" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Запись опубликована" @@ -2352,11 +2533,11 @@ msgid "You are not a user of that application." msgstr "Вы не являетесь пользователем этого приложения." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "Не удаётся отозвать права для приложения: " +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Не удаётся отозвать доступ для приложения: %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "Вы не разрешили приложениям использовать вашу учётную запись." @@ -2365,24 +2546,29 @@ msgid "Developers can edit the registration settings for their applications " msgstr "Разработчики могут изменять настройки регистрации своих приложений " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Запись без профиля" +msgid "Notice has no profile." +msgstr "Уведомление не имеет профиля." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Статус %1$s на %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "тип содержимого " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Тип содержимого %s не поддерживается." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Только " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Только %s URL в простом HTTP, пожалуйста." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -2487,7 +2673,7 @@ msgid "6 or more characters" msgstr "6 или больше знаков" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Подтверждение" @@ -2515,7 +2701,7 @@ msgstr "Некорректный старый пароль" msgid "Error saving user; invalid." msgstr "Ошибка сохранения пользователя; неверное имя." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Не удаётся сохранить новый пароль." @@ -2524,7 +2710,7 @@ msgid "Password saved." msgstr "Пароль сохранён." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Пути" @@ -2534,23 +2720,23 @@ msgstr "Настройки путей и серверов для этого са #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Директория тем недоступна для чтения: %s" +msgid "Theme directory not readable: %s." +msgstr "Директория тем не доступна для чтения: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Директория аватар не доступна для записи: %s" +msgid "Avatar directory not writable: %s." +msgstr "Директория аватар не доступна для записи: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Директория фоновых изображений не доступна для записи: %s" +msgid "Background directory not writable: %s." +msgstr "Директория фоновых изображений не доступна для записи: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Директория локализаций не доступна для чтения: %s" +msgid "Locales directory not readable: %s." +msgstr "Директория локализаций не доступна для чтения: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2689,19 +2875,19 @@ msgstr "" msgid "People search" msgstr "Поиск людей" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Неверный тег человека: %s" +msgid "Not a valid people tag: %s." +msgstr "Неверный тег человека: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Пользователи, установившие себе тег %1$s — страница %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Неверный контент записи" +msgid "Invalid notice content." +msgstr "Ошибочное содержание записи." #: actions/postnotice.php:101 #, php-format @@ -2728,13 +2914,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 латинских строчных буквы или цифры, без пробелов" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Полное имя" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Главная" @@ -2756,9 +2943,9 @@ msgid "Bio" msgstr "Биография" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Месторасположение" @@ -2772,7 +2959,7 @@ msgstr "Делиться своим текущим местоположение #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Теги" @@ -2845,8 +3032,8 @@ msgstr "Настройки сохранены." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Превышен предел страницы (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Превышен предел страницы (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3012,7 +3199,7 @@ msgstr "Переустановить пароль" msgid "Recover password" msgstr "Восстановление пароля" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Запрошено восстановление пароля" @@ -3032,19 +3219,19 @@ msgstr "Сбросить" msgid "Enter a nickname or email address." msgstr "Введите имя или электронный адрес." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Нет пользователя с таким электронным адресом или именем." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Нет зарегистрированных электронных адресов для этого пользователя." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Ошибка сохранения подтверждённого адреса." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3052,23 +3239,23 @@ msgstr "" "Инструкции по восстановлению пароля посланы на электронный адрес, который Вы " "указали при регистрации вашего аккаунта." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Нетиповая переустановка пароля." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Пароль должен быть длиной не менее 6 символов." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Пароль и его подтверждение не совпадают." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Ошибка в установках пользователя." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Новый пароль успешно сохранён. Вы авторизовались." @@ -3084,7 +3271,7 @@ msgstr "Извините, неверный пригласительный код msgid "Registration successful" msgstr "Регистрация успешна!" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрация" @@ -3108,13 +3295,12 @@ msgstr "Неверное имя или пароль." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -"При помощи этой формы вы можете создать новый аккаунт, чтобы публиковать " -"короткие сообщения и устанавливать связи с друзьями и коллегами (Есть " -"[OpenID](http://openid.net/) аккаунт? Тогда используй [OpenID регистрацию](%%" -"action.openidlogin%%)!)" +"С помощью этой формы вы можете создать новую учётную запись. Тогда вы " +"получите возможность публиковать короткие сообщения и устанавливать связи с " +"друзьями и коллегами. " #: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -3129,8 +3315,9 @@ msgstr "6 или более символов. Обязательное поле. msgid "Same as password above. Required." msgstr "Тот же пароль что и сверху. Обязательное поле." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Email" @@ -3143,22 +3330,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Полное имя, предпочтительно Ваше настоящее имя" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Мои тексты и файлы находятся под лицензией" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Attribution 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -", за исключением моей личной информации: пароля, почты, мессенджера и номера " -"телефона." +"Мои тексты и файлы доступны на условиях %s, за исключением следующей личной " +"информации: пароля, почтового адреса, номера мессенджера и номера телефона." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3192,7 +3372,7 @@ msgstr "" "Спасибо за то, что присоединились к нам, надеемся, что вы получите " "удовольствие от использования данного сервиса!" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3235,7 +3415,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Подписаться" @@ -3271,7 +3451,7 @@ msgstr "Вы не можете повторить собственную зап msgid "You already repeated that notice." msgstr "Вы уже повторили эту запись." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Повторено" @@ -3360,7 +3540,7 @@ msgstr "Пользователь уже в режиме песочницы." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Сессии" @@ -3397,26 +3577,30 @@ msgstr "Вы должны авторизоваться, чтобы просма msgid "Application profile" msgstr "Профиль приложения" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Иконка" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Имя" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Организация" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Описание" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Статистика" @@ -3524,7 +3708,7 @@ msgstr "" #: actions/showfavorites.php:243 msgid "This is a way to share what you like." -msgstr "Это способ разделить то, что вам нравится." +msgstr "Это способ поделиться тем, что вам нравится." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -3536,67 +3720,67 @@ msgstr "Группа %s" msgid "%1$s group, page %2$d" msgstr "Группа %1$s, страница %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Профиль группы" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Запись" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Алиасы" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Действия группы" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Лента записей группы %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Лента записей группы %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Лента записей группы %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF для группы %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Участники" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(пока ничего нет)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Все участники" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Создано" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3612,7 +3796,7 @@ msgstr "" "action.register%%%%), чтобы стать участником группы и получить множество " "других возможностей! ([Читать далее](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3625,7 +3809,7 @@ msgstr "" "обеспечении [StatusNet](http://status.net/). Участники обмениваются " "короткими сообщениями о своей жизни и интересах. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Администраторы" @@ -3767,12 +3951,12 @@ msgid "Unknown language \"%s\"." msgstr "Неизвестный язык «%s»." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "Минимальное ограничение текста составляет 140 символов." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Минимальное ограничение текста составляет 0 (без ограничений)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." -msgstr "Ограничение дублирования должно составлять 1 или более секунд." +msgid "Dupe limit must be one or more seconds." +msgstr "Ограничение дублирования должно составлять одну или более секунд." #: actions/siteadminpanel.php:221 msgid "General" @@ -3863,8 +4047,8 @@ msgid "Unable to save site notice." msgstr "Не удаётся сохранить уведомление сайта." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "Максимальная длина уведомления сайта составляет 255 символов" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "Максимальная длина уведомления сайта составляет 255 символов." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -3878,46 +4062,73 @@ msgstr "Текст уведомления сайта (максимум 255 си msgid "Save site notice" msgstr "Сохранить уведомление сайта" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Установки СМС" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" "Вы можете отправлять СМС-сообщения по электронному адресу от %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "Отправка СМС недоступна." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "SMS-адрес" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" "Подтверждённый в настоящее время SMS-доступный номер мобильного телефона." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "В ожидании подтверждения данного номера телефона." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Код подтверждения" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Введите код, который вы получили по телефону." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Подтвердить" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Номер телефона для СМС" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Номер телефона, без пробелов, с кодом зоны" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "Настройки SMS" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3925,23 +4136,33 @@ msgstr "" "Посылать мне записи через СМС; я понимаю, что это может привести к расходам " "по пересылке." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Настройки SMS сохранены." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Нет номера телефона." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Провайдер не выбран." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Это уже ваш номер телефона." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Этот телефонный номер уже задействован другим пользователем." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3949,23 +4170,40 @@ msgstr "" "Код подтверждения выслан на мобильный номер, который вы добавили. Проверьте " "телефон для нахождения этого кода и инструкций по его использованию." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Это неверный номер подтверждения." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Подтверждение SMS отменено." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Это не Ваш номер телефона." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Номер SMS телефона удалён." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Выбор провайдера" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Выбор провайдера" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3975,13 +4213,14 @@ msgstr "" "принимает СМС при помощи электронных адресов и которого нет в списке ниже, " "то сообщите нам об этом по электронной почте %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Код не введён" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Снимки" @@ -4002,8 +4241,8 @@ msgid "Invalid snapshot report URL." msgstr "Неверный URL отчёта снимка." #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" -msgstr "При случайном посещении" +msgid "Randomly during web hit" +msgstr "При случайном веб-обращении" #: actions/snapshotadminpanel.php:201 msgid "In a scheduled job" @@ -4041,8 +4280,7 @@ msgstr "Сохранить настройки снимка" msgid "You are not subscribed to that profile." msgstr "Вы не подписаны на этот профиль." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Не удаётся сохранить подписку." @@ -4145,11 +4383,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s не просматривает ничьи записи." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "СМС" @@ -4182,12 +4420,12 @@ msgstr "Нет аргумента ID." msgid "Tag %s" msgstr "Теги %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Профиль пользователя" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Фото" @@ -4240,7 +4478,7 @@ msgid "User is not silenced." msgstr "Пользователь не заглушён." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Нет ID профиля в запросе." #: actions/unsubscribe.php:98 @@ -4278,7 +4516,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профиль" @@ -4439,28 +4678,34 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Приятного аппетита!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "Группы %1$s, страница %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Искать другие группы" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s не состоит ни в одной группе." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Попробуйте [найти группы](%%action.groupsearch%%) и присоединиться к ним." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Обновлено от %1$s на %2$s!" @@ -4520,7 +4765,8 @@ msgstr "" msgid "Plugins" msgstr "Плагины" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Версия" @@ -4528,7 +4774,7 @@ msgstr "Версия" msgid "Author(s)" msgstr "Автор(ы)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4537,12 +4783,12 @@ msgstr "" "Файл не может быть больше %d байт, тогда как отправленный вами файл содержал " "%d байт. Попробуйте загрузить меньшую версию." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Файл такого размера превысит вашу пользовательскую квоту в %d байта." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Файл такого размера превысит вашу месячную квоту в %d байта." @@ -4580,27 +4826,28 @@ msgstr "Не удаётся вставить сообщение." msgid "Could not update message with new URI." msgstr "Не удаётся обновить сообщение с новым URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" -msgstr "Ошибка баз данных при вставке хеш-тегов для %s" +msgid "Database error inserting hashtag: %s" +msgstr "Ошибка баз данных при вставке хеш-тегов: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Проблемы с сохранением записи. Слишком длинно." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Проблема при сохранении записи. Неизвестный пользователь." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Слишком много записей за столь короткий срок; передохните немного и " "попробуйте вновь через пару минут." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4608,287 +4855,319 @@ msgstr "" "Слишком много одинаковых записей за столь короткий срок; передохните немного " "и попробуйте вновь через пару минут." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Вам запрещено поститься на этом сайте (бан)" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Проблемы с сохранением записи." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Проблемы с сохранением входящих сообщений группы." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Вы заблокированы от подписки." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Уже подписаны!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Пользователь заблокировал Вас." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Не подписаны!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Невозможно удалить самоподписку." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Не удаётся удалить подписочный жетон OMB." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Не удаётся удалить подписку." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добро пожаловать на %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Не удаётся создать группу." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Не удаётся назначить URI группы." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Не удаётся назначить членство в группе." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Не удаётся сохранить информацию о локальной группе." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Изменить ваши настройки профиля" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Загрузить аватару" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Измените свой пароль" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Изменить электронный адрес" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Оформить ваш профиль" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Другое" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Другие опции" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Другое" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s — %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Страница без названия" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Главная навигация" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Личный профиль и лента друзей" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Личное" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Изменить ваш email, аватар, пароль, профиль" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Соединить с сервисами" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Соединить" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Изменить конфигурацию сайта" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Настройки" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Пригласите друзей и коллег стать такими же как Вы участниками %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Пригласить" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Выйти" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Выход" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Создать новый аккаунт" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Регистрация" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Войти" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Вход" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Помощь" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Помощь" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Искать людей или текст" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Поиск" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Новая запись" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Локальные виды" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Новая запись" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Навигация по подпискам" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Помощь" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "О проекте" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "ЧаВо" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "TOS" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Пользовательское соглашение" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Исходный код" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Контактная информация" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Бедж" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "StatusNet лицензия" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" -"**%%site.name%%** — это сервис микроблогинга, созданный для вас при помощи [%" -"%site.broughtby%%](%%site.broughtbyurl%%). " +"**%%site.name%%** — это служба микроблогинга, организованная [%%site." +"broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** — сервис микроблогинга. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** — сервис микроблогинга." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4900,70 +5179,84 @@ msgstr "" "лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/" "licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Лицензия содержимого сайта" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Содержание и данные %1$s являются личными и конфиденциальными." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Авторские права на содержание и данные принадлежат %1$s. Все права защищены." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Авторские права на содержание и данные принадлежат разработчикам. Все права " "защищены." -#: lib/action.php:847 -msgid "All " -msgstr "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "Все материалы и данные %1$s доступны на условиях лицензии %2$s." -#: lib/action.php:853 -msgid "license." -msgstr "license." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Разбиение на страницы" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Сюда" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Туда" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Пока ещё нельзя обрабатывать удалённое содержимое." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Пока ещё нельзя обрабатывать встроенный XML." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Пока ещё нельзя обрабатывать встроенное содержание Base64." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Вы не можете изменять этот сайт." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Изменения для этой панели недопустимы." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() не реализована." @@ -4973,156 +5266,192 @@ msgstr "showForm() не реализована." msgid "saveSettings() not implemented." msgstr "saveSettings() не реализована." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Не удаётся удалить настройки оформления." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Основная конфигурация сайта" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Сайт" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Конфигурация оформления" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Оформление" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Конфигурация пользователя" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Пользователь" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Конфигурация доступа" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Конфигурация путей" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Конфигурация сессий" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 msgid "Edit site notice" msgstr "Изменить уведомление сайта" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" msgstr "Конфигурация снимков" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API ресурса требует доступ для чтения и записи, но у вас есть только доступ " "для чтения." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" -"Неудачная попытка авторизации через API, nickname = %1$s, proxy = %2$s, ip = " -"%3$s" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Изменить приложение" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Иконка для этого приложения" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Опишите ваше приложение при помощи %d символов" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Опишите ваше приложение" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "URL источника" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "URL-адрес домашней страницы этого приложения" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "URL источника" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Организация, ответственная за это приложение" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "URL-адрес домашней страницы организации" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "URL для перенаправления после проверки подлинности" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Браузер" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Операционная система" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Среда выполнения приложения: браузер или операционная система" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Только чтение" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Чтение и запись" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Доступ по умолчанию для этого приложения: только чтение или чтение и запись" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Отменить" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "чтение/запись" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "только чтение" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Подтверждён доступ %1$s — «%2$s»." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Отозвать" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Вложения" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Автор" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Сервис" @@ -5142,37 +5471,56 @@ msgstr "Изменение пароля не удалось" msgid "Password changing is not allowed" msgstr "Смена пароля не разрешена" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Команда исполнена" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Команда завершена" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Команда неудачна" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Простите, эта команда ещё не выполнена." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Записи с таким id не существует" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "У пользователя нет последней записи." + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Не удаётся найти пользователя с именем %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Не удаётся найти пользователя с именем %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Простите, эта команда ещё не выполнена." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Нет смысла «подталкивать» самого себя!" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "«Подталкивание» послано %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5183,198 +5531,206 @@ msgstr "" "Подписчиков: %2$s\n" "Записей: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Записи с таким id не существует" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "У пользователя нет последней записи." - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Запись помечена как любимая." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Вы уже являетесь членом этой группы." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Не удаётся присоединить пользователя %s к группе %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%1$s вступил в группу %2$s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Не удаётся удалить пользователя %1$s из группы %2$s" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Не удаётся удалить пользователя %1$s из группы %2$s." - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%1$s покинул группу %2$s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Полное имя: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Месторасположение: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Домашняя страница: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "О пользователе: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Сообщение слишком длинное — не больше %d символов, вы посылаете %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" +"%s профиль другой системы; вы можете отсылать личное сообщение только " +"пользователям этой системы." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"Сообщение слишком велико. Предельно допустимая длина составляет %1$d " +"символов, вы отправили %2$d." + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Прямое сообщение для %s послано." -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Ошибка при отправке прямого сообщения." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Невозможно повторить собственную запись." -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Эта запись уже повторена" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Запись %s повторена" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Ошибка при повторении записи." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Ответ %s отправлен" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Проблемы с сохранением записи." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Укажите имя пользователя для подписки." -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Нет такого пользователя." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Невозможно подписаться командой на профили OMB." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Подписано на %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Укажите имя пользователя для отмены подписки." -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Отписано от %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Команда ещё не выполнена." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Оповещение отсутствует." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Нет оповещения." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Есть оповещение." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Есть оповещение." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "Команда входа отключена" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "Отписано %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Вы ни на кого не подписаны." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вы подписаны на этих людей:" msgstr[1] "Вы подписаны на этих людей:" msgstr[2] "Вы подписаны на этих людей:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Никто не подписан на вас." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Эти люди подписались на вас:" msgstr[1] "Эти люди подписались на вас:" msgstr[2] "Эти люди подписались на вас:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Вы не состоите ни в одной группе." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Вы являетесь участником следующих групп:" msgstr[1] "Вы являетесь участником следующих групп:" msgstr[2] "Вы являетесь участником следующих групп:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5454,19 +5810,19 @@ msgstr "" "tracks — пока не реализовано.\n" "tracking — пока не реализовано.\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Конфигурационный файл не найден. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Конфигурационные файлы искались в следующих местах: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Возможно, вы решите запустить установщик для исправления этого." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Перейти к установщику" @@ -5640,53 +5996,54 @@ msgstr "Группы с наибольшим количеством записе msgid "Tags in %s group's notices" msgstr "Теги записей группы %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Страница недоступна для того типа, который Вы задействовали." -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Неподдерживаемый формат файла изображения." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Этот файл слишком большой. Максимальный размер файла составляет %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Частичная загрузка." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системная ошибка при загрузке файла." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Не является изображением или повреждённый файл." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Неподдерживаемый формат файла изображения." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Потерян файл." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Неподдерживаемый тип файла" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "МБ" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "КБ" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Неизвестный источник входящих сообщений %d." @@ -5707,11 +6064,13 @@ msgstr "Войти с вашим ником и паролем." msgid "Sign up for a new account" msgstr "Создать новый аккаунт" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Подтверждение электронного адреса" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5741,12 +6100,14 @@ msgstr "" "Благодарим за потраченное время, \n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s теперь следит за вашими записями на %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5771,17 +6132,20 @@ msgstr "" "----\n" "Измените email-адрес и настройки уведомлений на %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Биография: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Новый электронный адрес для постинга %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5802,21 +6166,31 @@ msgstr "" "Искренне Ваш,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s статус" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Подтверждение СМС" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "%s. Подтвердите, что это ваш телефон, следующим кодом:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Вас «подтолкнул» пользователь %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5843,12 +6217,14 @@ msgstr "" "С уважением,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Новое приватное сообщение от %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5881,12 +6257,14 @@ msgstr "" "С уважением,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) добавил вашу запись в число своих любимых" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5923,12 +6301,25 @@ msgstr "" "С уважением,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"Всю цепочку можно прочитать здесь:\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) отправил запись для вашего внимания" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5941,18 +6332,41 @@ msgid "" "\n" "\t%4$s\n" "\n" -msgstr "" -"%1$s (@%9$s) только что отправил запись для вашего внимания («@-ответ») на %2" -"$s.\n" +"%5$sYou can reply back here:\n" "\n" -"Текст записи:\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" +msgstr "" +"%1$s (@%9$s) отправил вам сообщение («@-ответ») на %2$s.\n" +"\n" +"Сообщение находится здесь:\n" "\n" "%3$s\n" "\n" -"Оно содержит:\n" +"В нём говорится:\n" "\n" "%4$s\n" "\n" +"%5$sВы можете ответить здесь:\n" +"\n" +"%6$s\n" +"\n" +"Список всех @-ответов для вас находится здесь:\n" +"\n" +"%7$s\n" +"\n" +"С уважением,\n" +"%2$s\n" +"\n" +"PS Вы можете отключить эти уведомления по электронной почте здесь: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5967,7 +6381,7 @@ msgstr "" "вовлечения других пользователей в разговор. Сообщения, получаемые от других " "людей, видите только вы." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "от " @@ -6097,48 +6511,52 @@ msgstr "" "К сожалению, получение информации о вашем местонахождении заняло больше " "времени, чем ожидалось; повторите попытку позже" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "с. ш." -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "ю. ш." -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "в. д." -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "з. д." #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "на" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "в контексте" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Повторено" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Ответить на эту запись" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Ответить" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Запись повторена" @@ -6162,6 +6580,10 @@ msgstr "Ошибка при вставке нового профиля" msgid "Error inserting avatar" msgstr "Ошибка при вставке аватары" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Ошибка обновления удалённого профиля" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Ошибка вставки удалённого профиля" @@ -6211,7 +6633,7 @@ msgstr "Теги записей пользователя %s" msgid "Unknown" msgstr "Неизвестно" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Подписки" @@ -6219,31 +6641,32 @@ msgstr "Подписки" msgid "All subscriptions" msgstr "Все подписки." -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Подписчики" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Все подписчики" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ID пользователя" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Регистрация" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Среднесуточная" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Все группы" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Нет аргумента return-to." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Нереализованный метод." @@ -6267,10 +6690,18 @@ msgstr "Особые" msgid "Popular" msgstr "Популярное" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Нет аргумента return-to." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Повторить эту запись?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Да" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Повторить эту запись" @@ -6280,7 +6711,7 @@ msgstr "Повторить эту запись" msgid "Revoke the \"%s\" role from this user" msgstr "Отозвать у этого пользователя роль «%s»" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "Ни задан пользователь для однопользовательского режима." @@ -6406,89 +6837,108 @@ msgstr "Отписаться от этого пользователя" msgid "Unsubscribe" msgstr "Отписаться" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "У пользователя %s (%d) нет профильной записи." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Изменить аватару" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Действия пользователя" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Идёт удаление пользователя…" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Изменение настроек профиля" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Редактировать" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Послать приватное сообщение этому пользователю." -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Сообщение" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Модерировать" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 msgid "User role" msgstr "Роль пользователя" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "Администратор" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "Модератор" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "пару секунд назад" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(ы) назад" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "около часа назад" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "около %d часа(ов) назад" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "около дня назад" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "около %d дня(ей) назад" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "около месяца назад" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "около %d месяца(ев) назад" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "около года назад" @@ -6504,7 +6954,7 @@ msgstr "" "%s не является допустимым цветом! Используйте 3 или 6 шестнадцатеричных " "символов." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 61d902a1a9..e0aad71466 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-08 21:09+0000\n" +"POT-Creation-Date: 2010-04-26 22:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,7 +19,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "" @@ -69,7 +69,13 @@ msgstr "" msgid "Save access settings" msgstr "" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "" @@ -77,7 +83,7 @@ msgstr "" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +msgid "No such page." msgstr "" #: actions/all.php:75 actions/allrss.php:68 @@ -88,9 +94,9 @@ msgstr "" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -98,11 +104,9 @@ msgstr "" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "" @@ -114,8 +118,9 @@ msgstr "" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -173,8 +178,10 @@ msgstr "" msgid "You and friends" msgstr "" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -189,18 +196,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "" @@ -213,15 +220,15 @@ msgstr "" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -233,7 +240,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "" @@ -243,9 +250,9 @@ msgid "Could not save profile." msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -327,7 +334,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" @@ -417,10 +424,9 @@ msgstr "" msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" +msgid "Invalid alias: \"%s\"." msgstr "" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -437,14 +443,14 @@ msgstr "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" +msgid "Group not found." msgstr "" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -462,17 +468,26 @@ msgstr "" msgid "Could not remove user %1$s from group %2$s." msgstr "" -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "" @@ -486,17 +501,17 @@ msgid "Invalid token." msgstr "" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -527,12 +542,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" @@ -552,20 +570,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "" @@ -610,17 +630,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:202 -msgid "Not found" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." msgstr "" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -629,12 +649,12 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" @@ -644,17 +664,17 @@ msgstr "" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -669,20 +689,16 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "" - #: actions/attachment.php:73 msgid "No such attachment." msgstr "" @@ -702,8 +718,9 @@ msgstr "" msgid "Invalid size." msgstr "" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "" @@ -713,9 +730,9 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." msgstr "" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -734,7 +751,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "" @@ -746,23 +763,27 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "" @@ -770,7 +791,7 @@ msgstr "" msgid "You already blocked that user." msgstr "" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "" @@ -781,27 +802,42 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "" @@ -814,8 +850,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "" @@ -845,8 +881,10 @@ msgstr "" msgid "Unblock this user" msgstr "" -#: actions/bookmarklet.php:50 -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" msgstr "" #: actions/confirmaddress.php:75 @@ -861,33 +899,43 @@ msgstr "" msgid "That confirmation code is not for you!" msgstr "" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" +msgid "Unrecognized address type %s." msgstr "" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "" -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "" -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "" -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "" @@ -897,7 +945,7 @@ msgid "Conversation" msgstr "" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "" @@ -916,7 +964,7 @@ msgstr "" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -931,15 +979,17 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -968,11 +1018,13 @@ msgstr "" msgid "Are you sure you want to delete this notice?" msgstr "" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "" @@ -994,125 +1046,129 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "" -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1217,11 +1273,16 @@ msgstr "" msgid "description is too long (max %d chars)." msgstr "" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "" -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "" @@ -1229,178 +1290,229 @@ msgstr "" msgid "Options saved." msgstr "" -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" msgstr "" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" msgstr "" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "" -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." msgstr "" -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "" -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "" -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "" -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." msgstr "" -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." msgstr "" -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "" -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." msgstr "" -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" @@ -1513,8 +1625,8 @@ msgstr "" msgid "Remote service uses unknown version of OMB protocol." msgstr "" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." msgstr "" #: actions/getfile.php:79 @@ -1570,11 +1682,11 @@ msgstr "" msgid "User is not a member of group." msgstr "" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1582,15 +1694,17 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1631,10 +1745,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1665,34 +1775,38 @@ msgstr "" msgid "Admin" msgstr "" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -1712,7 +1826,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "" @@ -1758,90 +1872,144 @@ msgstr "" msgid "Error removing the block." msgstr "" -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "" + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "" -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "" -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." msgstr "" -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "" + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "" + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "" + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "" +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "" + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1862,7 +2030,7 @@ msgstr "" #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" +msgid "You must be logged in to invite other users to use %s." msgstr "" #: actions/invite.php:72 @@ -1882,7 +2050,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1929,12 +2099,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -1973,7 +2145,9 @@ msgstr "" msgid "No nickname or ID." msgstr "" -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1982,11 +2156,13 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "" @@ -2030,10 +2206,13 @@ msgid "" msgstr "" #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "" + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 @@ -2056,7 +2235,7 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "" #: actions/microsummary.php:69 -msgid "No current status" +msgid "No current status." msgstr "" #: actions/newapplication.php:52 @@ -2091,12 +2270,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "" @@ -2104,7 +2283,7 @@ msgstr "" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2118,7 +2297,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2126,7 +2305,7 @@ msgstr "" msgid "New notice" msgstr "" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "" @@ -2213,11 +2392,11 @@ msgid "You are not a user of that application." msgstr "" #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2226,24 +2405,29 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +msgid "Notice has no profile." msgstr "" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." msgstr "" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -2346,7 +2530,7 @@ msgid "6 or more characters" msgstr "" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "" @@ -2374,7 +2558,7 @@ msgstr "" msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "" @@ -2383,7 +2567,7 @@ msgid "Password saved." msgstr "" #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2393,22 +2577,22 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "" #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" +msgid "Avatar directory not writable: %s." msgstr "" #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" +msgid "Background directory not writable: %s." msgstr "" #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" +msgid "Locales directory not readable: %s." msgstr "" #: actions/pathsadminpanel.php:183 @@ -2546,18 +2730,18 @@ msgstr "" msgid "People search" msgstr "" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." msgstr "" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "" #: actions/postnotice.php:95 -msgid "Invalid notice content" +msgid "Invalid notice content." msgstr "" #: actions/postnotice.php:101 @@ -2583,13 +2767,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "" @@ -2611,9 +2796,9 @@ msgid "Bio" msgstr "" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "" @@ -2627,7 +2812,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -2698,7 +2883,7 @@ msgstr "" #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -2851,7 +3036,7 @@ msgstr "" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2871,41 +3056,41 @@ msgstr "" msgid "Enter a nickname or email address." msgstr "" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -2921,7 +3106,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2943,7 +3128,7 @@ msgstr "" #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -2959,8 +3144,9 @@ msgstr "" msgid "Same as password above. Required." msgstr "" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "" @@ -2973,20 +3159,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3005,7 +3184,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3044,7 +3223,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "" @@ -3080,7 +3259,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "" @@ -3162,7 +3341,7 @@ msgstr "" #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3199,26 +3378,30 @@ msgstr "" msgid "Application profile" msgstr "" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "" @@ -3328,67 +3511,67 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3398,7 +3581,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3407,7 +3590,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "" @@ -3534,11 +3717,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3626,7 +3809,7 @@ msgid "Unable to save site notice." msgstr "" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3641,101 +3824,156 @@ msgstr "" msgid "Save site notice" msgstr "" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "" -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "" -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "" + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "" -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "" -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "" -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "" + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "" -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3756,7 +3994,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3795,8 +4033,7 @@ msgstr "" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -3887,11 +4124,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "" @@ -3924,12 +4161,12 @@ msgstr "" msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -3977,7 +4214,7 @@ msgid "User is not silenced." msgstr "" #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "" #: actions/unsubscribe.php:98 @@ -4013,7 +4250,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "" @@ -4165,27 +4403,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4233,7 +4477,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "" @@ -4241,19 +4486,19 @@ msgstr "" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4291,309 +4536,342 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" - -#: classes/Notice.php:241 -msgid "Problem saving notice. Too long." +msgid "Database error inserting hashtag: %s" msgstr "" #: classes/Notice.php:245 +msgid "Problem saving notice. Too long." +msgstr "" + +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "" -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "" -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "" -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "" -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "" -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "" -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4601,67 +4879,81 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4671,151 +4963,189 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 msgid "Edit site notice" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" msgstr "" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "" @@ -4835,37 +5165,56 @@ msgstr "" msgid "Password changing is not allowed" msgstr "" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -4873,195 +5222,199 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "" -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "" -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." msgstr "" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5103,19 +5456,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5285,53 +5638,54 @@ msgstr "" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 -msgid "Not an image or corrupt file." -msgstr "" - #: lib/imagefile.php:109 -msgid "Unsupported image file format." +msgid "Not an image or corrupt file." msgstr "" #: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5352,11 +5706,13 @@ msgstr "" msgid "Sign up for a new account" msgstr "" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5373,12 +5729,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5393,17 +5751,20 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5416,21 +5777,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5446,12 +5817,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5470,12 +5843,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5496,12 +5871,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5514,6 +5899,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5526,7 +5923,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "" @@ -5651,48 +6048,52 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "" @@ -5716,6 +6117,10 @@ msgstr "" msgid "Error inserting avatar" msgstr "" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "" @@ -5765,7 +6170,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -5773,31 +6178,32 @@ msgstr "" msgid "All subscriptions" msgstr "" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "" - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -5821,10 +6227,18 @@ msgstr "" msgid "Popular" msgstr "" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "" + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "" @@ -5834,7 +6248,7 @@ msgstr "" msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -5960,89 +6374,108 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "" + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 msgid "User role" msgstr "" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "" @@ -6056,7 +6489,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 2a508849f2..65a64dc320 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:58+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:20+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -22,7 +22,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Åtkomst" @@ -73,7 +73,13 @@ msgstr "Stängd" msgid "Save access settings" msgstr "Spara inställningar för åtkomst" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Spara" @@ -81,7 +87,7 @@ msgstr "Spara" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +msgid "No such page." msgstr "Ingen sådan sida" #: actions/all.php:75 actions/allrss.php:68 @@ -92,9 +98,9 @@ msgstr "Ingen sådan sida" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -102,11 +108,9 @@ msgstr "Ingen sådan sida" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Ingen sådan användare." @@ -118,8 +122,9 @@ msgstr "%1$s och vänner, sida %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -184,8 +189,10 @@ msgstr "" msgid "You and friends" msgstr "Du och vänner" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Uppdateringar från %1$s och vänner på %2$s!" @@ -200,18 +207,18 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-metod hittades inte." @@ -224,15 +231,15 @@ msgstr "API-metod hittades inte." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Denna metod kräver en POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -244,7 +251,7 @@ msgstr "Kunde inte uppdatera användare." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Användaren har ingen profil." @@ -254,9 +261,9 @@ msgid "Could not save profile." msgstr "Kunde inte spara profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -340,7 +347,7 @@ msgstr "Ingen status hittad med det ID:t." msgid "This status is already a favorite." msgstr "Denna status är redan en favorit." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Kunde inte skapa favorit." @@ -405,7 +412,7 @@ msgstr "Inte ett giltigt smeknamn." #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." -msgstr "Hemsida är inte en giltig URL." +msgstr "Hemsida är inte en giltig webbadress." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 @@ -431,11 +438,10 @@ msgstr "Beskrivning av plats är för lång (max 255 tecken)." msgid "Too many aliases! Maximum %d." msgstr "För många alias! Maximum %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Ogiltigt alias: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Ogiltigt alias: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -451,14 +457,14 @@ msgstr "Alias kan inte vara samma som smeknamn." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Grupp hittades inte!" +msgid "Group not found." +msgstr "Grupp hittades inte." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Du är redan en medlem i denna grupp." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Du har blivit blockerad från denna grupp av administratören." @@ -476,17 +482,26 @@ msgstr "Du är inte en medlem i denna grupp." msgid "Could not remove user %1$s from group %2$s." msgstr "Kunde inte ta bort användare %1$s från grupp %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "%ss grupper" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%1$s grupper %2$s är en medlem i." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s grupper" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "grupper på %s" @@ -500,17 +515,17 @@ msgid "Invalid token." msgstr "Ogiltig token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -541,12 +556,15 @@ msgstr "Begäran-token %s har godkänts. Byt ut den mot en åtkomst-token." msgid "The request token %s has been denied and revoked." msgstr "Begäran-token %s har nekats och återkallats." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Oväntat inskick av formulär." @@ -569,20 +587,22 @@ msgstr "" "möjligheten att %3$s din %4$s kontoinformation. Du bör bara " "ge tillgång till ditt %4$s-konto till tredje-parter du litar på." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Smeknamn" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Lösenord" @@ -627,31 +647,31 @@ msgstr "Status borttagen." msgid "No status with that ID found." msgstr "Ingen status med det ID:t hittades." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det är för långt. Maximal notisstorlek är %d tecken." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Hittades inte" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Hittades inte." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." -msgstr "Maximal notisstorlek är %d tecken, inklusive URL för bilaga." +msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 msgid "Unsupported format." msgstr "Format som inte stödjs." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoriter från %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s." @@ -661,17 +681,17 @@ msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Uppdateringar som nämner %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s publika tidslinje" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s uppdateringar från alla!" @@ -686,20 +706,16 @@ msgstr "Upprepat till %s" msgid "Repeats of %s" msgstr "Upprepningar av %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notiser taggade med %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Uppdateringar taggade med %1$s på %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Hittades inte." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Ingen sådan bilaga." @@ -719,8 +735,9 @@ msgstr "Ingen storlek." msgid "Invalid size." msgstr "Ogiltig storlek." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -731,10 +748,10 @@ msgstr "" "Du kan ladda upp din personliga avatar. Den maximala filstorleken är %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Användare utan matchande profil" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Användare utan matchande profil." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -752,7 +769,7 @@ msgid "Preview" msgstr "Förhandsgranska" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Ta bort" @@ -764,23 +781,27 @@ msgstr "Ladda upp" msgid "Crop" msgstr "Beskär" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Ingen fil laddades upp." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Välj ett kvadratiskt område i bilden som din avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Förlorade vår fildata." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar uppdaterad." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Misslyckades uppdatera avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar borttagen." @@ -788,7 +809,7 @@ msgstr "Avatar borttagen." msgid "You already blocked that user." msgstr "Du har redan blockerat denna användare." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Blockera användare" @@ -802,27 +823,42 @@ msgstr "" "prenumeration på dig tas bort, de kommer inte kunna prenumerera på dig i " "framtiden och du kommer inte bli underrättad om några @-svar från dem." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Nej" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Blockera inte denna användare" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Ja" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blockera denna användare" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Misslyckades att spara blockeringsinformation." @@ -835,8 +871,8 @@ msgstr "Misslyckades att spara blockeringsinformation." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Ingen sådan grupp." @@ -867,9 +903,11 @@ msgstr "Häv blockering" msgid "Unblock this user" msgstr "Häv blockering av denna användare" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Posta till " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Posta till %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -883,33 +921,43 @@ msgstr "Bekräftelsekod kunde inte hittas." msgid "That confirmation code is not for you!" msgstr "Denna bekräftelsekod är inte för dig!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Adresstypen %s känns inte igen" +msgid "Unrecognized address type %s." +msgstr "Adresstypen %s känns inte igen." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Denna adress har redan blivit bekräftad." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Kunde inte uppdatera användare." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Kunde inte ta bort e-postbekräftelse." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Bekräfta adress" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto." @@ -919,7 +967,7 @@ msgid "Conversation" msgstr "Konversationer" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notiser" @@ -938,7 +986,7 @@ msgstr "Du är inte ägaren av denna applikation." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Det var ett problem med din sessions-token." @@ -956,15 +1004,17 @@ msgstr "" "bort all data om applikationen från databasen, inklusive alla befintliga " "användaranslutningar." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Ta inte bort denna applikation" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Ta bort denna applikation" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -995,11 +1045,13 @@ msgstr "Ta bort notis" msgid "Are you sure you want to delete this notice?" msgstr "Är du säker på att du vill ta bort denna notis?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Ta inte bort denna notis" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Ta bort denna notis" @@ -1023,58 +1075,61 @@ msgstr "" "Är du säker på att du vill ta bort denna användare? Det kommer rensa all " "data om användaren från databasen, utan en säkerhetskopia." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Ta bort denna användare" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Utseende" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Utseendeinställningar för denna StatusNet-webbplats." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." -msgstr "Ogiltig logtyp-URL." +msgstr "Ogiltig webbadress för logtyp." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Tema inte tillgängligt: %s" +msgid "Theme not available: %s." +msgstr "Tema inte tillgängligt: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Byt logotyp" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Webbplatslogotyp" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Byt tema" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Webbplatstema" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Tema för webbplatsen." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Ändra bakgrundsbild" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Bakgrund" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1083,67 +1138,68 @@ msgstr "" "Du kan ladda upp en bakgrundsbild för denna webbplats. Den maximala " "filstorleken är %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "På" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Av" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Sätt på eller stäng av bakgrundsbild." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Upprepa bakgrundsbild" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Byt färger" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Innehåll" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Sidofält" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Text" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Länkar" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "Använd standardvärden" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Återställ standardutseende" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Återställ till standardvärde" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Spara" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Spara utseende" @@ -1195,11 +1251,11 @@ msgstr "Beskrivning krävs." #: actions/editapplication.php:194 msgid "Source URL is too long." -msgstr "URL till källa är för lång." +msgstr "Webbadress till källa är för lång." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Source URL is not valid." -msgstr "URL till källa är inte giltig." +msgstr "Webbadress till källa är inte giltig." #: actions/editapplication.php:203 actions/newapplication.php:188 msgid "Organization is required." @@ -1219,7 +1275,7 @@ msgstr "Anrop är för lång." #: actions/editapplication.php:225 actions/newapplication.php:215 msgid "Callback URL is not valid." -msgstr "URL för anrop är inte giltig." +msgstr "Webbadress för anrop är inte giltig." #: actions/editapplication.php:258 msgid "Could not update application." @@ -1248,11 +1304,16 @@ msgstr "Använd detta formulär för att redigera gruppen." msgid "description is too long (max %d chars)." msgstr "beskrivning är för lång (max %d tecken)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Ogiltigt alias: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Kunde inte uppdatera grupp." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Kunde inte skapa alias." @@ -1260,31 +1321,42 @@ msgstr "Kunde inte skapa alias." msgid "Options saved." msgstr "Alternativ sparade." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "E-postinställningar" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Hantera hur du får e-post från %%site.name%%" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adress" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "E-postadress" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Aktuell, bekräftad e-postadress." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Ta bort" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1292,107 +1364,137 @@ msgstr "" "Väntar bekräftelse av denna adress. Kontrollera din inkorg (och " "skräppostkorg!) efter ett meddelande med vidare instruktioner." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Avbryt" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "E-postadress" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "E-postadress, såsom \"användarnamn@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Lägg till" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Inkommande e-post" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Skicka e-post till denna adress för att posta nya notiser." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" "Ange en ny e-postadress för att posta till; detta inaktiverar den gamla." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Ny" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Inställningar" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "E-postinställningar" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Skicka notiser om nya prenumerationer till mig genom e-post." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Skicka mig e-post när någon lägger till min notis som en favorit." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Skicka mig e-post när någon skickar mig ett privat meddelande." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Skicka mig e-post när någon skickar ett \"@-svar\"." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Tillåt vänner att knuffa mig och skicka e-post till mig." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Jag vill posta notiser genom min e-post." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Publicera ett MicroID för min e-postadress." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Inställningar sparade." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "E-postinställningar sparade." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Ingen e-postadress." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Kan inte normalisera den e-postadressen" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Inte en giltig e-postadress." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Det är redan din e-postadress." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Den e-postadressen tillhör redan en annan användare." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Kunde inte infoga bekräftelsekod." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1401,43 +1503,53 @@ msgstr "" "din inkorg (och skräppostkorg!) för koden och instruktioner hur du använder " "den." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Ingen väntande bekräftelse att avbryta." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Detta är fel IM-adress." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Detta är fel e-postadress." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Bekräftelse avbruten." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "E-postbekräftelse avbruten." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Det är inte din e-postadress." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Adressen togs bort." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "E-postadressen togs bort." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Ingen inkommande e-postadress." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Kunde inte uppdatera användaruppgift." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Inkommande e-postadress borttagen." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Ny inkommande e-postadress tillagd." @@ -1556,9 +1668,9 @@ msgstr "Kunde inte konvertera token för begäran till token för åtkomst." msgid "Remote service uses unknown version of OMB protocol." msgstr "Fjärrtjänsten använder en okänd version av OMB-protokollet." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Fel vid uppdatering av fjärrprofil" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Fel vid uppdatering av fjärrprofil." #: actions/getfile.php:79 msgid "No such file." @@ -1613,11 +1725,11 @@ msgstr "Användaren är redan blockerad från grupp." msgid "User is not a member of group." msgstr "Användare är inte en gruppmedlem." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Blockera användare från grupp" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1628,15 +1740,17 @@ msgstr "" "\"? De kommer bli borttagna från gruppen, inte kunna skriva till och inte " "kunna prenumerera på gruppen i framtiden." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Blockera inte denna användare från denna grupp" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Blockera denna användare från denna grupp" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "Databasfel vid blockering av användare från grupp." @@ -1680,10 +1794,6 @@ msgstr "" "Du kan ladda upp en logotypbild för din grupp. Den maximala filstorleken är %" "s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Användare utan matchande profil." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Välj ett kvadratiskt område i bilden som logotyp" @@ -1714,34 +1824,38 @@ msgstr "En lista av användarna i denna grupp." msgid "Admin" msgstr "Administratör" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Blockera" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Gör användare till en administratör för gruppen" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Gör till administratör" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Gör denna användare till administratör" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s tidslinje" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Uppdateringar från medlemmar i %1$s på %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupper" @@ -1766,7 +1880,7 @@ msgstr "" "inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%" "%%%) eller [starta din egen!](%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Skapa en ny grupp" @@ -1819,11 +1933,15 @@ msgstr "Användare är inte blockerad från grupp." msgid "Error removing the block." msgstr "Fel vid hävning av blockering." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Inställningar för snabbmeddelanden" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1832,15 +1950,24 @@ msgstr "" "Du kan skicka och ta emot notiser genom Jabber/GTalk-[snabbmeddelanden](%%" "doc.im%%). Konfigurera din adress och dina inställningar nedan." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "IM är inte tillgänglig." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "Adress för snabbmeddelanden" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Aktuell bekräftad Jabber/Gtalk-adress." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1849,11 +1976,9 @@ msgstr "" "Väntar på bekräftelse för denna adress. Kontrollera ditt Jabber/GTalk-konto " "för vidare instruktioner. (La du till %s i din kompislista?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "Adress för snabbmeddelanden" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1862,45 +1987,66 @@ msgstr "" "Jabber- eller GTalk-adress, som \"användarnamn@example.org\". Se först till " "att lägga till %s i din kompislista i din IM-klient eller hos GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Inställningar för snabbmeddelanden" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Skicka notiser till mig genom Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Posta en notis när min Jabber/GTalk-status ändras." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Skicka svar till mig genom Jabber/GTalk från personer som jag inte " "prenumererar på." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Publicera ett MicroID för min Jabber/GTalk-adress." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Inställningar sparade." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Inget Jabber-ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Kan inte normalisera detta Jabber-ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Inte ett giltigt Jabber-ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Detta är redan ditt Jabber-ID" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber-ID:t tillhör redan en annan användare." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1909,10 +2055,32 @@ msgstr "" "En bekräftelsekod skickades till den IM-adress du angav. Du måste godkänna " "att %s får skicka meddelanden till dig." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Detta är fel IM-adress." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Kunde inte ta bort bekräftelse för snabbmeddelanden." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Bekräftelse för snabbmeddelanden avbruten." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Detta är inte ditt Jabber-ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "Adressen för snabbmeddelanden togs bort." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1934,8 +2102,8 @@ msgstr "Inbjudningar har blivit inaktiverade." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "Du måste vara inloggad för att kunna bjuda in andra användare till %s" +msgid "You must be logged in to invite other users to use %s." +msgstr "Du måste vara inloggad för att kunna bjuda in andra användare till %s." #: actions/invite.php:72 #, php-format @@ -1954,7 +2122,9 @@ msgstr "Bjud in nya användare" msgid "You are already subscribed to these users:" msgstr "Du prenumererar redan på dessa användare:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2007,12 +2177,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Skicka" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s har bjudit in dig att gå med dem på %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2077,7 +2249,9 @@ msgstr "Du måste vara inloggad för att kunna gå med i en grupp." msgid "No nickname or ID." msgstr "Inget smeknamn eller ID." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s gick med i grupp %2$s" @@ -2086,11 +2260,13 @@ msgstr "%1$s gick med i grupp %2$s" msgid "You must be logged in to leave a group." msgstr "Du måste vara inloggad för att lämna en grupp." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Du är inte en medlem i den gruppen." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s lämnade grupp %2$s" @@ -2136,13 +2312,16 @@ msgstr "" "igen innan du ändrar dina inställningar." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Logga in med ditt användarnamn och lösenord." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? " -"[Registrera](%%action.register%%) ett nytt konto." +"Har du inte ett användarnamn ännu? [Registrera](%%action.register%%) ett " +"nytt konto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2164,8 +2343,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Kan inte göra %1$s till en administratör för grupp %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Ingen aktuell status" +msgid "No current status." +msgstr "Ingen aktuell status." #: actions/newapplication.php:52 msgid "New Application" @@ -2181,7 +2360,7 @@ msgstr "Använd detta formulär för att registrera en ny applikation." #: actions/newapplication.php:176 msgid "Source URL is required." -msgstr "URL till källa krävs." +msgstr "Webbadress till källa krävs." #: actions/newapplication.php:258 actions/newapplication.php:267 msgid "Could not create application." @@ -2199,12 +2378,12 @@ msgstr "Använd detta formulär för att skapa en ny grupp." msgid "New message" msgstr "Nytt meddelande" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Du kan inte skicka ett meddelande till den användaren." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Inget innehåll!" @@ -2212,7 +2391,7 @@ msgstr "Inget innehåll!" msgid "No recipient specified." msgstr "Ingen mottagare angiven." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2228,7 +2407,7 @@ msgstr "Meddelande skickat" msgid "Direct message to %s sent." msgstr "Direktmeddelande till %s skickat." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "AJAX-fel" @@ -2236,7 +2415,7 @@ msgstr "AJAX-fel" msgid "New notice" msgstr "Ny notis" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Notis postad" @@ -2331,11 +2510,11 @@ msgid "You are not a user of that application." msgstr "Du är inte en användare av den applikationen." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "Kunde inte återkalla åtkomst för applikation: " +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Kunde inte återkalla åtkomst för applikation: %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "Du har inte tillåtit några applikationer att använda ditt konto." @@ -2345,24 +2524,29 @@ msgstr "" "Utvecklare kan redigera registreringsinställningarna för sina applikationer " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Notisen har ingen profil" +msgid "Notice has no profile." +msgstr "Notisen har ingen profil." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$ss status den %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "innehållstyp " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Innehållstyp %s stödjs inte." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Bara " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "Endast %s-webbadresser över vanlig HTTP." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -2465,7 +2649,7 @@ msgid "6 or more characters" msgstr "Minst 6 tecken" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Bekräfta" @@ -2493,7 +2677,7 @@ msgstr "Felaktigt gammalt lösenord" msgid "Error saving user; invalid." msgstr "Fel vid sparande av användare; ogiltig." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Kan inte spara nytt lösenord." @@ -2502,7 +2686,7 @@ msgid "Password saved." msgstr "Lösenord sparat." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Sökvägar" @@ -2512,23 +2696,23 @@ msgstr "Sökvägs- och serverinställningar för denna StatusNet-webbplats." #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Katalog med teman är inte läsbar: %s" +msgid "Theme directory not readable: %s." +msgstr "Katalog med teman är inte läsbar: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Katalog med avatarer är inte skrivbar: %s" +msgid "Avatar directory not writable: %s." +msgstr "Katalog med avatarer är inte skrivbar: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Katalog med bakgrunder är inte skrivbar: %s" +msgid "Background directory not writable: %s." +msgstr "Katalog med bakgrunder är inte skrivbar: %s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Katalog med lokaliseringfiler (locales) är inte läsbar. %s" +msgid "Locales directory not readable: %s." +msgstr "Katalog med lokaliseringfiler (locales) är inte läsbar. %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2668,19 +2852,19 @@ msgstr "" msgid "People search" msgstr "Personsökning" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Inte en giltig persontagg: %s" +msgid "Not a valid people tag: %s." +msgstr "Inte en giltig persontagg: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Användare som taggat sig själv med %1$s - sida %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Ogiltigt notisinnehåll" +msgid "Invalid notice content." +msgstr "Ogiltigt notisinnehåll." #: actions/postnotice.php:101 #, php-format @@ -2707,13 +2891,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullständigt namn" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Hemsida" @@ -2735,9 +2920,9 @@ msgid "Bio" msgstr "Biografi" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Plats" @@ -2751,7 +2936,7 @@ msgstr "Dela min nuvarande plats när jag skickar notiser" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Taggar" @@ -2826,8 +3011,8 @@ msgstr "Inställningar sparade." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Bortom sidbegränsningen (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Bortom sidbegränsningen (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2995,7 +3180,7 @@ msgstr "Återställ lösenord" msgid "Recover password" msgstr "Återskapa lösenord" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Återskapande av lösenord begärd" @@ -3015,19 +3200,19 @@ msgstr "Återställ" msgid "Enter a nickname or email address." msgstr "Skriv in ett smeknamn eller en e-postadress." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Ingen användare med den e-postadressen eller användarnamn." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Ingen registrerad e-postadress för den användaren." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Fel vid sparande av adressbekräftelse." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3035,23 +3220,23 @@ msgstr "" "Instruktioner för att återställa ditt lösenord har skickats till e-" "postadressen som är registrerat till ditt konto " -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Oväntad återställning av lösenord." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Lösenordet måste vara minst 6 tecken." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Lösenord och bekräftelse matchar inte." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Fel uppstog i användarens inställning" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nya lösenordet sparat. Du är nu inloggad." @@ -3067,7 +3252,7 @@ msgstr "Tyvärr, ogiltig inbjudningskod." msgid "Registration successful" msgstr "Registreringen genomförd" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrera" @@ -3089,7 +3274,7 @@ msgstr "Ogiltigt användarnamn eller lösenord." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" "Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser " @@ -3109,8 +3294,9 @@ msgstr "Minst 6 tecken. Måste fyllas i." msgid "Same as password above. Required." msgstr "Samma som lösenordet ovan. Måste fyllas i." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-post" @@ -3125,22 +3311,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Min text och mina filer är tillgängliga under " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Creative Commons Erkännande 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -"med undantag av den här privata datan: lösenord, e-postadress, IM-adress, " -"telefonnummer." +"Mina texter och filer är tillgängliga under %s med undantag av den här " +"privata datan: lösenord, e-postadress, IM-adress, telefonnummer." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3173,7 +3352,7 @@ msgstr "" "Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda " "denna tjänst." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3218,7 +3397,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL till din profil på en annan kompatibel mikrobloggtjänst" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Prenumerera" @@ -3256,7 +3435,7 @@ msgstr "Du kan inte upprepa din egna notis." msgid "You already repeated that notice." msgstr "Du har redan upprepat denna notis." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Upprepad" @@ -3327,9 +3506,8 @@ msgid "You cannot revoke user roles on this site." msgstr "Du kan inte återkalla användarroller på denna webbplats." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Användare utan matchande profil." +msgstr "Användare har inte denna roll." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3345,7 +3523,7 @@ msgstr "Användare är redan flyttad till sandlådan." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Sessioner" @@ -3382,26 +3560,30 @@ msgstr "Du måste vara inloggad för att se en applikation." msgid "Application profile" msgstr "Applikationsprofil" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Ikon" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Namn" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Organisation" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beskrivning" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Statistik" @@ -3522,67 +3704,67 @@ msgstr "%s grupp" msgid "%1$s group, page %2$d" msgstr "%1$s grupp, sida %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Grupprofil" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Notis" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Alias" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Åtgärder för grupp" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Flöde av notiser för %s grupp (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Flöde av notiser för %s grupp (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Flöde av notiser för %s grupp (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF för %s grupp" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Medlemmar" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Alla medlemmar" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Skapad" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3597,7 +3779,7 @@ msgstr "" "sina liv och intressen. [Gå med nu](%%%%action.register%%%%) för att bli en " "del av denna grupp och många fler! ([Läs mer](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3610,7 +3792,7 @@ msgstr "" "[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om " "sina liv och intressen. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Administratörer" @@ -3731,7 +3913,6 @@ msgid "User is already silenced." msgstr "Användaren är redan nedtystad." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" msgstr "Grundinställningar för din StatusNet-webbplats" @@ -3749,12 +3930,12 @@ msgid "Unknown language \"%s\"." msgstr "Okänt språk \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "Minsta textbegränsning är 140 tecken." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Minsta textbegränsning är 0 (obegränsat)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." -msgstr "Begränsning av duplikat måste vara en eller fler sekuner." +msgid "Dupe limit must be one or more seconds." +msgstr "Duplikatgräns måste vara en eller fler sekuner." #: actions/siteadminpanel.php:221 msgid "General" @@ -3801,13 +3982,14 @@ msgid "Default timezone for the site; usually UTC." msgstr "Standardtidzon för denna webbplats; vanligtvis UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Webbplatsens standardspråk" +msgstr "Standardspråk" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Webbplatsspråk när automatisk identifiering av inställningar i webbläsaren " +"inte är tillgänglig" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3831,76 +4013,98 @@ msgstr "" "Hur länge användare måste vänta (i sekunder) för att posta samma sak igen." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" msgstr "Webbplatsnotis" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nytt meddelande" +msgstr "Redigera webbplastsnotis" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Kunde inte spara dina utseendeinställningar." +msgstr "Kunde inte spara webbplatsnotis." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "Maximal längd för webbplatsnotisen är 255 tecken." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Webbplatsnotis" +msgstr "Text för webbplatsnotis" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "Text för webbplatsnotis (max 255 tecken; HTML ok)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Webbplatsnotis" +msgstr "Spara webbplatsnotis" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Inställningar för SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Du kan ta emot SMS-meddelanden genom e-post från %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "SMS är inte tillgängligt." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "SMS-adress" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Nuvarande bekäftat telefonnummer för SMS." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Väntar bekräftelse för detta telefonnummer." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Bekräftelsekod" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Fyll i koden du mottog i din telefon." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Bekräfta" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Telefonnummer för SMS" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "SMS-inställningar" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3908,23 +4112,33 @@ msgstr "" "Skicka notiser till mig via SMS. Jag är införstådd med att min operatör kan " "debitera mig." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "SMS-inställningar sparade." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Inget telefonnummer." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Ingen operatör vald." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Detta är redan ditt telefonnummer." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Detta telefonnumr tillhör redan en annan användare." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3932,23 +4146,40 @@ msgstr "" "En bekräftelsekod skickades till det telefonnummer du lagt till. Kontrollera " "din telefon för koden och instruktioner om hur du använder den." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Detta är fel bekräftelsenummer." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "SMS-bekräftelse avbruten." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Detta är inte ditt telefonnummer." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Telefonnummer för SMS togs bort." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Mobiloperatör" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Välj en operatör" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3958,20 +4189,20 @@ msgstr "" "SMS via e-post men som inte finns med i listan, skicka ett e-post till oss " "på %s och berätta." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Ingen kod ifylld" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" -msgstr "Ögonblicksbild" +msgstr "Ögonblicksbilder" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Ändra webbplatskonfiguration" +msgstr "Hantera konfiguration för ögonblicksbild" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -3986,7 +4217,7 @@ msgid "Invalid snapshot report URL." msgstr "Ogiltig rapport-URL för ögonblicksbild" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "Slumpmässigt vid webbförfrågningar" #: actions/snapshotadminpanel.php:201 @@ -4018,16 +4249,14 @@ msgid "Snapshots will be sent to this URL" msgstr "Ögonblicksbild kommer skickat till denna URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Spara webbplatsinställningar" +msgstr "Spara inställningar för ögonblicksbild" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." msgstr "Du är inte prenumerat hos den profilen." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Kunde inte spara prenumeration." @@ -4128,11 +4357,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s lyssnar inte på någon." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4165,12 +4394,12 @@ msgstr "Inget ID-argument." msgid "Tag %s" msgstr "Tagg %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Användarprofil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -4223,7 +4452,7 @@ msgid "User is not silenced." msgstr "Användare är inte nedtystad." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Ingen profil-ID i begäran." #: actions/unsubscribe.php:98 @@ -4261,7 +4490,8 @@ msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken." msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Ogiltig standardprenumeration: '%1$s' är inte användare." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" @@ -4425,28 +4655,34 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Smaklig måltid!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "%1$s grupper, sida %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Sök efter fler grupper" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s är inte en medlem i någon grupp." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Prova att [söka efter grupper](%%action.groupsearch%%) och gå med i dem." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Uppdateringar från %1$s på %2$s!" @@ -4506,7 +4742,8 @@ msgstr "" msgid "Plugins" msgstr "Insticksmoduler" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Version" @@ -4514,7 +4751,7 @@ msgstr "Version" msgid "Author(s)" msgstr "Författare" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4523,12 +4760,12 @@ msgstr "" "Inga filer får vara större än %d byte och filen du skickade var %d byte. " "Prova att ladda upp en mindre version." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "En så här stor fil skulle överskrida din användarkvot på %d byte." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "En sådan här stor fil skulle överskrida din månatliga kvot på %d byte." @@ -4566,27 +4803,28 @@ msgstr "Kunde inte infoga meddelande." msgid "Could not update message with new URI." msgstr "Kunde inte uppdatera meddelande med ny URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" msgstr "Databasfel vid infogning av hashtag: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Problem vid sparande av notis. För långt." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Problem vid sparande av notis. Okänd användare." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "För många notiser för snabbt; ta en vilopaus och posta igen om ett par " "minuter." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4594,288 +4832,319 @@ msgstr "" "För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen " "om ett par minuter." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Du är utestängd från att posta notiser på denna webbplats." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Problem med att spara notis." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Problem med att spara gruppinkorg." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Du har blivit utestängd från att prenumerera." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Redan prenumerant!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Användaren har blockerat dig." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Inte prenumerant!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Kunde inte ta bort själv-prenumeration." -#: classes/Subscription.php:190 -#, fuzzy +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "Kunde inte ta bort prenumeration." +msgstr "Kunde inte radera OMB prenumerations-token." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Kunde inte ta bort prenumeration." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Välkommen till %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Kunde inte skapa grupp." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Kunde inte ställa in grupp-URI." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Kunde inte ställa in gruppmedlemskap." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Kunde inte spara lokal gruppinformation." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Ändra dina profilinställningar" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Ladda upp en avatar" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Ändra ditt lösenord" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Ändra e-posthantering" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Designa din profil" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Övrigt" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Övriga alternativ" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Övrigt" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Namnlös sida" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Primär webbplatsnavigation" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Personlig profil och vänners tidslinje" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Personligt" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Ändra din e-post, avatar, lösenord, profil" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Anslut till tjänster" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Anslut" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Ändra webbplatskonfiguration" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Administratör" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Bjud in vänner och kollegor att gå med dig på %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Bjud in" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Logga ut från webbplatsen" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Logga ut" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Skapa ett konto" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Registrera" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Logga in på webbplatsen" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Logga in" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Hjälp mig!" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Hjälp" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Sök efter personer eller text" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Sök" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "Webbplatsnotis" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Lokala vyer" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Sidnotis" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Sekundär webbplatsnavigation" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Hjälp" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Om" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "Frågor & svar" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "Användarvillkor" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Sekretess" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Källa" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Emblem" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Programvarulicens för StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** är en mikrobloggtjänst tillhandahållen av [%%site.broughtby" -"%%](%%site.broughtbyurl%%). " +"%%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** är en mikrobloggtjänst. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** är en mikrobloggtjänst." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4886,68 +5155,82 @@ msgstr "" "version %s, tillgänglig under [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Licens för webbplatsinnehåll" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Innehåll och data av %1$s är privat och konfidensiell." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Innehåll och data copyright av medarbetare. Alla rättigheter reserverade." -#: lib/action.php:847 -msgid "All " -msgstr "Alla " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "Innehåll och data på %1$s är tillgänglig under licensen %2$s." -#: lib/action.php:853 -msgid "license." -msgstr "licens." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Numrering av sidor" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Senare" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Tidigare" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Kan inte hantera fjärrinnehåll ännu." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Kan inte hantera inbäddat XML-innehåll ännu." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Kan inte hantera inbäddat Base64-innehåll ännu." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Du kan inte göra förändringar av denna webbplats." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Ändringar av den panelen tillåts inte." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() är inte implementerat." @@ -4957,157 +5240,191 @@ msgstr "showForm() är inte implementerat." msgid "saveSettings() not implemented." msgstr "saveSetting() är inte implementerat." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Kunde inte ta bort utseendeinställning." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Grundläggande webbplatskonfiguration" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Webbplats" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Konfiguration av utseende" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Utseende" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Konfiguration av användare" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Användare" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Konfiguration av åtkomst" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Konfiguration av sökvägar" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Konfiguration av sessioner" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 -#, fuzzy +#: lib/adminpanelaction.php:397 msgid "Edit site notice" -msgstr "Webbplatsnotis" +msgstr "Redigera webbplatsnotis" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 -#, fuzzy +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" -msgstr "Konfiguration av sökvägar" +msgstr "Konfiguration av ögonblicksbilder" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" -"Misslyckat försök till API-autentisering, smeknamn =%1$s, proxy =%2$s, ip =%3" -"$s" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Redigera applikation" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Ikon för denna applikation" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Beskriv din applikation med högst %d tecken" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Beskriv din applikation" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "URL för källa" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "URL till hemsidan för denna applikation" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "URL för källa" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Organisation som ansvarar för denna applikation" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "URL till organisationens hemsidan" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "URL att omdirigera till efter autentisering" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Webbläsare" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Skrivbord" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Typ av applikation, webbläsare eller skrivbord" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Skrivskyddad" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Läs och skriv" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Standardåtkomst för denna applikation: skrivskyddad, eller läs och skriv" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Avbryt" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "läs och skriv" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "skrivskyddad" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Godkänd %1$s - \"%2$s\" åtkomst." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Återkalla" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Bilagor" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Författare" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Tillhandahållare" @@ -5127,37 +5444,56 @@ msgstr "Byte av lösenord misslyckades" msgid "Password changing is not allowed" msgstr "Byte av lösenord är inte tillåtet" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultat av kommando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Kommando komplett" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Kommando misslyckades" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Tyvärr, detta kommando är inte implementerat än." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Notis med den ID:n finns inte" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Användare har ingen sista notis" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Kunde inte hitta en användare med smeknamnet %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Kunde inte hitta en lokal användare med smeknamnet %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Tyvärr, detta kommando är inte implementerat än." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Det verkar inte vara särskilt meningsfullt att knuffa dig själv!" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Knuff skickad till %s" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5168,196 +5504,202 @@ msgstr "" "Prenumeranter: %2$s\n" "Notiser: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Notis med den ID:n finns inte" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Användare har ingen sista notis" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Notis markerad som favorit." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Du är redan en medlem i denna grupp" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "Kunde inte ansluta användare %s till groupp %s" +msgid "Could not join user %1$s to group %2$s" +msgstr "Kunde inte ansluta användare %1$s till grupp %2$s." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%s gick med i grupp %s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Kunde inte ta bort användare %1$s från grupp %2$s" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Kunde inte ta bort användare %s från grupp %s" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s lämnade grupp %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Fullständigt namn: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "Plats: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Hemsida: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" +"%s är en fjärrprofil; du kan bara skicka direktmeddelanden till användare på " +"samma server." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Direktmeddelande till %s skickat" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Fel vid sändning av direktmeddelande." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Kan inte upprepa din egen notis" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Redan upprepat denna notis" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Notis fron %s upprepad" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Fel vid upprepning av notis." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notis för långt - maximum är %d tecken, du skickade %d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Svar på %s skickat" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Fel vid sparande av notis." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Ange namnet på användaren att prenumerara på" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Ingen sådan användare." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Kan inte prenumera på OMB-profiler via kommando." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Prenumerar på %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Ange namnet på användaren att avsluta prenumeration på" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Prenumeration hos %s avslutad" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Kommando inte implementerat än." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Notifikation av." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Kan inte sätta på notifikation." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Notifikation på." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Kan inte stänga av notifikation." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "Inloggningskommando är inaktiverat" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Denna länk är endast användbar en gång, och gäller bara i 2 minuter: %s" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "Prenumeration avslutad %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Du prenumererar inte på någon." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du prenumererar på denna person:" msgstr[1] "Du prenumererar på dessa personer:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "Ingen prenumerar på dig." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Denna person prenumererar på dig:" msgstr[1] "Dessa personer prenumererar på dig:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Du är inte medlem i några grupper." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du är en medlem i denna grupp:" msgstr[1] "Du är en medlem i dessa grupper:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5437,19 +5779,19 @@ msgstr "" "tracks - inte implementerat än.\n" "tracking - inte implementerat än.\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Ingen konfigurationsfil hittades. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Jag letade efter konfigurationsfiler på följande platser: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Du kanske vill köra installeraren för att åtgärda detta." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Gå till installeraren." @@ -5551,7 +5893,7 @@ msgstr "Gå" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Bevilja denna användare \"%s\"-rollen" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5621,53 +5963,54 @@ msgstr "Grupper med flest inlägg" msgid "Tags in %s group's notices" msgstr "Taggar i %s grupps notiser" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Bildfilens format stödjs inte." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Denna fil är för stor. Den maximala filstorleken är %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Bitvis uppladdad." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfel vid uppladdning av fil." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Inte en bildfil eller så är filen korrupt." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Bildfilens format stödjs inte." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Förlorade vår fil." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Okänd filtyp" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Okänd källa för inkorg %d." @@ -5688,11 +6031,13 @@ msgstr "Logga in med ett användarnamn och lösenord" msgid "Sign up for a new account" msgstr "Registrera dig för ett nytt konto" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "E-postadressbekräftelse" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5721,12 +6066,14 @@ msgstr "" "Tack för din tid, \n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s lyssnar nu på dina notiser på %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5751,17 +6098,20 @@ msgstr "" "----\n" "Ändra din e-postadress eller notiferingsinställningar på %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Biografi: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Ny e-postadress för att skicka till %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5782,21 +6132,31 @@ msgstr "" "Med vänliga hälsningar,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s status" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS-bekräftelse" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "%s: bekräfta detta telefonnummer med denna kod:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Du har blivit knuffad av %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5823,12 +6183,14 @@ msgstr "" "Med vänliga hälsningar,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Nytt privat meddelande från %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5861,12 +6223,14 @@ msgstr "" "Med vänliga hälsningar,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) lade till din notis som en favorit" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5903,12 +6267,25 @@ msgstr "" "Med vänliga hälsningar,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"Hela konversationen kan läsas här:\n" +"\n" +"\t%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) skickade en notis för din uppmärksamhet" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5921,18 +6298,41 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" "%1$s (@%9$s) skickade precis en notis för din uppmärksamhet (ett '@-svar') " "på %2$s.\n" "\n" "Notisen är här:\n" "\n" -"%3$s\n" +"\t%3$s\n" "\n" "Den lyder:\n" "\n" -"%4$s\n" +"\t%4$s\n" "\n" +"%5$sDu kan svara här:\n" +"\n" +"\t%6$s\n" +"\n" +"Listan med alla @-svar till dig hittar du här:\n" +"%7$s\n" +"\n" +"Med vänliga hälsningar,\n" +"%2$s\n" +"\n" +"P.S. Du kan stänga av dessa e-postnotifikationer här: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5947,7 +6347,7 @@ msgstr "" "engagera andra användare i konversationen. Folk kan skicka meddelanden till " "dig som bara du ser." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "från" @@ -6078,48 +6478,52 @@ msgstr "" "Tyvärr, hämtning av din geografiska plats tar längre tid än förväntat, var " "god försök igen senare" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "N" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "S" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "Ö" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "V" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "på" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "i sammanhang" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Upprepad av" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Svara på denna notis" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Svara" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Notis upprepad" @@ -6143,6 +6547,10 @@ msgstr "Fel vid infogning av ny profil" msgid "Error inserting avatar" msgstr "Fel vid infogning av avatar" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Fel vid uppdatering av fjärrprofil" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Fel vid infogning av fjärrprofilen" @@ -6192,7 +6600,7 @@ msgstr "Taggar i %ss notiser" msgid "Unknown" msgstr "Okänd" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Prenumerationer" @@ -6200,31 +6608,32 @@ msgstr "Prenumerationer" msgid "All subscriptions" msgstr "Alla prenumerationer" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Prenumeranter" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Alla prenumeranter" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "Användar-ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Medlem sedan" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Dagligt genomsnitt" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Alla grupper" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Inga \"return-to\"-argument." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Inte implementerad metod." @@ -6248,20 +6657,28 @@ msgstr "Profilerade" msgid "Popular" msgstr "Populärt" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Inga \"return-to\"-argument." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Upprepa denna notis?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Ja" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Upprepa denna notis" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Blockera denna användare från denna grupp" +msgstr "Återkalla rollen \"%s\" från denna användare" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "Ingen enskild användare definierad för enanvändarläge." @@ -6387,92 +6804,108 @@ msgstr "Avsluta prenumerationen på denna användare" msgid "Unsubscribe" msgstr "Avsluta pren." -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "Användare %s (%d) har inga profiluppgifter." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Redigera avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Åtgärder för användare" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Borttagning av användare pågår..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Redigera profilinställningar" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Redigera" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Skicka ett direktmeddelande till denna användare" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Meddelande" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Moderera" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "Användarprofil" +msgstr "Användarroll" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" -msgstr "Administratörer" +msgstr "Administratör" -#: lib/userprofile.php:355 -#, fuzzy +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "Moderera" +msgstr "Moderator" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "för nån minut sedan" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "för en månad sedan" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "för %d månader sedan" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "för ett år sedan" @@ -6486,7 +6919,7 @@ msgstr "%s är inte en giltig färg!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d." diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index c8a2f5c1ad..54e7d0de18 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:01+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:38+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -22,10 +22,9 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 -#, fuzzy +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" -msgstr "అంగీకరించు" +msgstr "అందుబాటు" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -44,7 +43,6 @@ msgstr "అజ్ఞాత (ప్రవేశించని) వాడుక #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "అంతరంగికం" @@ -66,18 +64,21 @@ msgstr "కొత్త నమోదులను అచేతనంచేయి. #. TRANS: Checkbox label for disabling new user registrations. #: actions/accessadminpanel.php:185 -#, fuzzy msgid "Closed" -msgstr "అటువంటి వాడుకరి లేరు." +msgstr "మూసివేయబడింది" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "సైటు అమరికలను భద్రపరచు" +msgstr "అందుబాటు అమరికలను భద్రపరచు" -#: actions/accessadminpanel.php:203 -#, fuzzy +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "భద్రపరచు" @@ -85,8 +86,8 @@ msgstr "భద్రపరచు" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "అటువంటి పేజీ లేదు" +msgid "No such page." +msgstr "అటువంటి పేజీ లేదు." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -96,9 +97,9 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -106,11 +107,9 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "అటువంటి వాడుకరి లేరు." @@ -122,8 +121,9 @@ msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -181,11 +181,13 @@ msgstr "" msgid "You and friends" msgstr "మీరు మరియు మీ స్నేహితులు" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" -msgstr "" +msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 @@ -197,18 +199,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "నిర్ధారణ సంకేతం కనబడలేదు." @@ -222,15 +224,15 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -243,7 +245,7 @@ msgstr "వాడుకరిని తాజాకరించలేకున #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "వాడుకరికి ప్రొఫైలు లేదు." @@ -254,9 +256,9 @@ msgid "Could not save profile." msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -273,7 +275,7 @@ msgstr "" #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." -msgstr "" +msgstr "మీ రూపురేఖల అమరికలని భద్రపరచలేకున్నాం." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 @@ -301,7 +303,7 @@ msgstr "%s నుండి నేరు సందేశాలు" #: actions/apidirectmessage.php:93 #, php-format msgid "All the direct messages sent from %s" -msgstr "" +msgstr "%s నుండి పంపిన అన్ని నేరు సందేశాలు" #: actions/apidirectmessage.php:101 #, php-format @@ -311,7 +313,7 @@ msgstr "%s కి నేరు సందేశాలు" #: actions/apidirectmessage.php:105 #, php-format msgid "All the direct messages sent to %s" -msgstr "" +msgstr "%sకి పంపిన అన్ని నేరు సందేశాలు" #: actions/apidirectmessagenew.php:126 msgid "No message text!" @@ -328,18 +330,18 @@ msgstr "అందుకోవాల్సిన వాడుకరి కనబ #: actions/apidirectmessagenew.php:150 msgid "Can't send direct messages to users who aren't your friend." -msgstr "" +msgstr "మీ స్నేహితులు కాని వాడుకరులకి నేరు సందేశాలు పంపించలేరు." #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." -msgstr "" +msgstr "ఆ IDతో ఏ నోటీసూ కనబడలేదు." #: actions/apifavoritecreate.php:119 msgid "This status is already a favorite." msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం." @@ -366,9 +368,8 @@ msgid "Could not unfollow user: User not found." msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s" #: actions/apifriendshipsdestroy.php:120 -#, fuzzy msgid "You cannot unfollow yourself." -msgstr "మిమ్మల్ని మీరే నిరోధించుకోలేరు!" +msgstr "మిమ్మల్ని మీరే అననుసరించలేరు." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -432,11 +433,10 @@ msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉ msgid "Too many aliases! Maximum %d." msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "తప్పుడు మారుపేరు: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "తప్పుడు మారుపేరు: \"%s\"." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -452,42 +452,51 @@ msgstr "మారుపేరు పేరుతో సమానంగా ఉం #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "గుంపు దొరకలేదు!" +msgid "Group not found." +msgstr "గుంపు దొరకలేదు." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు." #: actions/apigroupjoin.php:138 actions/joingroup.php:134 -#, fuzzy, php-format +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s" +msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్చలేకపోయాం" #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "మీరు ఈ గుంపులో సభ్యులు కాదు." #: actions/apigroupleave.php:124 actions/leavegroup.php:129 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం." +msgstr "వాడుకరి %1$sని %2$s గుంపు నుండి తొలగించలేకపోయాం." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "%s యొక్క గుంపులు" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%2$s సభ్యులుగా ఉన్న %2$s గుంపులు." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s గుంపులు" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "%s పై గుంపులు" @@ -502,17 +511,17 @@ msgid "Invalid token." msgstr "తప్పుడు పరిమాణం." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -545,22 +554,25 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" -msgstr "" +msgstr "ఒక ఉపకరణం మీ ఖాతాకి అనుసంధానమవ్వాలనుకుంటూంది." #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" -msgstr "" +msgstr "అనుమతిని ఇవ్వండి లేదా తిరస్కరించండి" #: actions/apioauthauthorize.php:292 #, php-format @@ -570,20 +582,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "ఖాతా" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "పేరు" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "సంకేతపదం" @@ -597,7 +611,7 @@ msgstr "అనుమతించు" #: actions/apioauthauthorize.php:351 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "మీ ఖాతా సమాచారాన్ని సంప్రాపించడానికి అనుమతించండి లేదా నిరాకరించండి." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." @@ -626,19 +640,19 @@ msgstr "స్థితిని తొలగించాం." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." -msgstr "" +msgstr "ఆ IDతో ఏ నోటీసు కనబడలేదు." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "అది చాలా పొడవుంది. గరిష్ఠ నోటీసు పరిమాణం %d అక్షరాలు." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "దొరకలేదు" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "కనబడలేదు." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షరాలు, జోడింపు URLని కలుపుకుని." @@ -647,12 +661,12 @@ msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షర msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s యొక్క మైక్రోబ్లాగు" @@ -662,17 +676,17 @@ msgstr "%s యొక్క మైక్రోబ్లాగు" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s బహిరంగ కాలరేఖ" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "అందరి నుండి %s తాజాకరణలు!" @@ -687,20 +701,16 @@ msgstr "%sకి స్పందనలు" msgid "Repeats of %s" msgstr "%s యొక్క పునరావృతాలు" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%s యొక్క మైక్రోబ్లాగు" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "కనబడలేదు." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "అటువంటి జోడింపు లేదు." @@ -721,8 +731,9 @@ msgstr "పరిమాణం లేదు." msgid "Invalid size." msgstr "తప్పుడు పరిమాణం." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "అవతారం" @@ -732,10 +743,11 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "మీ వ్యక్తిగత అవతారాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." +msgstr "వాడుకరికి ప్రొఫైలు లేదు." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -753,7 +765,7 @@ msgid "Preview" msgstr "మునుజూపు" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "తొలగించు" @@ -765,23 +777,27 @@ msgstr "ఎగుమతించు" msgid "Crop" msgstr "కత్తిరించు" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "ఏ దస్త్రమూ ఎక్కింపబడలేదు." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "అవతారాన్ని తాజాకరించాం." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "అవతారపు తాజాకరణ విఫలమైంది." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "అవతారాన్ని తొలగించాం." @@ -789,7 +805,7 @@ msgstr "అవతారాన్ని తొలగించాం." msgid "You already blocked that user." msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "వాడుకరిని నిరోధించు" @@ -799,28 +815,45 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" +"మీరు ఈ వాడుకరిని నిజంగానే నిరోధించాలనుకుంటున్నారా? ఆ తర్వాత, వారు మీ నుండి చందా విరమింపబడతారు, " +"భవిష్యత్తులో మీకు చందా చేరలేరు, మరియు వారి నుండి @-స్పందనలని మీకు తెలియజేయము." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "కాదు" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "ఈ వాడుకరిని నిరోధించకు" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "అవును" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "ఈ వాడుకరిని నిరోధించు" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం." @@ -833,8 +866,8 @@ msgstr "నిరోధపు సమాచారాన్ని భద్రప #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "అటువంటి గుంపు లేదు." @@ -866,9 +899,11 @@ msgstr "" msgid "Unblock this user" msgstr "అటువంటి వాడుకరి లేరు." -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "" +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" +msgstr "%s పై గుంపులు" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -882,33 +917,43 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు." msgid "That confirmation code is not for you!" msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "గుర్తుతెలియని చిరునామా రకం %s" +msgid "Unrecognized address type %s." +msgstr "గుర్తుతెలియని చిరునామా రకం %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధారితమైంది." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "వాడుకరిని తాజాకరించలేకున్నాం." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "చిరునామాని నిర్ధారించు" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "\"%s\" అనే చిరునామా మీ ఖాతాకి నిర్ధారితమైంది." @@ -918,7 +963,7 @@ msgid "Conversation" msgstr "సంభాషణ" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "సందేశాలు" @@ -937,7 +982,7 @@ msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -954,15 +999,17 @@ msgstr "" "మీరు నిజంగానే ఈ ఉపకరణాన్ని తొలగించాలనుకుంటున్నారా? ఇది ఆ ఉపకరణం గురించి భోగట్టాని, ప్రస్తుత " "వాడుకరుల అనుసంధానాలతో సహా, డాటాబేసు నుండి తొలగిస్తుంది." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "ఈ ఉపకరణాన్ని తొలగించకు" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "ఈ ఉపకరణాన్ని తొలగించు" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -991,11 +1038,13 @@ msgstr "నోటీసుని తొలగించు" msgid "Are you sure you want to delete this notice?" msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "ఈ నోటీసుని తొలగించకు" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "ఈ నోటీసుని తొలగించు" @@ -1019,125 +1068,129 @@ msgstr "" "మీరు నిజంగానే ఈ వాడుకరిని తొలగించాలనుకుంటున్నారా? ఇది ఆ వాడుకరి భోగట్టాని డాటాబేసు నుండి తొలగిస్తుంది, " "వెనక్కి తేలేకుండా." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "ఈ వాడుకరిని తొలగించు" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "రూపురేఖలు" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "ఈ స్టేటస్‌నెట్ సైటుకి రూపురేఖల అమరికలు." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "చిహ్నపు URL చెల్లదు." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "అలంకారం అందుబాటులో లేదు: %s" +msgid "Theme not available: %s." +msgstr "అలంకారం అందుబాటులో లేదు: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "చిహ్నాన్ని మార్చు" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "సైటు చిహ్నం" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "అలంకారాన్ని మార్చు" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "సైటు అలంకారం" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "సైటుకి అలంకారం." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "నేపథ్య చిత్రాన్ని మార్చు" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "నేపథ్యం" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "సైటుకి మీరు నేపథ్యపు చిత్రాన్ని ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం %1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "రంగులను మార్చు" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "విషయం" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "పక్కపట్టీ" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "పాఠ్యం" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "లంకెలు" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" -msgstr "" +msgstr "అప్రమేయాలని ఉపయోగించు" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "భద్రపరచు" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "రూపురేఖలని భద్రపరచు" @@ -1155,7 +1208,6 @@ msgid "No such document \"%s\"" msgstr "అటువంటి పత్రమేమీ లేదు." #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" msgstr "ఉపకరణాన్ని మార్చు" @@ -1181,7 +1233,6 @@ msgid "Name is too long (max 255 chars)." msgstr "పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)." #: actions/editapplication.php:183 actions/newapplication.php:162 -#, fuzzy msgid "Name already in use. Try another one." msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి." @@ -1246,11 +1297,16 @@ msgstr "గుంపుని మార్చడానికి ఈ ఫారా msgid "description is too long (max %d chars)." msgstr "వివరణ చాలా పెద్దదిగా ఉంది (140 అక్షరాలు గరిష్ఠం)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "తప్పుడు మారుపేరు: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "గుంపుని తాజాకరించలేకున్నాం." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "మారుపేర్లని సృష్టించలేకపోయాం." @@ -1258,178 +1314,231 @@ msgstr "మారుపేర్లని సృష్టించలేకప msgid "Options saved." msgstr "ఎంపికలు భద్రమయ్యాయి." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "ఈమెయిల్ అమరికలు" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." -msgstr "" +msgstr "%%site.name%% నుండి మీకు ఎలా మెయిల్ వస్తూంతో సంభాళించుకోండి." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "చిరునామా" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "ఈమెయిలు చిరునామా" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "తొలగించు" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" +"ఈ చిరునామా నిర్ధారణకై వేచివున్నాం. తదుపరి సూచనలతో ఉన్న సందేశానికై మీ ఇన్‌బాక్స్‌లో (స్పామ్ బాక్సులో కూడా!) " +"చూడండి." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "రద్దుచేయి" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "ఈమెయిలు చిరునామా" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "ఈమెయిల్ చిరునామా, \"username@example.org\" వలె" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "చేర్చు" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "కొత్తది" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "అభిరుచులు" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "ఈమెయిలు అభిరుచులు" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." -msgstr "" +msgstr "నేను ఈమెయిలు ద్వారా నోటీసులు పంపాలనుకుంటున్నాను." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "అభిరుచులు భద్రమయ్యాయి." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "ఈమెయిలు అభిరుచులు భద్రమయ్యాయి." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "ఈమెయిలు చిరునామా లేదు." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:" -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "రద్దుచేయడానికి వేచివున్న నిర్ధారణలేమీ లేవు." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "ఆ IM చిరునామా సరైనది కాదు." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "ఆ ఈమెయిలు చిరునామా సరైనది కాదు." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "నిర్ధారణ రద్దయింది." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "ఈమెయిలు నిర్ధారణ రద్దయింది." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "అది మీ ఈమెయిలు చిరునామా కాదు." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "ఆ చిరునామాని తొలగించాం." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" @@ -1543,8 +1652,9 @@ msgstr "" msgid "Remote service uses unknown version of OMB protocol." msgstr "" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు" #: actions/getfile.php:79 @@ -1556,23 +1666,20 @@ msgid "Cannot read file." msgstr "ఫైలుని చదవలేకపోతున్నాం." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "తప్పుడు పరిమాణం." +msgstr "తప్పుడు పాత్ర." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." msgstr "" #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" +msgstr "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు." +msgstr "వాడుకరికి ఇప్పటికే ఈ పాత్ర ఉంది." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1589,7 +1696,7 @@ msgstr "" #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 msgid "No group specified." -msgstr "" +msgstr "గుంపు ఏమీ పేర్కొనలేదు." #: actions/groupblock.php:91 msgid "Only an admin can block group members." @@ -1603,11 +1710,11 @@ msgstr "వాడుకరిని ఇప్పటికే గుంపున msgid "User is not a member of group." msgstr "వాడుకరి ఈ గుంపులో సభ్యులు కాదు." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "వాడుకరిని గుంపు నుండి నిరోధించు" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1617,15 +1724,17 @@ msgstr "" "నిజంగానే వాడుకరి \"%1$s\"ని \"%2$s\" గుంపు నుండి నిరోధించాలనుకుంటున్నారా? వారిని గుంపు నుండి " "తొలగిస్తాం, ఇక భవిష్యత్తులో వారు గుంపులో ప్రచురించలేరు, మరియు గుంపుకి చందాచేరలేరు." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1646,7 +1755,7 @@ msgstr "గుంపు అలంకారం" msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." -msgstr "" +msgstr "నేపథ్య చిత్రం మరియు రంగుల ఎంపికతో మీ గుంపు ఎలా కనిపించాలో మలచుకోండి." #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 @@ -1668,11 +1777,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "మీ గుంపుకి మీరు ఒక చిహ్నాన్ని ఎక్కించవచ్చు. ఆ ఫైలు యొక్క గరిష్ఠ పరిమాణం %s." -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "వాడుకరికి ప్రొఫైలు లేదు." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "చిహ్నంగా ఉండాల్సిన చతురస్త్ర ప్రదేశాన్ని బొమ్మ నుండి ఎంచుకోండి." @@ -1701,36 +1805,40 @@ msgstr "ఈ గుంపులో వాడుకరులు జాబితా #: actions/groupmembers.php:182 lib/groupnav.php:107 msgid "Admin" -msgstr "" +msgstr "నిర్వాహకులు" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "నిరోధించు" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "వాడుకరిని గుంపుకి ఒక నిర్వాహకునిగా చేయి" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "నిర్వాహకున్ని చేయి" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "ఈ వాడుకరిని నిర్వాహకున్ని చేయి" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s కాలరేఖ" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "%s యొక్క మైక్రోబ్లాగు" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "గుంపులు" @@ -1754,7 +1862,7 @@ msgstr "" "గుంపు లోని సభ్యులందరికీ సందేశాలని పంపించవచ్చు. మీకు నచ్చిన గుంపు కనబడలేదా? [దాని కోసం వెతకండి](%%" "%%action.groupsearch%%%%) లేదా [మీరే కొత్తది సృష్టించండి!](%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "కొత్త గుంపుని సృష్టించు" @@ -1795,7 +1903,7 @@ msgstr "" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "నిర్వాహకులు మాత్రమే గుంపు సభ్యులపై నిరోధాన్ని ఎత్తివేయగలరు." #: actions/groupunblock.php:95 msgid "User is not blocked from group." @@ -1805,94 +1913,149 @@ msgstr "వాడుకరిని గుంపు నుండి నిరో msgid "Error removing the block." msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "IM అమరికలు" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "IM అందుబాటులో లేదు." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "IM చిరునామా" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "IM చిరునామా" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "IM అభిరుచులు" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "అభిరుచులు భద్రమయ్యాయి." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Jabber ID లేదు." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "సరైన Jabber ఐడీ కాదు" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "ఈ Jabber ID మీకు ఇప్పటికే ఉంది" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber ID ఇప్పటికే వేరొకరికి ఉంది." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." msgstr "" -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "ఆ IM చిరునామా సరైనది కాదు." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "IM నిర్ధారణ రద్దయింది." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "ఇది మీ Jabber ID కాదు" +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "ఆ IM చిరునామాని తొలగించాం." + #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "%sకి వచ్చినవి" +msgstr "%1$sకి వచ్చినవి - %2$dవ పేజీ" #: actions/inbox.php:62 #, php-format @@ -1909,8 +2072,8 @@ msgstr "ఆహ్వానాలని అచేతనం చేసారు." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "%sని ఉపయోగించమని ఇతర వాడుకరులని ఆహ్వానించడానికి మీరు ప్రవేశించి ఉండాలి" +msgid "You must be logged in to invite other users to use %s." +msgstr "sని ఉపయోగించమని ఇతర వాడుకరులని ఆహ్వానించడానికి మీరు ప్రవేశించి ఉండాలి." #: actions/invite.php:72 #, php-format @@ -1929,7 +2092,9 @@ msgstr "కొత్త వాడుకరులని ఆహ్వానిం msgid "You are already subscribed to these users:" msgstr "మీరు ఇప్పటికే ఈ వాడుకరులకు చందాచేరి ఉన్నారు:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1972,17 +2137,18 @@ msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్య #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "పంపించు" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%2$sలో చేరమని %1$s మిమ్మల్ని ఆహ్వానించారు" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2012,6 +2178,29 @@ msgid "" "\n" "Sincerely, %2$s\n" msgstr "" +"%2$s (%3$s) లో వారితో చేరమని %1$s మిమ్మల్ని ఆహ్వానించారు.\n" +"\n" +"%2$s అనేది మీకు తెలిసిన మరియు మీకు ఆసక్తి ఉన్న వ్యక్తులతో ఎప్పటికప్పుడు పరిచయంలో ఉండేదుకు " +"వీలుకల్పించే ఒక సూక్ష్మ-బ్లాగింగు సేవ.\n" +"\n" +"మీరు కూడా మీ గురించి, మీ ఆలోచనల గురించి లేదా మీ జీవితం గురించిన విశేషాలను మీకు తెలిసిన వారితో " +"పంచుకోవచ్చు. అలానే ఇది మీలాంటి ఆసక్తులు కలిగిన కొత్త వ్యక్తులని కలుసుకునేందుకు గొప్ప ప్రదేశం.\n" +"\n" +"%1$s అన్నారు:\n" +"\n" +"%4$s\n" +"\n" +"%2$sలో %1$s యొక్క ప్రొఫైలుని మీరు ఇక్కడ చూడవచ్చు:\n" +"\n" +"%5$s\n" +"\n" +"మీరు దీన్ని ప్రయత్నించి చూడాలనుకుంటే, ఈ ఆహ్వానాన్ని అంగీకరించడానికి ఈ క్రింద లంకెపై నొక్కండి.\n" +"\n" +"%6$s\n" +"\n" +"కాదనుకుంటే, ఈ సందేశాన్ని పట్టించుకోకండి. మీ ఓపిక మరియు సమయానికి ధన్యవాదాలు.\n" +"\n" +"వినమ్రతతో, %2$s\n" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." @@ -2022,7 +2211,9 @@ msgstr "గుంపుల్లో చేరడానికి మీరు ప msgid "No nickname or ID." msgstr "పేరు లేదు." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s %2$s గుంపులో చేరారు" @@ -2031,11 +2222,13 @@ msgstr "%1$s %2$s గుంపులో చేరారు" msgid "You must be logged in to leave a group." msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" @@ -2050,7 +2243,7 @@ msgstr "వాడుకరిపేరు లేదా సంకేతపదం #: actions/login.php:132 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." -msgstr "" +msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు." #: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 msgid "Login" @@ -2080,13 +2273,14 @@ msgstr "" "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." -msgstr "" -"మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి. మీకు ఇంకా వాడుకరిపేరు లేదా? కొత్త ఖాతాని [నమోదుచేసుకోండి]" -"(%%action.register%%)." +"Don't have a username yet? [Register](%%action.register%%) a new account." +msgstr "మీకు ఇంకా వాడుకరిపేరు లేదా? కొత్త ఖాతాని [నమోదుచేసుకోండి](%%action.register%%)." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2103,13 +2297,13 @@ msgid "Can't get membership record for %1$s in group %2$s." msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం" #: actions/makeadmin.php:146 -#, fuzzy, php-format +#, php-format msgid "Can't make %1$s an admin for group %2$s." -msgstr "%s ఇప్పటికే \"%s\" గుంపు యొక్క ఒక నిర్వాకులు." +msgstr "%1$sని %2$s గుంపు యొక్క నిర్వాహకున్ని చేయలేకపోయాం." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "ప్రస్తుత స్థితి ఏమీ లేదు" +msgid "No current status." +msgstr "ప్రస్తుత స్థితి ఏమీ లేదు." #: actions/newapplication.php:52 msgid "New Application" @@ -2128,9 +2322,8 @@ msgid "Source URL is required." msgstr "" #: actions/newapplication.php:258 actions/newapplication.php:267 -#, fuzzy msgid "Could not create application." -msgstr "మారుపేర్లని సృష్టించలేకపోయాం." +msgstr "ఉపకరణాన్ని సృష్టించలేకపోయాం." #: actions/newgroup.php:53 msgid "New group" @@ -2144,12 +2337,12 @@ msgstr "కొత్త గుంపుని సృష్టిండాని msgid "New message" msgstr "కొత్త సందేశం" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "విషయం లేదు!" @@ -2157,7 +2350,7 @@ msgstr "విషయం లేదు!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీలో మీరే మెల్లగా చెప్పుకోండి." @@ -2167,11 +2360,11 @@ msgid "Message sent" msgstr "సందేశాన్ని పంపించాం" #: actions/newmessage.php:185 -#, fuzzy, php-format +#, php-format msgid "Direct message to %s sent." -msgstr "%sకి నేరు సందేశాన్ని పంపించాం" +msgstr "%sకి నేరు సందేశాన్ని పంపించాం." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "అజాక్స్ పొరపాటు" @@ -2179,7 +2372,7 @@ msgstr "అజాక్స్ పొరపాటు" msgid "New notice" msgstr "కొత్త సందేశం" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 #, fuzzy msgid "Notice posted" msgstr "సందేశాలు" @@ -2198,7 +2391,7 @@ msgid "Text search" msgstr "పాఠ్య అన్వేషణ" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" msgstr "%2$sలో \"%1$s\"కై అన్వేషణ ఫలితాలు" @@ -2208,6 +2401,7 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ్రాసే మొదటివారు మీరే అవ్వండి!" #: actions/noticesearch.php:124 #, php-format @@ -2271,11 +2465,11 @@ msgid "You are not a user of that application." msgstr "మీరు ఆ ఉపకరణం యొక్క వాడుకరి కాదు." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2284,24 +2478,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "" +#, fuzzy +msgid "Notice has no profile." +msgstr "వాడుకరికి ప్రొఫైలు లేదు." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" -msgstr "" +msgstr "%2$sలో %1$s యొక్క స్థితి" -#: actions/oembed.php:157 -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "విషయ రకం " -#: actions/oembed.php:160 -msgid "Only " -msgstr "మాత్రమే " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -2409,7 +2609,7 @@ msgid "6 or more characters" msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "నిర్థారించు" @@ -2437,7 +2637,7 @@ msgstr "పాత సంకేతపదం తప్పు" msgid "Error saving user; invalid." msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము." @@ -2446,9 +2646,9 @@ msgid "Password saved." msgstr "సంకేతపదం భద్రమయ్యింది." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" -msgstr "" +msgstr "త్రోవలు" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." @@ -2456,23 +2656,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "హోమ్ పేజీ URL సరైనది కాదు." #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "హోమ్ పేజీ URL సరైనది కాదు." #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "నేపథ్యాల సంచయం" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "హోమ్ పేజీ URL సరైనది కాదు." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2584,11 +2784,11 @@ msgstr "ఎల్లప్పుడూ" #: actions/pathsadminpanel.php:329 msgid "Use SSL" -msgstr "" +msgstr "SSLని ఉపయోగించు" #: actions/pathsadminpanel.php:330 msgid "When to use SSL" -msgstr "" +msgstr "SSLని ఎప్పుడు ఉపయోగించాలి" #: actions/pathsadminpanel.php:335 #, fuzzy @@ -2617,18 +2817,19 @@ msgstr "" msgid "People search" msgstr "వ్యక్తుల అన్వేషణ" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, fuzzy, php-format -msgid "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "%s యొక్క మైక్రోబ్లాగు" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "సందేశపు విషయం సరైనది కాదు" #: actions/postnotice.php:101 @@ -2656,13 +2857,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "పూర్తి పేరు" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "హోమ్ పేజీ" @@ -2684,9 +2886,9 @@ msgid "Bio" msgstr "స్వపరిచయం" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "ప్రాంతం" @@ -2700,7 +2902,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "ట్యాగులు" @@ -2772,7 +2974,7 @@ msgstr "అమరికలు భద్రమయ్యాయి." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -2789,19 +2991,16 @@ msgid "Public timeline" msgstr "ప్రజా కాలరేఖ" #: actions/public.php:160 -#, fuzzy msgid "Public Stream Feed (RSS 1.0)" -msgstr "ప్రజా వాహిని ఫీడు" +msgstr "ప్రజా వాహిని ఫీడు (RSS 1.0)" #: actions/public.php:164 -#, fuzzy msgid "Public Stream Feed (RSS 2.0)" -msgstr "ప్రజా వాహిని ఫీడు" +msgstr "ప్రజా వాహిని ఫీడు (RSS 2.0)" #: actions/public.php:168 -#, fuzzy msgid "Public Stream Feed (Atom)" -msgstr "ప్రజా వాహిని ఫీడు" +msgstr "ప్రజా వాహిని ఫీడు (ఆటమ్)" #: actions/public.php:188 #, php-format @@ -2818,7 +3017,7 @@ msgstr "" #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" -msgstr "" +msgstr "[ఖాతా నమోదు చేసుకుని](%%action.register%%) మొదటగా వ్రాసేది మీరే ఎందుకు కాకూడదు!" #: actions/public.php:242 #, php-format @@ -2895,7 +3094,7 @@ msgstr "ఈ నిర్ధారణ సంకేతం చాలా పాత #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." -msgstr "" +msgstr "నిర్ధారిత ఈమెయిలు చిరునామాతో వాడుకరిని తాజాకరించలేకపోయాం." #: actions/recoverpassword.php:152 msgid "" @@ -2932,7 +3131,7 @@ msgstr "" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2952,41 +3151,41 @@ msgstr "" msgid "Enter a nickname or email address." msgstr "పేరు లేదా ఈమెయిల్ చిరునామా ఇవ్వండి." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "చిరునామా నిర్ధారణని భద్రపరచడంలో పొరపాటు." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "మీ సంకేతపదాన్ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల్ చిరునామాకి పంపించాం." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్కవ అక్షరాలుండాలి." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు." @@ -3002,7 +3201,7 @@ msgstr "క్షమించండి, తప్పు ఆహ్వాన స msgid "Registration successful" msgstr "నమోదు విజయవంతం" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "నమోదు" @@ -3024,7 +3223,7 @@ msgstr "వాడుకరిపేరు లేదా సంకేతపదం #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3040,8 +3239,9 @@ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షర msgid "Same as password above. Required." msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "ఈమెయిల్" @@ -3054,20 +3254,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "నా పాఠ్యం మరియు ఫైళ్ళు లభ్యమయ్యే లైసెన్సు " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "క్రియేటివ్ కామన్స్ అట్రిబ్యూషన్ 3.0" - -#: actions/register.php:497 +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr " ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, మరియు ఫోన్ నంబర్." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3098,11 +3291,13 @@ msgstr "" "\n" "నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" msgstr "" +"(మీ ఈమెయిలు చిరునామాని ఎలా నిర్ధారించాలో తెలిపే సూచనలతో ఒక సందేశం మీరు ఈమెయిలు ద్వారా మరి కొద్దిసేపట్లోనే " +"అందుతుంది.)" #: actions/remotesubscribe.php:98 #, php-format @@ -3111,6 +3306,9 @@ msgid "" "register%%) a new account. If you already have an account on a [compatible " "microblogging site](%%doc.openmublog%%), enter your profile URL below." msgstr "" +"చందా చేరడానికి, మీరు [ప్రవేశించవచ్చు](%%action.login%%), లేదా కొత్త ఖాతాని [నమోదుచేసుకోవచ్చు](%%" +"action.register%%). ఒకవేళ మీకు ఇప్పటికే ఏదైనా [పొసగే మైక్రోబ్లాగింగు సైటులో](%%doc.openmublog%" +"%) ఖాతా ఉంటే, మీ ప్రొఫైలు చిరునామాని క్రింద ఇవ్వండి." #: actions/remotesubscribe.php:112 msgid "Remote subscribe" @@ -3138,7 +3336,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "చందాచేరు" @@ -3152,7 +3350,7 @@ msgstr "" #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "అది స్థానిక ప్రొఫైలు! చందాచేరడానికి ప్రవేశించండి." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." @@ -3160,7 +3358,7 @@ msgstr "" #: actions/repeat.php:57 msgid "Only logged-in users can repeat notices." -msgstr "" +msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు." #: actions/repeat.php:64 actions/repeat.php:71 #, fuzzy @@ -3168,16 +3366,14 @@ msgid "No notice specified." msgstr "కొత్త సందేశం" #: actions/repeat.php:76 -#, fuzzy msgid "You can't repeat your own notice." -msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు." +msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు." +msgstr "మీరు ఇప్పటికే ఆ నోటీసుని పునరావృతించారు." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "సృష్టితం" @@ -3194,31 +3390,31 @@ msgid "Replies to %s" msgstr "%sకి స్పందనలు" #: actions/replies.php:128 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "%sకి స్పందనలు" +msgstr "%1$sకి స్పందనలు, %2$dవ పేజీ" #: actions/replies.php:145 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "%s యొక్క సందేశముల ఫీడు" +msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)" #: actions/replies.php:152 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "%s యొక్క సందేశముల ఫీడు" +msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)" #: actions/replies.php:159 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (Atom)" -msgstr "%s యొక్క సందేశముల ఫీడు" +msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)" #: actions/replies.php:199 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." -msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ కానీ ఇంకా ఎవరూ ఏమీ రాయలేదు." +msgstr "ఇది %1$sకి వచ్చిన స్పందనలని చూపించే కాలరేఖ కానీ %2$s దృష్టికి ఇంకా ఎవరూ ఏమీ పంపించలేదు." #: actions/replies.php:204 #, php-format @@ -3237,9 +3433,9 @@ msgid "" msgstr "" #: actions/repliesrss.php:72 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s on %2$s!" -msgstr "%sకి స్పందనలు" +msgstr "%2$sలో %1$sకి స్పందనలు!" #: actions/revokerole.php:75 #, fuzzy @@ -3267,7 +3463,7 @@ msgstr "వాడుకరిని ఇప్పటికే గుంపున #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3298,41 +3494,44 @@ msgid "Save site settings" msgstr "సైటు అమరికలను భద్రపరచు" #: actions/showapplication.php:82 -#, fuzzy msgid "You must be logged in to view an application." -msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి." +msgstr "ఉపకరణాలని చూడడానికి మీరు తప్పనిసరిగా ప్రవేశించి ఉండాలి." #: actions/showapplication.php:157 msgid "Application profile" -msgstr "" +msgstr "ఉపకరణ ప్రవర" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "ప్రతీకం" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "పేరు" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "సంస్ధ" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "వివరణ" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "గణాంకాలు" #: actions/showapplication.php:203 #, php-format msgid "Created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "సృష్టించినది %1$s - అప్రమేయ అందుబాటు %2$s - %3$d వాడుకరులు" #: actions/showapplication.php:213 msgid "Application actions" @@ -3433,71 +3632,71 @@ msgid "%s group" msgstr "%s గుంపు" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d" +msgstr "%1$s గుంపు , %2$dవ పేజీ" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "గుంపు ప్రొఫైలు" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "గమనిక" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "మారుపేర్లు" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "గుంపు చర్యలు" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "%s యొక్క సందేశముల ఫీడు" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "%s యొక్క సందేశముల ఫీడు" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "%s యొక్క సందేశముల ఫీడు" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "%s గుంపు" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "సభ్యులు" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(ఏమీలేదు)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "అందరు సభ్యులూ" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "సృష్టితం" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3506,8 +3705,14 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** అనేది [స్టేటస్‌నెట్](http://status.net/) అనే స్వేచ్ఛా ఉపకరణ అధారిత [సూక్ష్మ-బ్లాగింగు]" +"(http://en.wikipedia.org/wiki/Micro-blogging) సేవ అయిన %%%%site.name%%%%లో ఒక " +"వాడుకరి గుంపు.\n" +"దీని సభ్యులు వారి జీవితం మరియు ఆసక్తుల గురించి చిన్న సందేశాలని పంచుకుంటారు. ఈ గుంపు మరియు ఇంకా " +"చాల వాటిలో భాగస్తులవ్వడానికి [ఇప్పుడే చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%" +"doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3516,7 +3721,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "నిర్వాహకులు" @@ -3548,9 +3753,9 @@ msgid " tagged %s" msgstr "" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d" +msgstr "%1$s, %2$dవ పేజీ" #: actions/showstream.php:122 #, fuzzy, php-format @@ -3578,9 +3783,9 @@ msgid "FOAF for %s" msgstr "" #: actions/showstream.php:200 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ కానీ ఇంకా ఎవరూ ఏమీ రాయలేదు." +msgstr "ఇది %1$s యొక్క కాలరేఖ కానీ %2$s ఇంకా ఏమీ రాయలేదు." #: actions/showstream.php:205 msgid "" @@ -3628,9 +3833,8 @@ msgid "User is already silenced." msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "ఈ స్టేటస్‌నెట్ సైటుకి ప్రాధమిక అమరికలు." +msgstr "ఈ స్టేటస్‌నెట్ సైటుకి ప్రాధమిక అమరికలు" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." @@ -3646,11 +3850,11 @@ msgid "Unknown language \"%s\"." msgstr "గుర్తు తెలియని భాష \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "కనిష్ఠ పాఠ్య పరిమితి 140 అక్షరాలు." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "కనిష్ఠ పాఠ్య పరిమితి 0 (అపరిమితం)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3667,7 +3871,7 @@ msgstr "మీ సైటు యొక్క పేరు, ఇలా \"మీక #: actions/siteadminpanel.php:229 msgid "Brought by" -msgstr "" +msgstr "అందిస్తున్నవారు" #: actions/siteadminpanel.php:230 msgid "Text used for credits link in footer of each page" @@ -3675,16 +3879,15 @@ msgstr "" #: actions/siteadminpanel.php:234 msgid "Brought by URL" -msgstr "" +msgstr "అందిస్తున్నవారి URL" #: actions/siteadminpanel.php:235 msgid "URL used for credits link in footer of each page" msgstr "" #: actions/siteadminpanel.php:239 -#, fuzzy msgid "Contact email address for your site" -msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు." +msgstr "మీ సైటుకి సంప్రదింపుల ఈమెయిల్ చిరునామా" #: actions/siteadminpanel.php:245 msgid "Local" @@ -3699,9 +3902,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "" #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "అప్రమేయ సైటు భాష" +msgstr "అప్రమేయ భాష" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3728,7 +3930,6 @@ msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" msgstr "సైటు గమనిక" @@ -3743,120 +3944,176 @@ msgid "Unable to save site notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "సైటు-వారీ నోటీసుకి గరిష్ఠ పొడవు 255 అక్షరాలు." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "సైటు గమనిక" +msgstr "సైటు గమనిక పాఠ్యం" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "సైటు-వారీ నోటీసు పాఠ్యం (255 అక్షరాలు గరిష్ఠం; HTML పర్లేదు)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "సైటు గమనిక" +msgstr "సైటు గమనికని భద్రపరచు" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "SMS అమరికలు" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "హోమ్ పేజీ URL సరైనది కాదు." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "SMS చిరునామా" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "ఈ ఫోను నంబరు యొక్క నిర్ధారణకై వేచివుంది." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "నిర్ధారణ సంకేతం" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "నిర్థారించు" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "SMS అభిరుచులు" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "అభిరుచులు భద్రమయ్యాయి." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "ఫోను నెంబరు లేదు." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "ఇది ఇప్పటికే మీ ఫోను నెంబరు." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "ఆ ఫోను నంబరు ఇప్పటికే వేరే వాడుకరికి చెందినది." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "అది తప్పుడు నిర్ధారణ సంఖ్య." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "నిర్ధారణ రద్దయింది." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "అది మీ ఫోను నంబర్ కాదు." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "ఆ చిరునామాని తొలగించాం." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3878,7 +4135,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3918,8 +4175,7 @@ msgstr "సైటు అమరికలను భద్రపరచు" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "చందాని సృష్టించలేకపోయాం." @@ -3938,9 +4194,8 @@ msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." msgstr "" #: actions/subscribe.php:145 -#, fuzzy msgid "Subscribed" -msgstr "చందాదార్లు" +msgstr "చందాచేరారు" #: actions/subscribers.php:50 #, php-format @@ -4012,13 +4267,13 @@ msgstr "" #: actions/subscriptions.php:128 actions/subscriptions.php:132 #, php-format msgid "%s is not listening to anyone." -msgstr "" +msgstr "%s ప్రస్తుతం ఎవరినీ వినడంలేదు." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "జాబర్" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "" @@ -4052,12 +4307,12 @@ msgstr "అటువంటి పత్రమేమీ లేదు." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "వాడుకరి ప్రొఫైలు" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "ఫొటో" @@ -4107,8 +4362,9 @@ msgid "User is not silenced." msgstr "వాడుకరికి ప్రొఫైలు లేదు." #: actions/unsubscribe.php:77 -msgid "No profile id in request." -msgstr "" +#, fuzzy +msgid "No profile ID in request." +msgstr "అధీకరణ అభ్యర్థన లేదు!" #: actions/unsubscribe.php:98 #, fuzzy @@ -4123,7 +4379,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "వాడుకరి" @@ -4138,14 +4393,15 @@ msgstr "" #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." -msgstr "" +msgstr "చెల్లని స్వాగత పాఠ్యం. గరిష్ఠ పొడవు 255 అక్షరాలు." #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "ప్రొఫైలు" @@ -4225,11 +4481,11 @@ msgstr "ఈ చందాని తిరస్కరించు" #: actions/userauthorization.php:232 msgid "No authorization request!" -msgstr "" +msgstr "అధీకరణ అభ్యర్థన లేదు!" #: actions/userauthorization.php:254 msgid "Subscription authorized" -msgstr "" +msgstr "చందాని అధీకరించారు" #: actions/userauthorization.php:256 msgid "" @@ -4298,27 +4554,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, fuzzy, php-format +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 +#, php-format msgid "%1$s groups, page %2$d" -msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d" +msgstr "%1$s గుంపులు, %2$dవ పేజీ" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "మరిన్ని గుంపులకై వెతుకు" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s ఏ గుంపు లోనూ సభ్యులు కాదు." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "[గుంపులని వెతికి](%%action.groupsearch%%) వాటిలో చేరడానికి ప్రయత్నించండి." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4366,7 +4628,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "సంచిక" @@ -4374,19 +4637,19 @@ msgstr "సంచిక" msgid "Author(s)" msgstr "రచయిత(లు)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4404,9 +4667,8 @@ msgid "Group leave failed." msgstr "గుంపు నుండి వైదొలగడం విఫలమైంది." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "గుంపుని తాజాకరించలేకున్నాం." +msgstr "స్థానిక గుంపుని తాజాకరించలేకున్నాం." #: classes/Login_token.php:76 #, fuzzy, php-format @@ -4425,337 +4687,356 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" +msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:245 +#: classes/Notice.php:249 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:1459 -#, fuzzy, php-format +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 +#, php-format msgid "RT @%1$s %2$s" -msgstr "%1$s (%2$s)" +msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "ఇప్పటికే చందాచేరారు!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "చందాదార్లు" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "@%2$s, %1$sకి స్వాగతం!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "గుంపుని సృష్టించలేకపోయాం." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "చందాని సృష్టించలేకపోయాం." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "ఒక అవతారాన్ని ఎక్కించండి" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "మీ సంకేతపదాన్ని మార్చుకోండి" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "వాడుకరికి ప్రొఫైలు లేదు." -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "ఇతర" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "ఇతర ఎంపికలు" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "ఇతర" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s - %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" -msgstr "" +msgstr "శీర్షికలేని పేజీ" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 -#, fuzzy +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "వ్యక్తిగత" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "అనుసంధానాలు" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "అనుసంధానించు" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 -#, fuzzy +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "చందాలు" +msgstr "సైటు స్వరూపణాన్ని మార్చండి" -#: lib/action.php:449 -#, fuzzy +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "నిర్వాహకులు" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "ఈ ఫారాన్ని ఉపయోగించి మీ స్నేహితులను మరియు సహోద్యోగులను ఈ సేవను వినియోగించుకోమని ఆహ్వానించండి." -#: lib/action.php:456 -#, fuzzy +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "ఆహ్వానించు" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 -#, fuzzy +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "సైటు నుండి నిష్క్రమించు" -#: lib/action.php:465 -#, fuzzy +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "నిష్క్రమించు" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 -#, fuzzy +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" -msgstr "కొత్త ఖాతా సృష్టించు" +msgstr "ఖాతాని సృష్టించుకోండి" -#: lib/action.php:473 -#, fuzzy +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "నమోదు" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 -#, fuzzy +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" -msgstr "సైటులోని ప్రవేశించు" +msgstr "సైటు లోనికి ప్రవేశించండి" -#: lib/action.php:479 -#, fuzzy +#: lib/action.php:481 msgctxt "MENU" msgid "Login" -msgstr "ప్రవేశించండి" +msgstr "ప్రవేశించు" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 -#, fuzzy +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "సహాయం కావాలి!" -#: lib/action.php:485 -#, fuzzy +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "సహాయం" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 -#, fuzzy +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" -msgstr "మరిన్ని గుంపులకై వెతుకు" +msgstr "ప్రజలు లేదా పాఠ్యం కొరకు వెతకండి" -#: lib/action.php:491 -#, fuzzy +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "వెతుకు" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" msgstr "సైటు గమనిక" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "స్థానిక వీక్షణలు" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "పేజీ గమనిక" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 #, fuzzy msgid "Secondary site navigation" msgstr "చందాలు" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "సహాయం" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "గురించి" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "ప్రశ్నలు" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "సేవా నియమాలు" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "అంతరంగికత" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "మూలము" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "సంప్రదించు" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "బాడ్జి" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు " "అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4766,68 +5047,82 @@ msgstr "" "html) కింద లభ్యమయ్యే [స్టేటస్‌నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s " "పై నడుస్తుంది." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "కొత్త సందేశం" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "అన్నీ " - -#: lib/action.php:853 -msgid "license." +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "పేజీకరణ" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "తర్వాత" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "ఇంతక్రితం" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "ఈ సైటుకి మీరు మార్పులు చేయలేరు." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4837,161 +5132,197 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "ప్రాథమిక సైటు స్వరూపణం" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 -#, fuzzy +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "సైటు" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "రూపకల్పన స్వరూపణం" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 -#, fuzzy +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "రూపురేఖలు" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "వాడుకరి స్వరూపణం" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "వాడుకరి" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "SMS నిర్ధారణ" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "SMS నిర్ధారణ" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "రూపకల్పన స్వరూపణం" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "సైటు గమనిక" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "SMS నిర్ధారణ" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "ఉపకరణాన్ని మార్చు" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "ఈ ఉపకరణానికి ప్రతీకం" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "మీ ఉపకరణం గురించి %d అక్షరాల్లో వివరించండి" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "మీ ఉపకరణాన్ని వివరించండి" -#: lib/applicationeditform.php:216 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 +msgid "URL of the homepage of this application" +msgstr "ఈ ఉపకరణం యొక్క హోమ్‌పేజీ చిరునామా" + +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 #, fuzzy msgid "Source URL" msgstr "మూలము" -#: lib/applicationeditform.php:218 -msgid "URL of the homepage of this application" -msgstr "ఈ ఉపకరణం యొక్క హోమ్‌పేజీ చిరునామా" - -#: lib/applicationeditform.php:224 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "ఈ ఉపకరణానికి బాధ్యతాయుతమైన సంస్థ" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "విహారిణి" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" -msgstr "" - -#: lib/applicationeditform.php:275 -msgid "Type of application, browser or desktop" -msgstr "" +msgstr "మేజోపరి" +#. TRANS: Form guide. #: lib/applicationeditform.php:297 +msgid "Type of application, browser or desktop" +msgstr "ఉపకరణ రకం, విహారిణి లేదా మేజోపరి" + +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "చదవడం-మాత్రమే" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "చదవడం-వ్రాయడం" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "రద్దుచేయి" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "చదవడం-వ్రాయడం" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "చదవడం-మాత్రమే" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "తొలగించు" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "జోడింపులు" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "రచయిత" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 #, fuzzy msgid "Provider" msgstr "ప్రొఫైలు" @@ -5014,37 +5345,58 @@ msgstr "సంకేతపదం మార్పు" msgid "Password changing is not allowed" msgstr "సంకేతపదం మార్పు" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "ఆదేశ ఫలితాలు" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "ఆదేశం పూర్తయ్యింది" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "ఆదేశం విఫలమైంది" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +#, fuzzy +msgid "User has no last notice" +msgstr "వాడుకరికి ప్రొఫైలు లేదు." + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "వాడుకరిని తాజాకరించలేకున్నాం." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "వాడుకరిని తాజాకరించలేకున్నాం." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "%sకి స్పందనలు" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5055,199 +5407,199 @@ msgstr "" "చందాదార్లు: %2$s\n" "నోటీసులు: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "వాడుకరికి ప్రొఫైలు లేదు." - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" -msgstr "వాడుకరి %sని %s గుంపులో చేర్చలేకపోయాం" +msgid "Could not join user %1$s to group %2$s" +msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్చలేకపోయాం" -#: lib/command.php:236 -#, php-format -msgid "%s joined group %s" -msgstr "%s %s గుంపులో చేరారు" +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s" +msgstr "వాడుకరి %1$sని %2$s గుంపు నుండి తొలగించలేకపోయాం." -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం" - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "పూర్తిపేరు: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "ప్రాంతం: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "హోంపేజీ: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "గురించి: %s" -#: lib/command.php:349 -#, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు." + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "%sకి నేరు సందేశాన్ని పంపించాం" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "మీ నోటిసుని మీరే పునరావృతించలేరు" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "ఇప్పటికే ఈ నోటీసుని పునరావృతించారు" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "సందేశాలు" -#: lib/command.php:428 -#, fuzzy +#: lib/command.php:531 msgid "Error repeating notice." -msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." +msgstr "నోటీసుని పునరావృతించడంలో పొరపాటు." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:571 +#, php-format msgid "Reply to %s sent" -msgstr "%sకి స్పందనలు" +msgstr "%sకి స్పందనని పంపించాం" -#: lib/command.php:493 -#, fuzzy +#: lib/command.php:573 msgid "Error saving notice." -msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." +msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "ఏవరికి చందా చేరాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "అటువంటి వాడుకరి లేరు" +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "%sకి చందా చేరారు" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "ఎవరి నుండి చందా విరమించాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "%s నుండి చందా విరమించారు" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "ఈ లంకెని ఒకే సారి ఉపయోగించగలరు, మరియు అది పనిచేసేది 2 నిమిషాలు మాత్రమే: %s" -#: lib/command.php:692 -#, fuzzy, php-format +#: lib/command.php:761 +#, php-format msgid "Unsubscribed %s" msgstr "%s నుండి చందా విరమించారు" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "మీరు ఎవరికీ చందాచేరలేదు." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "మీకు చందాదార్లు ఎవరూ లేరు." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5289,20 +5641,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 -#, fuzzy +#: lib/common.php:135 msgid "No configuration file found. " -msgstr "నిర్ధారణ సంకేతం లేదు." +msgstr "స్వరూపణపు దస్త్రమేమీ కనబడలేదు. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "స్వరూపణపు దస్త్రాల కొరకు ఈ ప్రదేశాలతో చూసాం: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5324,7 +5675,7 @@ msgstr "అనుసంధానాలు" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "అధీకృత అనుసంధాన ఉపకరణాలు" #: lib/dberroraction.php:60 msgid "Database error" @@ -5354,7 +5705,7 @@ msgstr "అటువంటి సందేశమేమీ లేదు." #: lib/favorform.php:140 msgid "Favor" -msgstr "" +msgstr "ఇష్టపడు" #: lib/feed.php:85 msgid "RSS 1.0" @@ -5411,9 +5762,8 @@ msgid "URL of the homepage or blog of the group or topic" msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి" +msgstr "గుంపుని లేదా విషయాన్ని వివరించండి" #: lib/groupeditform.php:170 #, php-format @@ -5435,9 +5785,8 @@ msgid "Group" msgstr "గుంపు" #: lib/groupnav.php:101 -#, fuzzy msgid "Blocked" -msgstr "అటువంటి వాడుకరి లేరు." +msgstr "నిరోధించారు" #: lib/groupnav.php:102 #, php-format @@ -5476,54 +5825,55 @@ msgstr "ఎక్కువ టపాలున్న గుంపులు" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "పాక్షిక ఎగుమతి." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "" - #: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "అటువంటి సందేశమేమీ లేదు." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "తెలియని ఫైలు రకం" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "మెబై" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "కిబై" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "గుర్తు తెలియని భాష \"%s\"" @@ -5541,15 +5891,16 @@ msgid "Login with a username and password" msgstr "వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి" #: lib/logingroupnav.php:86 -#, fuzzy msgid "Sign up for a new account" -msgstr "కొత్త ఖాతా సృష్టించుకోండి" +msgstr "కొత్త ఖాతా కొరకై నమోదుచేసుకోండి" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5565,13 +5916,27 @@ msgid "" "Thanks for your time, \n" "%s\n" msgstr "" +"హోయి, %s.\n" +"\n" +"%sలో ఎవరో మీ ఈమెయిలు చిరునామాని ఇచ్చారు.\n" +"\n" +"అది మీరే అయితే, మరియు మీ పద్దుని మీరు నిర్ధారించాలనుకుంటే, క్రింది చిరునామాపై నొక్కండి:\n" +"\n" +"%s\n" +"\n" +"మీరు కాకపోతే, ఈ సందేశాన్ని పట్టించుకోకండి.\n" +"\n" +"మీ సమయానికి కృతజ్ఞతలు, \n" +"%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని వింటున్నారు." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5596,17 +5961,20 @@ msgstr "" "----\n" "మీ ఈమెయిలు చిరునామాని లేదా గమనింపుల ఎంపికలను %8$s వద్ద మార్చుకోండి\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "స్వపరిచయం: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" -msgstr "" +msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5619,21 +5987,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s స్థితి" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS నిర్ధారణ" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "ఈ ఫోను నంబరు యొక్క నిర్ధారణకై వేచివుంది." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5648,13 +6026,26 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) మీరేం చేస్తున్నారో అని విస్మయం చెందుతున్నారు మరియు ఏవైనా విశేషాలని వ్రాయమని మిమ్మల్ని " +"ఆహ్వానిస్తున్నారు.\n" +"\n" +"కాబట్టి మిమ్మల్ని విననివ్వండి :)\n" +"\n" +"%3$s\n" +"\n" +"ఈ ఈమెయిలుకే స్పందించకండి; ఇది వారికి వెళ్ళదు.\n" +"\n" +"శుభాశీస్సులతో,\n" +"%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "%s నుండి కొత్త అంతరంగిక సందేశం" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5672,13 +6063,29 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) మీకు ఒక అంతరంగిక సందేశాన్ని పంపించారు:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"వారి సందేశానికి మీరు ఇక్కడ జవాబివ్వవచ్చు:\n" +"\n" +"%4$s\n" +"\n" +"ఈ ఈమెయిలుకి స్పందించకండి; ఇది వారికి వెళ్ళదు.\n" +"\n" +"శుభాకాంక్షలతో,\n" +"%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "" +msgstr "%s (@%s) మీ నోటీసుని ఇష్టపడ్డారు" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5698,13 +6105,42 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%2$s లోని మీ నోటీసుని %1$s (@%7$s) తన ఇష్టాంశాలలో ఇప్పుడే చేర్చుకున్నారు.\n" +"\n" +"మీ నోటీసు యొక్క చిరునామా ఇదీ:\n" +"\n" +"%3$s\n" +"\n" +"మీ నోటీసు యొక్క పాఠ్యం ఇదీ:\n" +"\n" +"%4$s\n" +"\n" +"%1$s యొక్క ఇష్టాంశాల జాబితాని మీరు ఇక్కడ చూడవచ్చు:\n" +"\n" +"%5$s\n" +"\n" +"మీ విధేయులు,\n" +"%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"పూర్తి సంభాషణని ఇక్కడ చదవవచ్చు:\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) మీకు ఒక నోటీసుని పంపించారు" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5717,17 +6153,41 @@ msgid "" "\n" "\t%4$s\n" "\n" -msgstr "" -"%1$s (@%9$s) %2$sలో మీకు ('@-స్పందన') ఒక నోటీసుని పంపించారు .\n" +"%5$sYou can reply back here:\n" "\n" -"ఆ నోటీసు ఇక్కడ:\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" +msgstr "" +"%2$sలో %1$s (@%9$s) ఒక నోటీసుని మీ దృష్టికి ('@-స్పందన') పంపించారు.\n" +"\n" +"ఈదీ నోటీసు:\n" "\n" "%3$s\n" "\n" -"ఇదీ పాఠ్యం:\n" +"నోటీసు పాఠ్యం:\n" "\n" "%4$s\n" "\n" +"%5$sమీరు ఇక్కడ ప్రతిస్పందించవచ్చు:\n" +"\n" +"%6$s\n" +"\n" +"మీకు వచ్చిన అన్ని @-స్పందనలని ఇక్కడ చూడవచ్చు:\n" +"\n" +"%7$s\n" +"\n" +"మీ విధేయులు,\n" +"%2$s\n" +"\n" +"తా.క. ఈ ఈమెయిలు గమనింపులని మీరు ఇక్కడ నిలిపివేసుకోవచ్చు: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5738,8 +6198,10 @@ msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" +"మీకు అంతరంగిక సందేశాలు లేవు. ఇతర వాడుకరులతో సంభాషణకై మీరు వారికి అంతరంగిక సందేశాలు " +"పంపించవచ్చు. మీ కంటికి మాత్రమే కనబడేలా వారు మీకు సందేశాలు పంపవచ్చు." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "నుండి" @@ -5780,11 +6242,11 @@ msgstr "" #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "ఎక్కించిన ఫైలు కేవలం పాక్షికంగా మాత్రమే ఎక్కింది." #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "తాత్కాలిక సంచయం కనబడటంలేదు." #: lib/mediafile.php:162 msgid "Failed to write file to disk." @@ -5830,7 +6292,6 @@ msgid "Available characters" msgstr "అందుబాటులో ఉన్న అక్షరాలు" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "పంపించు" @@ -5854,64 +6315,68 @@ msgid "Attach a file" msgstr "ఒక ఫైలుని జోడించు" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "ట్యాగులని భద్రపరచలేకున్నాం." +msgstr "నేనున్న ప్రాంతాన్ని బహిరంగపరచు" #: lib/noticeform.php:215 -#, fuzzy msgid "Do not share my location" -msgstr "ట్యాగులని భద్రపరచలేకున్నాం." +msgstr "నేనున్న ప్రాంతాన్ని బహిరంగపరచకు" #: lib/noticeform.php:216 msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"క్షమించండి, మీ భౌగోళిక ప్రాంతాన్ని తెలుసుకోవడం అనుకున్నదానికంటే ఎక్కవ సమయం తీసుకుంటూంది, దయచేసి " +"కాసేపాగి ప్రయత్నించండి" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "ఉ" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "ద" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "తూ" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "ప" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "సందర్భంలో" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "సృష్టితం" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "ఈ నోటీసుపై స్పందించండి" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "స్పందించండి" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "నోటీసుని తొలగించాం." @@ -5937,6 +6402,10 @@ msgstr "కొత్త ప్రొపైలుని చేర్చటంల msgid "Error inserting avatar" msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "దూరపు ప్రొపైలుని చేర్చటంలో పొరపాటు" @@ -5948,7 +6417,7 @@ msgstr "కొత్త సందేశం" #: lib/oauthstore.php:490 msgid "Couldn't insert new subscription." -msgstr "" +msgstr "కొత్త చందాని చేర్చలేకపోయాం." #: lib/personalgroupnav.php:99 msgid "Personal" @@ -5987,7 +6456,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "చందాలు" @@ -5995,32 +6464,32 @@ msgstr "చందాలు" msgid "All subscriptions" msgstr "అన్ని చందాలు" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "చందాదార్లు" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "అందరు చందాదార్లు" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "వాడుకరి ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "సభ్యులైన తేదీ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "రోజువారీ సగటు" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "అన్ని గుంపులు" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "అటువంటి పత్రమేమీ లేదు." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6044,10 +6513,19 @@ msgstr "విశేషం" msgid "Popular" msgstr "ప్రాచుర్యం" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "అటువంటి పత్రమేమీ లేదు." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "ఈ నోటీసుని పునరావృతించాలా?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "అవును" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "ఈ నోటీసుని పునరావృతించు" @@ -6057,7 +6535,7 @@ msgstr "ఈ నోటీసుని పునరావృతించు" msgid "Revoke the \"%s\" role from this user" msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6092,7 +6570,7 @@ msgstr "ప్రజలు" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "" +msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి" #: lib/searchgroupnav.php:83 msgid "Find content of notices" @@ -6100,11 +6578,11 @@ msgstr "" #: lib/searchgroupnav.php:85 msgid "Find groups on this site" -msgstr "" +msgstr "ఈ సైటులోని గుంపులని కనుగొనండి" #: lib/section.php:89 msgid "Untitled section" -msgstr "" +msgstr "శీర్షికలేని విభాగం" #: lib/section.php:106 msgid "More..." @@ -6142,7 +6620,7 @@ msgstr "ఆహ్వానించు" #: lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "" +msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -6188,92 +6666,108 @@ msgstr "ఈ వాడుకరి నుండి చందామాను" msgid "Unsubscribe" msgstr "చందామాను" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "వాడుకరి %s (%d) కి ప్రొఫైలు లేదు." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "అవతారాన్ని మార్చు" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "వాడుకరి చర్యలు" -#: lib/userprofile.php:251 -#, fuzzy -msgid "Edit profile settings" -msgstr "ఫ్రొఫైలు అమరికలు" +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "వాడుకరి తొలగింపు కొనసాగుతూంది..." -#: lib/userprofile.php:252 +#: lib/userprofile.php:263 +msgid "Edit profile settings" +msgstr "ఫ్రొఫైలు అమరికలని మార్చు" + +#: lib/userprofile.php:264 msgid "Edit" msgstr "మార్చు" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "సందేశం" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 -#, fuzzy +#: lib/userprofile.php:364 msgid "User role" -msgstr "వాడుకరి ప్రొఫైలు" +msgstr "వాడుకరి పాత్ర" -#: lib/userprofile.php:354 -#, fuzzy +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "నిర్వాహకులు" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "" +msgstr "సమన్వయకర్త" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "కొన్ని క్షణాల క్రితం" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల క్రితం" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "%d గంటల క్రితం" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "%d రోజుల క్రితం" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "ఓ నెల క్రితం" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "%d నెలల క్రితం" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" @@ -6287,7 +6781,7 @@ msgstr "%s అనేది సరైన రంగు కాదు!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు." diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 805e552688..8514f78d5d 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:04+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:42+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -22,7 +22,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 #, fuzzy msgid "Access" msgstr "Kabul et" @@ -78,7 +78,13 @@ msgstr "Böyle bir kullanıcı yok." msgid "Save access settings" msgstr "Ayarlar" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -88,7 +94,7 @@ msgstr "Kaydet" #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy -msgid "No such page" +msgid "No such page." msgstr "Böyle bir durum mesajı yok." #: actions/all.php:75 actions/allrss.php:68 @@ -99,9 +105,9 @@ msgstr "Böyle bir durum mesajı yok." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -109,11 +115,9 @@ msgstr "Böyle bir durum mesajı yok." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Böyle bir kullanıcı yok." @@ -125,8 +129,9 @@ msgstr "%s ve arkadaşları" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -185,8 +190,10 @@ msgstr "" msgid "You and friends" msgstr "%s ve arkadaşları" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -201,18 +208,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Onay kodu bulunamadı." @@ -226,15 +233,15 @@ msgstr "Onay kodu bulunamadı." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -247,7 +254,7 @@ msgstr "Kullanıcı güncellenemedi." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Kullanıcının profili yok." @@ -258,9 +265,9 @@ msgid "Could not save profile." msgstr "Profil kaydedilemedi." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -346,7 +353,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "Bu zaten sizin Jabber ID'niz." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" @@ -442,10 +449,9 @@ msgstr "Yer bilgisi çok uzun (azm: 255 karakter)." msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, fuzzy, php-format -msgid "Invalid alias: \"%s\"" +msgid "Invalid alias: \"%s\"." msgstr "%s Geçersiz başlangıç sayfası" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -463,7 +469,7 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy -msgid "Group not found!" +msgid "Group not found." msgstr "İstek bulunamadı!" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 @@ -471,7 +477,7 @@ msgstr "İstek bulunamadı!" msgid "You are already a member of that group." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -490,17 +496,26 @@ msgstr "Bize o profili yollamadınız" msgid "Could not remove user %1$s from group %2$s." msgstr "OpenID formu yaratılamadı: %s" -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, fuzzy, php-format msgid "%s's groups" msgstr "Profil" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Bize o profili yollamadınız" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "" @@ -515,17 +530,17 @@ msgid "Invalid token." msgstr "Geçersiz büyüklük." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -559,12 +574,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Beklenmeğen form girdisi." @@ -584,21 +602,23 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 #, fuzzy msgid "Account" msgstr "Hakkında" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Takma ad" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Parola" @@ -646,18 +666,19 @@ msgstr "Avatar güncellendi." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#, fuzzy +msgid "Not found." +msgstr "İstek bulunamadı!" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -667,12 +688,12 @@ msgstr "" msgid "Unsupported format." msgstr "Desteklenmeyen görüntü dosyası biçemi." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s adli kullanicinin durum mesajlari" @@ -682,17 +703,17 @@ msgstr "%s adli kullanicinin durum mesajlari" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -707,21 +728,16 @@ msgstr "%s için cevaplar" msgid "Repeats of %s" msgstr "%s için cevaplar" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%s adli kullanicinin durum mesajlari" -#: actions/apiusershow.php:96 -#, fuzzy -msgid "Not found." -msgstr "İstek bulunamadı!" - #: actions/attachment.php:73 #, fuzzy msgid "No such attachment." @@ -742,8 +758,9 @@ msgstr "" msgid "Invalid size." msgstr "Geçersiz büyüklük." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Avatar" @@ -753,10 +770,11 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." +msgstr "Kullanıcının profili yok." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -775,7 +793,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "" @@ -787,23 +805,28 @@ msgstr "Yükle" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Kısmi yükleme." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar güncellendi." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Avatar güncellemede hata." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Avatar güncellendi." @@ -813,7 +836,7 @@ msgstr "Avatar güncellendi." msgid "You already blocked that user." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "Böyle bir kullanıcı yok." @@ -825,29 +848,45 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" -msgstr "" +msgstr "Durum mesajları" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Böyle bir kullanıcı yok." -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "Böyle bir kullanıcı yok." -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "" @@ -860,8 +899,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 #, fuzzy msgid "No such group." msgstr "Böyle bir durum mesajı yok." @@ -894,9 +933,11 @@ msgstr "" msgid "Unblock this user" msgstr "Böyle bir kullanıcı yok." -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "" +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" +msgstr "%s için cevaplar" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -910,34 +951,44 @@ msgstr "Onay kodu bulunamadı." msgid "That confirmation code is not for you!" msgstr "O onay kodu sizin için değil!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "Tanınmayan adres türü %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "O adres daha önce onaylanmış." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Kullanıcı güncellenemedi." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Eposta onayı silinemedi." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "Adresi Onayla" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "\"%s\" adresi hesabınız için onaylandı." @@ -948,7 +999,7 @@ msgid "Conversation" msgstr "Yer" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Durum mesajları" @@ -970,7 +1021,7 @@ msgstr "Bize o profili yollamadınız" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -986,17 +1037,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "Böyle bir durum mesajı yok." -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1025,12 +1078,14 @@ msgstr "" msgid "Are you sure you want to delete this notice?" msgstr "" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 #, fuzzy msgid "Do not delete this notice" msgstr "Böyle bir durum mesajı yok." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "" @@ -1054,64 +1109,67 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 #, fuzzy msgid "Delete this user" msgstr "Böyle bir kullanıcı yok." -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "Geçersiz büyüklük." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "Parolayı değiştir" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 #, fuzzy msgid "Site logo" msgstr "Yeni durum mesajı" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "Değiştir" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "Yeni durum mesajı" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1119,71 +1177,72 @@ msgid "" msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Parolayı değiştir" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Bağlan" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Ara" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Giriş" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Kaydet" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1296,12 +1355,17 @@ msgstr "" msgid "description is too long (max %d chars)." msgstr "Hakkında bölümü çok uzun (azm 140 karakter)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"" +msgstr "%s Geçersiz başlangıç sayfası" + #: actions/editgroup.php:258 #, fuzzy msgid "Could not update group." msgstr "Kullanıcı güncellenemedi." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Avatar bilgisi kaydedilemedi" @@ -1311,180 +1375,239 @@ msgstr "Avatar bilgisi kaydedilemedi" msgid "Options saved." msgstr "Ayarlar kaydedildi." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "Profil ayarları" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Adres" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "Eposta adresi onayı" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "Kaldır" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "İptal et" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "Eposta adresi onayı" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "Ekle" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "Tercihler" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "" -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." msgstr "Tercihler kaydedildi." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Geçersiz bir eposta adresi." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Onay kodu eklenemedi." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "İptal etmek için beklenen onay yok." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "Yanlış IM adresi." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "Onaylama iptal edildi." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "" -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "Bu adres kaldırılmıştı." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" @@ -1604,8 +1727,9 @@ msgstr "" msgid "Remote service uses unknown version of OMB protocol." msgstr "OMB protokolünün bilinmeğen sürümü." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "Uzaktaki profili güncellemede hata oluştu" #: actions/getfile.php:79 @@ -1668,12 +1792,12 @@ msgstr "Kullanıcının profili yok." msgid "User is not a member of group." msgstr "Bize o profili yollamadınız" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 #, fuzzy msgid "Block user from group" msgstr "Böyle bir kullanıcı yok." -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1681,17 +1805,19 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 #, fuzzy msgid "Do not block this user from this group" msgstr "Sunucuya yönlendirme yapılamadı: %s" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 #, fuzzy msgid "Block this user from this group" msgstr "Böyle bir kullanıcı yok." -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1735,11 +1861,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "Kullanıcının profili yok." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1772,34 +1893,38 @@ msgstr "" msgid "Admin" msgstr "" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "%s adli kullanicinin durum mesajlari" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -1819,7 +1944,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 #, fuzzy msgid "Create a new group" msgstr "Yeni hesap oluştur" @@ -1873,12 +1998,16 @@ msgstr "Kullanıcının profili yok." msgid "Error removing the block." msgstr "Kullanıcıyı kaydetmede hata oluştu." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "IM Ayarları" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1887,16 +2016,26 @@ msgstr "" "Jabber/GTalk kullanarak durum mesaji gÖnderip alabilirsiniz. IM adres " "ayarlarinizi aşağıda yapın." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 #, fuzzy msgid "IM is not available." msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "IM adresi" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Onaylanmış Jabber/Gtalk adresi." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1905,12 +2044,9 @@ msgstr "" "Bu adresten onay bekleniyor. Jabber/Google Talk hesabınızı ayrıntılı bilgi " "içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize eklediniz mi?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "IM adresi" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1919,44 +2055,66 @@ msgstr "" "Jabber veya Gtalk adresi: \"KullaniciAdi@example.org\" gibi. Öncelikle %s, " "IM istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Tercihler" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" "Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu güncelle" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Tercihler kaydedildi." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "JabberID yok." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Jabber işlemlerinde bir hata oluştu." -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Geçersiz bir Jabber ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Bu zaten sizin Jabber ID'niz." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber ID başka bir kullanıcıya ait." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1965,10 +2123,35 @@ msgstr "" "Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size " "mesaj yollanabilmesi için onaylamanız gerekmektedir." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Yanlış IM adresi." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Eposta onayı silinemedi." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "Onaylama iptal edildi." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Bu sizin Jabber ID'niz değil." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Bu adres kaldırılmıştı." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1988,9 +2171,9 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." +msgstr "Kullanıcı güncellenemedi." #: actions/invite.php:72 #, php-format @@ -2009,7 +2192,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2057,12 +2242,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Gönder" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2102,7 +2289,9 @@ msgstr "" msgid "No nickname or ID." msgstr "Takma ad yok" -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -2111,12 +2300,14 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 #, fuzzy msgid "You are not a member of that group." msgstr "Bize o profili yollamadınız" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " @@ -2164,10 +2355,14 @@ msgstr "" "ve parolanızı tekrar giriniz." #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "Geçersiz kullanıcı adı veya parola." + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok mu? Ne " "duruyorsunuz, hemen bir [yeni hesap oluşturun](%%action.register%%) ya da " @@ -2193,8 +2388,9 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Kullanıcının profili yok." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "" +#, fuzzy +msgid "No current status." +msgstr "Sonuç yok" #: actions/newapplication.php:52 #, fuzzy @@ -2230,12 +2426,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "İçerik yok!" @@ -2243,7 +2439,7 @@ msgstr "İçerik yok!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2257,7 +2453,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2265,7 +2461,7 @@ msgstr "" msgid "New notice" msgstr "Yeni durum mesajı" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 #, fuzzy msgid "Notice posted" msgstr "Durum mesajları" @@ -2356,11 +2552,11 @@ msgid "You are not a user of that application." msgstr "Bize o profili yollamadınız" #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2369,25 +2565,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "Bağlan" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -2499,7 +2700,7 @@ msgid "6 or more characters" msgstr "6 veya daha fazla karakter" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Onayla" @@ -2527,7 +2728,7 @@ msgstr "Eski parola yanlış" msgid "Error saving user; invalid." msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Yeni parola kaydedilemedi." @@ -2536,7 +2737,7 @@ msgid "Password saved." msgstr "Parola kaydedildi." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2546,23 +2747,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2711,18 +2912,19 @@ msgstr "" msgid "People search" msgstr "Kişi Arama" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, fuzzy, php-format -msgid "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." msgstr "Geçersiz bir eposta adresi." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "%s adli kullanicinin durum mesajlari" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "Geçersiz durum mesajı" #: actions/postnotice.php:101 @@ -2753,13 +2955,14 @@ msgstr "" "verilmez" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Tam İsim" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Başlangıç Sayfası" @@ -2783,9 +2986,9 @@ msgid "Bio" msgstr "Hakkında" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Yer" @@ -2799,7 +3002,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -2872,7 +3075,7 @@ msgstr "Ayarlar kaydedildi." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -3029,7 +3232,7 @@ msgstr "Parolayı sıfırla" msgid "Recover password" msgstr "Parolanı geri al" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Parola geri alma isteği" @@ -3049,19 +3252,19 @@ msgstr "Sıfırla" msgid "Enter a nickname or email address." msgstr "Bir takma ad veya eposta adresi girin." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Kullanıcı için kaydedilmiş eposta adresi yok." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Adres onayını kaydetmede hata." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3069,23 +3272,23 @@ msgstr "" "Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için " "gerekli olan talimatlar yollanmıştır." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Beklemeğen parola sıfırlaması." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Parola ve onaylaması birbirini tutmuyor." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Kullanıcı ayarlamada hata oluştu." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız." @@ -3102,7 +3305,7 @@ msgstr "Onay kodu hatası." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Kayıt" @@ -3124,7 +3327,7 @@ msgstr "Geçersiz kullanıcı adı veya parola." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3140,8 +3343,9 @@ msgstr "" msgid "Same as password above. Required." msgstr "" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Eposta" @@ -3155,23 +3359,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Durum mesajlarim ve dosyalarim şu lisans ile korunmaktadır: " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon " "numarası." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3190,7 +3386,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3230,7 +3426,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Abone ol" @@ -3270,7 +3466,7 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." msgid "You already repeated that notice." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "Yarat" @@ -3359,7 +3555,7 @@ msgstr "Kullanıcının profili yok." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3398,29 +3594,33 @@ msgstr "" msgid "Application profile" msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "Takma ad" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "Yer" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "Abonelikler" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "İstatistikler" @@ -3530,71 +3730,71 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "Bütün abonelikler" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "Böyle bir durum mesajı yok." -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 #, fuzzy msgid "Note" msgstr "Durum mesajları" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "%s için durum RSS beslemesi" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "%s için durum RSS beslemesi" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "%s için durum RSS beslemesi" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "%s için durum RSS beslemesi" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Üyelik başlangıcı" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 #, fuzzy msgid "Created" msgstr "Yarat" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3604,7 +3804,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3613,7 +3813,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "" @@ -3743,11 +3943,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3840,7 +4040,7 @@ msgid "Unable to save site notice." msgstr "Durum mesajını kaydederken hata oluştu." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3857,104 +4057,165 @@ msgstr "" msgid "Save site notice" msgstr "Yeni durum mesajı" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "IM Ayarları" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "IM adresi" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "" -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Onayla" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Tercihler" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "Tercihler kaydedildi." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "" -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "" -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "O onay kodu sizin için değil!" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "" -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Onaylama iptal edildi." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "" -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "Bu adres kaldırılmıştı." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3976,7 +4237,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4017,8 +4278,7 @@ msgstr "Ayarlar" msgid "You are not subscribed to that profile." msgstr "Bize o profili yollamadınız" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Abonelik oluşturulamadı." @@ -4113,12 +4373,12 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%1$s %2$s'da durumunuzu takip ediyor" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 #, fuzzy msgid "Jabber" msgstr "JabberID yok." -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "" @@ -4152,13 +4412,13 @@ msgstr "Böyle bir belge yok." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "Kullanıcının profili yok." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -4212,7 +4472,7 @@ msgstr "Kullanıcının profili yok." #: actions/unsubscribe.php:77 #, fuzzy -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Yetkilendirme isteği yok!" #: actions/unsubscribe.php:98 @@ -4249,7 +4509,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" @@ -4411,27 +4672,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "Bütün abonelikler" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, fuzzy, php-format msgid "%s is not a member of any group." msgstr "Bize o profili yollamadınız" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4479,7 +4746,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Kişisel" @@ -4488,19 +4756,19 @@ msgstr "Kişisel" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4542,262 +4810,281 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" +msgstr "Cevap eklenirken veritabanı hatası: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:245 +#: classes/Notice.php:249 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "Kullanıcının profili yok." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Abonelik silinemedi." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Abonelik silinemedi." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Abonelik silinemedi." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "Avatar bilgisi kaydedilemedi" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Abonelik oluşturulamadı." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Abonelik oluşturulamadı." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Abonelik oluşturulamadı." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 #, fuzzy msgid "Upload an avatar" msgstr "Avatar güncellemede hata." -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "Kullanıcının profili yok." -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Kişisel" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Parolayı değiştir" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Sunucuya yönlendirme yapılamadı: %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Bağlan" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Abonelikler" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Geçersiz büyüklük." #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Çıkış" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Yeni hesap oluştur" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "Kayıt" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "Giriş" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Yardım" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "Yardım" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4805,76 +5092,90 @@ msgstr "Ara" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 #, fuzzy msgid "Site notice" msgstr "Yeni durum mesajı" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 #, fuzzy msgid "Page notice" msgstr "Yeni durum mesajı" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 #, fuzzy msgid "Secondary site navigation" msgstr "Abonelikler" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Yardım" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Hakkında" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "SSS" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Gizlilik" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Kaynak" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "İletişim" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından " "hazırlanan anında mesajlaşma ağıdır. " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4885,70 +5186,84 @@ msgstr "" "licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) " "microbloglama yazılımının %s. versiyonunu kullanmaktadır." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "Yeni durum mesajı" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 #, fuzzy msgid "After" msgstr "« Sonra" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 #, fuzzy msgid "Before" msgstr "Önce »" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4958,168 +5273,206 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "Eposta adresi onayı" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "Yeni durum mesajı" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "Eposta adresi onayı" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "Kişisel" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "Eposta adresi onayı" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "Eposta adresi onayı" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "Eposta adresi onayı" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "Eposta adresi onayı" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "Yeni durum mesajı" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "Eposta adresi onayı" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Kaynak" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "" "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "Kaynak" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "" "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "İptal et" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "Kaldır" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 #, fuzzy msgid "Provider" msgstr "Profil" @@ -5142,37 +5495,57 @@ msgstr "Parola kaydedildi." msgid "Password changing is not allowed" msgstr "Parola kaydedildi." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +#, fuzzy +msgid "User has no last notice" +msgstr "Kullanıcının profili yok." + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Kullanıcı güncellenemedi." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Kullanıcı güncellenemedi." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "%s için cevaplar" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5180,202 +5553,205 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "Kullanıcının profili yok." - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 #, fuzzy msgid "You are already a member of that group" msgstr "Zaten giriş yapmış durumdasıznız!" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, fuzzy, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "Sunucuya yönlendirme yapılamadı: %s" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, fuzzy, php-format -msgid "%s joined group %s" -msgstr "%1$s'in %2$s'deki durum mesajları " - -#: lib/command.php:275 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "OpenID formu yaratılamadı: %s" -#: lib/command.php:280 -#, fuzzy, php-format -msgid "%s left group %s" -msgstr "%1$s'in %2$s'deki durum mesajları " - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Tam İsim" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "Zaten giriş yapmış durumdasıznız!" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Durum mesajları" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%s için cevaplar" -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:628 #, fuzzy -msgid "No such user" -msgstr "Böyle bir kullanıcı yok." +msgid "Can't subscribe to OMB profiles by command." +msgstr "Bize o profili yollamadınız" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Aboneliği sonlandır" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bize o profili yollamadınız" -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "Uzaktan abonelik" -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Uzaktan abonelik" -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "Bize o profili yollamadınız" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5417,20 +5793,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Onay kodu yok." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5611,55 +5987,56 @@ msgstr "" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Desteklenmeyen görüntü dosyası biçemi." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Kısmi yükleme." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Dosya yüklemede sistem hatası." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Bu bir resim dosyası değil ya da dosyada hata var" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Desteklenmeyen görüntü dosyası biçemi." - #: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Böyle bir durum mesajı yok." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5684,11 +6061,13 @@ msgstr "Geçersiz kullanıcı adı veya parola." msgid "Sign up for a new account" msgstr "Yeni hesap oluştur" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Eposta adresi onayı" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5705,12 +6084,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s %2$s'da durumunuzu takip ediyor" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5731,17 +6112,20 @@ msgstr "" "Kendisini durumsuz bırakmayın!,\n" "%4$s.\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "Hakkında" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5754,21 +6138,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s durum" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5784,12 +6178,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5808,12 +6204,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%1$s %2$s'da durumunuzu takip ediyor" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5834,12 +6232,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5852,6 +6260,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5864,7 +6284,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "" @@ -5995,51 +6415,55 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 #, fuzzy msgid "in context" msgstr "İçerik yok!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "Yarat" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 #, fuzzy msgid "Reply" msgstr "cevapla" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "Durum mesajları" @@ -6064,6 +6488,10 @@ msgstr "Yeni profil eklemede hata oluştu" msgid "Error inserting avatar" msgstr "Avatar eklemede hata oluştu" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Uzaktaki profili güncellemede hata oluştu" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Uzak profil eklemede hata oluştu" @@ -6114,7 +6542,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonelikler" @@ -6122,33 +6550,33 @@ msgstr "Abonelikler" msgid "All subscriptions" msgstr "Bütün abonelikler" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abone olanlar" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 #, fuzzy msgid "All subscribers" msgstr "Abone olanlar" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Üyelik başlangıcı" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "Böyle bir belge yok." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6173,11 +6601,20 @@ msgstr "" msgid "Popular" msgstr "Kişi Arama" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "Böyle bir belge yok." + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "Böyle bir durum mesajı yok." +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6188,7 +6625,7 @@ msgstr "Böyle bir durum mesajı yok." msgid "Revoke the \"%s\" role from this user" msgstr "Böyle bir kullanıcı yok." -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6321,92 +6758,111 @@ msgstr "" msgid "Unsubscribe" msgstr "Aboneliği sonlandır" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Kullanıcının profili yok." + +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 #, fuzzy msgid "Edit profile settings" msgstr "Profil ayarları" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "Kullanıcının profili yok." -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" @@ -6420,7 +6876,7 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 78aa5dc235..efdcae240f 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -3,6 +3,7 @@ # Author@translatewiki.net: AS # Author@translatewiki.net: Boogie # Author@translatewiki.net: Prima klasy4na +# Author@translatewiki.net: Тест # -- # This file is distributed under the same license as the StatusNet package. # @@ -10,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:07+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:45+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -24,7 +25,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" msgstr "Погодитись" @@ -76,7 +77,13 @@ msgstr "Закрито" msgid "Save access settings" msgstr "Зберегти параметри доступу" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "Зберегти" @@ -84,8 +91,8 @@ msgstr "Зберегти" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" -msgstr "Немає такої сторінки" +msgid "No such page." +msgstr "Немає такої сторінки." #: actions/all.php:75 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -95,9 +102,9 @@ msgstr "Немає такої сторінки" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -105,11 +112,9 @@ msgstr "Немає такої сторінки" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Такого користувача немає." @@ -121,8 +126,9 @@ msgstr "%1$s та друзі, сторінка %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -186,8 +192,10 @@ msgstr "" msgid "You and friends" msgstr "Ви з друзями" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Оновлення від %1$s та друзів на %2$s!" @@ -202,18 +210,18 @@ msgstr "Оновлення від %1$s та друзів на %2$s!" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API метод не знайдено." @@ -226,17 +234,17 @@ msgstr "API метод не знайдено." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Цей метод потребує POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" -"Ви мусите встановити параметр «девайс» з одним зі значень: СМС, ІМ, жоден" +"Ви мусите встановити параметр «device» з одним зі значень: sms, im, none." #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -247,7 +255,7 @@ msgstr "Не вдалося оновити користувача." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Користувач не має профілю." @@ -257,9 +265,9 @@ msgid "Could not save profile." msgstr "Не вдалося зберегти профіль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -344,7 +352,7 @@ msgstr "Жодних статусів з таким ID." msgid "This status is already a favorite." msgstr "Цей статус вже є обраним." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Не можна позначити як обране." @@ -428,7 +436,7 @@ msgstr "Опис надто довгий (%d знаків максимум)." #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:227 msgid "Location is too long (max 255 chars)." -msgstr "Локація надто довга (255 знаків максимум)." +msgstr "Розташування надто довге (255 знаків максимум)." #: actions/apigroupcreate.php:245 actions/editgroup.php:219 #: actions/newgroup.php:159 @@ -436,11 +444,10 @@ msgstr "Локація надто довга (255 знаків максимум) msgid "Too many aliases! Maximum %d." msgstr "Забагато додаткових імен! Максимум становить %d." -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, php-format -msgid "Invalid alias: \"%s\"" -msgstr "Помилкове додаткове ім’я: \"%s\"" +msgid "Invalid alias: \"%s\"." +msgstr "Помилкове додаткове ім’я: «%s»." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -456,14 +463,14 @@ msgstr "Додаткове ім’я не може бути таким сами #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 -msgid "Group not found!" -msgstr "Групу не знайдено!" +msgid "Group not found." +msgstr "Групу не знайдено." #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Ви вже є учасником цієї групи." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Адмін цієї групи заблокував Вашу присутність в ній." @@ -481,17 +488,26 @@ msgstr "Ви не є учасником цієї групи." msgid "Could not remove user %1$s from group %2$s." msgstr "Не вдалось видалити користувача %1$s з групи %2$s." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, php-format msgid "%s's groups" msgstr "%s групи" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%1$s групи, в яких %2$s бере участь." + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s групи" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "групи на %s" @@ -505,17 +521,17 @@ msgid "Invalid token." msgstr "Невірний токен." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -549,12 +565,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "Токен запиту %s було скасовано і відхилено." +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Несподіване представлення форми." @@ -578,20 +597,22 @@ msgstr "" "на доступ до Вашого акаунту %4$s лише тим стороннім додаткам, яким Ви " "довіряєте." -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "Акаунт" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Ім’я користувача" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Пароль" @@ -636,17 +657,17 @@ msgstr "Статус видалено." msgid "No status with that ID found." msgstr "Не знайдено жодних статусів з таким ID." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Надто довго. Максимальний розмір допису — %d знаків." -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "Не знайдено" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +msgid "Not found." +msgstr "Не знайдено." -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -657,12 +678,12 @@ msgstr "" msgid "Unsupported format." msgstr "Формат не підтримується." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Обрані від %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s оновлення обраних від %2$s / %2$s." @@ -672,17 +693,17 @@ msgstr "%1$s оновлення обраних від %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Оновленні відповіді %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s." -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s загальна стрічка" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s оновлення від усіх!" @@ -697,20 +718,16 @@ msgstr "Повторено для %s" msgid "Repeats of %s" msgstr "Повторення %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Дописи позначені з %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Оновлення позначені з %1$s на %2$s!" -#: actions/apiusershow.php:96 -msgid "Not found." -msgstr "Не знайдено." - #: actions/attachment.php:73 msgid "No such attachment." msgstr "Такого вкладення немає." @@ -730,8 +747,9 @@ msgstr "Немає розміру." msgid "Invalid size." msgstr "Недійсний розмір." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Аватара" @@ -741,10 +759,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Ви можете завантажити аватару. Максимальний розмір %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" -msgstr "Користувач з невідповідним профілем" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." +msgstr "Користувач без відповідного профілю." #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:254 @@ -762,7 +780,7 @@ msgid "Preview" msgstr "Перегляд" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "Видалити" @@ -774,23 +792,27 @@ msgstr "Завантажити" msgid "Crop" msgstr "Втяти" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "Жодного файлу не завантажено." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Оберіть квадратну ділянку зображення, яка й буде Вашою автарою." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Дані Вашого файлу десь загубились." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватару оновлено." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Оновлення аватари невдале." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватару видалено." @@ -798,7 +820,7 @@ msgstr "Аватару видалено." msgid "You already blocked that user." msgstr "Цього користувача вже заблоковано." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" msgstr "Блокувати користувача" @@ -812,27 +834,42 @@ msgstr "" "відписано від Вас, він не зможе підписитасть до Вас у майбутньому і Ви " "більше не отримуватимете жодних дописів від нього." -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "Ні" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Не блокувати цього користувача" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "Так" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Блокувати користувача" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "Збереження інформації про блокування завершилось невдачею." @@ -845,8 +882,8 @@ msgstr "Збереження інформації про блокування з #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "Такої групи немає." @@ -876,9 +913,11 @@ msgstr "Розблокувати" msgid "Unblock this user" msgstr "Розблокувати цього користувача" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "Написати " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" +msgstr "Опублікувати в %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -892,33 +931,43 @@ msgstr "Код підтвердження не знайдено." msgid "That confirmation code is not for you!" msgstr "Цей код підтвердження не для Вас!" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" -msgstr "Невизначений тип адреси %s" +msgid "Unrecognized address type %s." +msgstr "Невизначений тип адреси %s." -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Цю адресу вже було підтверджено." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Не вдалося оновити користувача." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Не вдалося видалити підтвердження поштової адреси." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 msgid "Confirm address" msgstr "Підтвердити адресу" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Адресу \"%s\" було підтверджено для Вашого акаунту." @@ -928,7 +977,7 @@ msgid "Conversation" msgstr "Розмова" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Дописи" @@ -947,7 +996,7 @@ msgstr "Ви не є власником цього додатку." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "Виникли певні проблеми з токеном поточної сесії." @@ -965,15 +1014,17 @@ msgstr "" "інформацію стосовно нього, включно із даними про під’єднаних до цього " "додатку користувачів." -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 msgid "Do not delete this application" msgstr "Не видаляти додаток" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 msgid "Delete this application" msgstr "Видалити додаток" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1002,11 +1053,13 @@ msgstr "Видалити допис" msgid "Are you sure you want to delete this notice?" msgstr "Ви впевненні, що бажаєте видалити цей допис?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 msgid "Do not delete this notice" msgstr "Не видаляти цей допис" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "Видалити допис" @@ -1030,58 +1083,61 @@ msgstr "" "Впевнені, що бажаєте видалити цього користувача? Усі дані буде знищено без " "можливості відновлення." -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Видалити цього користувача" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "Дизайн" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "Налаштування дизайну для цього сайту StatusNet." -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 msgid "Invalid logo URL." msgstr "Помилкова URL-адреса логотипу." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, php-format -msgid "Theme not available: %s" -msgstr "Тема не доступна: %s" +msgid "Theme not available: %s." +msgstr "Тема недоступна: %s." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 msgid "Change logo" msgstr "Змінити логотип" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 msgid "Site logo" msgstr "Логотип сайту" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 msgid "Change theme" msgstr "Змінити тему" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 msgid "Site theme" msgstr "Тема сайту" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "Тема для цього сайту." -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "Змінити фонове зображення" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "Фон" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1090,67 +1146,68 @@ msgstr "" "Ви можете завантажити фонове зображення для сайту. Максимальний розмір файлу " "%1$s." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "Увімк." -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "Вимк." -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Увімкнути або вимкнути фонове зображення." -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "Замостити фон" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 msgid "Change colours" msgstr "Змінити кольори" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 msgid "Content" msgstr "Зміст" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "Бічна панель" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Текст" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 msgid "Links" msgstr "Посилання" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "За замовч." -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Оновити налаштування за замовчуванням" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Повернутись до початкових налаштувань" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Зберегти" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "Зберегти дизайн" @@ -1255,11 +1312,16 @@ msgstr "Скористайтесь цією формою, щоб відреда msgid "description is too long (max %d chars)." msgstr "опис надто довгий (%d знаків максимум)." +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Помилкове додаткове ім’я: \"%s\"" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "Не вдалося оновити групу." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Неможна призначити додаткові імена." @@ -1267,31 +1329,42 @@ msgstr "Неможна призначити додаткові імена." msgid "Options saved." msgstr "Опції збережено." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 msgid "Email settings" msgstr "Налаштування пошти" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Зазначте, як саме Ви бажаєте отримувати листи з %%site.name%%." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Адреса" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +msgid "Email address" +msgstr "Електронна адреса" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Поточна підтверджена поштова адреса." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "Видалити" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1299,106 +1372,136 @@ msgstr "" "Очікування підтвердження цієї адреси. Перевірте вхідну пошту (і теку зі " "спамом також!), там має бути повідомлення з подальшими інструкціями." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +msgctxt "BUTTON" msgid "Cancel" msgstr "Скасувати" -#: actions/emailsettings.php:121 -msgid "Email address" -msgstr "Електронна адреса" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "Електронна адреса, на зразок \"UserName@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +msgctxt "BUTTON" msgid "Add" msgstr "Додати" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "Вхідна пошта" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Надсилайте дописи на цю адресу і їх буде опубліковано на сайті." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Створити нову адресу для надсилання повідомлень; видалити стару." -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "Нове" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "Преференції" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +msgid "Email preferences" +msgstr "Преференції ел. пошти" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Поівдомляти мене поштою про нові підписки." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "Надсилати мені листа, коли хтось додає мій допис до списку обраних." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Надсилати мені листа, коли хтось має приватне повідомлення для мене." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Надсилати мені листа, коли на мій допис з’являється \"@-відповідь\"." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "Дозволити друзям «розштовхати» мене, надіславши мені листа." -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Я хочу надсилати дописи поштою." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Позначати міткою MicroID мою електронну адресу." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "Преференції збережно." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." +msgstr "Преференції пошти збережно." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Немає електронної адреси." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "Не можна полагодити цю поштову адресу" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Це недійсна електронна адреса." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "Це і є Вашою адресою." -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "Ця електронна адреса належить іншому користувачу." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Не вдалося додати код підтвердження." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1407,43 +1510,53 @@ msgstr "" "Перевірте вхідну пошту (і теку зі спамом також!), там має бути код та " "подальші інструкції." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Не очікується підтвердження для скасування." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "Це помилкова адреса IM." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +msgid "That is the wrong email address." +msgstr "Це помилкова адреса електронної пошти." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." -msgstr "Підтвердження скасовано." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +msgid "Email confirmation cancelled." +msgstr "Підтвердження електронної пошти скасовано." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "Це не є Вашою адресою." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "Адресу було видалено." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +msgid "The email address was removed." +msgstr "Адреса була видалена." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "Немає адреси для вхідної пошти." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "Не вдалося оновити запис користувача." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "Адресу вхідної пошти видалено." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "Нову адресу для вхідних повідомлень додано." @@ -1560,9 +1673,9 @@ msgstr "Не вдалося перетворити токени запиту н msgid "Remote service uses unknown version of OMB protocol." msgstr "Невідома версія протоколу OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" -msgstr "Помилка при оновленні віддаленого профілю" +#: actions/finishremotesubscribe.php:138 +msgid "Error updating remote profile." +msgstr "Помилка при оновленні віддаленого профілю." #: actions/getfile.php:79 msgid "No such file." @@ -1617,11 +1730,11 @@ msgstr "Користувача заблоковано в цій групі." msgid "User is not a member of group." msgstr "Користувач не є учасником групи." -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 msgid "Block user from group" msgstr "Блокувати користувача в групі" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1632,15 +1745,17 @@ msgstr "" "позбавлено членства в групі, він не зможе сюди писати, і не зможе вступити " "до групи знов." -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 msgid "Do not block this user from this group" msgstr "Не блокувати користувача в групі" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 msgid "Block this user from this group" msgstr "Блокувати користувача цієї групи" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "Виникла помилка при блокуванні користувача в цій групі." @@ -1685,10 +1800,6 @@ msgstr "" "Ви маєте можливість завантажити логотип для Вашої группи. Максимальний " "розмір файлу %s." -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "Користувач без відповідного профілю." - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "Оберіть квадратну ділянку зображення, яка й буде логотипом групи." @@ -1719,34 +1830,38 @@ msgstr "Список учасників цієї групи." msgid "Admin" msgstr "Адмін" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "Блок" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "Надати користувачеві права адміністратора" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "Зробити адміном" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "Надати цьому користувачеві права адміністратора" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s стрічка" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Оновлення членів %1$s на %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Групи" @@ -1771,7 +1886,7 @@ msgstr "" "повідомлення. Не бачите групу, яка Вас цікавить? Спробуйте її [знайти](%%%%" "action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Створити нову групу" @@ -1781,7 +1896,7 @@ msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Пошук груп на %%site.name%% за їхньою назвою, локацією або описом. " +"Пошук груп на %%site.name%% за їхньою назвою, розташуванням або описом. " "Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків " "або більше." @@ -1824,11 +1939,15 @@ msgstr "Користувача не блоковано." msgid "Error removing the block." msgstr "Помилка при розблокуванні." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 msgid "IM settings" msgstr "Налаштування ІМ" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1837,15 +1956,24 @@ msgstr "" "Ви можете надсилати та отримувати дописи через Jabber/GTalk [службу миттєвих " "повідомлень](%%doc.im%%). Вкажить свою адресу і налаштуйте опції нижче." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 msgid "IM is not available." msgstr "ІМ недоступний" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +msgid "IM address" +msgstr "ІМ-адреса" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Поточна підтверджена адреса Jabber/GTalk." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1855,11 +1983,9 @@ msgstr "" "туди має надійти повідомлення з подальшими інструкціями. (Ви додали %s до " "Вашого списку контактів?)" -#: actions/imsettings.php:124 -msgid "IM address" -msgstr "ІМ-адреса" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1869,45 +1995,66 @@ msgstr "" "переконайтеся, що додали %s до списку контактів в своєму IM-клієнті або в " "GTalk." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "Преференції ІМ" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Повідомляти мене через Jabber/GTalk." -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Надсилати дописи на сайт, коли мій статус Jabber/GTalk змінюється." -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Надсилати також мені відповіді через Jabber/GTalk від людей, до яких я не " "підписаний." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Позначати міткою MicroID мою адресу Jabber/GTalk." -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Преференції збережно." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Немає Jabber ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Не можна полагодити цей Jabber ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Це недійсний Jabber ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Це і є Ваш Jabber ID." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber ID вже належить іншому користувачу." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -1916,10 +2063,32 @@ msgstr "" "Код підтвердження був відправлений на адресу IM, яку Ви додали. Ви повинні " "затведити %s для відправлення вам повідомлень." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Це помилкова адреса IM." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +msgid "Couldn't delete IM confirmation." +msgstr "Не вдалося видалити підтвердження ІМ." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +msgid "IM confirmation cancelled." +msgstr "Підтвердження ІМ скасовано." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Це не Ваш Jabber ID." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "Адреса ІМ була видалена." + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1941,8 +2110,8 @@ msgstr "Запрошення були скасовані." #: actions/invite.php:41 #, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "Ви маєте спочатку увійти, аби мати змогу запросити когось до %s" +msgid "You must be logged in to invite other users to use %s." +msgstr "Ви маєте спочатку увійти, аби мати змогу запросити когось до %s." #: actions/invite.php:72 #, php-format @@ -1961,7 +2130,9 @@ msgstr "Запросити нових користувачів" msgid "You are already subscribed to these users:" msgstr "Ви вже підписані до цих користувачів:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2013,12 +2184,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Надіслати" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s запросив(ла) Вас приєднатися до нього(неї) на %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2084,7 +2257,9 @@ msgstr "Ви повинні спочатку увійти на сайт, аби msgid "No nickname or ID." msgstr "Немає імені або ІД." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s приєднався до групи %2$s" @@ -2093,11 +2268,13 @@ msgstr "%1$s приєднався до групи %2$s" msgid "You must be logged in to leave a group." msgstr "Ви повинні спочатку увійти на сайт, аби залишити групу." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "Ви не є учасником цієї групи." -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s залишив групу %2$s" @@ -2145,13 +2322,16 @@ msgstr "" "змінювати налаштування." #: actions/login.php:270 +msgid "Login with your username and password." +msgstr "Увійти використовуючи ім’я та пароль." + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Увійти викристовуючи ім’я та пароль. Ще не маєте імені користувача? " -"[Зареєструвати](%%action.register%%) новий акаунт." +"Ще не маєте імені користувача? [Зареєструвати](%%action.register%%) новий " +"акаунт." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2174,8 +2354,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Не можна надати %1$s права адміна в групі %2$s." #: actions/microsummary.php:69 -msgid "No current status" -msgstr "Ніякого поточного статусу" +msgid "No current status." +msgstr "Жодного поточного статусу." #: actions/newapplication.php:52 msgid "New Application" @@ -2209,12 +2389,12 @@ msgstr "Скористайтесь цією формою для створенн msgid "New message" msgstr "Нове повідомлення" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "Ви не можете надіслати повідомлення цьому користувачеві." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Немає змісту!" @@ -2222,7 +2402,7 @@ msgstr "Немає змісту!" msgid "No recipient specified." msgstr "Жодного отримувача не визначено." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2237,7 +2417,7 @@ msgstr "Повідомлення надіслано" msgid "Direct message to %s sent." msgstr "Пряме повідомлення для %s надіслано." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Помилка в Ajax" @@ -2245,7 +2425,7 @@ msgstr "Помилка в Ajax" msgid "New notice" msgstr "Новий допис" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "Допис надіслано" @@ -2341,11 +2521,11 @@ msgid "You are not a user of that application." msgstr "Ви не є користувачем даного додатку." #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " -msgstr "Не вдалося скасувати доступ для додатку: " +#, php-format +msgid "Unable to revoke access for app: %s." +msgstr "Не вдалося скасувати доступ для додатку: %s." #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "Ви не дозволили жодним додаткам використовувати Ваш акаунт." @@ -2354,24 +2534,29 @@ msgid "Developers can edit the registration settings for their applications " msgstr "Розробники можуть змінити налаштування реєстрації для їхніх додатків " #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "Допис не має профілю" +msgid "Notice has no profile." +msgstr "Допис не має профілю." -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s має статус на %2$s" -#: actions/oembed.php:157 -msgid "content type " -msgstr "тип змісту " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, php-format +msgid "Content type %s not supported." +msgstr "Тип змісту %s не підтримується." -#: actions/oembed.php:160 -msgid "Only " -msgstr "Лише " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." +msgstr "URL-адреса %s лише в простому HTTP, будь ласка." -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -2393,11 +2578,11 @@ msgstr "Керування деякими іншими опціями." #: actions/othersettings.php:108 msgid " (free service)" -msgstr " (безкоштовно)" +msgstr " (вільний сервіс)" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "Зручні URL" +msgstr "Скорочення URL-адрес" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." @@ -2476,7 +2661,7 @@ msgid "6 or more characters" msgstr "6 або більше знаків" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Підтвердити" @@ -2504,7 +2689,7 @@ msgstr "Старий пароль є неточним" msgid "Error saving user; invalid." msgstr "Помилка при збереженні користувача; недійсний." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Неможна зберегти новий пароль." @@ -2513,7 +2698,7 @@ msgid "Password saved." msgstr "Пароль збережено." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "Шлях" @@ -2523,23 +2708,23 @@ msgstr "Шлях та налаштування серверу для цього #: actions/pathsadminpanel.php:157 #, php-format -msgid "Theme directory not readable: %s" -msgstr "Дирикторію теми неможна прочитати: %s" +msgid "Theme directory not readable: %s." +msgstr "Директорію теми не можна прочитати: %s." #: actions/pathsadminpanel.php:163 #, php-format -msgid "Avatar directory not writable: %s" -msgstr "Щось не так із написанням директорії аватари: %s" +msgid "Avatar directory not writable: %s." +msgstr "Директорія аватарів не доступна для запису: %s." #: actions/pathsadminpanel.php:169 #, php-format -msgid "Background directory not writable: %s" -msgstr "Щось не так із написанням директорії фону: %s" +msgid "Background directory not writable: %s." +msgstr "Директорія фонових зображень не доступна для запису:% s." #: actions/pathsadminpanel.php:177 #, php-format -msgid "Locales directory not readable: %s" -msgstr "Не можу прочитати директорію локалі: %s" +msgid "Locales directory not readable: %s." +msgstr "Не можна прочитати директорію локалі: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2671,7 +2856,7 @@ msgid "" "Search for people on %%site.name%% by their name, location, or interests. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Пошук людей на %%site.name%% за їх ім’ям, локацією або інтересами. " +"Пошук людей на %%site.name%% за їх ім’ям, розташуванням або інтересами. " "Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків " "або більше." @@ -2679,19 +2864,19 @@ msgstr "" msgid "People search" msgstr "Пошук людей" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, php-format -msgid "Not a valid people tag: %s" -msgstr "Це недійсний особистий теґ: %s" +msgid "Not a valid people tag: %s." +msgstr "Це недійсний особистий теґ: %s." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Користувачі з особистим теґом %1$s — сторінка %2$d" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "Недійсний зміст допису" +msgid "Invalid notice content." +msgstr "Недійсний зміст допису." #: actions/postnotice.php:101 #, php-format @@ -2718,13 +2903,14 @@ msgstr "" "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Повне ім’я" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Веб-сторінка" @@ -2746,23 +2932,23 @@ msgid "Bio" msgstr "Про себе" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Розташування" #: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "Де Ви живете, штибу \"Місто, область (регіон), країна\"" +msgstr "Де Ви живете, на кшталт «Місто, область (регіон), країна»" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "Показувати мою поточну локацію при надсиланні дописів" +msgstr "Показувати моє місцезнаходження при надсиланні дописів" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Теґи" @@ -2836,8 +3022,8 @@ msgstr "Налаштування збережено." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" -msgstr "Досягнуто ліміту сторінки (%s)" +msgid "Beyond the page limit (%s)." +msgstr "Перевищено ліміт сторінки (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2846,7 +3032,7 @@ msgstr "Не вдається відновити загальну стрічку #: actions/public.php:130 #, php-format msgid "Public timeline, page %d" -msgstr "Загальний стрічка, сторінка %d" +msgstr "Загальна стрічка, сторінка %d" #: actions/public.php:132 lib/publicgroupnav.php:79 msgid "Public timeline" @@ -2893,7 +3079,7 @@ msgid "" "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" "Це %%site.name%% — сервіс [мікроблоґів](http://uk.wikipedia.org/wiki/" -"Мікроблоґ), який працює на вільному програмному забезпеченні [StatusNet]" +"Мікроблоггінг), який працює на вільному програмному забезпеченні [StatusNet]" "(http://status.net/). [Приєднуйтесь](%%action.register%%) зараз і зможете " "розділити своє життя з друзями, родиною і колегами! ([Дізнатися більше](%%" "doc.help%%))" @@ -2906,7 +3092,7 @@ msgid "" "tool." msgstr "" "Це %%site.name%% — сервіс [мікроблоґів](http://uk.wikipedia.org/wiki/" -"Мікроблоґ), який працює на вільному програмному забезпеченні [StatusNet]" +"Мікроблоггінг), який працює на вільному програмному забезпеченні [StatusNet]" "(http://status.net/)." #: actions/publictagcloud.php:57 @@ -3005,7 +3191,7 @@ msgstr "Скинути пароль" msgid "Recover password" msgstr "Відновити пароль" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Запит на відновлення паролю відправлено" @@ -3025,19 +3211,19 @@ msgstr "Скинути" msgid "Enter a nickname or email address." msgstr "Введіть ім’я або електронну адресу." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Користувача з такою електронною адресою або ім’ям немає." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Для цього користувача немає зареєстрованої електронної адреси." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Помилка при збереженні підтвердження адреси." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3045,23 +3231,23 @@ msgstr "" "Інструкції з відновлення паролю було надіслано на електронну адресу, яку Ви " "вказали у налаштуваннях Вашого профілю." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Несподіване скидання паролю." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Пароль має складатись з 6-ти або більше знаків." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Пароль та підтвердження не співпадають." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Помилка в налаштуваннях користувача." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Новий пароль успішно збережено. Тепер Ви увійшли." @@ -3078,7 +3264,7 @@ msgstr "Даруйте, помилка у коді запрошення." msgid "Registration successful" msgstr "Реєстрація успішна" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Реєстрація" @@ -3100,11 +3286,11 @@ msgstr "Недійсне ім’я або пароль." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -"Ця форма дозволить створити новий акаунт. Ви зможете робити дописи і будете " -"в курсі справ Ваших друзів та колег. " +"Ця форма дозволить вам створити новий акаунт. Ви зможете робити дописи і " +"будете в курсі справ ваших друзів та колег. " #: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -3120,8 +3306,9 @@ msgstr "6 або більше знаків. Неодмінно." msgid "Same as password above. Required." msgstr "Такий само, як і пароль вище. Неодмінно." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Пошта" @@ -3134,22 +3321,15 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Повне ім’я, звісно ж Ваше справжнє ім’я :)" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Мої повідомлення та файли доступні під " - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "Кріейтів Комонс Авторство 3.0" - -#: actions/register.php:497 +#, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "" -" окрім цих приватних даних: пароль, електронна адреса, адреса IM, телефонний " -"номер." +"Мої тексти і файли доступні під %s, окрім цих приватних даних: пароль, " +"електронна адреса, адреса IM, телефонний номер." -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3182,7 +3362,7 @@ msgstr "" "Дякуємо, що зареєструвались у нас, і, сподіваємось, Вам сподобається наш " "сервіс." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3226,7 +3406,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL-адреса Вашого профілю на іншому сумісному сервісі" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Підписатись" @@ -3263,7 +3443,7 @@ msgstr "Ви не можете повторювати свої власні до msgid "You already repeated that notice." msgstr "Ви вже повторили цей допис." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 msgid "Repeated" msgstr "Повторено" @@ -3351,7 +3531,7 @@ msgstr "Користувача ізольовано доки наберетьс #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "Сесії" @@ -3388,26 +3568,30 @@ msgstr "Ви повинні спочатку увійти, аби перегля msgid "Application profile" msgstr "Профіль додатку" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "Іконка" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 msgid "Name" msgstr "Ім’я" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 msgid "Organization" msgstr "Організація" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Опис" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Статистика" @@ -3527,67 +3711,67 @@ msgstr "Група %s" msgid "%1$s group, page %2$d" msgstr "Група %1$s, сторінка %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Профіль групи" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Зауваження" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Додаткові імена" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Діяльність групи" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Стрічка дописів групи %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Стрічка дописів групи %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Стрічка дописів групи %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF для групи %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Учасники" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Пусто)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "Всі учасники" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 msgid "Created" msgstr "Створено" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3597,12 +3781,12 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" "**%s** це група на %%%%site.name%%%% — сервісі [мікроблоґів](http://uk." -"wikipedia.org/wiki/Мікроблоґ), який працює на вільному програмному " +"wikipedia.org/wiki/Мікроблоггінг), який працює на вільному програмному " "забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблять " "короткі дописи про своє життя та інтереси. [Приєднуйтесь](%%action.register%" "%) зараз і долучіться до спілкування! ([Дізнатися більше](%%doc.help%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3611,11 +3795,11 @@ msgid "" "their life and interests. " msgstr "" "**%s** це група користувачів на %%site.name%% — сервісі [мікроблоґів](http://" -"uk.wikipedia.org/wiki/Мікроблоґ), який працює на вільному програмному " +"uk.wikipedia.org/wiki/Мікроблоггінг), який працює на вільному програмному " "забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблять " "короткі дописи про своє життя та інтереси. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "Адміни" @@ -3720,7 +3904,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" "**%s** є власником акаунту на сайті %%%%site.name%%%% — сервісі [мікроблоґів]" -"(http://uk.wikipedia.org/wiki/Мікроблоґ), який працює на вільному " +"(http://uk.wikipedia.org/wiki/Мікроблоггінг), який працює на вільному " "програмному забезпеченні [StatusNet](http://status.net/). " #: actions/showstream.php:305 @@ -3754,14 +3938,14 @@ msgid "Unknown language \"%s\"." msgstr "Невідома мова «%s»." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." -msgstr "Ліміт текстових повідомлень становить 140 знаків." +msgid "Minimum text limit is 0 (unlimited)." +msgstr "Ліміт текстових повідомлень становить 0 (необмежено)." #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" -"Часове обмеження при надсиланні дублікату повідомлення має становити від 1 і " -"більше секунд." +"Обмеження часу при повторному надісланні того самого повідомлення має " +"становити одну і більше секунд." #: actions/siteadminpanel.php:221 msgid "General" @@ -3773,7 +3957,7 @@ msgstr "Назва сайту" #: actions/siteadminpanel.php:225 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "Назва Вашого сайту, штибу \"Мікроблоґи компанії ...\"" +msgstr "Назва Вашого сайту, щось на зразок «Мікроблоґи компанії ...»" #: actions/siteadminpanel.php:229 msgid "Brought by" @@ -3852,8 +4036,8 @@ msgid "Unable to save site notice." msgstr "Не вдається зберегти повідомлення сайту." #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" -msgstr "Максимальна довжина повідомлення сайту становить 255 символів" +msgid "Max length for the site-wide notice is 255 chars." +msgstr "Максимальна довжина повідомлення сайту становить 255 символів." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" @@ -3867,44 +4051,71 @@ msgstr "Текст повідомлення сайту (255 символів м msgid "Save site notice" msgstr "Зберегти повідомлення сайту" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 msgid "SMS settings" msgstr "Налаштування СМС" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Ви можете отримувати СМС через електронну пошту від %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 msgid "SMS is not available." msgstr "СМС недоступно." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +msgid "SMS address" +msgstr "SMS-адреса" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "Поточний підтверджений телефонний номер." -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "Очікування підтвердження телефонного номера." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "Код підтвердження" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Введіть код, який Ви отримали телефоном." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Підтвердити" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "Телефонний номер" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "Преференції SMS" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -3912,23 +4123,33 @@ msgstr "" "Повідомляти мене за допомогою СМС; Я розімію, що, можливо, понесу надмірні " "витрати від мого мобільного оператора." -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "Преференції SMS збережено." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Немає телефонного номера." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "Оператора не обрано." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "Це і є Ваш телефонний номер." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "Цей телефонний номер належить іншому користувачу." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." @@ -3936,23 +4157,40 @@ msgstr "" "Код підтвердження був відправлений на телефонний номер, який Ви додали. " "Перевірте вхідні повідомлення, там має бути код та подальші інструкції." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "Це помилковий код підтвердження." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +msgid "SMS confirmation cancelled." +msgstr "Підтвердження SMS скасовано." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Це не Ваш телефонний номер." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "Телефонний номер для SMS був видалений." + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "Мобільний оператор" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Оберіть оператора" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -3962,13 +4200,14 @@ msgstr "" "надсилання СМС через електронну пошту, але він тут не вказаний, напишіть нам " "і ми внесемо його до списку." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Код не введено" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "Снепшоти" @@ -3989,8 +4228,8 @@ msgid "Invalid snapshot report URL." msgstr "Помилковий снепшот URL." #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" -msgstr "Випадково під час веб-хіта" +msgid "Randomly during web hit" +msgstr "Випадково під час веб-звернення" #: actions/snapshotadminpanel.php:201 msgid "In a scheduled job" @@ -4028,8 +4267,7 @@ msgstr "Зберегти налаштування знімку" msgid "You are not subscribed to that profile." msgstr "Ви не підписані до цього профілю." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Не вдалося зберегти підписку." @@ -4130,11 +4368,11 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%s не відслідковує нічого" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 msgid "Jabber" msgstr "Jabber" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "СМС" @@ -4167,12 +4405,12 @@ msgstr "Немає ID аргументу." msgid "Tag %s" msgstr "Позначити %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Профіль користувача." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Фото" @@ -4224,7 +4462,7 @@ msgid "User is not silenced." msgstr "Користувач поки що має право голосу." #: actions/unsubscribe.php:77 -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "У запиті відсутній ID профілю." #: actions/unsubscribe.php:98 @@ -4260,7 +4498,8 @@ msgstr "Помилковий текст привітання. Максималь msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Помилкова підписка за замовчуванням: '%1$s' не є користувачем." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профіль" @@ -4424,28 +4663,34 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Поласуйте бутербродом!" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, php-format msgid "%1$s groups, page %2$d" msgstr "Групи %1$s, сторінка %2$d" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "Шукати групи ще" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "%s не є учасником жодної групи." -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Спробуйте [знайти якісь групи](%%action.groupsearch%%) і приєднайтеся до них." -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Оновлення від %1$s на %2$s!" @@ -4505,7 +4750,8 @@ msgstr "" msgid "Plugins" msgstr "Додатки" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 msgid "Version" msgstr "Версія" @@ -4513,7 +4759,7 @@ msgstr "Версія" msgid "Author(s)" msgstr "Автор(и)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4522,12 +4768,12 @@ msgstr "" "Ні, файл не може бути більшим за %d байтів, а те, що Ви хочете надіслати, " "важить %d байтів. Спробуйте меншу версію." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Розміри цього файлу перевищують Вашу квоту на %d байтів." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Розміри цього файлу перевищують Вашу місячну квоту на %d байтів." @@ -4565,27 +4811,28 @@ msgstr "Не можна долучити повідомлення." msgid "Could not update message with new URI." msgstr "Не можна оновити повідомлення з новим URI." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, php-format -msgid "DB error inserting hashtag: %s" -msgstr "Помилка бази даних при додаванні теґу: %s" +msgid "Database error inserting hashtag: %s" +msgstr "Помилка бази даних при додаванні хеш-теґу: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 msgid "Problem saving notice. Too long." msgstr "Проблема при збереженні допису. Надто довге." -#: classes/Notice.php:245 +#: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." msgstr "Проблема при збереженні допису. Невідомий користувач." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Дуже багато дописів за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4593,287 +4840,319 @@ msgstr "" "Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "Вам заборонено надсилати дописи до цього сайту." -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Проблема при збереженні допису." -#: classes/Notice.php:927 +#: classes/Notice.php:967 msgid "Problem saving group inbox." msgstr "Проблема при збереженні вхідних дописів для групи." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Вас позбавлено можливості підписатись." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Вже підписаний!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Користувач заблокував Вас." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Не підписано!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Не можу видалити самопідписку." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Не вдається видалити токен підписки OMB." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Не вдалося видалити підписку." -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Вітаємо на %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Не вдалося створити нову групу." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Не вдалося встановити URI групи." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Не вдалося встановити членство." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Не вдалося зберегти інформацію про локальну групу." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Змінити налаштування профілю" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "Завантаження аватари" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Змінити Ваш пароль" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Змінити електронну адресу" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 msgid "Design your profile" msgstr "Дизайн Вашого профілю" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "Інше" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "Інші опції" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "Інше" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, php-format msgid "%1$s - %2$s" msgstr "%1$s — %2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "Сторінка без заголовку" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "Відправна навігація по сайту" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Персональний профіль і стрічка друзів" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 msgctxt "MENU" msgid "Personal" msgstr "Особисте" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Змінити електронну адресу, аватару, пароль, профіль" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 msgctxt "TOOLTIP" msgid "Connect to services" msgstr "З’єднання з сервісами" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "З’єднання" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Змінити конфігурацію сайту" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "Адмін" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Запросіть друзів та колег приєднатись до Вас на %s" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 msgctxt "MENU" msgid "Invite" msgstr "Запросити" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Вийти з сайту" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 msgctxt "MENU" msgid "Logout" msgstr "Вийти" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 msgctxt "TOOLTIP" msgid "Create an account" msgstr "Створити новий акаунт" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 msgctxt "MENU" msgid "Register" msgstr "Реєстрація" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Увійти на сайт" -#: lib/action.php:479 +#: lib/action.php:481 msgctxt "MENU" msgid "Login" msgstr "Увійти" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 msgctxt "TOOLTIP" msgid "Help me!" msgstr "Допоможіть!" -#: lib/action.php:485 +#: lib/action.php:487 msgctxt "MENU" msgid "Help" msgstr "Довідка" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Пошук людей або текстів" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "Пошук" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" -msgstr "Зауваження сайту" +msgstr "Об’яви на сайті" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "Огляд" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 msgid "Page notice" msgstr "Зауваження сторінки" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "Другорядна навігація по сайту" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Допомога" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Про" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" -msgstr "ЧаПи" +msgstr "ЧаП" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "Умови" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" -msgstr "Конфіденційність" +msgstr "Приватність" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Джерело" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Контакт" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "Бедж" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "Ліцензія програмного забезпечення StatusNet" -#: lib/action.php:802 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** — це сервіс мікроблоґів наданий вам [%%site.broughtby%%](%%" -"site.broughtbyurl%%). " +"site.broughtbyurl%%)." -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** — це сервіс мікроблоґів. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** — це сервіс мікроблоґів." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4884,68 +5163,83 @@ msgstr "" "для мікроблоґів, версія %s, доступному під [GNU Affero General Public " "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 msgid "Site content license" msgstr "Ліцензія змісту сайту" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Зміст і дані %1$s є приватними і конфіденційними." -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "Авторські права на зміст і дані належать %1$s. Всі права захищено." -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Авторські права на зміст і дані належать розробникам. Всі права захищено." -#: lib/action.php:847 -msgid "All " -msgstr "Всі " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "Весь зміст і дані %1$s доступні на умовах ліцензії %2$s." -#: lib/action.php:853 -msgid "license." -msgstr "ліцензія." - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "Нумерація сторінок" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "Вперед" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 msgid "Before" msgstr "Назад" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" +"В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Поки що не можу обробити віддалений контент." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Поки що не можу обробити вбудований XML контент." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Поки що не можу обробити вбудований контент Base64." -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "Ви не можете щось змінювати на цьому сайті." -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "Для цієї панелі зміни не припустимі." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "showForm() не виконано." @@ -4955,155 +5249,192 @@ msgstr "showForm() не виконано." msgid "saveSettings() not implemented." msgstr "saveSettings() не виконано." -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "Немає можливості видалити налаштування дизайну." #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 msgid "Basic site configuration" msgstr "Основна конфігурація сайту" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 msgctxt "MENU" msgid "Site" msgstr "Сайт" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 msgid "Design configuration" msgstr "Конфігурація дизайну" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 msgctxt "MENU" msgid "Design" msgstr "Дизайн" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 msgid "User configuration" msgstr "Конфігурація користувача" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "Користувач" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 msgid "Access configuration" msgstr "Прийняти конфігурацію" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 msgid "Paths configuration" msgstr "Конфігурація шляху" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 msgid "Sessions configuration" msgstr "Конфігурація сесій" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 msgid "Edit site notice" msgstr "Редагувати повідомлення сайту" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 msgid "Snapshots configuration" msgstr "Конфігурація знімків" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-ресурс вимагає дозвіл типу «читання-запис», але у вас є лише доступ для " "читання." -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" -"Невдала спроба авторизації API, nickname = %1$s, proxy = %2$s, ip = %3$s" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "Керувати додатками" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "Іконка для цього додатку" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, php-format msgid "Describe your application in %d characters" msgstr "Опишіть додаток, вкладаючись у %d знаків" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 msgid "Describe your application" msgstr "Опишіть Ваш додаток" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "URL-адреса" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "URL-адреса веб-сторінки цього додатку" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "URL-адреса" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "Організація, відповідальна за цей додаток" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "URL-адреса веб-сторінки організації" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "URL-адреса, на яку перенаправляти після автентифікації" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "Браузер" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "Десктоп" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "Тип додатку, браузер або десктоп" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "Лише читання" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "Читати-писати" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" "Дозвіл за замовчуванням для цього додатку: лише читання або читати-писати" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Скасувати" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "читання/запис" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "лише читання" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "Підтверджено доступ %1$s — «%2$s»." + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "Відкликати" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "Вкладення" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "Автор" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "Провайдер" @@ -5123,37 +5454,56 @@ msgstr "Не вдалося змінити пароль" msgid "Password changing is not allowed" msgstr "Змінювати пароль не дозволено" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Результати команди" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Команду виконано" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Команду не виконано" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Даруйте, але виконання команди ще не завершено." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Такого допису не існує" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "Користувач не має останнього допису" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "Не вдалося знайти користувача з іменем %s" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Не вдалося знайти локального користувача з іменем %s" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "Даруйте, але виконання команди ще не завершено." + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Гадаємо, користі від «розштовхування» самого себе небагато, чи не так?!" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "Спробу «розштовхати» %s зараховано" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5164,199 +5514,207 @@ msgstr "" "Підписчики: %2$s\n" "Дописи: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Такого допису не існує" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Користувач не має останнього допису" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "Допис позначено як обраний." -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "Ви вже є учасником цієї групи." -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "Не вдалось долучити користувача %1$s до групи %2$s." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, php-format -msgid "%s joined group %s" -msgstr "%1$s приєднався до групи %2$s" +msgid "Could not remove user %1$s from group %2$s" +msgstr "Не вдалось видалити користувача %1$s з групи %2$s" -#: lib/command.php:275 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Не вдалося видалити користувача %1$s з групи %2$s." - -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%1$s залишив групу %2$s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "Повне ім’я: %s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" -msgstr "Локація: %s" +msgstr "Розташування: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "Веб-сторінка: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "Про мене: %s" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Повідомлення надто довге — максимум %d знаків, а ви надсилаєте %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" +"%s — це віддалений профіль; Ви можете надсилати приватні повідомлення лише " +"користувачам одного з вами сервісу." -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" +"Повідомлення надто довге — максимум становить %1$d символів, Ви надсилаєте %2" +"$d" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "Пряме повідомлення для %s надіслано." -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "Помилка при відправці прямого повідомлення." -#: lib/command.php:413 +#: lib/command.php:514 msgid "Cannot repeat your own notice" msgstr "Не можу повторити Ваш власний допис" -#: lib/command.php:418 +#: lib/command.php:519 msgid "Already repeated that notice" msgstr "Цей допис вже повторили" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, php-format msgid "Notice from %s repeated" msgstr "Допис %s повторили" -#: lib/command.php:428 +#: lib/command.php:531 msgid "Error repeating notice." msgstr "Помилка при повторенні допису." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d" -#: lib/command.php:491 +#: lib/command.php:571 #, php-format msgid "Reply to %s sent" msgstr "Відповідь до %s надіслано" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "Проблема при збереженні допису." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Такого користувача немає." +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "Не можу підписатись до профілю OMB за командою." -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "Підписано до %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "Відписано від %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "Виконання команди ще не завершено." -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "Сповіщення вимкнуто." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "Не можна вимкнути сповіщення." -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "Сповіщення увімкнуто." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "Не можна увімкнути сповіщення." -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "Команду входу відключено" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s" -#: lib/command.php:692 +#: lib/command.php:761 #, php-format msgid "Unsubscribed %s" msgstr "Відписано %s" -#: lib/command.php:709 +#: lib/command.php:778 msgid "You are not subscribed to anyone." msgstr "Ви не маєте жодних підписок." -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ви підписані до цієї особи:" msgstr[1] "Ви підписані до цих людей:" msgstr[2] "Ви підписані до цих людей:" -#: lib/command.php:731 +#: lib/command.php:800 msgid "No one is subscribed to you." msgstr "До Вас ніхто не підписаний." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ця особа є підписаною до Вас:" msgstr[1] "Ці люди підписані до Вас:" msgstr[2] "Ці люди підписані до Вас:" -#: lib/command.php:753 +#: lib/command.php:822 msgid "You are not a member of any groups." msgstr "Ви не є учасником жодної групи." -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ви є учасником групи:" msgstr[1] "Ви є учасником таких груп:" msgstr[2] "Ви є учасником таких груп:" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5433,19 +5791,19 @@ msgstr "" "tracks — наразі не виконується\n" "tracking — наразі не виконується\n" -#: lib/common.php:148 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Файлу конфігурації не знайдено. " -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Шукав файли конфігурації в цих місцях: " -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Запустіть файл інсталяції, аби полагодити це." -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Іти до файлу інсталяції." @@ -5565,7 +5923,7 @@ msgstr "Опишіть групу або тему, вкладаючись у %d #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" -msgstr "Локація групи, штибу \"Місто, область (або регіон), країна\"" +msgstr "Розташування групи, на кшталт «Місто, область (або регіон), країна»" #: lib/groupeditform.php:187 #, php-format @@ -5618,53 +5976,54 @@ msgstr "Групи з найбільшою кількістю дописів" msgid "Tags in %s group's notices" msgstr "Теґи у дописах групи %s" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Формат зображення не підтримується." + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Цей файл завеликий. Максимальний розмір %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Часткове завантаження." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Система відповіла помилкою при завантаженні цього файла." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Це не зображення, або файл зіпсовано." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Формат зображення не підтримується." - #: lib/imagefile.php:122 msgid "Lost our file." msgstr "Файл втрачено." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Тип файлу не підтримується" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "Мб" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "кб" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "Невідоме джерело вхідного повідомлення %d." @@ -5685,11 +6044,13 @@ msgstr "Увійти використовуючи ім’я та пароль" msgid "Sign up for a new account" msgstr "Зареєструвати новий акаунт" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Підтвердження електронної адреси" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5718,12 +6079,14 @@ msgstr "" "Дякуємо за Ваш час \n" "%s\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s тепер слідкує за Вашими дописами на %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5748,17 +6111,20 @@ msgstr "" "----\n" "Змінити електронну адресу або умови сповіщення — %8$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, php-format msgid "Bio: %s" msgstr "Про себе: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Нова електронна адреса для надсилання повідомлень на %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5779,21 +6145,33 @@ msgstr "" "Щиро Ваші,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s статус" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Підтвердження СМС" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" +"%s, підтвердьте, що Ви є власником зазначеного номеру телефону, " +"скориставшись даним кодом:" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "Вас спробував «розштовхати» %s" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5820,12 +6198,14 @@ msgstr "" "З найкращими побажаннями,\n" "%4$s\n" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Нове приватне повідомлення від %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5858,12 +6238,14 @@ msgstr "" "З найкращими побажаннями,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) додав(ла) Ваш допис обраних" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5900,12 +6282,25 @@ msgstr "" "Щиро Ваші,\n" "%6$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" +"Всю розмову можна переглянути тут:\n" +"\n" +"%s" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) пропонує до Вашої уваги наступний допис" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5918,18 +6313,41 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"%1$s (@%9$s) пропонує до Вашої уваги наступний допис (це '@-відповідь') %2" -"$s.\n" +"%1$s (@%9$s) щойно надіслав(ла) Вам повідомлення («@-відповідь») на %2$s.\n" "\n" -"Допис тут:\n" +"Повідомлення знаходиться тут:\n" "\n" -"\t%3$s\n" +"%3$s\n" "\n" -"Текст:\n" +"Ось його зміст:\n" "\n" -"\t%4$s\n" +"%4$s\n" "\n" +"%5$sНадіслати відповідь можна звідси:\n" +"\n" +"%6$s\n" +"\n" +"Список всіх @-відповідей, надісланих Вам, знаходиться тут:\n" +"\n" +"%7$s\n" +"\n" +"З повагою,\n" +"%2$s\n" +"\n" +"P.S. Ви можете вимкнути сповіщення електронною поштою тут: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5945,7 +6363,7 @@ msgstr "" "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите " "лише Ви." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "від" @@ -6061,11 +6479,11 @@ msgstr "Вкласти файл" #: lib/noticeform.php:212 msgid "Share my location" -msgstr "Показувати локацію." +msgstr "Показувати місцезнаходження." #: lib/noticeform.php:215 msgid "Do not share my location" -msgstr "Приховувати мою локацію" +msgstr "Приховувати моє місцезнаходження" #: lib/noticeform.php:216 msgid "" @@ -6075,48 +6493,52 @@ msgstr "" "На жаль, отримання інформації щодо Вашого місцезнаходження займе більше " "часу, ніж очікувалось; будь ласка, спробуйте пізніше" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "Півн." -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "Півд." -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "Сх." -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "Зах." #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" + +#: lib/noticelist.php:447 msgid "at" msgstr "в" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 msgid "in context" msgstr "в контексті" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 msgid "Repeated by" msgstr "Повторено" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "Відповісти на цей допис" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Відповісти" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 msgid "Notice repeated" msgstr "Допис повторили" @@ -6140,6 +6562,10 @@ msgstr "Помилка при додаванні нового профілю" msgid "Error inserting avatar" msgstr "Помилка при додаванні аватари" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Помилка при оновленні віддаленого профілю" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Помилка при додаванні віддаленого профілю" @@ -6189,7 +6615,7 @@ msgstr "Теґи у дописах %s" msgid "Unknown" msgstr "Невідомо" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Підписки" @@ -6197,31 +6623,32 @@ msgstr "Підписки" msgid "All subscriptions" msgstr "Всі підписки" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Підписчики" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 msgid "All subscribers" msgstr "Всі підписчики" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "ІД" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "З нами від" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "Середньодобове" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "Всі групи" -#: lib/profileformaction.php:123 -msgid "No return-to arguments." -msgstr "Немає аргументів return-to." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "Метод не виконується." @@ -6245,10 +6672,18 @@ msgstr "Постаті" msgid "Popular" msgstr "Популярне" +#: lib/redirectingaction.php:94 +msgid "No return-to arguments." +msgstr "Немає аргументів return-to." + #: lib/repeatform.php:107 msgid "Repeat this notice?" msgstr "Повторити цей допис?" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Так" + #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Повторити цей допис" @@ -6258,7 +6693,7 @@ msgstr "Повторити цей допис" msgid "Revoke the \"%s\" role from this user" msgstr "Відкликати роль \"%s\" для цього користувача" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "Користувача для однокористувацького режиму не визначено." @@ -6384,89 +6819,108 @@ msgstr "Відписатись від цього користувача" msgid "Unsubscribe" msgstr "Відписатись" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "Користувач %s (%d) не має запису профілю." + +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Аватара" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "Діяльність користувача" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "Видалення користувача у процесі..." + +#: lib/userprofile.php:263 msgid "Edit profile settings" msgstr "Налаштування профілю" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "Правка" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "Надіслати пряме повідомлення цьому користувачеві" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "Повідомлення" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "Модерувати" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 msgid "User role" msgstr "Роль користувача" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "Адміністратор" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "Модератор" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "місяць тому" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "близько %d місяців тому" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "рік тому" @@ -6480,7 +6934,7 @@ msgstr "%s є неприпустимим кольором!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s неприпустимий колір! Використайте 3 або 6 знаків (HEX-формат)" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 59751aa5d1..4dd5e6ceb8 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:10+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:48+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -20,7 +20,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 #, fuzzy msgid "Access" msgstr "Chấp nhận" @@ -77,7 +77,13 @@ msgstr "Ban user" msgid "Save access settings" msgstr "Thay đổi hình đại diện" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -87,7 +93,7 @@ msgstr "Lưu" #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy -msgid "No such page" +msgid "No such page." msgstr "Không có tin nhắn nào." #: actions/all.php:75 actions/allrss.php:68 @@ -98,9 +104,9 @@ msgstr "Không có tin nhắn nào." #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -108,11 +114,9 @@ msgstr "Không có tin nhắn nào." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Không có user nào." @@ -124,8 +128,9 @@ msgstr "%s và bạn bè" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -184,8 +189,10 @@ msgstr "" msgid "You and friends" msgstr "%s và bạn bè" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -200,18 +207,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Phương thức API không tìm thấy!" @@ -225,15 +232,15 @@ msgstr "Phương thức API không tìm thấy!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "Phương thức này yêu cầu là POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -246,7 +253,7 @@ msgstr "Không thể cập nhật thành viên." #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "Người dùng không có thông tin." @@ -257,9 +264,9 @@ msgid "Could not save profile." msgstr "Không thể lưu hồ sơ cá nhân." #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -347,7 +354,7 @@ msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." msgid "This status is already a favorite." msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Không thể tạo favorite." @@ -444,10 +451,9 @@ msgstr "Tên khu vực quá dài (không quá 255 ký tự)." msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, fuzzy, php-format -msgid "Invalid alias: \"%s\"" +msgid "Invalid alias: \"%s\"." msgstr "Trang chủ '%s' không hợp lệ" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -465,7 +471,7 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy -msgid "Group not found!" +msgid "Group not found." msgstr "Phương thức API không tìm thấy!" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 @@ -473,7 +479,7 @@ msgstr "Phương thức API không tìm thấy!" msgid "You are already a member of that group." msgstr "Bạn đã theo những người này:" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -492,17 +498,26 @@ msgstr "Bạn chưa cập nhật thông tin riêng" msgid "Could not remove user %1$s from group %2$s." msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, fuzzy, php-format msgid "%s's groups" msgstr "%s và nhóm" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "Bạn chưa cập nhật thông tin riêng" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, fuzzy, php-format msgid "%s groups" msgstr "%s và nhóm" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, fuzzy, php-format msgid "groups on %s" msgstr "Mã nhóm" @@ -517,17 +532,17 @@ msgid "Invalid token." msgstr "Kích thước không hợp lệ." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -561,12 +576,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Bất ngờ gửi mẫu thông tin. " @@ -586,21 +604,23 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 #, fuzzy msgid "Account" msgstr "Giới thiệu" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Biệt danh" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Mật khẩu" @@ -648,17 +668,18 @@ msgstr "Hình đại diện đã được cập nhật." msgid "No status with that ID found." msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Quá dài. Tối đa là 140 ký tự." -#: actions/apistatusesupdate.php:202 -msgid "Not found" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#, fuzzy +msgid "Not found." msgstr "Không tìm thấy" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -668,12 +689,12 @@ msgstr "" msgid "Unsupported format." msgstr "Không hỗ trợ kiểu file ảnh này." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "Tìm kiếm các tin nhắn ưa thích của %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Tất cả các cập nhật của %s" @@ -683,17 +704,17 @@ msgstr "Tất cả các cập nhật của %s" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Các cập nhật đang trả lời tới %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, fuzzy, php-format msgid "%s public timeline" msgstr "Dòng tin công cộng" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s cập nhật từ tất cả mọi người!" @@ -708,21 +729,16 @@ msgstr "Trả lời cho %s" msgid "Repeats of %s" msgstr "Trả lời cho %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Thông báo được gắn thẻ %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Dòng tin nhắn cho %s" -#: actions/apiusershow.php:96 -#, fuzzy -msgid "Not found." -msgstr "Không tìm thấy" - #: actions/attachment.php:73 #, fuzzy msgid "No such attachment." @@ -743,8 +759,9 @@ msgstr "Không có kích thước." msgid "Invalid size." msgstr "Kích thước không hợp lệ." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "Hình đại diện" @@ -756,10 +773,10 @@ msgstr "" "về bạn." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 #, fuzzy -msgid "User without matching profile" +msgid "User without matching profile." msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -778,7 +795,7 @@ msgid "Preview" msgstr "Xem trước" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 #, fuzzy msgid "Delete" msgstr "Xóa tin nhắn" @@ -792,23 +809,28 @@ msgstr "Tải file" msgid "Crop" msgstr "Nhóm" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Upload từng phần." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Hình đại diện đã được cập nhật." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Cập nhật hình đại diện không thành công." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Hình đại diện đã được cập nhật." @@ -818,7 +840,7 @@ msgstr "Hình đại diện đã được cập nhật." msgid "You already blocked that user." msgstr "Bạn đã theo những người này:" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "Ban user" @@ -830,29 +852,46 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "Không" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Bỏ chặn người dùng này" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "Có" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "Ban user" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "" @@ -865,8 +904,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 #, fuzzy msgid "No such group." msgstr "Không có tin nhắn nào." @@ -898,9 +937,11 @@ msgstr "Bỏ chặn" msgid "Unblock this user" msgstr "Bỏ chặn người dùng này" -#: actions/bookmarklet.php:50 -msgid "Post to " -msgstr "" +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" +msgstr "Mã nhóm" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -914,34 +955,44 @@ msgstr "Không tìm thấy mã xác nhận." msgid "That confirmation code is not for you!" msgstr "Mã xác nhận này không phải của bạn!" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "Không nhận dạng kiểu địa chỉ %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "Địa chỉ đó đã được xác nhận rồi." -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "Không thể cập nhật thành viên." -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "Không thể xóa email xác nhận." -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "Xác nhận địa chỉ" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "Địa chỉ \"%s\" đã được xác nhận từ tài khoản của bạn." @@ -952,7 +1003,7 @@ msgid "Conversation" msgstr "Không có mã số xác nhận." #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Tin nhắn" @@ -974,7 +1025,7 @@ msgstr "Bạn chưa cập nhật thông tin riêng" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 #, fuzzy msgid "There was a problem with your session token." msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa." @@ -991,17 +1042,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "Không thể xóa tin nhắn này." -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "Xóa tin nhắn" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1031,12 +1084,14 @@ msgstr "Xóa tin nhắn" msgid "Are you sure you want to delete this notice?" msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 #, fuzzy msgid "Do not delete this notice" msgstr "Không thể xóa tin nhắn này." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 #, fuzzy msgid "Delete this notice" msgstr "Xóa tin nhắn" @@ -1062,66 +1117,69 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 #, fuzzy msgid "Delete this user" msgstr "Xóa tin nhắn" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "Kích thước không hợp lệ." -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "Thay đổi mật khẩu của bạn" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 #, fuzzy msgid "Site logo" msgstr "Thư mời" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "Thay đổi" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "Thông báo mới" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 #, fuzzy msgid "Change background image" msgstr "Background Theme:" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 #, fuzzy msgid "Background" msgstr "Background Theme:" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -1130,72 +1188,73 @@ msgstr "" "Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin " "về bạn." -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 #, fuzzy msgid "Tile background image" msgstr "Background Theme:" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Thay đổi mật khẩu của bạn" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Kết nối" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Tìm kiếm" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "Chuỗi bất kỳ" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Đăng nhập" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Lưu" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 #, fuzzy msgid "Save design" msgstr "Lưu" @@ -1315,12 +1374,17 @@ msgstr "" msgid "description is too long (max %d chars)." msgstr "Lý lịch quá dài (không quá 140 ký tự)" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Trang chủ '%s' không hợp lệ" + #: actions/editgroup.php:258 #, fuzzy msgid "Could not update group." msgstr "Không thể cập nhật thành viên." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Không thể tạo favorite." @@ -1330,32 +1394,45 @@ msgstr "Không thể tạo favorite." msgid "Options saved." msgstr "Đã lưu các điều chỉnh." -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "Thiết lập địa chỉ email" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "Bạn nhận email từ %%site.name%% như thế nào." -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "Địa chỉ" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "Địa chỉ email" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "Đã xác nhận địa chỉ này." -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "Xóa" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1363,114 +1440,148 @@ msgstr "" "Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến (hoặc thư rác) " "để nhận tin nhắn và lời hướng dẫn." -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "Hủy" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "Địa chỉ email" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 #, fuzzy msgid "Email address, like \"UserName@example.org\"" msgstr "Địa chỉ email GTalk, Ví dụ: \"UserName@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "Thêm" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "Gửi email đến địa chỉ này để đưa tin nhắn mới lên." -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "Tạo một địa chỉ email mới để đưa tin nhắn lên; và xóa " -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "Mới" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "Tính năng" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "Hãy gửi email cho tôi thông báo về các đăng nhận mới." -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" "Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào danh sách ưa " "thích của họ." -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi." -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 #, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi." -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "Tôi muốn đưa tin nhắn lên bằng email." -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "Xuất bản một MicroID đến địa chỉ email của tôi." -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." msgstr "Các tính năng đã được lưu." -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "Không có địa chỉ email." -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 #, fuzzy msgid "Cannot normalize that email address" msgstr "Không thể bình thường hóa địa chỉ GTalk này" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Địa chỉ email không hợp lệ." -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 #, fuzzy msgid "That is already your email address." msgstr "Bạn đã dùng địa chỉ email này rồi" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 #, fuzzy msgid "That email address already belongs to another user." msgstr "Địa chỉ email GTalk này đã có người khác sử dụng rồi." -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "Không thể chèn mã xác nhận." -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1478,47 +1589,60 @@ msgstr "" "Mã xác nhận đã được gửi tới địa chỉ email của bạn. Hãy kiểm tra hộp thư và " "làm theo hướng dẫn." -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "Sự xác nhận chưa được hủy bỏ." -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "Sai IM." -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "Sự xác nhận đã bị hủy bỏ." -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 #, fuzzy msgid "That is not your email address." msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào." -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "Đã xóa địa chỉ." -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 #, fuzzy msgid "No incoming email address." msgstr "Địa chỉ email không hợp lệ." -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 #, fuzzy msgid "Couldn't update user record." msgstr "Không thể cập nhật thành viên." -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 #, fuzzy msgid "Incoming email address removed." msgstr "Địa chỉ email hoặc mật khẩu không đúng." -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 #, fuzzy msgid "New incoming email address added." msgstr "Đã xác nhận địa chỉ này." @@ -1643,8 +1767,9 @@ msgstr "Không thể chuyển các token yêu cầu đến token truy cập." msgid "Remote service uses unknown version of OMB protocol." msgstr "Không biết phiên bản của giao thức OMB." -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân" #: actions/getfile.php:79 @@ -1708,12 +1833,12 @@ msgstr "Người dùng không có thông tin." msgid "User is not a member of group." msgstr "Bạn chưa cập nhật thông tin riêng" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 #, fuzzy msgid "Block user from group" msgstr "Ban user" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1721,17 +1846,19 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 #, fuzzy msgid "Do not block this user from this group" msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 #, fuzzy msgid "Block this user from this group" msgstr "Ban user" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1778,11 +1905,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1815,36 +1937,40 @@ msgstr "" msgid "Admin" msgstr "" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 #, fuzzy msgid "Make user an admin of the group" msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những " -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 #, fuzzy msgid "Make this user an admin" msgstr "Kênh mà bạn tham gia" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, fuzzy, php-format msgid "%s timeline" msgstr "Dòng tin nhắn của %s" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "Dòng tin nhắn cho %s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 #, fuzzy msgid "Groups" @@ -1865,7 +1991,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 #, fuzzy msgid "Create a new group" msgstr "Tạo nhóm" @@ -1918,12 +2044,16 @@ msgstr "Người dùng không có thông tin." msgid "Error removing the block." msgstr "Lỗi xảy ra khi lưu thành viên." -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "Cấu hình IM" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1932,16 +2062,26 @@ msgstr "" "Bạn có thể gửi và nhận những tin nhắn qua Jabber hoặc GTalk [tin nhắn nhanh]" "(%%doc.im%%). Định dạng địa chỉ của bạn và các thiết lập sau." -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 #, fuzzy msgid "IM is not available." msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "IM" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "Địa chỉ Jabber/GTalk vừa được xác nhận." -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1950,12 +2090,9 @@ msgstr "" "Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra tài khoản Jabber/GTalk để " "nhận tin nhắn và lời hướng dẫn. (Bạn đã thêm %s vào danh sách bạn thân chưa?)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "IM" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1964,45 +2101,67 @@ msgstr "" "Địa chỉ Jabber hoặc GTalk, giống như \"UserName@example.org\". Đầu tiên, hãy " "tạo thêm %s vào danh sách buddy trên IM client hoặc GTalk của bạn." -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "Tính năng" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "Hãy gửi tin nhắn đến tôi qua Jabber hay GTalk" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "Gửi một tin nhắn khi trạng thái của tôi trên Jabber hay GTalk " -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" "Gửi những tin nhắn trả lời của tôi từ những người mà tôi không theo qua " "Jabber/GTalk." -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "Gửi MicroID đến địa chỉ Jabber/GTalk của tôi. " -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "Các tính năng đã được lưu." + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "Không có Jabber ID." -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "Không thể bình thường hóa Jabber ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "Jabber ID không hợp lệ" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "Tài khoản đó đã là tên tài khoản Jabber của bạn rồi." -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber ID này đã thuộc về người khác rồi." -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" @@ -2011,10 +2170,35 @@ msgstr "" "Mã xác nhận đã được gửi đến địa chỉ IM. Bạn phải chấp nhận %s để có thể gửi " "tin nhắn đến bạn." -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "Sai IM." + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "Không thể xóa email xác nhận." + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "Sự xác nhận đã bị hủy bỏ." + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "Đây không phải Jabber ID của bạn." +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "Đã xóa địa chỉ." + #: actions/inbox.php:59 #, fuzzy, php-format msgid "Inbox for %1$s - page %2$d" @@ -2034,8 +2218,8 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những " #: actions/invite.php:72 @@ -2055,7 +2239,9 @@ msgstr "Gửi thư mời đến những người chưa có tài khoản" msgid "You are already subscribed to these users:" msgstr "Bạn đã theo những người này:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, fuzzy, php-format msgid "%1$s (%2$s)" msgstr "%s (%s)" @@ -2110,12 +2296,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "Gửi" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s moi ban tham gia vao %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2182,7 +2370,9 @@ msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những msgid "No nickname or ID." msgstr "Không có biệt hiệu." -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s và nhóm" @@ -2192,12 +2382,14 @@ msgstr "%s và nhóm" msgid "You must be logged in to leave a group." msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những " -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 #, fuzzy msgid "You are not a member of that group." msgstr "Bạn chưa cập nhật thông tin riêng" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s và nhóm" @@ -2244,10 +2436,14 @@ msgstr "" "đổi trong điều chỉnh." #: actions/login.php:270 -#, php-format +#, fuzzy +msgid "Login with your username and password." +msgstr "Sai tên đăng nhập hoặc mật khẩu." + +#: actions/login.php:273 +#, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. Nếu bạn chưa có tài " "khoản, [hãy đăng ký](%%action.register%%) tài khoản mới, hoặc thử đăng nhập " @@ -2273,8 +2469,9 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những " #: actions/microsummary.php:69 -msgid "No current status" -msgstr "" +#, fuzzy +msgid "No current status." +msgstr "Không có kết quả nào" #: actions/newapplication.php:52 #, fuzzy @@ -2313,13 +2510,13 @@ msgstr "" msgid "New message" msgstr "Tin mới nhất" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 #, fuzzy msgid "You can't send a message to this user." msgstr "Bạn đã theo những người này:" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "Không có nội dung!" @@ -2327,7 +2524,7 @@ msgstr "Không có nội dung!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2342,7 +2539,7 @@ msgstr "Tin mới nhất" msgid "Direct message to %s sent." msgstr "Tin nhắn riêng" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 #, fuzzy msgid "Ajax Error" msgstr "Lỗi" @@ -2351,7 +2548,7 @@ msgstr "Lỗi" msgid "New notice" msgstr "Thông báo mới" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 #, fuzzy msgid "Notice posted" msgstr "Tin đã gửi" @@ -2445,11 +2642,11 @@ msgid "You are not a user of that application." msgstr "Bạn chưa cập nhật thông tin riêng" #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2458,25 +2655,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "Tin nhắn không có hồ sơ cá nhân" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Trạng thái của %1$s vào %2$s" -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "Kết nối" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -2591,7 +2793,7 @@ msgid "6 or more characters" msgstr "Nhiều hơn 6 ký tự" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "Xác nhận" @@ -2620,7 +2822,7 @@ msgstr "Mật khẩu cũ sai" msgid "Error saving user; invalid." msgstr "Lỗi xảy ra khi lưu thành viên; không hợp lệ." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Không thể lưu mật khẩu mới" @@ -2629,7 +2831,7 @@ msgid "Password saved." msgstr "Đã lưu mật khẩu." #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2639,23 +2841,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "Background Theme:" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2810,18 +3012,19 @@ msgstr "" msgid "People search" msgstr "Tìm kiếm nhiều người" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, fuzzy, php-format -msgid "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." msgstr "Địa chỉ email không hợp lệ." -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "Dòng tin nhắn cho %s" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "Nội dung tin nhắn không hợp lệ" #: actions/postnotice.php:101 @@ -2850,13 +3053,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay " #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Tên đầy đủ" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Trang chủ hoặc Blog" @@ -2879,9 +3083,9 @@ msgid "Bio" msgstr "Lý lịch" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Thành phố" @@ -2895,7 +3099,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Từ khóa" @@ -2970,7 +3174,7 @@ msgstr "Đã lưu các điều chỉnh." #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -3128,7 +3332,7 @@ msgstr "Khởi tạo lại mật khẩu" msgid "Recover password" msgstr "Khôi phục mật khẩu" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi" @@ -3148,20 +3352,20 @@ msgstr "Khởi tạo" msgid "Enter a nickname or email address." msgstr "Nhập biệt hiệu hoặc email." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" "Không tìm thấy người dùng nào tương ứng với địa chỉ email hoặc username đó." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Thành viên này đã không đăng ký địa chỉ email." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Lỗi xảy ra khi lưu địa chỉ đã được xác nhận." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3169,23 +3373,23 @@ msgstr "" "Hướng dẫn cách khôi phục mật khẩu đã được gửi đến địa chỉ email đăng ký " "trong tài khoản của bạn." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Bất ngờ reset mật khẩu." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Mật khẩu phải nhiều hơn 6 ký tự." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Lỗi xảy ra khi tạo thành viên." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây giờ." @@ -3202,7 +3406,7 @@ msgstr "Lỗi xảy ra với mã xác nhận." msgid "Registration successful" msgstr "Đăng ký thành công" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "Đăng ký" @@ -3225,7 +3429,7 @@ msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ." #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3243,8 +3447,9 @@ msgstr "Nhiều hơn 6 ký tự. Bắt buộc" msgid "Same as password above. Required." msgstr "Cùng mật khẩu ở trên. Bắt buộc." +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Email" @@ -3257,21 +3462,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Họ tên đầy đủ của bạn, tốt nhất là tên thật của bạn." #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "Ghi chú và các file của tôi đã có ở phía dưới" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại" -#: actions/register.php:538 +#: actions/register.php:542 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3302,7 +3499,7 @@ msgstr "" "\n" "Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này." -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3348,7 +3545,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogging khác" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "Theo bạn này" @@ -3389,7 +3586,7 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các điều kho msgid "You already repeated that notice." msgstr "Bạn đã theo những người này:" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "Tạo" @@ -3478,7 +3675,7 @@ msgstr "Người dùng không có thông tin." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3518,28 +3715,32 @@ msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những msgid "Application profile" msgstr "Tin nhắn không có hồ sơ cá nhân" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "Biệt danh" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "Thư mời đã gửi" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Mô tả" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "Số liệu thống kê" @@ -3650,72 +3851,72 @@ msgstr "%s và nhóm" msgid "%1$s group, page %2$d" msgstr "Thành viên" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "Thông tin nhóm" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 #, fuzzy msgid "Note" msgstr "Tin nhắn" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 #, fuzzy msgid "Group actions" msgstr "Mã nhóm" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Dòng tin nhắn cho %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Dòng tin nhắn cho %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Dòng tin nhắn cho %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Hộp thư đi của %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 msgid "Members" msgstr "Thành viên" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 #, fuzzy msgid "All members" msgstr "Thành viên" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 #, fuzzy msgid "Created" msgstr "Tạo" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3725,7 +3926,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3734,7 +3935,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "" @@ -3866,11 +4067,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3965,7 +4166,7 @@ msgid "Unable to save site notice." msgstr "Không thể lưu thông tin Twitter của bạn!" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3982,49 +4183,79 @@ msgstr "" msgid "Save site notice" msgstr "Thông báo mới" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "Thiết lập SMS" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Bạn có thể nhận tin nhắn SMS qua email từ %%site.name%%." -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "IM" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. " -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 #, fuzzy msgid "Awaiting confirmation on this phone number." msgstr "Đó không phải là số điện thoại của bạn." -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 #, fuzzy msgid "Confirmation code" msgstr "Không có mã số xác nhận." -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "Nhập mã mà bạn nhận được trên điện thoại của bạn." -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "Xác nhận" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 #, fuzzy msgid "SMS phone number" msgstr "Số điện thoại để nhắn SMS " -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "Số điện thoại, không cho phép nhập dấu chấm và ký tự " -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "Tính năng" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." @@ -4032,26 +4263,37 @@ msgstr "" "Hãy gửi thông báo đến tôi qua SMS; Tôi biết là bạn đang phải trả giá cao " "cho dịch vụ của chúng tôi. " -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "Các tính năng đã được lưu." + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "Không có số điện thoại." -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 #, fuzzy msgid "No carrier selected." msgstr "Bạn chưa chọn hình để đưa lên." -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 #, fuzzy msgid "That is already your phone number." msgstr "Đó không phải là số điện thoại của bạn." -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 #, fuzzy msgid "That phone number already belongs to another user." msgstr "Địa chỉ email Yahoo này đã có người khác sử dụng rồi." -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " @@ -4060,25 +4302,44 @@ msgstr "" "Mã xác nhận đã được gửi tới địa chỉ email của bạn. Hãy kiểm tra hộp thư và " "làm theo hướng dẫn." -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 #, fuzzy msgid "That is the wrong confirmation number." msgstr "Đó không phải là số điện thoại của bạn." -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "Sự xác nhận đã bị hủy bỏ." + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "Đó không phải là số điện thoại của bạn." -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "Số điện thoại để nhắn SMS " + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 #, fuzzy msgid "Mobile carrier" msgstr "Chọn nhà cung cấp Mobile" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "Chọn nhà cung cấp Mobile" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -4088,13 +4349,14 @@ msgstr "" "dịch vụ điện thoại nào cho phép nhận SMS qua email mà chưa có trong danh " "sách này, vui lòng gửi mail cho chúng tôi đến địa chỉ %s." -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "Không có mã nào được nhập" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -4116,7 +4378,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4157,8 +4419,7 @@ msgstr "Thay đổi hình đại diện" msgid "You are not subscribed to that profile." msgstr "Bạn chưa cập nhật thông tin riêng" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Không thể tạo đăng nhận." @@ -4253,12 +4514,12 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s." -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 #, fuzzy msgid "Jabber" msgstr "Không có Jabber ID." -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" @@ -4292,13 +4553,13 @@ msgstr "Không có tài liệu nào." msgid "Tag %s" msgstr "Từ khóa" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "Hồ sơ" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -4353,7 +4614,7 @@ msgstr "Người dùng không có thông tin." #: actions/unsubscribe.php:77 #, fuzzy -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "Không có URL cho hồ sơ để quay về." #: actions/unsubscribe.php:98 @@ -4390,7 +4651,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Hồ sơ " @@ -4561,27 +4823,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "Thành viên" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, fuzzy, php-format msgid "%s is not a member of any group." msgstr "Bạn chưa cập nhật thông tin riêng" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4629,7 +4897,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Cá nhân" @@ -4638,19 +4907,19 @@ msgstr "Cá nhân" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4695,195 +4964,211 @@ msgstr "Không thể chèn thêm vào đăng nhận." msgid "Could not update message with new URI." msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận." -#: classes/Notice.php:172 +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 #, fuzzy, php-format -msgid "DB error inserting hashtag: %s" +msgid "Database error inserting hashtag: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:245 +#: classes/Notice.php:249 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "Người dùng không có thông tin." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Chưa đăng nhận!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Không thể xóa đăng nhận." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Không thể xóa đăng nhận." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Không thể xóa đăng nhận." -#: classes/User.php:373 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%s chào mừng bạn " -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "Không thể tạo favorite." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Không thể tạo đăng nhận." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Không thể tạo đăng nhận." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Không thể tạo đăng nhận." -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 #, fuzzy msgid "Upload an avatar" msgstr "Cập nhật hình đại diện không thành công." -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "Thay đổi mật khẩu của bạn" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "Đang thực hiện việc thay đổi email" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "Hồ sơ" -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 +msgid "Other options" +msgstr "" + +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 #, fuzzy msgid "Other" msgstr "Sau" -#: lib/accountsettingsaction.php:128 -msgid "Other options" -msgstr "" - -#: lib/action.php:144 +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%s (%s)" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Cá nhân" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Thay đổi mật khẩu của bạn" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Không thể chuyển đến máy chủ: %s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "Kết nối" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Tôi theo" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" @@ -4891,69 +5176,72 @@ msgstr "" "Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp " "của bạn tham gia vào dịch vụ này." -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Thư mời" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Thoát" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Tạo tài khoản mới" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "Đăng ký" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "Đăng nhập" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Hướng dẫn" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "Hướng dẫn" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4961,77 +5249,91 @@ msgstr "Tìm kiếm" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 #, fuzzy msgid "Site notice" msgstr "Thông báo mới" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 #, fuzzy msgid "Page notice" msgstr "Thông báo mới" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 #, fuzzy msgid "Secondary site navigation" msgstr "Tôi theo" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "Hướng dẫn" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "Giới thiệu" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "Riêng tư" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "Nguồn" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "Liên hệ" -#: lib/action.php:771 +#: lib/action.php:784 #, fuzzy msgid "Badge" msgstr "Tin đã gửi" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%" "%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. " +msgid "**%%site.name%%** is a microblogging service." +msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn." -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, fuzzy, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -5042,72 +5344,86 @@ msgstr "" "quyền [GNU Affero General Public License](http://www.fsf.org/licensing/" "licenses/agpl-3.0.html)." -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "Tìm theo nội dung của tin nhắn" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 #, fuzzy msgid "After" msgstr "Sau" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 #, fuzzy msgid "Before" msgstr "Trước" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 #, fuzzy msgid "You cannot make changes to this site." msgstr "Bạn đã theo những người này:" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 #, fuzzy msgid "Changes to that panel are not allowed." msgstr "Biệt hiệu không được cho phép." -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -5117,167 +5433,205 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 #, fuzzy msgid "Unable to delete design setting." msgstr "Không thể lưu thông tin Twitter của bạn!" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "Xac nhan dia chi email" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "Thư mời" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "Xác nhận SMS" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "Cá nhân" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "Xác nhận SMS" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "Xác nhận SMS" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "Xác nhận SMS" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "Xác nhận SMS" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "Thông báo mới" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "Xác nhận SMS" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "Nguồn" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên " -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "Nguồn" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên " -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "Hủy" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "Xóa" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 #, fuzzy msgid "Provider" msgstr "Hồ sơ " @@ -5300,39 +5654,60 @@ msgstr "Đã lưu mật khẩu." msgid "Password changing is not allowed" msgstr "Đã lưu mật khẩu." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 #, fuzzy msgid "Command results" msgstr "Không có kết quả nào" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 #, fuzzy msgid "Command failed" msgstr " và bạn bè" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +#, fuzzy +msgid "User has no last notice" +msgstr "Người dùng không có thông tin." + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận." -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận." + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Tin đã gửi" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5340,207 +5715,209 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "Người dùng không có thông tin." - -#: lib/command.php:190 +#: lib/command.php:302 #, fuzzy msgid "Notice marked as fave." msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!" -#: lib/command.php:217 +#: lib/command.php:323 #, fuzzy msgid "You are already a member of that group" msgstr "Bạn đã theo những người này:" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, fuzzy, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, fuzzy, php-format -msgid "%s joined group %s" -msgstr "%s và nhóm" - -#: lib/command.php:275 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." -#: lib/command.php:280 -#, fuzzy, php-format -msgid "%s left group %s" -msgstr "%s và nhóm" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Tên đầy đủ" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, fuzzy, php-format msgid "Location: %s" msgstr "Thành phố: %s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, fuzzy, php-format msgid "Homepage: %s" msgstr "Trang chủ hoặc Blog: %s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, fuzzy, php-format msgid "About: %s" msgstr "Giới thiệu" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, fuzzy, php-format msgid "Direct message to %s sent" msgstr "Tin nhắn riêng" -#: lib/command.php:369 +#: lib/command.php:494 #, fuzzy msgid "Error sending direct message." msgstr "Thư bạn đã gửi" -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản." -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "Xóa tin nhắn" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Tin đã gửi" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Trả lời tin nhắn này" -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:628 #, fuzzy -msgid "No such user" -msgstr "Không có user nào." +msgid "Can't subscribe to OMB profiles by command." +msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:561 +#: lib/command.php:634 #, fuzzy, php-format msgid "Subscribed to %s" msgstr "Theo nhóm này" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, fuzzy, php-format msgid "Unsubscribed from %s" msgstr "Hết theo" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 #, fuzzy msgid "Notification off." msgstr "Không có mã số xác nhận." -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 #, fuzzy msgid "Notification on." msgstr "Không có mã số xác nhận." -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Hết theo" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bạn đã theo những người này:" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "Không thể tạo favorite." -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Không thể tạo favorite." -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5582,20 +5959,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Không có mã số xác nhận." -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5781,57 +6158,58 @@ msgstr "" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "Không hỗ trợ kiểu file ảnh này." + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin " "về bạn." -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Upload từng phần." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Hệ thống xảy ra lỗi trong khi tải file." -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "File hỏng hoặc không phải là file ảnh." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Không hỗ trợ kiểu file ảnh này." - #: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Không có tin nhắn nào." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 #, fuzzy msgid "Unknown file type" msgstr "Không hỗ trợ kiểu file ảnh này." -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5856,11 +6234,13 @@ msgstr "Sai tên đăng nhập hoặc mật khẩu." msgid "Sign up for a new account" msgstr "Tạo tài khoản mới" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "Xac nhan dia chi email" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, fuzzy, php-format msgid "" "Hey, %s.\n" @@ -5892,12 +6272,14 @@ msgstr "" "%4$s\n" "\n" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s." -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5918,17 +6300,20 @@ msgstr "" "Người bạn trung thành của bạn,\n" "%4$s.\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "Thành phố: %s" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "Dia chi email moi de gui tin nhan den %s" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5949,21 +6334,31 @@ msgstr "" "Chúc sức khỏe,\n" "%4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, fuzzy, php-format msgid "%s status" msgstr "Trạng thái của %1$s vào %2$s" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "Xác nhận SMS" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "Đó không phải là số điện thoại của bạn." + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5979,12 +6374,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "Bạn có tin nhắn riêng từ %s" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6017,12 +6414,14 @@ msgstr "" "Chúc sức khỏe,\n" "%5$s\n" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, fuzzy, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6056,12 +6455,22 @@ msgstr "" "Chúc sức khỏe,\n" "%5$s\n" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6074,6 +6483,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -6086,7 +6507,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 #, fuzzy msgid "from" msgstr " từ " @@ -6220,52 +6641,56 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 #, fuzzy msgid "N" msgstr "Không" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 #, fuzzy msgid "in context" msgstr "Không có nội dung!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "Tạo" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 #, fuzzy msgid "Reply to this notice" msgstr "Trả lời tin nhắn này" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "Trả lời" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "Tin đã gửi" @@ -6293,6 +6718,10 @@ msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân" msgid "Error inserting avatar" msgstr "Lỗi xảy ra khi thêm mới hình đại diện" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân" @@ -6344,7 +6773,7 @@ msgstr "cảnh báo tin nhắn" msgid "Unknown" msgstr "Không tìm thấy action" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tôi theo bạn này" @@ -6352,34 +6781,34 @@ msgstr "Tôi theo bạn này" msgid "All subscriptions" msgstr "Tất cả đăng nhận" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Bạn này theo tôi" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 #, fuzzy msgid "All subscribers" msgstr "Bạn này theo tôi" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "Gia nhập từ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 #, fuzzy msgid "All groups" msgstr "Nhóm" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "Không có tài liệu nào." - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6406,11 +6835,20 @@ msgstr "" msgid "Popular" msgstr "Tên tài khoản" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "Không có tài liệu nào." + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "Trả lời tin nhắn này" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "Có" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6421,7 +6859,7 @@ msgstr "Trả lời tin nhắn này" msgid "Revoke the \"%s\" role from this user" msgstr "Ban user" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6560,95 +6998,114 @@ msgstr "Ngừng đăng ký từ người dùng này" msgid "Unsubscribe" msgstr "Hết theo" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Người dùng không có thông tin." + +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Hình đại diện" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 #, fuzzy msgid "User actions" msgstr "Không tìm thấy action" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 #, fuzzy msgid "Edit profile settings" msgstr "Các thiết lập cho Hồ sơ cá nhân" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 #, fuzzy msgid "Send a direct message to this user" msgstr "Bạn đã theo những người này:" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 #, fuzzy msgid "Message" msgstr "Tin mới nhất" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "Hồ sơ" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "vài giây trước" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "1 phút trước" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "1 giờ trước" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "1 ngày trước" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "1 tháng trước" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "1 năm trước" @@ -6662,7 +7119,7 @@ msgstr "Trang chủ không phải là URL" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index cc17616169..e38cda2ec6 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:13+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:51+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -23,7 +23,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 #, fuzzy msgid "Access" msgstr "接受" @@ -43,7 +43,7 @@ msgstr "注册" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" +msgstr "要禁止匿名用户（未登录）浏览网站吗？" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 @@ -55,7 +55,7 @@ msgstr "隐私" #. TRANS: Checkbox instructions for admin setting "Invite only" #: actions/accessadminpanel.php:174 msgid "Make registration invitation only." -msgstr "" +msgstr "只允许邀请注册。" #. TRANS: Checkbox label for configuring site as invite only. #: actions/accessadminpanel.php:176 @@ -66,13 +66,13 @@ msgstr "邀请" #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations) #: actions/accessadminpanel.php:183 msgid "Disable new registrations." -msgstr "" +msgstr "禁止新用户注册" #. TRANS: Checkbox label for disabling new user registrations. #: actions/accessadminpanel.php:185 #, fuzzy msgid "Closed" -msgstr "阻止" +msgstr "已关闭" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 @@ -80,7 +80,13 @@ msgstr "阻止" msgid "Save access settings" msgstr "头像设置" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 #, fuzzy msgctxt "BUTTON" msgid "Save" @@ -89,7 +95,8 @@ msgstr "保存" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 -msgid "No such page" +#, fuzzy +msgid "No such page." msgstr "没有该页面" #: actions/all.php:75 actions/allrss.php:68 @@ -100,9 +107,9 @@ msgstr "没有该页面" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -110,24 +117,23 @@ msgstr "没有该页面" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "没有这个用户。" #. TRANS: Page title. %1$s is user nickname, %2$d is page number #: actions/all.php:86 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "%s 及好友" +msgstr "%1$s 和好友，第%2$d页" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -182,12 +188,13 @@ msgstr "" #. TRANS: H1 text #: actions/all.php:178 -#, fuzzy msgid "You and friends" -msgstr "%s 及好友" +msgstr "你和好友" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "来自%2$s 上 %1$s 和好友的更新！" @@ -202,18 +209,18 @@ msgstr "来自%2$s 上 %1$s 和好友的更新！" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API 方法未实现！" @@ -227,15 +234,15 @@ msgstr "API 方法未实现！" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "此方法接受POST请求。" #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -248,7 +255,7 @@ msgstr "无法更新用户。" #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "用户没有个人信息。" @@ -259,9 +266,9 @@ msgid "Could not save profile." msgstr "无法保存个人信息。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -347,7 +354,7 @@ msgstr "没有找到此ID的信息。" msgid "This status is already a favorite." msgstr "已收藏此通告！" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "无法创建收藏。" @@ -442,10 +449,9 @@ msgstr "位置过长(不能超过255个字符)。" msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, fuzzy, php-format -msgid "Invalid alias: \"%s\"" +msgid "Invalid alias: \"%s\"." msgstr "主页'%s'不正确" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -463,7 +469,7 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy -msgid "Group not found!" +msgid "Group not found." msgstr "API 方法未实现！" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 @@ -471,7 +477,7 @@ msgstr "API 方法未实现！" msgid "You are already a member of that group." msgstr "您已经是该组成员" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -490,17 +496,26 @@ msgstr "您未告知此个人信息" msgid "Could not remove user %1$s from group %2$s." msgstr "无法订阅用户：未找到。" -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, fuzzy, php-format msgid "%s's groups" msgstr "%s 群组" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "%s 组是成员组成了" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s 群组" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, fuzzy, php-format msgid "groups on %s" msgstr "组动作" @@ -515,17 +530,17 @@ msgid "Invalid token." msgstr "大小不正确。" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -559,12 +574,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "未预料的表单提交。" @@ -584,20 +602,22 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 msgid "Account" msgstr "帐号" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "昵称" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "密码" @@ -646,17 +666,18 @@ msgstr "头像已更新。" msgid "No status with that ID found." msgstr "没有找到此ID的信息。" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "超出长度限制。不能超过 140 个字符。" -#: actions/apistatusesupdate.php:202 -msgid "Not found" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#, fuzzy +msgid "Not found." msgstr "未找到" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -666,12 +687,12 @@ msgstr "" msgid "Unsupported format." msgstr "不支持这种图像格式。" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s 的收藏 / %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s 收藏了 %s 的 %s 通告。" @@ -681,17 +702,17 @@ msgstr "%s 收藏了 %s 的 %s 通告。" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / 回复 %2$s 的消息" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "回复 %2$s / %3$s 的 %1$s 更新。" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s 公众时间表" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "来自所有人的 %s 消息！" @@ -706,21 +727,16 @@ msgstr "%s 的回复" msgid "Repeats of %s" msgstr "%s 的回复" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "带 %s 标签的通告" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" -#: actions/apiusershow.php:96 -#, fuzzy -msgid "Not found." -msgstr "未找到" - #: actions/attachment.php:73 #, fuzzy msgid "No such attachment." @@ -741,8 +757,9 @@ msgstr "没有大小。" msgid "Invalid size." msgstr "大小不正确。" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "头像" @@ -752,9 +769,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "您可以在这里上传个人头像。" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +#, fuzzy +msgid "User without matching profile." msgstr "找不到匹配的用户。" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -773,7 +791,7 @@ msgid "Preview" msgstr "预览" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 #, fuzzy msgid "Delete" msgstr "删除" @@ -786,23 +804,28 @@ msgstr "上传" msgid "Crop" msgstr "剪裁" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "没有收件人。" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "请选择一块方形区域作为你的头像" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "文件数据丢失" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "头像已更新。" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "更新头像失败。" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "头像已更新。" @@ -812,7 +835,7 @@ msgstr "头像已更新。" msgid "You already blocked that user." msgstr "您已成功阻止该用户：" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "阻止用户" @@ -824,29 +847,46 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +#, fuzzy +msgctxt "BUTTON" msgid "No" msgstr "否" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "取消阻止次用户" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +#, fuzzy +msgctxt "BUTTON" msgid "Yes" msgstr "是" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "阻止该用户" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "保存阻止信息失败。" @@ -859,8 +899,8 @@ msgstr "保存阻止信息失败。" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 msgid "No such group." msgstr "没有这个组。" @@ -893,9 +933,10 @@ msgstr "取消阻止" msgid "Unblock this user" msgstr "取消阻止次用户" -#: actions/bookmarklet.php:50 -#, fuzzy -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, fuzzy, php-format +msgid "Post to %s" msgstr "相片" #: actions/confirmaddress.php:75 @@ -910,34 +951,44 @@ msgstr "未找到确认码。" msgid "That confirmation code is not for you!" msgstr "此确认码不适用！" -#: actions/confirmaddress.php:90 -#, php-format -msgid "Unrecognized address type %s" +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 +#, fuzzy, php-format +msgid "Unrecognized address type %s." msgstr "不可识别的地址类型 %s" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "此地址已被确认。" -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "无法更新用户。" -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "无法删除电子邮件确认。" -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "确认地址" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "地址 \"%s\" 已确认。" @@ -948,7 +999,7 @@ msgid "Conversation" msgstr "确认码" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "通告" @@ -970,7 +1021,7 @@ msgstr "您未告知此个人信息" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 #, fuzzy msgid "There was a problem with your session token." msgstr "会话标识有问题，请重试。" @@ -986,18 +1037,22 @@ msgid "" "about the application from the database, including all existing user " "connections." msgstr "" +"你确定要删除这个组件吗？这将从数据库中清除有关这个组件的所有数据，包括所有的" +"用户联系。" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "无法删除通告。" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "删除通告" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1027,12 +1082,14 @@ msgstr "删除通告" msgid "Are you sure you want to delete this notice?" msgstr "确定要删除这条消息吗？" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 #, fuzzy msgid "Do not delete this notice" msgstr "无法删除通告。" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 #, fuzzy msgid "Delete this notice" msgstr "删除通告" @@ -1058,136 +1115,140 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 #, fuzzy msgid "Delete this user" msgstr "删除通告" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "大小不正确。" -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "这个页面不提供您想要的媒体类型" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "修改密码" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 #, fuzzy msgid "Site logo" msgstr "邀请" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "修改" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "新通告" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 #, fuzzy msgid "Theme for the site." msgstr "登出本站" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "你可以给你的组上载一个logo图。" -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "修改密码" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "连接" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "搜索" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "文本" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "登录" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "保存" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1304,11 +1365,16 @@ msgstr "使用这个表单来编辑组" msgid "description is too long (max %d chars)." msgstr "描述过长(不能超过140字符)。" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"" +msgstr "主页'%s'不正确" + #: actions/editgroup.php:258 msgid "Could not update group." msgstr "无法更新组" -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "无法创建收藏。" @@ -1317,32 +1383,45 @@ msgstr "无法创建收藏。" msgid "Options saved." msgstr "选项已保存。" -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "电子邮件设置" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "设置 %%site.name%% 发送的邮件。" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "地址" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "电子邮件地址" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "已确认的电子邮件。" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +#, fuzzy +msgctxt "BUTTON" msgid "Remove" msgstr "移除" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1350,108 +1429,142 @@ msgstr "" "等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件，其中包含了进一步的" "指示。" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "取消" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "电子邮件地址" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "电子邮件，类似 \"UserName@example.org\"" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "添加" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "发布用的电子邮件" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "向这个电子邮件发信以发布新的通告。" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "生成新的电子邮件地址用于发布信息；取消旧的。" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +#, fuzzy +msgctxt "BUTTON" msgid "New" msgstr "新建" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" msgstr "首选项" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "如果有新订阅，通过电子邮件告诉我。" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "如果有人收藏我的通告，发邮件通知我。" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "如果收到私人信息，发邮件通知我。" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 #, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." msgstr "如果收到私人信息，发邮件通知我。" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "允许朋友们呼叫并给我发送邮件。" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "我希望通过邮件发布信息。" -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "公开电子邮件的 MicroID。" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." -msgstr "首选项已保存。" +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +#, fuzzy +msgid "Email preferences saved." +msgstr "同步选项已保存。" -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "没有电子邮件地址。" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "无法识别此电子邮件" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "不是有效的电子邮件。" -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "您已登记此电子邮件。" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "此电子邮件属于其他用户。" -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "无法插入验证码。" -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." @@ -1459,43 +1572,56 @@ msgstr "" "验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱)，找到验证码并按要求" "使用它。" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "没有可以取消的确认。" -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." msgstr "即时通讯帐号错误。" -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "已取消确认。" -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "这是他人的电子邮件。" -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." msgstr "地址被移除。" -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "没有发布用的电子邮件地址。" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "无法更新用户记录。" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "发布用的电子邮件被移除。" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "已添加新的发布用的电子邮件地址。" @@ -1619,8 +1745,9 @@ msgstr "无法将请求标记转换为访问令牌。" msgid "Remote service uses unknown version of OMB protocol." msgstr "此OMB协议版本无效。" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "更新远程的个人信息时出错" #: actions/getfile.php:79 @@ -1686,12 +1813,12 @@ msgstr "用户没有个人信息。" msgid "User is not a member of group." msgstr "您未告知此个人信息" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 #, fuzzy msgid "Block user from group" msgstr "阻止用户" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1699,17 +1826,19 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 #, fuzzy msgid "Do not block this user from this group" msgstr "该组成员列表。" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 #, fuzzy msgid "Block this user from this group" msgstr "该组成员列表。" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1755,11 +1884,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "你可以给你的组上载一个logo图。" -#: actions/grouplogo.php:181 -#, fuzzy -msgid "User without matching profile." -msgstr "找不到匹配的用户。" - #: actions/grouplogo.php:365 #, fuzzy msgid "Pick a square area of the image to be the logo." @@ -1792,36 +1916,40 @@ msgstr "该组成员列表。" msgid "Admin" msgstr "admin管理员" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "阻止" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 #, fuzzy msgid "Make user an admin of the group" msgstr "只有admin才能编辑这个组" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 #, fuzzy msgid "Make Admin" msgstr "admin管理员" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "%s 时间表" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "组" @@ -1841,7 +1969,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 #, fuzzy msgid "Create a new group" msgstr "创建新组" @@ -1893,12 +2021,16 @@ msgstr "用户没有个人信息。" msgid "Error removing the block." msgstr "保存用户时出错。" -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "IM 设置" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" @@ -1907,16 +2039,26 @@ msgstr "" "您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它" "们。" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 #, fuzzy msgid "IM is not available." msgstr "这个页面不提供您想要的媒体类型" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "IM 帐号" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "已确认的Jabber/GTalk帐号。" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1925,12 +2067,9 @@ msgstr "" "正在等待这个地址的确认。请查阅你Jabber/GTalk的帐户看有没有收到进一步的指示。" "（你是否已经添加 %s为你的好友？）" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "IM 帐号" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " @@ -1939,53 +2078,100 @@ msgstr "" "Jabber 或 GTalk 帐号，类似\"UserName@example.org\"。首先，必须在即时聊天工具" "或GTalk中将 %s 加为好友。" -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +#, fuzzy +msgid "IM preferences" +msgstr "首选项" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "通过Jabber/GTalk发送通告。" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "当我的Jabber/GTalk状态改变时自动发布通告。" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "如果我尚未订阅的用户回我消息，使用Jabber/GTalk通知我。" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "公开Jabber/GTalk帐号的 MicroID。" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "首选项已保存。" + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "没有 Jabber ID。" -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "无法识别此Jabber ID" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "不是有效的 Jabber ID" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "您已登记此Jabber帐号。" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "Jabber ID 属于另一用户。" -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。" -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "即时通讯帐号错误。" + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "无法删除电子邮件确认。" + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "已取消确认。" + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "这不是您的Jabber帐号。" +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +#, fuzzy +msgid "The IM address was removed." +msgstr "地址被移除。" + #: actions/inbox.php:59 #, fuzzy, php-format msgid "Inbox for %1$s - page %2$d" @@ -2005,8 +2191,8 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." msgstr "您必须登录才能邀请其他人使用 %s" #: actions/invite.php:72 @@ -2026,7 +2212,9 @@ msgstr "邀请新用户" msgid "You are already subscribed to these users:" msgstr "您已订阅这些用户：" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2074,12 +2262,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "发送" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s 邀请您加入 %2$s" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2140,7 +2330,9 @@ msgstr "您必须登录才能加入组。" msgid "No nickname or ID." msgstr "没有昵称。" -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s 加入 %s 组" @@ -2150,12 +2342,14 @@ msgstr "%s 加入 %s 组" msgid "You must be logged in to leave a group." msgstr "您必须登录才能邀请其他人使用 %s" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 #, fuzzy msgid "You are not a member of that group." msgstr "您未告知此个人信息" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s 离开群 %s" @@ -2200,10 +2394,14 @@ msgid "" msgstr "由于安全原因，修改设置前需要输入用户名和密码。" #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "输入用户名和密码以登录。" + +#: actions/login.php:273 #, fuzzy, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" "请使用你的帐号和密码登入。没有帐号？[注册](%%action.register%%) 一个新帐号, " "或使用 [OpenID](%%action.openidlogin%%). " @@ -2228,7 +2426,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "只有admin才能编辑这个组" #: actions/microsummary.php:69 -msgid "No current status" +#, fuzzy +msgid "No current status." msgstr "没有当前状态" #: actions/newapplication.php:52 @@ -2267,12 +2466,12 @@ msgstr "使用此表格创建组。" msgid "New message" msgstr "新消息" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "无法向此用户发送消息。" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "没有内容！" @@ -2280,7 +2479,7 @@ msgstr "没有内容！" msgid "No recipient specified." msgstr "没有收件人。" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "不要向自己发送消息；跟自己悄悄说就得了。" @@ -2295,7 +2494,7 @@ msgstr "新消息" msgid "Direct message to %s sent." msgstr "已向 %s 发送消息" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax错误" @@ -2303,7 +2502,7 @@ msgstr "Ajax错误" msgid "New notice" msgstr "新通告" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "消息已发布。" @@ -2395,11 +2594,11 @@ msgid "You are not a user of that application." msgstr "您未告知此个人信息" #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2408,25 +2607,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" +#, fuzzy +msgid "Notice has no profile." msgstr "通告没有关联个人信息" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s 的 %2$s 状态" -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "连接" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -2539,7 +2743,7 @@ msgid "6 or more characters" msgstr "6 个或更多字符" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "确认" @@ -2567,7 +2771,7 @@ msgstr "旧密码不正确" msgid "Error saving user; invalid." msgstr "保存用户时出错；不正确。" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "无法保存新密码。" @@ -2576,7 +2780,7 @@ msgid "Password saved." msgstr "密码已保存。" #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2586,23 +2790,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "这个页面不提供您想要的媒体类型" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "这个页面不提供您想要的媒体类型" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "这个页面不提供您想要的媒体类型" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "这个页面不提供您想要的媒体类型" #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2753,18 +2957,19 @@ msgstr "" msgid "People search" msgstr "搜索用户" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, fuzzy, php-format -msgid "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." msgstr "不是有效的电子邮件" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "用户自加标签 %s - 第 %d 页" #: actions/postnotice.php:95 -msgid "Invalid notice content" +#, fuzzy +msgid "Invalid notice content." msgstr "通告内容不正确" #: actions/postnotice.php:101 @@ -2791,13 +2996,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 到 64 个小写字母或数字，不包含标点及空白" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "全名" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "主页" @@ -2820,9 +3026,9 @@ msgid "Bio" msgstr "自述" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "位置" @@ -2836,7 +3042,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "标签" @@ -2909,7 +3115,7 @@ msgstr "设置已保存。" #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -3069,7 +3275,7 @@ msgstr "重置密码" msgid "Recover password" msgstr "恢复密码" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "请求恢复密码" @@ -3089,41 +3295,41 @@ msgstr "重置" msgid "Enter a nickname or email address." msgstr "输入昵称或电子邮件。" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "没有拥有这个用户名或电子邮件的用户。" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "用户没有注册电子邮件。" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "保存地址确认时出错。" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "恢复密码的指示已被发送到您的注册邮箱。" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "未预料的密码重置。" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "密码必须是 6 个字符或更多。" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "密码和确认不匹配。" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "保存用户设置时出错。" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "新密码已保存，您现在已登录。" @@ -3140,7 +3346,7 @@ msgstr "验证码出错。" msgid "Registration successful" msgstr "注册成功。" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "注册" @@ -3162,7 +3368,7 @@ msgstr "用户名或密码不正确。" #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3178,8 +3384,9 @@ msgstr "6 个或更多字符。此项必填。" msgid "Same as password above. Required." msgstr "相同的密码。此项必填。" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "电子邮件" @@ -3192,21 +3399,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "长名字，最好是“实名”" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "我的文字和文件采用的授权方式为" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。" -#: actions/register.php:538 +#: actions/register.php:542 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3237,7 +3436,7 @@ msgstr "" "\n" "感谢您的注册，希望您喜欢这个服务。" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3280,7 +3479,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "您在其他兼容的微博客服务的个人信息URL" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "订阅" @@ -3323,7 +3522,7 @@ msgstr "您必须同意此授权方可注册。" msgid "You already repeated that notice." msgstr "您已成功阻止该用户：" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "创建" @@ -3412,7 +3611,7 @@ msgstr "用户没有个人信息。" #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3452,29 +3651,33 @@ msgstr "您必须登录才能邀请其他人使用 %s" msgid "Application profile" msgstr "通告没有关联个人信息" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "昵称" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "分页" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "描述" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "统计" @@ -3585,71 +3788,71 @@ msgstr "%s 组" msgid "%1$s group, page %2$d" msgstr "%s 组成员, 第 %d 页" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "组资料" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL 互联网地址" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 #, fuzzy msgid "Note" msgstr "通告" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "组动作" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "%s 的通告聚合" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "%s 的通告聚合" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "%s 的通告聚合" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "%s 的发件箱" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "注册于" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "（没有）" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "所有成员" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 #, fuzzy msgid "Created" msgstr "创建" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3659,7 +3862,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3670,7 +3873,7 @@ msgstr "" "**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-blogging]" "(http://en.wikipedia.org/wiki/Micro-blogging)" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 #, fuzzy msgid "Admins" msgstr "admin管理员" @@ -3804,11 +4007,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3903,7 +4106,7 @@ msgid "Unable to save site notice." msgstr "无法保存 Twitter 设置！" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3920,69 +4123,110 @@ msgstr "" msgid "Save site notice" msgstr "新通告" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "SMS短信设置" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "这个页面不提供您想要的媒体类型" -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "IM 帐号" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "已确认的可以发送SMS短消息的电话号码。" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "等待确认此电话号码。" -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "确认码" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "输入手机收到的验证码。" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "确认" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 #, fuzzy msgid "SMS phone number" msgstr "SMS短信电话号码" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "电话号码，不带标点或空格，包含地区代码" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +#, fuzzy +msgid "SMS preferences" +msgstr "首选项" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "通过SMS短信将通告发给我；我了解这样也许会给我带来不菲的开支。" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +#, fuzzy +msgid "SMS preferences saved." +msgstr "首选项已保存。" + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "没有电话号码。" -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "未选择运营商。" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "您已登记此电话号码。" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "这个电话号码属于另一个用户。" -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " @@ -3991,24 +4235,43 @@ msgstr "" "验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱)，找到验证码并按要求" "使用它。" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "确认码错误。" -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "已取消确认。" + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "这是他人的电话号码。" -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +#, fuzzy +msgid "The SMS phone number was removed." +msgstr "SMS短信电话号码" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 #, fuzzy msgid "Mobile carrier" msgstr "选择运营商" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "选择运营商" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " @@ -4017,13 +4280,14 @@ msgstr "" "电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信，而这里尚未列出，请联" "系 %s 以告知。" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "没有输入验证码" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -4045,7 +4309,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -4086,8 +4350,7 @@ msgstr "头像设置" msgid "You are not subscribed to that profile." msgstr "您未告知此个人信息" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "无法删除订阅。" @@ -4182,12 +4445,12 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "%1$s 开始关注您的 %2$s 信息。" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 #, fuzzy msgid "Jabber" msgstr "没有 Jabber ID。" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS短信" @@ -4221,13 +4484,13 @@ msgstr "没有这份文档。" msgid "Tag %s" msgstr "标签" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "用户没有个人信息。" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "相片" @@ -4283,7 +4546,7 @@ msgstr "用户没有个人信息。" #: actions/unsubscribe.php:77 #, fuzzy -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "服务器没有返回个人信息URL。" #: actions/unsubscribe.php:98 @@ -4321,7 +4584,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "个人信息" @@ -4488,28 +4752,34 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "%s 组成员, 第 %d 页" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 #, fuzzy msgid "Search for more groups" msgstr "检索人或文字" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, fuzzy, php-format msgid "%s is not a member of any group." msgstr "您未告知此个人信息" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" @@ -4557,7 +4827,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "个人" @@ -4566,19 +4837,19 @@ msgstr "个人" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4621,267 +4892,286 @@ msgstr "无法添加信息。" msgid "Could not update message with new URI." msgstr "无法添加新URI的信息。" -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" msgstr "添加标签时数据库出错：%s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "保存通告时出错。" -#: classes/Notice.php:245 +#: classes/Notice.php:249 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "保存通告时出错。" -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:256 +#: classes/Notice.php:260 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "在这个网站你被禁止发布消息。" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "保存通告时出错。" -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "保存通告时出错。" -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "那个用户阻止了你的订阅。" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "用户没有个人信息。" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "未订阅！" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "无法删除订阅。" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "无法删除订阅。" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "无法删除订阅。" -#: classes/User.php:373 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "发送给 %1$s 的 %2$s 消息" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "无法创建组。" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "无法删除订阅。" -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "无法删除订阅。" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "无法删除订阅。" -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "修改您的个人信息" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 msgid "Upload an avatar" msgstr "上载一个头像。" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "修改密码" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "修改电子邮件" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "用户没有个人信息。" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "其他" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "其他选项" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "其他" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%1$s (%2$s)" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "无标题页" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "主站导航" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 #, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "个人资料及朋友年表" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "个人" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "修改资料" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "无法重定向到服务器：%s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "连接" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "主站导航" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 #, fuzzy msgctxt "MENU" msgid "Admin" msgstr "admin管理员" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, fuzzy, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "使用这个表单来邀请好友和同事加入。" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "邀请" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 #, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "登出本站" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "登出" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "创建新帐号" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "注册" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 #, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "登入本站" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "登录" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "帮助" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "帮助" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 #, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "检索人或文字" -#: lib/action.php:491 +#: lib/action.php:493 #, fuzzy msgctxt "MENU" msgid "Search" @@ -4889,77 +5179,91 @@ msgstr "搜索" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 #, fuzzy msgid "Site notice" msgstr "新通告" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "本地显示" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 #, fuzzy msgid "Page notice" msgstr "新通告" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 #, fuzzy msgid "Secondary site navigation" msgstr "次项站导航" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "帮助" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "关于" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "常见问题FAQ" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "隐私" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "来源" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "联系人" -#: lib/action.php:771 +#: lib/action.php:784 #, fuzzy msgid "Badge" msgstr "呼叫" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "StatusNet软件注册证" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** 是一个微博客服务，提供者为 [%%site.broughtby%%](%%site." "broughtbyurl%%)。" -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%** 是一个微博客服务。" -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4970,72 +5274,86 @@ msgstr "" "General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)" "授权。" -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "StatusNet软件注册证" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " -msgstr "全部" +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." +msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "注册证" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "分页" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 #, fuzzy msgid "After" msgstr "« 之后" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 #, fuzzy msgid "Before" msgstr "之前 »" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 #, fuzzy msgid "You cannot make changes to this site." msgstr "无法向此用户发送消息。" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 #, fuzzy msgid "Changes to that panel are not allowed." msgstr "不允许注册。" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 #, fuzzy msgid "showForm() not implemented." @@ -5047,167 +5365,205 @@ msgstr "命令尚未实现。" msgid "saveSettings() not implemented." msgstr "命令尚未实现。" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 #, fuzzy msgid "Unable to delete design setting." msgstr "无法保存 Twitter 设置！" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "电子邮件地址确认" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "邀请" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "SMS短信确认" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "个人" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "SMS短信确认" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "用户" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "SMS短信确认" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "SMS短信确认" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "SMS短信确认" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "新通告" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "SMS短信确认" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "用不超过140个字符描述您自己和您的爱好" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "用不超过140个字符描述您自己和您的爱好" -#: lib/applicationeditform.php:216 -#, fuzzy -msgid "Source URL" -msgstr "来源" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 #, fuzzy msgid "URL of the homepage of this application" msgstr "您的主页、博客或在其他站点的URL" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +#, fuzzy +msgid "Source URL" +msgstr "来源" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 #, fuzzy msgid "URL for the homepage of the organization" msgstr "您的主页、博客或在其他站点的URL" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "取消" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 #, fuzzy +msgctxt "BUTTON" msgid "Revoke" msgstr "移除" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 #, fuzzy msgid "Provider" msgstr "个人信息" @@ -5230,37 +5586,57 @@ msgstr "密码已保存。" msgid "Password changing is not allowed" msgstr "密码已保存。" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "执行结果" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "执行完毕" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "执行失败" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "对不起，这个命令还没有实现。" +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "没有找到此ID的信息。" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +msgid "User has no last notice" +msgstr "用户没有通告。" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "无法更新已确认的电子邮件。" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "无法更新已确认的电子邮件。" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "对不起，这个命令还没有实现。" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "振铃呼叫发出。" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5268,200 +5644,204 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "没有找到此ID的信息。" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "用户没有通告。" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "通告被标记为收藏。" -#: lib/command.php:217 +#: lib/command.php:323 msgid "You are already a member of that group" msgstr "您已经是该组成员" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, fuzzy, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "无法把 %s 用户添加到 %s 组" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, fuzzy, php-format -msgid "%s joined group %s" -msgstr "%s 加入 %s 组" - -#: lib/command.php:275 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "无法订阅用户：未找到。" -#: lib/command.php:280 -#, php-format -msgid "%s left group %s" -msgstr "%s 离开群 %s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, php-format msgid "Fullname: %s" msgstr "全名：%s" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "位置：%s" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "主页：%s" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "关于：%s" -#: lib/command.php:349 +#: lib/command.php:457 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:367 +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "已向 %s 发送消息" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "发送消息出错。" -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "无法开启通告。" -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "删除通告" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "消息已发布。" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "保存通告时出错。" -#: lib/command.php:482 +#: lib/command.php:562 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "无法删除通告。" -#: lib/command.php:493 +#: lib/command.php:573 #, fuzzy msgid "Error saving notice." msgstr "保存通告时出错。" -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "指定要订阅的用户名" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "没有这个用户。" +#: lib/command.php:628 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "您未告知此个人信息" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "订阅 %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "指定要取消订阅的用户名" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "取消订阅 %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "命令尚未实现。" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "通告关闭。" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "无法关闭通告。" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "通告开启。" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "无法开启通告。" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "取消订阅 %s" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "您未告知此个人信息" -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "您已订阅这些用户：" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "无法订阅他人更新。" -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "无法订阅他人更新。" -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "您未告知此个人信息" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "您未告知此个人信息" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5503,20 +5883,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "没有验证码" -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "登入本站" @@ -5700,54 +6080,55 @@ msgstr "消息最多的群" msgid "Tags in %s group's notices" msgstr "这个组所发布的消息的标签" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "这个页面不提供您想要的媒体类型" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "不支持这种图像格式。" + +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "你可以给你的组上载一个logo图。" -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "部分上传。" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "上传文件时出错。" -#: lib/imagefile.php:96 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "不是图片文件或文件已损坏。" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "不支持这种图像格式。" - #: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "没有这份通告。" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "未知文件类型" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5772,11 +6153,13 @@ msgstr "输入用户名和密码以登录。" msgid "Sign up for a new account" msgstr "创建新帐号" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "电子邮件地址确认" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5793,12 +6176,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s 开始关注您的 %2$s 信息。" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5818,19 +6203,22 @@ msgstr "" "\n" "为您效力的 %4$s\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "自传Bio: %s\n" "\n" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "新的电子邮件地址，用于发布 %s 信息" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5850,21 +6238,31 @@ msgstr "" "\n" "为您效力的 %4$s" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "%s 状态" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "SMS短信确认" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, fuzzy, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "等待确认此电话号码。" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "%s 振铃呼叫你" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5880,12 +6278,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "%s 发送了新的私人信息" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5904,12 +6304,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s 收藏了您的通告" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5930,12 +6332,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5948,6 +6360,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5960,7 +6384,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 #, fuzzy msgid "from" msgstr " 从 " @@ -6093,53 +6517,57 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 #, fuzzy msgid "N" msgstr "否" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 #, fuzzy msgid "in context" msgstr "没有内容！" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "创建" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 #, fuzzy msgid "Reply to this notice" msgstr "无法删除通告。" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 #, fuzzy msgid "Reply" msgstr "回复" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "消息已发布。" @@ -6165,6 +6593,10 @@ msgstr "添加个人信息出错" msgid "Error inserting avatar" msgstr "添加头像出错" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "更新远程的个人信息时出错" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "添加远程的个人信息出错" @@ -6216,7 +6648,7 @@ msgstr "%s's 的消息的标签" msgid "Unknown" msgstr "未知动作" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "订阅" @@ -6224,34 +6656,34 @@ msgstr "订阅" msgid "All subscriptions" msgstr "所有订阅" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "订阅者" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 #, fuzzy msgid "All subscribers" msgstr "订阅者" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 #, fuzzy msgid "User ID" msgstr "用户" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "用户始于" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "所有组" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "没有这份文档。" - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6277,11 +6709,20 @@ msgstr "特征" msgid "Popular" msgstr "用户" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "没有这份文档。" + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "无法删除通告。" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "是" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6292,7 +6733,7 @@ msgstr "无法删除通告。" msgid "Revoke the \"%s\" role from this user" msgstr "该组成员列表。" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6347,7 +6788,7 @@ msgstr "无标题章节" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "更多..." #: lib/silenceform.php:67 #, fuzzy @@ -6430,96 +6871,115 @@ msgstr "取消订阅 %s" msgid "Unsubscribe" msgstr "退订" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "用户没有个人信息。" + +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "头像" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 #, fuzzy msgid "User actions" msgstr "未知动作" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 #, fuzzy msgid "Edit profile settings" msgstr "个人设置" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" -msgstr "" +msgstr "编辑" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 #, fuzzy msgid "Send a direct message to this user" msgstr "无法向此用户发送消息。" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 #, fuzzy msgid "Message" msgstr "新消息" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "用户没有个人信息。" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "admin管理员" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "几秒前" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "一分钟前" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "一小时前" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "一天前" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "%d 天前" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "一个月前" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "%d 个月前" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "一年前" @@ -6533,7 +6993,7 @@ msgstr "主页的URL不正确。" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 3ea887beb8..4240b921ab 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:15+0000\n" +"POT-Creation-Date: 2010-04-24 14:16+0000\n" +"PO-Revision-Date: 2010-04-26 22:18:54+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -20,7 +20,7 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration -#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 +#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 #, fuzzy msgid "Access" msgstr "接受" @@ -75,7 +75,13 @@ msgstr "無此使用者" msgid "Save access settings" msgstr "線上即時通設定" -#: actions/accessadminpanel.php:203 +#. TRANS: Button label to save e-mail preferences. +#. TRANS: Button label to save IM preferences. +#. TRANS: Button label to save SMS preferences. +#. TRANS: Button label +#: actions/accessadminpanel.php:203 actions/emailsettings.php:224 +#: actions/imsettings.php:184 actions/smssettings.php:209 +#: lib/applicationeditform.php:361 msgctxt "BUTTON" msgid "Save" msgstr "" @@ -84,7 +90,7 @@ msgstr "" #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy -msgid "No such page" +msgid "No such page." msgstr "無此通知" #: actions/all.php:75 actions/allrss.php:68 @@ -95,9 +101,9 @@ msgstr "無此通知" #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 +#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -105,11 +111,9 @@ msgstr "無此通知" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 -#: lib/command.php:355 lib/command.php:401 lib/command.php:462 -#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 +#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40 +#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "無此使用者" @@ -121,8 +125,9 @@ msgstr "%s與好友" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 +#. TRANS: Message is used as link title. %s is a user nickname. +#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 +#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -181,8 +186,10 @@ msgstr "" msgid "You and friends" msgstr "%s與好友" -#: actions/allrss.php:119 actions/apitimelinefriends.php:119 -#: actions/apitimelinehome.php:120 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. +#: actions/allrss.php:121 actions/apitimelinefriends.php:215 +#: actions/apitimelinehome.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -197,18 +204,18 @@ msgstr "" #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:132 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 +#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 +#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 #: actions/apigroupshow.php:115 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "確認碼遺失" @@ -222,15 +229,15 @@ msgstr "確認碼遺失" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:118 +#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 msgid "This method requires a POST." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " -"none" +"none." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 @@ -243,7 +250,7 @@ msgstr "無法更新使用者" #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 -#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66 #: lib/profileaction.php:84 msgid "User has no profile." msgstr "" @@ -254,9 +261,9 @@ msgid "Could not save profile." msgstr "無法儲存個人資料" #: actions/apiaccountupdateprofilebackgroundimage.php:108 -#: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 +#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -340,7 +347,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" @@ -434,10 +441,9 @@ msgstr "地點過長（共255個字）" msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 actions/editgroup.php:228 -#: actions/newgroup.php:168 +#: actions/apigroupcreate.php:266 #, fuzzy, php-format -msgid "Invalid alias: \"%s\"" +msgid "Invalid alias: \"%s\"." msgstr "個人首頁連結%s無效" #: actions/apigroupcreate.php:275 actions/editgroup.php:232 @@ -455,14 +461,14 @@ msgstr "" #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy -msgid "Group not found!" +msgid "Group not found." msgstr "目前無請求" #: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" @@ -481,17 +487,26 @@ msgstr "無法連結到伺服器:%s" msgid "Could not remove user %1$s from group %2$s." msgstr "無法從 %s 建立OpenID" -#: actions/apigrouplist.php:95 +#. TRANS: %s is a user name +#: actions/apigrouplist.php:97 #, fuzzy, php-format msgid "%s's groups" msgstr "無此通知" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s +#: actions/apigrouplist.php:107 +#, fuzzy, php-format +msgid "%1$s groups %2$s is a member of." +msgstr "無法連結到伺服器:%s" + +#. TRANS: Message is used as a title. %s is a site name. +#. TRANS: Message is used as a page title. %s is a nick name. +#: actions/apigrouplistall.php:91 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:94 +#: actions/apigrouplistall.php:95 #, php-format msgid "groups on %s" msgstr "" @@ -506,17 +521,17 @@ msgid "Invalid token." msgstr "尺寸錯誤" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 -#: actions/deletenotice.php:157 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 +#: actions/deletenotice.php:169 actions/disfavor.php:74 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 -#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 @@ -550,12 +565,15 @@ msgstr "" msgid "The request token %s has been denied and revoked." msgstr "" +#. TRANS: Message given submitting a form with an unknown action in e-mail settings. +#. TRANS: Message given submitting a form with an unknown action in IM settings. +#. TRANS: Message given submitting a form with an unknown action in SMS settings. #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 -#: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:322 -#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/designadminpanel.php:104 actions/editapplication.php:139 +#: actions/emailsettings.php:286 actions/grouplogo.php:322 +#: actions/imsettings.php:242 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 +#: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" @@ -575,21 +593,23 @@ msgid "" "give access to your %4$s account to third parties you trust." msgstr "" -#: actions/apioauthauthorize.php:310 lib/action.php:438 +#. TRANS: Main menu option when logged in for access to user settings +#: actions/apioauthauthorize.php:310 lib/action.php:440 #, fuzzy msgid "Account" msgstr "關於" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "暱稱" +#. TRANS: Link description in user account settings menu. #: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:116 +#: actions/register.php:429 lib/accountsettingsaction.php:125 msgid "Password" msgstr "" @@ -637,17 +657,18 @@ msgstr "更新個人圖像" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:202 -msgid "Not found" -msgstr "" +#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#, fuzzy +msgid "Not found." +msgstr "目前無請求" -#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -656,12 +677,12 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s的狀態是%2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "&s的微型部落格" @@ -671,17 +692,17 @@ msgstr "&s的微型部落格" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s的狀態是%2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -696,21 +717,16 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "&s的微型部落格" -#: actions/apiusershow.php:96 -#, fuzzy -msgid "Not found." -msgstr "目前無請求" - #: actions/attachment.php:73 #, fuzzy msgid "No such attachment." @@ -731,8 +747,9 @@ msgstr "無尺寸" msgid "Invalid size." msgstr "尺寸錯誤" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 -#: lib/accountsettingsaction.php:112 +#. TRANS: Link description in user account settings menu. +#: actions/avatarsettings.php:67 actions/showgroup.php:230 +#: lib/accountsettingsaction.php:118 msgid "Avatar" msgstr "個人圖像" @@ -742,9 +759,9 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:106 -msgid "User without matching profile" +#: actions/grouplogo.php:181 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:108 +msgid "User without matching profile." msgstr "" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 @@ -764,7 +781,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:656 msgid "Delete" msgstr "" @@ -776,23 +793,27 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "更新個人圖像" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "無法上傳個人圖像" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "更新個人圖像" @@ -802,7 +823,7 @@ msgstr "更新個人圖像" msgid "You already blocked that user." msgstr "無此使用者" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "無此使用者" @@ -814,29 +835,44 @@ msgid "" "will not be notified of any @-replies from them." msgstr "" -#: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:150 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 +msgctxt "BUTTON" msgid "No" msgstr "" -#: actions/block.php:143 actions/deleteuser.php:150 +#. TRANS: Submit button title for 'No' when blocking a user. +#. TRANS: Submit button title for 'No' when deleting a user. +#: actions/block.php:149 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "無此使用者" -#: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:151 -#: actions/groupblock.php:179 lib/repeatform.php:132 +#. TRANS: Button label on the user block form. +#. TRANS: Button label on the delete application form. +#. TRANS: Button label on the delete notice form. +#. TRANS: Button label on the delete user form. +#. TRANS: Button label on the form to block a user from a group. +#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/deletenotice.php:154 actions/deleteuser.php:159 +#: actions/groupblock.php:185 +msgctxt "BUTTON" msgid "Yes" msgstr "" -#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 +#. TRANS: Submit button title for 'Yes' when blocking a user. +#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "無此使用者" -#: actions/block.php:167 +#: actions/block.php:179 msgid "Failed to save block information." msgstr "" @@ -849,8 +885,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166 +#: lib/command.php:368 #, fuzzy msgid "No such group." msgstr "無此通知" @@ -883,8 +919,10 @@ msgstr "" msgid "Unblock this user" msgstr "無此使用者" -#: actions/bookmarklet.php:50 -msgid "Post to " +#. TRANS: Title for mini-posting window loaded from bookmarklet. +#: actions/bookmarklet.php:51 +#, php-format +msgid "Post to %s" msgstr "" #: actions/confirmaddress.php:75 @@ -899,34 +937,44 @@ msgstr "確認碼遺失" msgid "That confirmation code is not for you!" msgstr "" -#: actions/confirmaddress.php:90 +#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. +#: actions/confirmaddress.php:91 #, php-format -msgid "Unrecognized address type %s" +msgid "Unrecognized address type %s." msgstr "" -#: actions/confirmaddress.php:94 +#. TRANS: Client error for an already confirmed email/jabbel/sms address. +#: actions/confirmaddress.php:96 msgid "That address has already been confirmed." msgstr "" -#: actions/confirmaddress.php:114 actions/emailsettings.php:296 -#: actions/emailsettings.php:427 actions/imsettings.php:258 -#: actions/imsettings.php:401 actions/othersettings.php:174 -#: actions/profilesettings.php:283 actions/smssettings.php:278 -#: actions/smssettings.php:420 +#. TRANS: Server error thrown on database error updating e-mail preferences. +#. TRANS: Server error thrown on database error removing a registered e-mail address. +#. TRANS: Server error thrown on database error updating IM preferences. +#. TRANS: Server error thrown on database error removing a registered IM address. +#. TRANS: Server error thrown on database error updating SMS preferences. +#. TRANS: Server error thrown on database error removing a registered SMS phone number. +#: actions/confirmaddress.php:116 actions/emailsettings.php:327 +#: actions/emailsettings.php:473 actions/imsettings.php:280 +#: actions/imsettings.php:439 actions/othersettings.php:174 +#: actions/profilesettings.php:283 actions/smssettings.php:308 +#: actions/smssettings.php:464 msgid "Couldn't update user." msgstr "無法更新使用者" -#: actions/confirmaddress.php:126 actions/emailsettings.php:391 -#: actions/imsettings.php:363 actions/smssettings.php:382 +#. TRANS: Server error thrown on database error canceling e-mail address confirmation. +#. TRANS: Server error thrown on database error canceling SMS phone number confirmation. +#: actions/confirmaddress.php:128 actions/emailsettings.php:433 +#: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." msgstr "無法取消信箱確認" -#: actions/confirmaddress.php:144 +#: actions/confirmaddress.php:146 #, fuzzy msgid "Confirm address" msgstr "確認信箱" -#: actions/confirmaddress.php:159 +#: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." msgstr "" @@ -937,7 +985,7 @@ msgid "Conversation" msgstr "地點" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:229 lib/searchgroupnav.php:82 msgid "Notices" msgstr "" @@ -959,7 +1007,7 @@ msgstr "無法連結到伺服器:%s" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1253 msgid "There was a problem with your session token." msgstr "" @@ -975,17 +1023,19 @@ msgid "" "connections." msgstr "" -#: actions/deleteapplication.php:156 +#. TRANS: Submit button title for 'No' when deleting an application. +#: actions/deleteapplication.php:158 #, fuzzy msgid "Do not delete this application" msgstr "無此通知" -#: actions/deleteapplication.php:160 +#. TRANS: Submit button title for 'Yes' when deleting an application. +#: actions/deleteapplication.php:164 #, fuzzy msgid "Delete this application" msgstr "請在140個字以內描述你自己與你的興趣" -#. TRANS: Client error message +#. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 @@ -1014,12 +1064,14 @@ msgstr "" msgid "Are you sure you want to delete this notice?" msgstr "" -#: actions/deletenotice.php:145 +#. TRANS: Submit button title for 'No' when deleting a notice. +#: actions/deletenotice.php:151 #, fuzzy msgid "Do not delete this notice" msgstr "無此通知" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#. TRANS: Submit button title for 'Yes' when deleting a notice. +#: actions/deletenotice.php:158 lib/noticelist.php:656 msgid "Delete this notice" msgstr "" @@ -1043,134 +1095,138 @@ msgid "" "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:151 lib/deleteuserform.php:77 +#. TRANS: Submit button title for 'Yes' when deleting a user. +#: actions/deleteuser.php:163 lib/deleteuserform.php:77 #, fuzzy msgid "Delete this user" msgstr "無此使用者" -#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#. TRANS: Message used as title for design settings for the site. +#. TRANS: Link description in user account settings menu. +#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139 #: lib/groupnav.php:119 msgid "Design" msgstr "" -#: actions/designadminpanel.php:73 +#: actions/designadminpanel.php:74 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:275 +#: actions/designadminpanel.php:276 #, fuzzy msgid "Invalid logo URL." msgstr "尺寸錯誤" -#: actions/designadminpanel.php:279 +#: actions/designadminpanel.php:280 #, fuzzy, php-format -msgid "Theme not available: %s" +msgid "Theme not available: %s." msgstr "個人首頁位址錯誤" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:376 #, fuzzy msgid "Change logo" msgstr "更改密碼" -#: actions/designadminpanel.php:380 +#: actions/designadminpanel.php:381 #, fuzzy msgid "Site logo" msgstr "新訊息" -#: actions/designadminpanel.php:387 +#: actions/designadminpanel.php:388 #, fuzzy msgid "Change theme" msgstr "更改" -#: actions/designadminpanel.php:404 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Site theme" msgstr "新訊息" -#: actions/designadminpanel.php:405 +#: actions/designadminpanel.php:406 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:417 lib/designsettings.php:101 +#: actions/designadminpanel.php:418 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: actions/designadminpanel.php:423 actions/designadminpanel.php:500 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:427 +#: actions/designadminpanel.php:428 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -#: actions/designadminpanel.php:457 lib/designsettings.php:139 +#. TRANS: Used as radio button label to add a background image. +#: actions/designadminpanel.php:459 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:473 lib/designsettings.php:155 +#. TRANS: Used as radio button label to not add a background image. +#: actions/designadminpanel.php:476 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:156 +#: actions/designadminpanel.php:477 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:479 lib/designsettings.php:161 +#: actions/designadminpanel.php:482 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:488 lib/designsettings.php:170 +#: actions/designadminpanel.php:491 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "更改密碼" -#: actions/designadminpanel.php:510 lib/designsettings.php:191 +#: actions/designadminpanel.php:513 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "連結" -#: actions/designadminpanel.php:523 lib/designsettings.php:204 +#: actions/designadminpanel.php:526 lib/designsettings.php:204 msgid "Sidebar" msgstr "" -#: actions/designadminpanel.php:536 lib/designsettings.php:217 +#: actions/designadminpanel.php:539 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:549 lib/designsettings.php:230 +#: actions/designadminpanel.php:552 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "登入" -#: actions/designadminpanel.php:577 lib/designsettings.php:247 +#: actions/designadminpanel.php:580 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:578 lib/designsettings.php:248 +#: actions/designadminpanel.php:581 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:584 lib/designsettings.php:254 +#: actions/designadminpanel.php:587 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:586 actions/emailsettings.php:195 -#: actions/imsettings.php:163 actions/othersettings.php:126 +#. TRANS: Submit button title +#: actions/designadminpanel.php:589 actions/othersettings.php:126 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 -#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181 -#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208 -#: actions/tagother.php:154 actions/useradminpanel.php:294 -#: lib/applicationeditform.php:333 lib/applicationeditform.php:334 +#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245 +#: actions/subscriptions.php:226 actions/tagother.php:154 +#: actions/useradminpanel.php:294 lib/applicationeditform.php:363 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "" -#: actions/designadminpanel.php:587 lib/designsettings.php:257 +#: actions/designadminpanel.php:590 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1283,12 +1339,17 @@ msgstr "" msgid "description is too long (max %d chars)." msgstr "自我介紹過長(共140個字元)" +#: actions/editgroup.php:228 actions/newgroup.php:168 +#, fuzzy, php-format +msgid "Invalid alias: \"%s\"" +msgstr "個人首頁連結%s無效" + #: actions/editgroup.php:258 #, fuzzy msgid "Could not update group." msgstr "無法更新使用者" -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "無法存取個人圖像資料" @@ -1297,180 +1358,237 @@ msgstr "無法存取個人圖像資料" msgid "Options saved." msgstr "" -#: actions/emailsettings.php:60 +#. TRANS: Title for e-mail settings. +#: actions/emailsettings.php:61 #, fuzzy msgid "Email settings" msgstr "線上即時通設定" -#: actions/emailsettings.php:71 +#. TRANS: E-mail settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." msgstr "" -#: actions/emailsettings.php:100 actions/imsettings.php:100 -#: actions/smssettings.php:104 -msgid "Address" -msgstr "信箱" +#. TRANS: Form legend for e-mail settings form. +#. TRANS: Field label for e-mail address input in e-mail settings form. +#: actions/emailsettings.php:106 actions/emailsettings.php:132 +#, fuzzy +msgid "Email address" +msgstr "確認信箱" -#: actions/emailsettings.php:105 +#. TRANS: Form note in e-mail settings form. +#: actions/emailsettings.php:112 msgid "Current confirmed email address." msgstr "" -#: actions/emailsettings.php:107 actions/emailsettings.php:140 -#: actions/imsettings.php:108 actions/smssettings.php:115 -#: actions/smssettings.php:158 +#. TRANS: Button label to remove a confirmed e-mail address. +#. TRANS: Button label for removing a set sender e-mail address to post notices from. +#. TRANS: Button label to remove a confirmed IM address. +#. TRANS: Button label to remove a confirmed SMS address. +#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from. +#: actions/emailsettings.php:115 actions/emailsettings.php:158 +#: actions/imsettings.php:116 actions/smssettings.php:124 +#: actions/smssettings.php:180 +msgctxt "BUTTON" msgid "Remove" msgstr "" -#: actions/emailsettings.php:113 +#: actions/emailsettings.php:122 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -#: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:331 -#: lib/applicationeditform.php:332 +#. TRANS: Button label to cancel an e-mail address confirmation procedure. +#. TRANS: Button label to cancel an IM address confirmation procedure. +#. TRANS: Button label to cancel a SMS address confirmation procedure. +#. TRANS: Button label +#: actions/emailsettings.php:127 actions/imsettings.php:131 +#: actions/smssettings.php:137 lib/applicationeditform.php:357 +#, fuzzy +msgctxt "BUTTON" msgid "Cancel" msgstr "取消" -#: actions/emailsettings.php:121 -#, fuzzy -msgid "Email address" -msgstr "確認信箱" - -#: actions/emailsettings.php:123 +#. TRANS: Instructions for e-mail address input form. +#: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" msgstr "" -#: actions/emailsettings.php:126 actions/imsettings.php:133 -#: actions/smssettings.php:145 +#. TRANS: Button label for adding an e-mail address in e-mail settings form. +#. TRANS: Button label for adding an IM address in IM settings form. +#. TRANS: Button label for adding a SMS phone number in SMS settings form. +#: actions/emailsettings.php:139 actions/imsettings.php:148 +#: actions/smssettings.php:162 +#, fuzzy +msgctxt "BUTTON" msgid "Add" msgstr "新增" -#: actions/emailsettings.php:133 actions/smssettings.php:152 +#. TRANS: Form legend for incoming e-mail settings form. +#. TRANS: Form legend for incoming SMS settings form. +#: actions/emailsettings.php:147 actions/smssettings.php:171 msgid "Incoming email" msgstr "" -#: actions/emailsettings.php:138 actions/smssettings.php:157 +#. TRANS: Form instructions for incoming e-mail form in e-mail settings. +#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. +#: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." msgstr "" -#: actions/emailsettings.php:145 actions/smssettings.php:162 +#. TRANS: Instructions for incoming e-mail address input form. +#. TRANS: Instructions for incoming SMS e-mail address input form. +#: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -#: actions/emailsettings.php:148 actions/smssettings.php:164 +#. TRANS: Button label for adding an e-mail address to send notices from. +#. TRANS: Button label for adding an SMS e-mail address to send notices from. +#: actions/emailsettings.php:168 actions/smssettings.php:189 +msgctxt "BUTTON" msgid "New" msgstr "" -#: actions/emailsettings.php:153 actions/imsettings.php:139 -#: actions/smssettings.php:169 -msgid "Preferences" -msgstr "" +#. TRANS: Form legend for e-mail preferences form. +#: actions/emailsettings.php:174 +#, fuzzy +msgid "Email preferences" +msgstr "確認信箱" -#: actions/emailsettings.php:158 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." msgstr "" -#: actions/emailsettings.php:163 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" -#: actions/emailsettings.php:169 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:193 msgid "Send me email when someone sends me a private message." msgstr "" -#: actions/emailsettings.php:174 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." msgstr "" -#: actions/emailsettings.php:179 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:205 msgid "Allow friends to nudge me and send me an email." msgstr "" -#: actions/emailsettings.php:185 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:212 msgid "I want to post notices by email." msgstr "" -#: actions/emailsettings.php:191 +#. TRANS: Checkbox label in e-mail preferences form. +#: actions/emailsettings.php:219 msgid "Publish a MicroID for my email address." msgstr "" -#: actions/emailsettings.php:302 actions/imsettings.php:264 -#: actions/othersettings.php:180 actions/smssettings.php:284 -msgid "Preferences saved." +#. TRANS: Confirmation message for successful e-mail preferences save. +#: actions/emailsettings.php:334 +msgid "Email preferences saved." msgstr "" -#: actions/emailsettings.php:320 +#. TRANS: Message given saving e-mail address without having provided one. +#: actions/emailsettings.php:353 msgid "No email address." msgstr "" -#: actions/emailsettings.php:327 +#. TRANS: Message given saving e-mail address that cannot be normalised. +#: actions/emailsettings.php:361 msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/register.php:201 +#. TRANS: Message given saving e-mail address that not valid. +#: actions/emailsettings.php:366 actions/register.php:201 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "此信箱無效" -#: actions/emailsettings.php:334 +#. TRANS: Message given saving e-mail address that is already set. +#: actions/emailsettings.php:370 msgid "That is already your email address." msgstr "" -#: actions/emailsettings.php:337 +#. TRANS: Message given saving e-mail address that is already set for another user. +#: actions/emailsettings.php:374 msgid "That email address already belongs to another user." msgstr "" -#: actions/emailsettings.php:353 actions/imsettings.php:319 -#: actions/smssettings.php:337 +#. TRANS: Server error thrown on database error adding e-mail confirmation code. +#. TRANS: Server error thrown on database error adding IM confirmation code. +#. TRANS: Server error thrown on database error adding SMS confirmation code. +#: actions/emailsettings.php:391 actions/imsettings.php:348 +#: actions/smssettings.php:373 msgid "Couldn't insert confirmation code." msgstr "無法輸入確認碼" -#: actions/emailsettings.php:359 +#. TRANS: Message given saving valid e-mail address that is to be confirmed. +#: actions/emailsettings.php:398 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -#: actions/emailsettings.php:379 actions/imsettings.php:351 -#: actions/smssettings.php:370 +#. TRANS: Message given canceling e-mail address confirmation that is not pending. +#. TRANS: Message given canceling IM address confirmation that is not pending. +#. TRANS: Message given canceling SMS phone number confirmation that is not pending. +#: actions/emailsettings.php:419 actions/imsettings.php:383 +#: actions/smssettings.php:408 msgid "No pending confirmation to cancel." msgstr "" -#: actions/emailsettings.php:383 actions/imsettings.php:355 -msgid "That is the wrong IM address." -msgstr "" +#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. +#: actions/emailsettings.php:424 +#, fuzzy +msgid "That is the wrong email address." +msgstr "請輸入暱稱或電子信箱" -#: actions/emailsettings.php:395 actions/imsettings.php:367 -#: actions/smssettings.php:386 -msgid "Confirmation cancelled." +#. TRANS: Message given after successfully canceling e-mail address confirmation. +#: actions/emailsettings.php:438 +#, fuzzy +msgid "Email confirmation cancelled." msgstr "確認取消" -#: actions/emailsettings.php:413 +#. TRANS: Message given trying to remove an e-mail address that is not +#. TRANS: registered for the active user. +#: actions/emailsettings.php:458 msgid "That is not your email address." msgstr "" -#: actions/emailsettings.php:432 actions/imsettings.php:408 -#: actions/smssettings.php:425 -msgid "The address was removed." -msgstr "" +#. TRANS: Message given after successfully removing a registered e-mail address. +#: actions/emailsettings.php:479 +#, fuzzy +msgid "The email address was removed." +msgstr "此電子信箱已註冊過了" -#: actions/emailsettings.php:446 actions/smssettings.php:518 +#: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." msgstr "" -#: actions/emailsettings.php:456 actions/emailsettings.php:478 -#: actions/smssettings.php:528 actions/smssettings.php:552 +#. TRANS: Server error thrown on database error removing incoming e-mail address. +#. TRANS: Server error thrown on database error adding incoming e-mail address. +#: actions/emailsettings.php:504 actions/emailsettings.php:528 +#: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." msgstr "" -#: actions/emailsettings.php:459 actions/smssettings.php:531 +#. TRANS: Message given after successfully removing an incoming e-mail address. +#: actions/emailsettings.php:508 actions/smssettings.php:581 msgid "Incoming email address removed." msgstr "" -#: actions/emailsettings.php:481 actions/smssettings.php:555 +#. TRANS: Message given after successfully adding an incoming e-mail address. +#: actions/emailsettings.php:532 actions/smssettings.php:605 msgid "New incoming email address added." msgstr "" @@ -1589,8 +1707,9 @@ msgstr "無法轉換請求標記以致無法存取標記" msgid "Remote service uses unknown version of OMB protocol." msgstr "" -#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 -msgid "Error updating remote profile" +#: actions/finishremotesubscribe.php:138 +#, fuzzy +msgid "Error updating remote profile." msgstr "更新遠端個人資料發生錯誤" #: actions/getfile.php:79 @@ -1650,12 +1769,12 @@ msgstr "" msgid "User is not a member of group." msgstr "" -#: actions/groupblock.php:136 actions/groupmembers.php:323 +#: actions/groupblock.php:134 actions/groupmembers.php:360 #, fuzzy msgid "Block user from group" msgstr "無此使用者" -#: actions/groupblock.php:162 +#: actions/groupblock.php:160 #, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " @@ -1663,17 +1782,19 @@ msgid "" "the group in the future." msgstr "" -#: actions/groupblock.php:178 +#. TRANS: Submit button title for 'No' when blocking a user from a group. +#: actions/groupblock.php:182 #, fuzzy msgid "Do not block this user from this group" msgstr "無法連結到伺服器:%s" -#: actions/groupblock.php:179 +#. TRANS: Submit button title for 'Yes' when blocking a user from a group. +#: actions/groupblock.php:189 #, fuzzy msgid "Block this user from this group" msgstr "無此使用者" -#: actions/groupblock.php:196 +#: actions/groupblock.php:206 msgid "Database error blocking user from group." msgstr "" @@ -1716,10 +1837,6 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:181 -msgid "User without matching profile." -msgstr "" - #: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1752,34 +1869,38 @@ msgstr "" msgid "Admin" msgstr "" -#: actions/groupmembers.php:355 lib/blockform.php:69 +#: actions/groupmembers.php:392 lib/blockform.php:69 msgid "Block" msgstr "" -#: actions/groupmembers.php:450 +#: actions/groupmembers.php:487 msgid "Make user an admin of the group" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:482 +#: actions/groupmembers.php:519 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:93 -#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 +#. TRANS: Message is used as link title. %s is a user nickname. +#. TRANS: Title in atom group notice feed. %s is a group name. +#. TRANS: Title in atom user notice feed. %s is a user name. +#: actions/grouprss.php:139 actions/userrss.php:94 +#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 #, php-format msgid "%s timeline" msgstr "" -#: actions/grouprss.php:140 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#: actions/grouprss.php:142 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "&s的微型部落格" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -1799,7 +1920,7 @@ msgid "" "%%%%)" msgstr "" -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 #, fuzzy msgid "Create a new group" msgstr "新增帳號" @@ -1848,28 +1969,42 @@ msgstr "" msgid "Error removing the block." msgstr "儲存使用者發生錯誤" -#: actions/imsettings.php:59 +#. TRANS: Title for instance messaging settings. +#: actions/imsettings.php:60 #, fuzzy msgid "IM settings" msgstr "線上即時通設定" -#: actions/imsettings.php:70 +#. TRANS: Instant messaging settings page instructions. +#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link. +#. TRANS: the order and formatting of link text and link should remain unchanged. +#: actions/imsettings.php:74 #, php-format msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -#: actions/imsettings.php:89 +#. TRANS: Message given in the IM settings if XMPP is not enabled on the site. +#: actions/imsettings.php:94 #, fuzzy msgid "IM is not available." msgstr "個人首頁位址錯誤" -#: actions/imsettings.php:106 +#. TRANS: Form legend for IM settings form. +#. TRANS: Field label for IM address input in IM settings form. +#: actions/imsettings.php:106 actions/imsettings.php:136 +#, fuzzy +msgid "IM address" +msgstr "線上即時通信箱" + +#: actions/imsettings.php:113 msgid "Current confirmed Jabber/GTalk address." msgstr "目前已確認的Jabber/Gtalk地址" -#: actions/imsettings.php:114 +#. TRANS: Form note in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:124 #, php-format msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " @@ -1878,65 +2013,107 @@ msgstr "" "等待確認此信箱。看看你的Jabber/GTalk是否有訊息指示下一步動作。(你加入%s到你的" "好友清單了嗎？)" -#: actions/imsettings.php:124 -#, fuzzy -msgid "IM address" -msgstr "線上即時通信箱" - -#: actions/imsettings.php:126 +#. TRANS: IM address input field instructions in IM settings form. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:140 #, php-format msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -#: actions/imsettings.php:143 +#. TRANS: Form legend for IM preferences form. +#: actions/imsettings.php:155 +msgid "IM preferences" +msgstr "" + +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:160 msgid "Send me notices through Jabber/GTalk." msgstr "" -#: actions/imsettings.php:148 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:166 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" -#: actions/imsettings.php:153 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:172 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -#: actions/imsettings.php:159 +#. TRANS: Checkbox label in IM preferences form. +#: actions/imsettings.php:179 msgid "Publish a MicroID for my Jabber/GTalk address." msgstr "" -#: actions/imsettings.php:285 +#. TRANS: Confirmation message for successful IM preferences save. +#: actions/imsettings.php:287 actions/othersettings.php:180 +msgid "Preferences saved." +msgstr "" + +#. TRANS: Message given saving IM address without having provided one. +#: actions/imsettings.php:309 msgid "No Jabber ID." msgstr "查無此Jabber ID" -#: actions/imsettings.php:292 +#. TRANS: Message given saving IM address that cannot be normalised. +#: actions/imsettings.php:317 msgid "Cannot normalize that Jabber ID" msgstr "此JabberID錯誤" -#: actions/imsettings.php:296 +#. TRANS: Message given saving IM address that not valid. +#: actions/imsettings.php:322 msgid "Not a valid Jabber ID" msgstr "此JabberID無效" -#: actions/imsettings.php:299 +#. TRANS: Message given saving IM address that is already set. +#: actions/imsettings.php:326 msgid "That is already your Jabber ID." msgstr "" -#: actions/imsettings.php:302 +#. TRANS: Message given saving IM address that is already set for another user. +#: actions/imsettings.php:330 msgid "Jabber ID already belongs to another user." msgstr "此Jabber ID已有人使用" -#: actions/imsettings.php:327 +#. TRANS: Message given saving valid IM address that is to be confirmed. +#. TRANS: %s is the IM address set for the site. +#: actions/imsettings.php:358 #, php-format msgid "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。" -#: actions/imsettings.php:387 +#. TRANS: Message given canceling IM address confirmation for the wrong IM address. +#: actions/imsettings.php:388 +msgid "That is the wrong IM address." +msgstr "" + +#. TRANS: Server error thrown on database error canceling IM address confirmation. +#: actions/imsettings.php:397 +#, fuzzy +msgid "Couldn't delete IM confirmation." +msgstr "無法取消信箱確認" + +#. TRANS: Message given after successfully canceling IM address confirmation. +#: actions/imsettings.php:402 +#, fuzzy +msgid "IM confirmation cancelled." +msgstr "確認取消" + +#. TRANS: Message given trying to remove an IM address that is not +#. TRANS: registered for the active user. +#: actions/imsettings.php:424 msgid "That is not your Jabber ID." msgstr "" +#. TRANS: Message given after successfully removing a registered IM address. +#: actions/imsettings.php:447 +msgid "The IM address was removed." +msgstr "" + #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" @@ -1956,9 +2133,9 @@ msgid "Invites have been disabled." msgstr "" #: actions/invite.php:41 -#, php-format -msgid "You must be logged in to invite other users to use %s" -msgstr "" +#, fuzzy, php-format +msgid "You must be logged in to invite other users to use %s." +msgstr "無法更新使用者" #: actions/invite.php:72 #, php-format @@ -1977,7 +2154,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#. TRANS: Whois output. +#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL. +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2024,12 +2203,14 @@ msgctxt "BUTTON" msgid "Send" msgstr "" -#: actions/invite.php:227 +#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:228 #, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "" -#: actions/invite.php:229 +#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. +#: actions/invite.php:231 #, php-format msgid "" "%1$s has invited you to join them on %2$s (%3$s).\n" @@ -2069,7 +2250,9 @@ msgstr "" msgid "No nickname or ID." msgstr "無暱稱" -#: actions/joingroup.php:141 +#. TRANS: Message given having added a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -2078,11 +2261,13 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:137 +#. TRANS: Message given having removed a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: actions/leavegroup.php:137 lib/command.php:392 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%1$s的狀態是%2$s" @@ -2126,10 +2311,14 @@ msgid "" msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更改設定。" #: actions/login.php:270 +#, fuzzy +msgid "Login with your username and password." +msgstr "使用者名稱或密碼無效" + +#: actions/login.php:273 #, php-format msgid "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" #: actions/makeadmin.php:92 @@ -2152,8 +2341,9 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "無法從 %s 建立OpenID" #: actions/microsummary.php:69 -msgid "No current status" -msgstr "" +#, fuzzy +msgid "No current status." +msgstr "無結果" #: actions/newapplication.php:52 #, fuzzy @@ -2189,12 +2379,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463 +#: lib/command.php:555 msgid "No content!" msgstr "無內容" @@ -2202,7 +2392,7 @@ msgstr "無內容" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:484 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2216,7 +2406,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2224,7 +2414,7 @@ msgstr "" msgid "New notice" msgstr "新訊息" -#: actions/newnotice.php:211 +#: actions/newnotice.php:217 msgid "Notice posted" msgstr "" @@ -2312,11 +2502,11 @@ msgid "You are not a user of that application." msgstr "無法連結到伺服器:%s" #: actions/oauthconnectionssettings.php:186 -msgid "Unable to revoke access for app: " +#, php-format +msgid "Unable to revoke access for app: %s." msgstr "" #: actions/oauthconnectionssettings.php:198 -#, php-format msgid "You have not authorized any applications to use your account." msgstr "" @@ -2325,25 +2515,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -msgid "Notice has no profile" -msgstr "" +#, fuzzy +msgid "Notice has no profile." +msgstr "無此通知" -#: actions/oembed.php:86 actions/shownotice.php:180 +#: actions/oembed.php:86 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s的狀態是%2$s" -#: actions/oembed.php:157 -#, fuzzy -msgid "content type " +#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') +#: actions/oembed.php:158 +#, fuzzy, php-format +msgid "Content type %s not supported." msgstr "連結" -#: actions/oembed.php:160 -msgid "Only " +#. TRANS: Error message displaying attachments. %s is the site's base URL. +#: actions/oembed.php:162 +#, php-format +msgid "Only %s URLs over plain HTTP please." msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#. TRANS: Client error on an API request with an unsupported data format. +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 +#: lib/apiaction.php:1160 lib/apiaction.php:1277 msgid "Not a supported data format." msgstr "" @@ -2453,7 +2648,7 @@ msgid "6 or more characters" msgstr "6個以上字元" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 actions/smssettings.php:134 +#: actions/register.php:433 msgid "Confirm" msgstr "確認" @@ -2481,7 +2676,7 @@ msgstr "舊密碼錯誤" msgid "Error saving user; invalid." msgstr "儲存使用者發生錯誤;使用者名稱無效" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "無法存取新密碼" @@ -2490,7 +2685,7 @@ msgid "Password saved." msgstr "" #. TRANS: Menu item for site administration -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383 msgid "Paths" msgstr "" @@ -2500,23 +2695,23 @@ msgstr "" #: actions/pathsadminpanel.php:157 #, fuzzy, php-format -msgid "Theme directory not readable: %s" +msgid "Theme directory not readable: %s." msgstr "個人首頁位址錯誤" #: actions/pathsadminpanel.php:163 -#, php-format -msgid "Avatar directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Avatar directory not writable: %s." +msgstr "個人首頁位址錯誤" #: actions/pathsadminpanel.php:169 -#, php-format -msgid "Background directory not writable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Background directory not writable: %s." +msgstr "個人首頁位址錯誤" #: actions/pathsadminpanel.php:177 -#, php-format -msgid "Locales directory not readable: %s" -msgstr "" +#, fuzzy, php-format +msgid "Locales directory not readable: %s." +msgstr "個人首頁位址錯誤" #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2660,19 +2855,20 @@ msgstr "" msgid "People search" msgstr "" -#: actions/peopletag.php:70 +#: actions/peopletag.php:68 #, fuzzy, php-format -msgid "Not a valid people tag: %s" +msgid "Not a valid people tag: %s." msgstr "此信箱無效" -#: actions/peopletag.php:144 +#: actions/peopletag.php:142 #, fuzzy, php-format msgid "Users self-tagged with %1$s - page %2$d" msgstr "&s的微型部落格" #: actions/postnotice.php:95 -msgid "Invalid notice content" -msgstr "" +#, fuzzy +msgid "Invalid notice content." +msgstr "尺寸錯誤" #: actions/postnotice.php:101 #, php-format @@ -2697,13 +2893,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "全名" +#. TRANS: Form input field label. #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:228 lib/groupeditform.php:161 +#: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "個人首頁" @@ -2726,9 +2923,9 @@ msgid "Bio" msgstr "自我介紹" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "地點" @@ -2742,7 +2939,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -2815,7 +3012,7 @@ msgstr "" #: actions/public.php:83 #, php-format -msgid "Beyond the page limit (%s)" +msgid "Beyond the page limit (%s)." msgstr "" #: actions/public.php:92 @@ -2969,7 +3166,7 @@ msgstr "" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2989,41 +3186,41 @@ msgstr "" msgid "Enter a nickname or email address." msgstr "請輸入暱稱或電子信箱" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "查無此使用者所註冊的信箱" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "儲存信箱確認發生錯誤" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "我們已寄出一封信到你帳號中的信箱，告訴你如何取回你的密碼。" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "使用者設定發生錯誤" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "新密碼已儲存成功。你已登入。" @@ -3040,7 +3237,7 @@ msgstr "確認碼發生錯誤" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -3062,7 +3259,7 @@ msgstr "使用者名稱或密碼無效" #: actions/register.php:343 msgid "" -"With this form you can create a new account. You can then post notices and " +"With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" @@ -3078,8 +3275,9 @@ msgstr "" msgid "Same as password above. Required." msgstr "" +#. TRANS: Link description in user account settings menu. #: actions/register.php:438 actions/register.php:442 -#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120 +#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "電子信箱" @@ -3092,21 +3290,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "" #: actions/register.php:494 -msgid "My text and files are available under " -msgstr "" - -#: actions/register.php:496 -msgid "Creative Commons Attribution 3.0" -msgstr "" - -#: actions/register.php:497 -#, fuzzy +#, fuzzy, php-format msgid "" -" except this private data: password, email address, IM address, and phone " -"number." +"My text and files are available under %s except this private data: password, " +"email address, IM address, and phone number." msgstr "不包含這些個人資料：密碼、電子信箱、線上即時通信箱、電話號碼" -#: actions/register.php:538 +#: actions/register.php:542 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3125,7 +3315,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:562 +#: actions/register.php:566 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3164,7 +3354,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:406 msgid "Subscribe" msgstr "" @@ -3203,7 +3393,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "無此使用者" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:675 #, fuzzy msgid "Repeated" msgstr "新增" @@ -3290,7 +3480,7 @@ msgstr "" #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:390 +#: lib/adminpanelaction.php:391 msgid "Sessions" msgstr "" @@ -3328,29 +3518,33 @@ msgstr "" msgid "Application profile" msgstr "" -#: actions/showapplication.php:159 lib/applicationeditform.php:180 +#. TRANS: Form input field label for application icon. +#: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" msgstr "" +#. TRANS: Form input field label for application name. #: actions/showapplication.php:169 actions/version.php:195 -#: lib/applicationeditform.php:195 +#: lib/applicationeditform.php:199 #, fuzzy msgid "Name" msgstr "暱稱" -#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#. TRANS: Form input field label. +#: actions/showapplication.php:178 lib/applicationeditform.php:235 #, fuzzy msgid "Organization" msgstr "地點" +#. TRANS: Form input field label. #: actions/showapplication.php:187 actions/version.php:198 -#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "所有訂閱" -#: actions/showapplication.php:192 actions/showgroup.php:438 -#: lib/profileaction.php:176 +#: actions/showapplication.php:192 actions/showgroup.php:444 +#: lib/profileaction.php:187 msgid "Statistics" msgstr "" @@ -3460,70 +3654,70 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "所有訂閱" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "無此通知" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "無此通知" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "何時加入會員的呢？" -#: actions/showgroup.php:395 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 -#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 +#: actions/showgroup.php:398 lib/profileaction.php:117 +#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95 +#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:404 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:447 #, fuzzy msgid "Created" msgstr "新增" -#: actions/showgroup.php:457 +#: actions/showgroup.php:463 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3533,7 +3727,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:469 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3542,7 +3736,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:497 msgid "Admins" msgstr "" @@ -3671,11 +3865,11 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 -msgid "Dupe limit must 1 or more seconds." +msgid "Dupe limit must be one or more seconds." msgstr "" #: actions/siteadminpanel.php:221 @@ -3768,7 +3962,7 @@ msgid "Unable to save site notice." msgstr "新訊息" #: actions/sitenoticeadminpanel.php:113 -msgid "Max length for the site-wide notice is 255 chars" +msgid "Max length for the site-wide notice is 255 chars." msgstr "" #: actions/sitenoticeadminpanel.php:176 @@ -3785,104 +3979,162 @@ msgstr "" msgid "Save site notice" msgstr "新訊息" -#: actions/smssettings.php:58 +#. TRANS: Title for SMS settings. +#: actions/smssettings.php:59 #, fuzzy msgid "SMS settings" msgstr "線上即時通設定" -#: actions/smssettings.php:69 +#. TRANS: SMS settings page instructions. +#. TRANS: %%site.name%% is the name of the site. +#: actions/smssettings.php:74 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." msgstr "" -#: actions/smssettings.php:91 +#. TRANS: Message given in the SMS settings if SMS is not enabled on the site. +#: actions/smssettings.php:97 #, fuzzy msgid "SMS is not available." msgstr "個人首頁位址錯誤" -#: actions/smssettings.php:112 +#. TRANS: Form legend for SMS settings form. +#: actions/smssettings.php:111 +#, fuzzy +msgid "SMS address" +msgstr "線上即時通信箱" + +#. TRANS: Form guide in SMS settings form. +#: actions/smssettings.php:120 msgid "Current confirmed SMS-enabled phone number." msgstr "" -#: actions/smssettings.php:123 +#. TRANS: Form guide in IM settings form. +#: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." msgstr "" -#: actions/smssettings.php:130 +#. TRANS: Field label for SMS address input in SMS settings form. +#: actions/smssettings.php:142 msgid "Confirmation code" msgstr "" -#: actions/smssettings.php:131 +#. TRANS: Form field instructions in SMS settings form. +#: actions/smssettings.php:144 msgid "Enter the code you received on your phone." msgstr "" -#: actions/smssettings.php:138 +#. TRANS: Button label to confirm SMS confirmation code in SMS settings. +#: actions/smssettings.php:148 +#, fuzzy +msgctxt "BUTTON" +msgid "Confirm" +msgstr "確認" + +#. TRANS: Field label for SMS phone number input in SMS settings form. +#: actions/smssettings.php:153 msgid "SMS phone number" msgstr "" -#: actions/smssettings.php:140 +#. TRANS: SMS phone number input field instructions in SMS settings form. +#: actions/smssettings.php:156 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" -#: actions/smssettings.php:174 +#. TRANS: Form legend for SMS preferences form. +#: actions/smssettings.php:195 +msgid "SMS preferences" +msgstr "" + +#. TRANS: Checkbox label in SMS preferences form. +#: actions/smssettings.php:201 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -#: actions/smssettings.php:306 +#. TRANS: Confirmation message for successful SMS preferences save. +#: actions/smssettings.php:315 +msgid "SMS preferences saved." +msgstr "" + +#. TRANS: Message given saving SMS phone number without having provided one. +#: actions/smssettings.php:338 msgid "No phone number." msgstr "" -#: actions/smssettings.php:311 +#. TRANS: Message given saving SMS phone number without having selected a carrier. +#: actions/smssettings.php:344 msgid "No carrier selected." msgstr "" -#: actions/smssettings.php:318 +#. TRANS: Message given saving SMS phone number that is already set. +#: actions/smssettings.php:352 msgid "That is already your phone number." msgstr "" -#: actions/smssettings.php:321 +#. TRANS: Message given saving SMS phone number that is already set for another user. +#: actions/smssettings.php:356 msgid "That phone number already belongs to another user." msgstr "" -#: actions/smssettings.php:347 +#. TRANS: Message given saving valid SMS phone number that is to be confirmed. +#: actions/smssettings.php:384 #, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。" -#: actions/smssettings.php:374 +#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. +#: actions/smssettings.php:413 msgid "That is the wrong confirmation number." msgstr "" -#: actions/smssettings.php:405 +#. TRANS: Message given after successfully canceling SMS phone number confirmation. +#: actions/smssettings.php:427 +#, fuzzy +msgid "SMS confirmation cancelled." +msgstr "確認取消" + +#. TRANS: Message given trying to remove an SMS phone number that is not +#. TRANS: registered for the active user. +#: actions/smssettings.php:448 msgid "That is not your phone number." msgstr "" -#: actions/smssettings.php:465 +#. TRANS: Message given after successfully removing a registered SMS phone number. +#: actions/smssettings.php:470 +msgid "The SMS phone number was removed." +msgstr "" + +#. TRANS: Label for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:511 msgid "Mobile carrier" msgstr "" -#: actions/smssettings.php:469 +#. TRANS: Default option for mobile carrier dropdown menu in SMS settings. +#: actions/smssettings.php:516 msgid "Select a carrier" msgstr "" -#: actions/smssettings.php:476 +#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings. +#. TRANS: %s is an administrative contact's e-mail address. +#: actions/smssettings.php:525 #, php-format msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -#: actions/smssettings.php:498 +#. TRANS: Message given saving SMS phone number confirmation code without having provided one. +#: actions/smssettings.php:548 msgid "No code entered" msgstr "" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 -#: lib/adminpanelaction.php:406 +#: lib/adminpanelaction.php:407 msgid "Snapshots" msgstr "" @@ -3904,7 +4156,7 @@ msgid "Invalid snapshot report URL." msgstr "" #: actions/snapshotadminpanel.php:200 -msgid "Randomly during Web hit" +msgid "Randomly during web hit" msgstr "" #: actions/snapshotadminpanel.php:201 @@ -3944,8 +4196,7 @@ msgstr "線上即時通設定" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "註冊失敗" @@ -4039,12 +4290,12 @@ msgstr "" msgid "%s is not listening to anyone." msgstr "現在%1$s在%2$s成為你的粉絲囉" -#: actions/subscriptions.php:199 +#: actions/subscriptions.php:208 #, fuzzy msgid "Jabber" msgstr "查無此Jabber ID" -#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115 +#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "" @@ -4078,13 +4329,13 @@ msgstr "無此文件" msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "無此通知" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -4136,7 +4387,7 @@ msgstr "" #: actions/unsubscribe.php:77 #, fuzzy -msgid "No profile id in request." +msgid "No profile ID in request." msgstr "無確認請求" #: actions/unsubscribe.php:98 @@ -4173,7 +4424,8 @@ msgstr "" msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#. TRANS: Link description in user account settings menu. +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "" @@ -4328,27 +4580,33 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 +#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. +#: actions/usergroups.php:66 #, fuzzy, php-format msgid "%1$s groups, page %2$d" msgstr "所有訂閱" -#: actions/usergroups.php:130 +#: actions/usergroups.php:132 msgid "Search for more groups" msgstr "" -#: actions/usergroups.php:157 +#: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." msgstr "" -#: actions/usergroups.php:162 +#: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 -#: lib/atomusernoticefeed.php:72 +#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom group notice feed. +#. TRANS: %1$s is a group name, %2$s is a site name. +#. TRANS: Message is used as a subtitle in atom user notice feed. +#. TRANS: %1$s is a user name, %2$s is a site name. +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 +#: lib/atomusernoticefeed.php:75 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" @@ -4396,7 +4654,8 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:196 lib/action.php:767 +#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. +#: actions/version.php:196 lib/action.php:779 #, fuzzy msgid "Version" msgstr "地點" @@ -4405,19 +4664,19 @@ msgstr "地點" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4459,336 +4718,369 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 -#, php-format -msgid "DB error inserting hashtag: %s" -msgstr "" +#. TRANS: Server exception. %s are the error details. +#: classes/Notice.php:176 +#, fuzzy, php-format +msgid "Database error inserting hashtag: %s" +msgstr "增加回覆時,資料庫發生錯誤: %s" -#: classes/Notice.php:241 +#: classes/Notice.php:245 #, fuzzy msgid "Problem saving notice. Too long." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:245 +#: classes/Notice.php:249 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:250 +#: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:256 +#: classes/Notice.php:260 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:262 +#: classes/Notice.php:266 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:328 classes/Notice.php:354 +#: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:927 +#: classes/Notice.php:967 #, fuzzy msgid "Problem saving group inbox." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:1459 +#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. +#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. +#: classes/Notice.php:1535 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "此帳號已註冊" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "無法刪除帳號" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "無法刪除帳號" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "無法刪除帳號" -#: classes/User.php:373 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "無法存取個人圖像資料" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "註冊失敗" -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "註冊失敗" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "註冊失敗" -#: lib/accountsettingsaction.php:108 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:109 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:116 #, fuzzy msgid "Upload an avatar" msgstr "無法上傳個人圖像" -#: lib/accountsettingsaction.php:116 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:123 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:120 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:130 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:124 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:137 #, fuzzy msgid "Design your profile" msgstr "無此通知" -#: lib/accountsettingsaction.php:128 -msgid "Other" -msgstr "" - -#: lib/accountsettingsaction.php:128 +#. TRANS: Link title attribute in user account settings menu. +#: lib/accountsettingsaction.php:144 msgid "Other options" msgstr "" -#: lib/action.php:144 +#. TRANS: Link description in user account settings menu. +#: lib/accountsettingsaction.php:146 +msgid "Other" +msgstr "" + +#. TRANS: Page title. %1$s is the title, %2$s is the site name. +#: lib/action.php:145 #, fuzzy, php-format msgid "%1$s - %2$s" msgstr "%1$s的狀態是%2$s" -#: lib/action.php:159 +#. TRANS: Page title for a page without a title set. +#: lib/action.php:161 msgid "Untitled page" msgstr "" -#: lib/action.php:424 +#. TRANS: DT element for primary navigation menu. String is hidden in default CSS. +#: lib/action.php:426 msgid "Primary site navigation" msgstr "" #. TRANS: Tooltip for main menu option "Personal" -#: lib/action.php:430 +#: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:433 +#. TRANS: Main menu option when logged in for access to personal profile and friends timeline +#: lib/action.php:435 #, fuzzy msgctxt "MENU" msgid "Personal" msgstr "地點" #. TRANS: Tooltip for main menu option "Account" -#: lib/action.php:435 +#: lib/action.php:437 #, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "更改密碼" #. TRANS: Tooltip for main menu option "Services" -#: lib/action.php:440 +#: lib/action.php:442 #, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "無法連結到伺服器:%s" -#: lib/action.php:443 +#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services +#: lib/action.php:445 msgid "Connect" msgstr "連結" #. TRANS: Tooltip for menu option "Admin" -#: lib/action.php:446 +#: lib/action.php:448 #, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "確認信箱" -#: lib/action.php:449 +#. TRANS: Main menu option when logged in and site admin for access to site configuration +#: lib/action.php:451 msgctxt "MENU" msgid "Admin" msgstr "" #. TRANS: Tooltip for main menu option "Invite" -#: lib/action.php:453 +#: lib/action.php:455 #, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:456 +#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users +#: lib/action.php:458 #, fuzzy msgctxt "MENU" msgid "Invite" msgstr "尺寸錯誤" #. TRANS: Tooltip for main menu option "Logout" -#: lib/action.php:462 +#: lib/action.php:464 msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "" -#: lib/action.php:465 +#. TRANS: Main menu option when logged in to log out the current user +#: lib/action.php:467 #, fuzzy msgctxt "MENU" msgid "Logout" msgstr "登出" #. TRANS: Tooltip for main menu option "Register" -#: lib/action.php:470 +#: lib/action.php:472 #, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "新增帳號" -#: lib/action.php:473 +#. TRANS: Main menu option when not logged in to register a new account +#: lib/action.php:475 #, fuzzy msgctxt "MENU" msgid "Register" msgstr "所有訂閱" #. TRANS: Tooltip for main menu option "Login" -#: lib/action.php:476 +#: lib/action.php:478 msgctxt "TOOLTIP" msgid "Login to the site" msgstr "" -#: lib/action.php:479 +#: lib/action.php:481 #, fuzzy msgctxt "MENU" msgid "Login" msgstr "登入" #. TRANS: Tooltip for main menu option "Help" -#: lib/action.php:482 +#: lib/action.php:484 #, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "求救" -#: lib/action.php:485 +#: lib/action.php:487 #, fuzzy msgctxt "MENU" msgid "Help" msgstr "求救" #. TRANS: Tooltip for main menu option "Search" -#: lib/action.php:488 +#: lib/action.php:490 msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "" -#: lib/action.php:491 +#: lib/action.php:493 msgctxt "MENU" msgid "Search" msgstr "" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration -#: lib/action.php:513 lib/adminpanelaction.php:398 +#: lib/action.php:515 lib/adminpanelaction.php:399 #, fuzzy msgid "Site notice" msgstr "新訊息" -#: lib/action.php:579 +#. TRANS: DT element for local views block. String is hidden in default CSS. +#: lib/action.php:582 msgid "Local views" msgstr "" -#: lib/action.php:645 +#. TRANS: DT element for page notice. String is hidden in default CSS. +#: lib/action.php:649 #, fuzzy msgid "Page notice" msgstr "新訊息" -#: lib/action.php:747 +#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. +#: lib/action.php:752 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:752 +#. TRANS: Secondary navigation menu option leading to help on StatusNet. +#: lib/action.php:758 msgid "Help" msgstr "求救" -#: lib/action.php:754 +#. TRANS: Secondary navigation menu option leading to text about StatusNet site. +#: lib/action.php:761 msgid "About" msgstr "關於" -#: lib/action.php:756 +#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions. +#: lib/action.php:764 msgid "FAQ" msgstr "常見問題" -#: lib/action.php:760 +#. TRANS: Secondary navigation menu option leading to Terms of Service. +#: lib/action.php:769 msgid "TOS" msgstr "" -#: lib/action.php:763 +#. TRANS: Secondary navigation menu option leading to privacy policy. +#: lib/action.php:773 msgid "Privacy" msgstr "" -#: lib/action.php:765 +#. TRANS: Secondary navigation menu option. +#: lib/action.php:776 msgid "Source" msgstr "" -#: lib/action.php:769 +#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site. +#: lib/action.php:782 msgid "Contact" msgstr "好友名單" -#: lib/action.php:771 +#: lib/action.php:784 msgid "Badge" msgstr "" -#: lib/action.php:799 +#. TRANS: DT element for StatusNet software license. +#: lib/action.php:813 msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 -#, php-format +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. +#: lib/action.php:817 +#, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." -"broughtby%%](%%site.broughtbyurl%%). " +"broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型" "部落格服務" -#: lib/action.php:804 +#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. +#: lib/action.php:820 #, php-format -msgid "**%%site.name%%** is a microblogging service. " +msgid "**%%site.name%%** is a microblogging service." msgstr "**%%site.name%%**是個微型部落格" -#: lib/action.php:806 +#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. +#: lib/action.php:824 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4796,69 +5088,83 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#. TRANS: DT element for StatusNet site content license. +#: lib/action.php:840 #, fuzzy msgid "Site content license" msgstr "新訊息" -#: lib/action.php:826 +#. TRANS: Content license displayed when license is set to 'private'. +#. TRANS: %1$s is the site name. +#: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#. TRANS: Content license displayed when license is set to 'allrightsreserved'. +#. TRANS: %1$s is the copyright owner. +#: lib/action.php:854 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. +#: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 -msgid "All " +#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. +#: lib/action.php:871 +#, php-format +msgid "All %1$s content and data are available under the %2$s license." msgstr "" -#: lib/action.php:853 -msgid "license." -msgstr "" - -#: lib/action.php:1152 +#. TRANS: DT element for pagination (previous/next, etc.). +#: lib/action.php:1182 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: present than the currently displayed information. +#: lib/action.php:1193 msgid "After" msgstr "" -#: lib/action.php:1169 +#. TRANS: Pagination message to go to a page displaying information more in the +#. TRANS: past than the currently displayed information. +#: lib/action.php:1203 #, fuzzy msgid "Before" msgstr "之前的內容»" -#: lib/activity.php:453 +#. TRANS: Client exception thrown when a feed instance is a DOMDocument. +#: lib/activity.php:121 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 msgid "Changes to that panel are not allowed." msgstr "" -#. TRANS: Client error message +#. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." msgstr "" @@ -4868,162 +5174,200 @@ msgstr "" msgid "saveSettings() not implemented." msgstr "" -#. TRANS: Client error message -#: lib/adminpanelaction.php:283 +#. TRANS: Client error message thrown if design settings could not be deleted in +#. TRANS: the admin panel Design. +#: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:348 +#: lib/adminpanelaction.php:349 #, fuzzy msgid "Basic site configuration" msgstr "確認信箱" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:350 +#: lib/adminpanelaction.php:351 #, fuzzy msgctxt "MENU" msgid "Site" msgstr "新訊息" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:356 +#: lib/adminpanelaction.php:357 #, fuzzy msgid "Design configuration" msgstr "確認信箱" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:358 +#: lib/adminpanelaction.php:359 #, fuzzy msgctxt "MENU" msgid "Design" msgstr "地點" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:364 +#: lib/adminpanelaction.php:365 #, fuzzy msgid "User configuration" msgstr "確認信箱" #. TRANS: Menu item for site administration -#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 +#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 msgid "User" msgstr "" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:372 +#: lib/adminpanelaction.php:373 #, fuzzy msgid "Access configuration" msgstr "確認信箱" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:380 +#: lib/adminpanelaction.php:381 #, fuzzy msgid "Paths configuration" msgstr "確認信箱" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:388 +#: lib/adminpanelaction.php:389 #, fuzzy msgid "Sessions configuration" msgstr "確認信箱" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:396 +#: lib/adminpanelaction.php:397 #, fuzzy msgid "Edit site notice" msgstr "新訊息" #. TRANS: Menu item title/tooltip -#: lib/adminpanelaction.php:404 +#: lib/adminpanelaction.php:405 #, fuzzy msgid "Snapshots configuration" msgstr "確認信箱" -#: lib/apiauth.php:94 +#. TRANS: Client error 401. +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 -#, php-format -msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" - -#: lib/applicationeditform.php:136 +#. TRANS: Form legend. +#: lib/applicationeditform.php:137 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:184 +#. TRANS: Form guide. +#: lib/applicationeditform.php:187 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:204 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:209 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "請在140個字以內描述你自己與你的興趣" -#: lib/applicationeditform.php:207 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:213 #, fuzzy msgid "Describe your application" msgstr "請在140個字以內描述你自己與你的興趣" -#: lib/applicationeditform.php:216 -msgid "Source URL" -msgstr "" - -#: lib/applicationeditform.php:218 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:224 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:224 +#. TRANS: Form input field label. +#: lib/applicationeditform.php:226 +msgid "Source URL" +msgstr "" + +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:233 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:230 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:236 +#. TRANS: Form input field instructions. +#: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:258 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:278 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:274 +#. TRANS: Radio button label for application type +#: lib/applicationeditform.php:295 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:275 +#. TRANS: Form guide. +#: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:297 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:320 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:315 +#. TRANS: Radio button label for access type. +#: lib/applicationeditform.php:339 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:316 +#. TRANS: Form guide. +#: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" -#: lib/applicationlist.php:154 +#. TRANS: Submit button title +#: lib/applicationeditform.php:359 +msgid "Cancel" +msgstr "取消" + +#. TRANS: Application access type +#: lib/applicationlist.php:136 +msgid "read-write" +msgstr "" + +#. TRANS: Application access type +#: lib/applicationlist.php:138 +msgid "read-only" +msgstr "" + +#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) +#: lib/applicationlist.php:144 +#, php-format +msgid "Approved %1$s - \"%2$s\" access." +msgstr "" + +#. TRANS: Button label +#: lib/applicationlist.php:159 +msgctxt "BUTTON" msgid "Revoke" msgstr "" -#: lib/attachmentlist.php:87 +#. TRANS: DT element label in attachment list. +#: lib/attachmentlist.php:88 msgid "Attachments" msgstr "" +#. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#. TRANS: DT element label in attachment list item. +#: lib/attachmentlist.php:279 msgid "Provider" msgstr "" @@ -5043,37 +5387,57 @@ msgstr "" msgid "Password changing is not allowed" msgstr "" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:596 +#, fuzzy +msgid "User has no last notice" +msgstr "新訊息" + +#. TRANS: Message given requesting a profile for a non-existing user. +#. TRANS: %s is the nickname of the user for which the profile could not be found. +#: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" msgstr "無法更新使用者" -#: lib/command.php:92 +#. TRANS: Message given getting a non-existing user. +#. TRANS: %s is the nickname of the user that could not be found. +#: lib/command.php:147 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "無法更新使用者" + +#: lib/command.php:180 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#. TRANS: Message given having nudged another user. +#. TRANS: %s is the nickname of the user that was nudged. +#: lib/command.php:234 #, php-format msgid "Nudge sent to %s" msgstr "" -#: lib/command.php:126 +#: lib/command.php:260 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5081,201 +5445,203 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "新訊息" - -#: lib/command.php:190 +#: lib/command.php:302 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:323 #, fuzzy msgid "You are already a member of that group" msgstr "無法連結到伺服器:%s" -#: lib/command.php:231 +#. TRANS: Message given having failed to add a user to a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:339 #, fuzzy, php-format -msgid "Could not join user %s to group %s" +msgid "Could not join user %1$s to group %2$s" msgstr "無法連結到伺服器:%s" -#: lib/command.php:236 +#. TRANS: Message given having failed to remove a user from a group. +#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. +#: lib/command.php:385 #, fuzzy, php-format -msgid "%s joined group %s" -msgstr "%1$s的狀態是%2$s" - -#: lib/command.php:275 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" +msgid "Could not remove user %1$s from group %2$s" msgstr "無法從 %s 建立OpenID" -#: lib/command.php:280 -#, fuzzy, php-format -msgid "%s left group %s" -msgstr "%1$s的狀態是%2$s" - -#: lib/command.php:309 +#. TRANS: Whois output. %s is the full name of the queried user. +#: lib/command.php:418 #, fuzzy, php-format msgid "Fullname: %s" msgstr "全名" -#: lib/command.php:312 lib/mail.php:258 +#. TRANS: Whois output. %s is the location of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:422 lib/mail.php:263 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#. TRANS: Whois output. %s is the homepage of the queried user. +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/command.php:426 lib/mail.php:266 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#. TRANS: Whois output. %s is the bio information of the queried user. +#: lib/command.php:430 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:349 +#: lib/command.php:457 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:367 +#. TRANS: Message given if content is too long. +#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. +#: lib/command.php:472 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d" +msgstr "" + +#. TRANS: Message given have sent a direct message to another user. +#. TRANS: %s is the name of the other user. +#: lib/command.php:492 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:494 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:514 #, fuzzy msgid "Cannot repeat your own notice" msgstr "儲存使用者發生錯誤" -#: lib/command.php:418 +#: lib/command.php:519 #, fuzzy msgid "Already repeated that notice" msgstr "無此使用者" -#: lib/command.php:426 +#. TRANS: Message given having repeated a notice from another user. +#. TRANS: %s is the name of the user for which the notice was repeated. +#: lib/command.php:529 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "更新個人圖像" -#: lib/command.php:428 +#: lib/command.php:531 #, fuzzy msgid "Error repeating notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:482 +#: lib/command.php:562 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:571 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "&s的微型部落格" -#: lib/command.php:493 +#: lib/command.php:573 msgid "Error saving notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:547 +#: lib/command.php:620 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -#, fuzzy -msgid "No such user" -msgstr "無此使用者" +#: lib/command.php:628 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:634 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:685 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:687 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:708 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:710 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:723 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:761 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "此帳號已註冊" -#: lib/command.php:709 +#: lib/command.php:778 #, fuzzy msgid "You are not subscribed to anyone." msgstr "此帳號已註冊" -#: lib/command.php:711 +#: lib/command.php:780 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "此帳號已註冊" -#: lib/command.php:731 +#: lib/command.php:800 #, fuzzy msgid "No one is subscribed to you." msgstr "無此訂閱" -#: lib/command.php:733 +#: lib/command.php:802 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "無此訂閱" -#: lib/command.php:753 +#: lib/command.php:822 #, fuzzy msgid "You are not a member of any groups." msgstr "無法連結到伺服器:%s" -#: lib/command.php:755 +#: lib/command.php:824 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "無法連結到伺服器:%s" -#: lib/command.php:769 +#: lib/command.php:838 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5317,20 +5683,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:148 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "無確認碼" -#: lib/common.php:149 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:151 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:152 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5506,29 +5872,30 @@ msgstr "" msgid "Tags in %s group's notices" msgstr "" -#: lib/htmloutputter.php:103 +#. TRANS: Client exception 406 +#: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:72 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:80 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 -msgid "Not an image or corrupt file." -msgstr "" - #: lib/imagefile.php:109 -msgid "Unsupported image file format." +msgid "Not an image or corrupt file." msgstr "" #: lib/imagefile.php:122 @@ -5536,24 +5903,24 @@ msgstr "" msgid "Lost our file." msgstr "無此通知" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:246 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:387 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:567 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5577,11 +5944,13 @@ msgstr "使用者名稱或密碼無效" msgid "Sign up for a new account" msgstr "新增帳號" -#: lib/mail.php:173 +#. TRANS: Subject for address confirmation email +#: lib/mail.php:174 msgid "Email address confirmation" msgstr "確認信箱" -#: lib/mail.php:175 +#. TRANS: Body for address confirmation email. +#: lib/mail.php:177 #, php-format msgid "" "Hey, %s.\n" @@ -5598,12 +5967,14 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:240 +#. TRANS: Subject of new-subscriber notification e-mail +#: lib/mail.php:243 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "現在%1$s在%2$s成為你的粉絲囉" -#: lib/mail.php:245 +#. TRANS: Main body of new-subscriber notification e-mail +#: lib/mail.php:249 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5625,17 +5996,20 @@ msgstr "" "%4$s.\n" "敬上。\n" -#: lib/mail.php:262 +#. TRANS: Profile info line in new-subscriber notification e-mail +#: lib/mail.php:269 #, fuzzy, php-format msgid "Bio: %s" msgstr "自我介紹" -#: lib/mail.php:290 +#. TRANS: Subject of notification mail for new posting email address +#: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:293 +#. TRANS: Body of notification mail for new posting email address +#: lib/mail.php:302 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5648,21 +6022,31 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:417 +#. TRANS: Subject line for SMS-by-email notification messages +#: lib/mail.php:427 #, php-format msgid "%s status" msgstr "" -#: lib/mail.php:443 +#. TRANS: Subject line for SMS-by-email address confirmation message +#: lib/mail.php:454 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:467 +#. TRANS: Main body heading for SMS-by-email address confirmation message +#: lib/mail.php:457 +#, php-format +msgid "%s: confirm you own this phone number with this code:" +msgstr "" + +#. TRANS: Subject for 'nudge' notification email +#: lib/mail.php:478 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:471 +#. TRANS: Body for 'nudge' notification email +#: lib/mail.php:483 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5678,12 +6062,14 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:517 +#. TRANS: Subject for direct-message notification email +#: lib/mail.php:530 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:521 +#. TRANS: Body for direct-message notification email +#: lib/mail.php:535 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5702,12 +6088,14 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:568 +#. TRANS: Subject for favorite notification email +#: lib/mail.php:583 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "現在%1$s在%2$s成為你的粉絲囉" -#: lib/mail.php:570 +#. TRANS: Body for favorite notification email +#: lib/mail.php:586 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5728,12 +6116,22 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:635 +#. TRANS: Line in @-reply notification e-mail. %s is conversation URL. +#: lib/mail.php:645 +#, php-format +msgid "" +"The full conversation can be read here:\n" +"\n" +"\t%s" +msgstr "" + +#: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:637 +#. TRANS: Body of @-reply notification e-mail. +#: lib/mail.php:654 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5746,6 +6144,18 @@ msgid "" "\n" "\t%4$s\n" "\n" +"%5$sYou can reply back here:\n" +"\n" +"\t%6$s\n" +"\n" +"The list of all @-replies for you here:\n" +"\n" +"%7$s\n" +"\n" +"Faithfully yours,\n" +"%2$s\n" +"\n" +"P.S. You can turn off these email notifications here: %8$s\n" msgstr "" #: lib/mailbox.php:89 @@ -5758,7 +6168,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:494 msgid "from" msgstr "" @@ -5888,50 +6298,54 @@ msgid "" "try again later" msgstr "" -#: lib/noticelist.php:429 -#, php-format -msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" - +#. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 msgid "N" msgstr "" -#: lib/noticelist.php:430 +#. TRANS: Used in coordinates as abbreviation of south +#: lib/noticelist.php:432 msgid "S" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of east +#: lib/noticelist.php:434 msgid "E" msgstr "" -#: lib/noticelist.php:431 +#. TRANS: Used in coordinates as abbreviation of west +#: lib/noticelist.php:436 msgid "W" msgstr "" #: lib/noticelist.php:438 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:447 msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:567 #, fuzzy msgid "in context" msgstr "無內容" -#: lib/noticelist.php:601 +#: lib/noticelist.php:602 #, fuzzy msgid "Repeated by" msgstr "新增" -#: lib/noticelist.php:628 +#: lib/noticelist.php:629 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:630 msgid "Reply" msgstr "" -#: lib/noticelist.php:673 +#: lib/noticelist.php:674 #, fuzzy msgid "Notice repeated" msgstr "更新個人圖像" @@ -5956,6 +6370,10 @@ msgstr "新的更人資料輸入錯誤" msgid "Error inserting avatar" msgstr "個人圖像插入錯誤" +#: lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "更新遠端個人資料發生錯誤" + #: lib/oauthstore.php:311 msgid "Error inserting remote profile" msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)" @@ -6006,7 +6424,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -6014,33 +6432,33 @@ msgstr "" msgid "All subscriptions" msgstr "所有訂閱" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "" -#: lib/profileaction.php:159 +#: lib/profileaction.php:161 #, fuzzy msgid "All subscribers" msgstr "所有訂閱" -#: lib/profileaction.php:180 +#: lib/profileaction.php:191 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:196 msgid "Member since" msgstr "何時加入會員的呢？" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:235 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:264 msgid "All groups" msgstr "" -#: lib/profileformaction.php:123 -#, fuzzy -msgid "No return-to arguments." -msgstr "無此文件" - -#: lib/profileformaction.php:137 +#: lib/profileformaction.php:114 msgid "Unimplemented method." msgstr "" @@ -6064,11 +6482,20 @@ msgstr "" msgid "Popular" msgstr "" +#: lib/redirectingaction.php:94 +#, fuzzy +msgid "No return-to arguments." +msgstr "無此文件" + #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" msgstr "無此通知" +#: lib/repeatform.php:132 +msgid "Yes" +msgstr "" + #: lib/repeatform.php:132 #, fuzzy msgid "Repeat this notice" @@ -6079,7 +6506,7 @@ msgstr "無此通知" msgid "Revoke the \"%s\" role from this user" msgstr "無此使用者" -#: lib/router.php:671 +#: lib/router.php:704 msgid "No single user defined for single-user mode." msgstr "" @@ -6210,92 +6637,111 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "" + +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "個人圖像" -#: lib/userprofile.php:236 +#: lib/userprofile.php:234 lib/userprofile.php:248 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:237 +msgid "User deletion in progress..." +msgstr "" + +#: lib/userprofile.php:263 #, fuzzy msgid "Edit profile settings" msgstr "線上即時通設定" -#: lib/userprofile.php:252 +#: lib/userprofile.php:264 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:287 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:288 msgid "Message" msgstr "" -#: lib/userprofile.php:314 +#: lib/userprofile.php:326 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:364 #, fuzzy msgid "User role" msgstr "無此通知" -#: lib/userprofile.php:354 +#: lib/userprofile.php:366 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1083 msgid "a few seconds ago" msgstr "" -#: lib/util.php:1017 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1086 msgid "about a minute ago" msgstr "" -#: lib/util.php:1019 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1090 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:1021 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1093 msgid "about an hour ago" msgstr "" -#: lib/util.php:1023 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1097 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:1025 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1100 msgid "about a day ago" msgstr "" -#: lib/util.php:1027 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1104 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:1029 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1107 msgid "about a month ago" msgstr "" -#: lib/util.php:1031 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1111 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:1033 +#. TRANS: Used in notices to indicate when the notice was made compared to now. +#: lib/util.php:1114 msgid "about a year ago" msgstr "" @@ -6309,7 +6755,7 @@ msgstr "個人首頁位址錯誤" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po index f17dfa50a5..0956d2f9b7 100644 --- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po +++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po @@ -104,3 +104,6 @@ msgstr "" #: actions/feedsubsettings.php:231 msgid "Previewing feed:" msgstr "" + +msgid "Confirm" +msgstr "Confirmer" diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po new file mode 100644 index 0000000000..ae0329376c --- /dev/null +++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po @@ -0,0 +1,340 @@ +# Translation of StatusNet plugin OpenID to Dutch +# +# Author@translatewiki.net: Siebrand +# -- +# This file is distributed under the same license as the StatusNet package. +# +msgid "" +msgstr "" +"Project-Id-Version: StatusNet\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-11 21:42+0000\n" +"PO-Revision-Date: 2010-04-12 00:53+0100\n" +"Language-Team: Dutch\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Last-Translator: Siebrand Mazeland \n" +"MIME-Version: 1.0\n" + +#: finishaddopenid.php:67 +msgid "Not logged in." +msgstr "Niet aangemeld." + +#: finishaddopenid.php:88 +#: finishopenidlogin.php:149 +msgid "OpenID authentication cancelled." +msgstr "De authenticatie via OpenID is afgebroken." + +#: finishaddopenid.php:92 +#: finishopenidlogin.php:153 +#, php-format +msgid "OpenID authentication failed: %s" +msgstr "De authenticatie via OpenID is mislukt: %s" + +#: finishaddopenid.php:112 +msgid "You already have this OpenID!" +msgstr "U hebt deze OpenID al!" + +#: finishaddopenid.php:114 +msgid "Someone else already has this OpenID." +msgstr "Iemand anders gebruikt deze OpenID al." + +#: finishaddopenid.php:126 +msgid "Error connecting user." +msgstr "Fout bij het verbinden met de gebruiker." + +#: finishaddopenid.php:131 +msgid "Error updating profile" +msgstr "Fout bij het bijwerken van het profiel." + +#: finishaddopenid.php:170 +#: openidlogin.php:95 +msgid "OpenID Login" +msgstr "Aanmelden via OpenID" + +#: finishopenidlogin.php:34 +#: openidlogin.php:30 +msgid "Already logged in." +msgstr "U bent al aangemeld." + +#: finishopenidlogin.php:38 +#: openidlogin.php:37 +#: openidsettings.php:194 +msgid "There was a problem with your session token. Try again, please." +msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw." + +#: finishopenidlogin.php:43 +msgid "You can't register if you don't agree to the license." +msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie." + +#: finishopenidlogin.php:52 +#: openidsettings.php:208 +msgid "Something weird happened." +msgstr "Er is iets vreemds gebeurd." + +#: finishopenidlogin.php:66 +#, php-format +msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one." +msgstr "Dit is de eerste keer dat u aameldt bij %s en uw OpenID moet gekoppeld worden aan uw lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of koppelen met uw bestaande gebruiker als u die al hebt." + +#: finishopenidlogin.php:72 +msgid "OpenID Account Setup" +msgstr "Instellingen OpenID" + +#: finishopenidlogin.php:97 +msgid "Create new account" +msgstr "Nieuwe gebruiker aanmaken" + +#: finishopenidlogin.php:99 +msgid "Create a new user with this nickname." +msgstr "Nieuwe gebruiker met deze naam aanmaken." + +#: finishopenidlogin.php:102 +msgid "New nickname" +msgstr "Nieuwe gebruiker" + +#: finishopenidlogin.php:104 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "1-64 kleine letters of getallen; geen leestekens of spaties" + +#: finishopenidlogin.php:114 +msgid "My text and files are available under " +msgstr "Mijn teksten en bestanden zijn beschikbaar onder" + +#: finishopenidlogin.php:117 +msgid " except this private data: password, email address, IM address, phone number." +msgstr "behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer." + +#: finishopenidlogin.php:121 +msgid "Create" +msgstr "Aanmaken" + +#: finishopenidlogin.php:126 +msgid "Connect existing account" +msgstr "Koppelen met bestaande gebruiker" + +#: finishopenidlogin.php:128 +msgid "If you already have an account, login with your username and password to connect it to your OpenID." +msgstr "Als u al een gebruiker hebt, meld u dan aan met uw gebruikersnaam en wachtwoord om de gebruiker te koppelen met uw OpenID." + +#: finishopenidlogin.php:131 +msgid "Existing nickname" +msgstr "Bestaande gebruiker" + +#: finishopenidlogin.php:134 +msgid "Password" +msgstr "Wachtwoord" + +#: finishopenidlogin.php:137 +msgid "Connect" +msgstr "Koppelen" + +#: finishopenidlogin.php:215 +#: finishopenidlogin.php:224 +msgid "Registration not allowed." +msgstr "Registreren is niet mogelijk." + +#: finishopenidlogin.php:231 +msgid "Not a valid invitation code." +msgstr "De uitnodigingscode is niet geldig." + +#: finishopenidlogin.php:241 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en geen spaties bevatten." + +#: finishopenidlogin.php:246 +msgid "Nickname not allowed." +msgstr "Deze gebruikersnaam is niet toegestaan." + +#: finishopenidlogin.php:251 +msgid "Nickname already in use. Try another one." +msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere." + +#: finishopenidlogin.php:258 +#: finishopenidlogin.php:338 +msgid "Stored OpenID not found." +msgstr "Het opgeslagen OpenID is niet aangetroffen." + +#: finishopenidlogin.php:267 +msgid "Creating new account for OpenID that already has a user." +msgstr "Bezig met het aanmaken van een gebruiker voor OpenID die al een gebruiker heeft." + +#: finishopenidlogin.php:327 +msgid "Invalid username or password." +msgstr "Ongeldige gebruikersnaam of wachtwoord." + +#: finishopenidlogin.php:345 +msgid "Error connecting user to OpenID." +msgstr "Fout bij het koppelen met OpenID." + +#: openid.php:141 +msgid "Cannot instantiate OpenID consumer object." +msgstr "Het was niet mogelijk een OpenID-object aan te maken." + +#: openid.php:151 +msgid "Not a valid OpenID." +msgstr "Geen geldige OpenID." + +#: openid.php:153 +#, php-format +msgid "OpenID failure: %s" +msgstr "OpenID-fout: %s" + +#: openid.php:180 +#, php-format +msgid "Could not redirect to server: %s" +msgstr "Het was niet mogelijk door te verwijzen naar de server: %s" + +#: openid.php:198 +#, php-format +msgid "Could not create OpenID form: %s" +msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s" + +#: openid.php:214 +msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider." +msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan." + +#: openid.php:246 +msgid "Error saving the profile." +msgstr "Fout bij het opslaan van het profiel." + +#: openid.php:257 +msgid "Error saving the user." +msgstr "Fout bij het opslaan van de gebruiker." + +#: openid.php:277 +msgid "OpenID Auto-Submit" +msgstr "OpenID automatisch opslaan" + +#: openidlogin.php:66 +#, php-format +msgid "For security reasons, please re-login with your [OpenID](%%doc.openid%%) before changing your settings." +msgstr "Om veiligheidsreden moet u opnieuw aanmelden met uw [OpenID](%%doc.openid%%) voordat u uw instellingen kunt wijzigen." + +#: openidlogin.php:70 +#, php-format +msgid "Login with an [OpenID](%%doc.openid%%) account." +msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker." + +#: openidlogin.php:112 +msgid "OpenID login" +msgstr "Aanmelden via OpenID" + +#: openidlogin.php:117 +#: openidsettings.php:107 +msgid "OpenID URL" +msgstr "OpenID-URL" + +#: openidlogin.php:119 +msgid "Your OpenID URL" +msgstr "Uw OpenID-URL" + +#: openidlogin.php:122 +msgid "Remember me" +msgstr "Aanmeldgegevens onthouden" + +#: openidlogin.php:123 +msgid "Automatically login in the future; not for shared computers!" +msgstr "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!" + +#: openidlogin.php:127 +msgid "Login" +msgstr "Aanmelden" + +#: OpenIDPlugin.php:123 +#: OpenIDPlugin.php:135 +msgid "OpenID" +msgstr "OpenID" + +#: OpenIDPlugin.php:124 +msgid "Login or register with OpenID" +msgstr "Aanmelden of registreren met OpenID" + +#: OpenIDPlugin.php:136 +msgid "Add or remove OpenIDs" +msgstr "OpenID's toevoegen of verwijderen" + +#: OpenIDPlugin.php:324 +msgid "Use OpenID to login to the site." +msgstr "Gebruik OpenID om aan te melden bij de site." + +#: openidserver.php:106 +#, php-format +msgid "You are not authorized to use the identity %s." +msgstr "U mag de identiteit %s niet gebruiken." + +#: openidserver.php:126 +msgid "Just an OpenID provider. Nothing to see here, move along..." +msgstr "Gewoon een OpenID-provider. Niets te zien hier..." + +#: openidsettings.php:59 +msgid "OpenID settings" +msgstr "OpenID-instellingen" + +#: openidsettings.php:70 +#, php-format +msgid "[OpenID](%%doc.openid%%) lets you log into many sites with the same user account. Manage your associated OpenIDs from here." +msgstr "Met [OpenID](%%doc.openid%%) kunt u aanmelden bij veel websites met dezelfde gebruiker. U kunt hier uw gekoppelde OpenID's beheren." + +#: openidsettings.php:99 +msgid "Add OpenID" +msgstr "OpenID toevoegen" + +#: openidsettings.php:102 +msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"." +msgstr "Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in en klik op \"Toevoegen\"." + +#: openidsettings.php:117 +msgid "Add" +msgstr "Toevoegen" + +#: openidsettings.php:129 +msgid "Remove OpenID" +msgstr "OpenID verwijderen" + +#: openidsettings.php:134 +msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first." +msgstr "Door uw enige OpenID te verwijderen zou het niet meer mogelijk zijn om aan te melden. Als u het wilt verwijderen, voeg dan eerst een andere OpenID toe." + +#: openidsettings.php:149 +msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"." +msgstr "U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop \"Verwijderen\"." + +#: openidsettings.php:172 +msgid "Remove" +msgstr "Verwijderen" + +#: openidsettings.php:228 +msgid "No such OpenID." +msgstr "De OpenID bestaat niet." + +#: openidsettings.php:233 +msgid "That OpenID does not belong to you." +msgstr "Die OpenID is niet van u." + +#: openidsettings.php:237 +msgid "OpenID removed." +msgstr "OpenID verwijderd." + +#: openidtrust.php:51 +msgid "OpenID Identity Verification" +msgstr "OpenID-identiteitscontrole" + +#: openidtrust.php:69 +msgid "This page should only be reached during OpenID processing, not directly." +msgstr "Deze pagina hoort alleen bezocht te worden tijdens het verwerken van een OpenID, en niet direct." + +#: openidtrust.php:118 +#, php-format +msgid "%s has asked to verify your identity. Click Continue to verify your identity and login without creating a new password." +msgstr "%s heeft gevraagd uw identiteit te bevestigen. Klik op \"Doorgaan\" om uw indentiteit te controleren en aan te melden zonder een wachtwoord te hoeven invoeren." + +#: openidtrust.php:136 +msgid "Continue" +msgstr "Doorgaan" + +#: openidtrust.php:137 +msgid "Cancel" +msgstr "Annuleren" + From a5761dd814e385c8479708334d884522dfa614a9 Mon Sep 17 00:00:00 2001 From: Zachary Copley Date: Tue, 20 Apr 2010 15:01:23 -0700 Subject: [PATCH 059/730] Update release notes and version number for 0.9.2 --- README | 53 ++++++++++++++++++++++++-------------------------- lib/common.php | 2 +- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/README b/README index 1e244c4482..ddc725d3c7 100644 --- a/README +++ b/README @@ -2,8 +2,8 @@ README ------ -StatusNet 0.9.1 ("Everybody Hurts") -28 Mar 2010 +StatusNet 0.9.2 ("King of Birds") +21 Apr 2010 This is the README file for StatusNet, the Open Source microblogging platform. It includes installation instructions, descriptions of @@ -77,7 +77,7 @@ for additional terms. New this version ================ -This is a minor bug and feature release since version 0.9.0 released 4 +This is a minor bug and feature release since version 0.9.1 released 28 March 2010. Because of fixes to OStatus bugs, it is highly recommended that all @@ -85,26 +85,23 @@ public sites upgrade to the new version immediately. Notable changes this version: -- Twitter bridge truncates and links back to original for long - notices. -- Changed "Home" link in main menu to "Personal". -- A new memcached plugin (using pecl/memcached versus pecl/memcache) -- Opt-in subscription to update@status.net -- Script to run commands on behalf of a user. -- Better Web UI for long notices. -- A plugin to open external links in their own window or tab -- Fixes to Salmon protocol for compatibility with other systems. -- Updates to latest ActivityStreams definition. -- Twitpic-compatible API for image upload. -- Background deletion of user accounts. -- Better support for HTTP basic authentication with CGI/FastCGI -- Better discovery on OStatus -- Support for PuSH-enabled RSS 2.0 feeds -- OpenID-only mode -- OpenID blacklist/whitelist -- OStatus unit tests +- Fixed email notifications for @-replies that come in via OStatus +- OStatus related Fixes to the cloudy theme +- Pass geo locations over Twitter bridge (will only be used if enabled on the Twitter side) +- scripts/showplugins.php - script to dump the list of activated plugins and their settings +- scripts/fixup_blocks.php - script to finds any stray subscriptions in violation of blocks, and removes them +- Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future) +- Default 2-second timeout on Geonames web service lookups +- Improved localization for plugins +- New anti-spam measures: added nofollow rels to group members list, subscribers list +- Shared cache key option for Geonames plugin (lets multi-instance sites share their cached geoname lookups) +- Stability fixes to the TwitterStatusFetcher +- If user allows location sharing but turned off browser location use profile location +- Improved group listing via the API +- Improved FOAF output +- Several other bugfixes -A full changelog is available at http://status.net/wiki/StatusNet_0.9.1. +A full changelog is available at http://status.net/wiki/StatusNet_0.9.2. Prerequisites ============= @@ -216,9 +213,9 @@ especially if you've previously installed PHP/MySQL packages. 1. Unpack the tarball you downloaded on your Web server. Usually a command like this will work: - tar zxf statusnet-0.9.1.tar.gz + tar zxf statusnet-0.9.2.tar.gz - ...which will make a statusnet-0.9.1 subdirectory in your current + ...which will make a statusnet-0.9.2 subdirectory in your current directory. (If you don't have shell access on your Web server, you may have to unpack the tarball on your local computer and FTP the files to the server.) @@ -226,7 +223,7 @@ especially if you've previously installed PHP/MySQL packages. 2. Move the tarball to a directory of your choosing in your Web root directory. Usually something like this will work: - mv statusnet-0.9.1 /var/www/statusnet + mv statusnet-0.9.2 /var/www/statusnet This will make your StatusNet instance available in the statusnet path of your server, like "http://example.net/statusnet". "microblog" or @@ -641,7 +638,7 @@ with this situation. If you've been using StatusNet 0.7, 0.6, 0.5 or lower, or if you've been tracking the "git" version of the software, you will probably want to upgrade and keep your existing data. There is no automated -upgrade procedure in StatusNet 0.9.1. Try these step-by-step +upgrade procedure in StatusNet 0.9.2. Try these step-by-step instructions; read to the end first before trying them. 0. Download StatusNet and set up all the prerequisites as if you were @@ -662,7 +659,7 @@ instructions; read to the end first before trying them. 5. Once all writing processes to your site are turned off, make a final backup of the Web directory and database. 6. Move your StatusNet directory to a backup spot, like "statusnet.bak". -7. Unpack your StatusNet 0.9.1 tarball and move it to "statusnet" or +7. Unpack your StatusNet 0.9.2 tarball and move it to "statusnet" or wherever your code used to be. 8. Copy the config.php file and avatar directory from your old directory to your new directory. @@ -1525,7 +1522,7 @@ repository (see below), and you get a compilation error ("unexpected T_STRING") in the browser, check to see that you don't have any conflicts in your code. -If you upgraded to StatusNet 0.9.1 without reading the "Notice +If you upgraded to StatusNet 0.9.2 without reading the "Notice inboxes" section above, and all your users' 'Personal' tabs are empty, read the "Notice inboxes" section above. diff --git a/lib/common.php b/lib/common.php index 8d2e6b420b..b29719b75c 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.1'); +define('STATUSNET_VERSION', '0.9.2'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Everybody Hurts'); From ecfe6b89443227854c057bb45b107368b860ad02 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 29 Apr 2010 16:08:20 -0700 Subject: [PATCH 060/730] Update codename in common.php --- lib/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.php b/lib/common.php index b29719b75c..064f6f73a6 100644 --- a/lib/common.php +++ b/lib/common.php @@ -25,7 +25,7 @@ if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } define('STATUSNET_VERSION', '0.9.2'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility -define('STATUSNET_CODENAME', 'Everybody Hurts'); +define('STATUSNET_CODENAME', 'King of Birds'); define('AVATAR_PROFILE_SIZE', 96); define('AVATAR_STREAM_SIZE', 48); From b584e325aee6d263482c35deea859c66d29e974b Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 30 Apr 2010 01:25:50 +0200 Subject: [PATCH 061/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/ar/LC_MESSAGES/statusnet.po | 62 +++++++++++------------- locale/de/LC_MESSAGES/statusnet.po | 27 +++++------ locale/gl/LC_MESSAGES/statusnet.po | 78 +++++++++++++++--------------- locale/statusnet.pot | 12 ++--- locale/te/LC_MESSAGES/statusnet.po | 36 ++++++++------ 5 files changed, 106 insertions(+), 109 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 84c856ba8c..ce7cc188c9 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:02+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-04-29 23:22:00+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65675); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -1227,7 +1227,7 @@ msgstr "الوصف مطلوب." #: actions/editapplication.php:194 msgid "Source URL is too long." -msgstr "" +msgstr "المسار المصدر طويل جدًا." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Source URL is not valid." @@ -2008,15 +2008,13 @@ msgstr "هذا عنوان محادثة فورية خاطئ." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "تعذّر حذف تأكيد البريد الإلكتروني." +msgstr "تعذّر حذف تأكيد البريد المراسلة الفورية." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "أُلغي التأكيد." +msgstr "أُلغي تأكيد المراسلة الفورية." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2026,9 +2024,8 @@ msgstr "هذه ليست هويتك في جابر." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "أزيل هذا العنوان." +msgstr "أزيل عنوان المراسلة الفورية هذا." #: actions/inbox.php:59 #, php-format @@ -2046,7 +2043,7 @@ msgstr "هذا صندوق بريدك الوارد، والذي يسرد رسائ #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "تم تعطيل الدعوات." #: actions/invite.php:41 #, fuzzy, php-format @@ -2258,9 +2255,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "لم يمكن جعل %1$s إداريا للمجموعة %2$s." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "لا حالة حالية" +msgstr "لا حالة جارية." #: actions/newapplication.php:52 msgid "New Application" @@ -2603,24 +2599,24 @@ msgid "Path and server settings for this StatusNet site." msgstr "" #: actions/pathsadminpanel.php:157 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s." -msgstr "لا يمكن قراءة دليل السمات: %s" +msgstr "لا يمكن قراءة دليل السمات: %s." #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "لا يمكن الكتابة في دليل الأفتارات: %s" +msgstr "لا يمكن الكتابة في دليل الأفتارات: %s." #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." -msgstr "لا يمكن الكتابة في دليل الخلفيات: %s" +msgstr "لا يمكن الكتابة في دليل الخلفيات: %s." #: actions/pathsadminpanel.php:177 -#, fuzzy, php-format +#, php-format msgid "Locales directory not readable: %s." -msgstr "لا يمكن قراءة دليل المحليات: %s" +msgstr "لا يمكن قراءة دليل المحليات: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2760,9 +2756,9 @@ msgid "People search" msgstr "بحث في الأشخاص" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "ليس وسم أشخاص صالح: %s" +msgstr "ليس وسم أشخاص صالح: %s." #: actions/peopletag.php:142 #, php-format @@ -2770,9 +2766,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "المستخدمون الذين وسموا أنفسهم ب%1$s - الصفحة %2$d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "محتوى إشعار غير صالح" +msgstr "محتوى إشعار غير صالح." #: actions/postnotice.php:101 #, php-format @@ -2913,9 +2908,9 @@ msgid "Settings saved." msgstr "حُفظت الإعدادات." #: actions/public.php:83 -#, fuzzy, php-format +#, php-format msgid "Beyond the page limit (%s)." -msgstr "وراء حد الصفحة (%s)" +msgstr "بعد حد الصفحة (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3385,9 +3380,8 @@ msgid "Sessions" msgstr "الجلسات" #: actions/sessionsadminpanel.php:65 -#, fuzzy msgid "Session settings for this StatusNet site." -msgstr "الإعدادات الأساسية لموقع StatusNet هذا." +msgstr "إعدادات جلسة موقع StatusNet هذا." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" @@ -4641,7 +4635,7 @@ msgstr "مشكلة أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" @@ -5002,7 +4996,7 @@ msgid "Before" msgstr "قبل" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5010,11 +5004,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6318,7 +6312,7 @@ msgstr "رسائلك المُرسلة" msgid "Tags in %s's notices" msgstr "وسوم في إشعارات %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "غير معروفة" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index f0225630f4..e12cf33785 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:22+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-04-29 23:22:18+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65675); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -3316,13 +3316,12 @@ msgid "Invalid username or password." msgstr "Benutzername oder Passwort falsch." #: actions/register.php:343 -#, fuzzy msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -"Hier kannst du einen neuen Zugang einrichten. Danach kannst du Nachrichten " -"und Links an deine Freunde und Kollegen schicken. " +"Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du " +"Nachrichten und Links mit deinen Freunden und Kollegen teilen. " #: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -3355,13 +3354,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Längerer Name, bevorzugt dein „echter“ Name" #: actions/register.php:494 -#, fuzzy, php-format +#, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -"außer folgende private Daten: Passwort, E-Mail-Adresse, IM-Adresse und " -"Telefonnummer." +"Abgesehen von folgenden Daten: Passwort, Email Adresse, IM Adresse und " +"Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar." #: actions/register.php:542 #, php-format @@ -4898,7 +4897,7 @@ msgstr "Problem bei Speichern der Nachricht." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5260,7 +5259,7 @@ msgid "Before" msgstr "Vorher" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten." @@ -5268,11 +5267,11 @@ msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten." msgid "Can't handle remote content yet." msgstr "Fremdinhalt kann noch nicht eingebunden werden." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Eingebundener Base64 Inhalt kann noch nicht verarbeitet werden." @@ -6657,7 +6656,7 @@ msgstr "Deine gesendeten Nachrichten" msgid "Tags in %s's notices" msgstr "Stichworte in %ss Nachrichten" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Unbekannter Befehl" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index ee17dbd292..1ade2156de 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:07+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-04-29 23:22:44+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65675); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -4880,7 +4880,7 @@ msgstr "Houbo un problema ao gardar a caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "♻ @%1$s %2$s" @@ -5242,7 +5242,7 @@ msgid "Before" msgstr "Anteriores" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "Esperábase unha fonte de novas raíz pero recibiuse un documento XML completo." @@ -5251,11 +5251,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Aínda non é posible manexar contidos remotos." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Aínda non se poden manexar contidos XML integrados." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Aínda non se poden manexar contidos Base64." @@ -5793,8 +5793,8 @@ msgstr "" "get - obter a última nota do usuario\n" "whois - obtén a información do perfil do usuario\n" "lose - facer que o usuario deixe de seguilo\n" -"fav - marcar como “favorita” a última nota do usuario\n" -"fav # - marcar como “favorita” a nota coa id indicada\n" +"fav - marcar como \"favorita\" a última nota do usuario\n" +"fav # - marcar como \"favorita\" a nota coa id indicada\n" "repeat # - repetir a nota doa id indicada\n" "repeat - repetir a última nota do usuario\n" "reply # - responder a unha nota coa id indicada\n" @@ -5803,11 +5803,11 @@ msgstr "" "login - obter un enderezo para identificarse na interface web\n" "drop - deixar o grupo indicado\n" "stats - obter as súas estatísticas\n" -"stop - idéntico a “off”\n" -"quit - idéntico a “off”\n" -"sub - idéntico a “follow”\n" -"unsub - idéntico a “leave”\n" -"last - idéntico a “get”\n" +"stop - idéntico a \"off\"\n" +"quit - idéntico a \"off\"\n" +"sub - idéntico a \"follow\"\n" +"unsub - idéntico a \"leave\"\n" +"last - idéntico a \"get\"\n" "on - aínda non se integrou\n" "off - aínda non se integrou\n" "nudge - facerlle un aceno ao usuario indicado\n" @@ -5841,7 +5841,7 @@ msgstr "MI" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "" +msgstr "Actualizacións por mensaxería instantánea (MI)" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" @@ -5868,7 +5868,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "" "Pode cargar a súa imaxe de fondo persoal. O ficheiro non pode ocupar máis de " -"2 MiB." +"2MB." #: lib/designsettings.php:418 msgid "Design defaults restored." @@ -5900,7 +5900,7 @@ msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "FOAF" +msgstr "Amigo dun amigo" #: lib/feedlist.php:64 msgid "Export data" @@ -5908,7 +5908,7 @@ msgstr "Exportar os datos" #: lib/galleryaction.php:121 msgid "Filter tags" -msgstr "Filtrar etiquetas" +msgstr "Filtrar as etiquetas" #: lib/galleryaction.php:131 msgid "All" @@ -5933,7 +5933,7 @@ msgstr "Continuar" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "Atribuírlle a este usuario o rol «%s»" +msgstr "Outorgarlle a este usuario o rol \"%s\"" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5952,8 +5952,8 @@ msgstr "Describa o grupo ou o tema en %d caracteres" msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" msgstr "" -"Localidade do grupo, e a ten, como por exemplo «Cidade, Provincia, " -"Comunidade, País»." +"Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, " +"Comunidade, País\"" #: lib/groupeditform.php:187 #, php-format @@ -6043,11 +6043,11 @@ msgstr "Non se coñece o tipo de ficheiro" #: lib/imagefile.php:244 msgid "MB" -msgstr "MiB" +msgstr "MB" #: lib/imagefile.php:246 msgid "kB" -msgstr "KiB" +msgstr "kB" #: lib/jabber.php:387 #, php-format @@ -6264,7 +6264,7 @@ msgstr "" "\n" "%4$s\n" "\n" -"Non responda a este correo, non lle chegará ao remitente.\n" +"Non responda a esta mensaxe, non lle chegará ao remitente.\n" "\n" "Atentamente,\n" "%5$s\n" @@ -6322,7 +6322,7 @@ msgid "" "\n" "\t%s" msgstr "" -"Pode ler a conversación completa en:\n" +"Pode ler a conversa completa en:\n" "\n" "%s" @@ -6358,7 +6358,7 @@ msgid "" "\n" "P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"%1$s (@%9$s) acaba de enviar unha nota á súa atención (un “respost@”) en %2" +"%1$s (@%9$s) acaba de enviar unha nota á súa atención (unha resposta) en %2" "$s.\n" "\n" "A nota está en:\n" @@ -6373,14 +6373,14 @@ msgstr "" "\n" "%6$s\n" "\n" -"A lista de todas as notas á súa @tención está en:\n" +"A lista de todas as respostas está en:\n" "\n" "%7$s\n" "\n" "Atentamente,\n" "%2$s\n" "\n" -"P.S: pode desactivar estas notificacións por correo electrónico en %8$s\n" +"P.S.: pode desactivar estas notificacións por correo electrónico en %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6417,7 +6417,7 @@ msgstr "Non se permite recibir correo electrónico." #: lib/mailhandler.php:228 #, php-format msgid "Unsupported message type: %s" -msgstr "Non se soporta o tipo de mensaxe %s" +msgstr "Non se soporta o tipo de mensaxe: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -6446,7 +6446,7 @@ msgstr "Falta un cartafol temporal." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "Non se puido escribir o ficheiro en disco." +msgstr "Non se puido escribir o ficheiro no disco." #: lib/mediafile.php:165 msgid "File upload stopped by extension." @@ -6480,7 +6480,7 @@ msgstr "Enviar unha nota directa" #: lib/messageform.php:146 msgid "To" -msgstr "a" +msgstr "A" #: lib/messageform.php:159 lib/noticeform.php:185 msgid "Available characters" @@ -6522,7 +6522,7 @@ msgid "" "try again later" msgstr "" "Estase tardando máis do esperado en obter a súa xeolocalización, vólvao " -"intentar máis tarde." +"intentar máis tarde" #. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 @@ -6547,7 +6547,7 @@ msgstr "O" #: lib/noticelist.php:438 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "1% u $ ½% 2 $ u '% 3 $ u \"s% 4% 5 $ u $ ½% 6 $ u' 7% $ u\" 8% $ s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:447 msgid "at" @@ -6642,7 +6642,7 @@ msgstr "As mensaxes enviadas" msgid "Tags in %s's notices" msgstr "Etiquetas nas notas de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Descoñecida" @@ -6705,11 +6705,11 @@ msgstr "Populares" #: lib/redirectingaction.php:94 msgid "No return-to arguments." -msgstr "Sen argumentos “return-to”." +msgstr "Sen argumentos \"return-to\"." #: lib/repeatform.php:107 msgid "Repeat this notice?" -msgstr "Quere repetir esta nova?" +msgstr "Quere repetir esta nota?" #: lib/repeatform.php:132 msgid "Yes" @@ -6717,12 +6717,12 @@ msgstr "Si" #: lib/repeatform.php:132 msgid "Repeat this notice" -msgstr "Repetir esta nova" +msgstr "Repetir esta nota" #: lib/revokeroleform.php:91 #, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Revogarlle o rol “%s” a este usuario" +msgstr "Revogarlle o rol \"%s\" a este usuario" #: lib/router.php:704 msgid "No single user defined for single-user mode." @@ -6806,7 +6806,7 @@ msgstr "Convidar" #: lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "Convida a amigos e compañeiros a unírseche en %s" +msgstr "Convide a amigos e compañeiros a unírselle en %s" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 diff --git a/locale/statusnet.pot b/locale/statusnet.pot index e0aad71466..82463a73dd 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-26 22:15+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4575,7 +4575,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4927,7 +4927,7 @@ msgid "Before" msgstr "" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4935,11 +4935,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6166,7 +6166,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 54e7d0de18..96ac240840 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:38+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-04-29 23:23:35+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65675); Translate extension (2010-04-25)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -2113,6 +2113,8 @@ msgid "" "You will be notified when your invitees accept the invitation and register " "on the site. Thanks for growing the community!" msgstr "" +"ఆహ్వానితులు మీ ఆహ్వానాన్ని అంగీకరించి సైటులో నమోదైనప్పుడు మీకు తెలియజేస్తాము. ఇక్కడి ప్రజని " +"పెంచుతున్నందుకు ధన్యవాదాలు!" #: actions/invite.php:162 msgid "" @@ -2450,7 +2452,7 @@ msgstr "మీరు నమోదు చేసివున్న ఉపకరణ #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "మీరు ఇంకా ఏ ఉపకరణాన్నీ నమోదు చేసుకోలేదు." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" @@ -2471,7 +2473,7 @@ msgstr "" #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "మీ ఖాతాని ఉపయోగించుకోడానికి మీరు ఏ ఉపకరణాన్నీ అధీకరించలేదు." #: actions/oauthconnectionssettings.php:211 msgid "Developers can edit the registration settings for their applications " @@ -3907,7 +3909,7 @@ msgstr "అప్రమేయ భాష" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" -msgstr "" +msgstr "విహారిణి అమరికల నుండి భాషని స్వయంచాలకంగా పొందలేకపోయినప్పుడు ఉపయోగించే సైటు భాష" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3927,7 +3929,7 @@ msgstr "" #: actions/siteadminpanel.php:278 msgid "How long users must wait (in seconds) to post the same thing again." -msgstr "" +msgstr "అదే విషయాన్ని మళ్ళీ టపా చేయడానికి వాడుకరులు ఎంత సమయం (క్షణాల్లో) వేచివుండాలి." #: actions/sitenoticeadminpanel.php:56 msgid "Site Notice" @@ -4234,6 +4236,8 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%sకి చందాదార్లు ఎవరూ లేరు. [ఒక ఖాతాని నమోదు చేసుకుని](%%%%action.register%%%%) మీరు " +"ఎందుకు మొదటి చందాదారు కాకూడదు?" #: actions/subscriptions.php:52 #, php-format @@ -4247,12 +4251,12 @@ msgstr "%1$s చందాలు, పేజీ %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "మీరు ఈ వ్యక్తుల నోటీసులని వింటున్నారు." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "%s వీరి నోటీసులని వింటున్నారు." #: actions/subscriptions.php:126 #, php-format @@ -4729,7 +4733,7 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5096,7 +5100,7 @@ msgid "Before" msgstr "ఇంతక్రితం" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5104,11 +5108,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -5465,9 +5469,9 @@ msgstr "" #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" -msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు." +msgstr "సందేశం చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -6452,7 +6456,7 @@ msgstr "మీరు పంపిన సందేశాలు" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" From 5ad2d0c30c2ea93243430e885a5358fd7a9e25c9 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 29 Apr 2010 23:43:06 +0000 Subject: [PATCH 062/730] Update gettext localisation files. --- plugins/AutoSandbox/locale/AutoSandbox.po | 21 + plugins/AutoSandbox/locale/AutoSandbox.pot | 21 + plugins/Autocomplete/locale/Autocomplete.po | 24 + plugins/Autocomplete/locale/Autocomplete.pot | 24 + plugins/BitlyUrl/locale/BitlyUrl.po | 22 + plugins/BitlyUrl/locale/BitlyUrl.pot | 22 + plugins/Blacklist/locale/Blacklist.po | 54 ++ plugins/Blacklist/locale/Blacklist.pot | 54 ++ .../locale/CasAuthentication.po | 35 ++ .../locale/CasAuthentication.pot | 35 ++ .../locale/ClientSideShorten.pot | 27 + .../locale/DirectionDetector.pot | 21 + .../locale/EmailAuthentication.po | 23 + .../locale/EmailAuthentication.pot | 23 + plugins/Facebook/locale/Facebook.pot | 472 ++++++++------- plugins/FirePHP/locale/FirePHP.po | 21 + plugins/FirePHP/locale/FirePHP.pot | 21 + plugins/Gravatar/locale/Gravatar.pot | 2 +- plugins/Imap/locale/Imap.po | 27 + plugins/Imap/locale/Imap.pot | 27 + .../InfiniteScroll/locale/InfiniteScroll.po | 25 + .../InfiniteScroll/locale/InfiniteScroll.pot | 25 + .../locale/LdapAuthentication.po | 23 + .../locale/LdapAuthentication.pot | 23 + .../locale/LdapAuthorization.po | 23 + .../locale/LdapAuthorization.pot | 23 + plugins/LilUrl/locale/LilUrl.po | 22 + plugins/LilUrl/locale/LilUrl.pot | 22 + plugins/Mapstraction/locale/Mapstraction.pot | 38 +- plugins/Minify/locale/Minify.po | 23 + plugins/Minify/locale/Minify.pot | 23 + plugins/MobileProfile/locale/MobileProfile.po | 21 + .../MobileProfile/locale/MobileProfile.pot | 21 + plugins/OStatus/locale/OStatus.pot | 435 ++++++------- .../locale/OpenExternalLinkTarget.po | 21 + .../locale/OpenExternalLinkTarget.pot | 21 + plugins/OpenID/locale/OpenID.pot | 572 ++++++++++-------- plugins/PostDebug/locale/PostDebug.po | 21 + plugins/PostDebug/locale/PostDebug.pot | 21 + .../locale/PoweredByStatusNet.pot | 2 +- plugins/PtitUrl/locale/PtitUrl.po | 22 + plugins/PtitUrl/locale/PtitUrl.pot | 22 + plugins/RSSCloud/locale/RSSCloud.po | 24 + plugins/RSSCloud/locale/RSSCloud.pot | 24 + plugins/Recaptcha/locale/Recaptcha.po | 23 + plugins/Recaptcha/locale/Recaptcha.pot | 23 + .../locale/RegisterThrottle.po | 29 + .../locale/RegisterThrottle.pot | 29 + .../locale/RequireValidatedEmail.pot | 2 +- .../locale/ReverseUsernameAuthentication.po | 24 + .../locale/ReverseUsernameAuthentication.pot | 24 + plugins/Sample/locale/Sample.pot | 40 +- plugins/SimpleUrl/locale/SimpleUrl.po | 22 + plugins/SimpleUrl/locale/SimpleUrl.pot | 22 + plugins/TabFocus/locale/TabFocus.po | 24 + plugins/TabFocus/locale/TabFocus.pot | 24 + plugins/TightUrl/locale/TightUrl.po | 22 + plugins/TightUrl/locale/TightUrl.pot | 22 + .../TwitterBridge/locale/TwitterBridge.pot | 103 +++- 59 files changed, 2159 insertions(+), 747 deletions(-) create mode 100644 plugins/AutoSandbox/locale/AutoSandbox.po create mode 100644 plugins/AutoSandbox/locale/AutoSandbox.pot create mode 100644 plugins/Autocomplete/locale/Autocomplete.po create mode 100644 plugins/Autocomplete/locale/Autocomplete.pot create mode 100644 plugins/BitlyUrl/locale/BitlyUrl.po create mode 100644 plugins/BitlyUrl/locale/BitlyUrl.pot create mode 100644 plugins/Blacklist/locale/Blacklist.po create mode 100644 plugins/Blacklist/locale/Blacklist.pot create mode 100644 plugins/CasAuthentication/locale/CasAuthentication.po create mode 100644 plugins/CasAuthentication/locale/CasAuthentication.pot create mode 100644 plugins/ClientSideShorten/locale/ClientSideShorten.pot create mode 100644 plugins/DirectionDetector/locale/DirectionDetector.pot create mode 100644 plugins/EmailAuthentication/locale/EmailAuthentication.po create mode 100644 plugins/EmailAuthentication/locale/EmailAuthentication.pot create mode 100644 plugins/FirePHP/locale/FirePHP.po create mode 100644 plugins/FirePHP/locale/FirePHP.pot create mode 100644 plugins/Imap/locale/Imap.po create mode 100644 plugins/Imap/locale/Imap.pot create mode 100644 plugins/InfiniteScroll/locale/InfiniteScroll.po create mode 100644 plugins/InfiniteScroll/locale/InfiniteScroll.pot create mode 100644 plugins/LdapAuthentication/locale/LdapAuthentication.po create mode 100644 plugins/LdapAuthentication/locale/LdapAuthentication.pot create mode 100644 plugins/LdapAuthorization/locale/LdapAuthorization.po create mode 100644 plugins/LdapAuthorization/locale/LdapAuthorization.pot create mode 100644 plugins/LilUrl/locale/LilUrl.po create mode 100644 plugins/LilUrl/locale/LilUrl.pot create mode 100644 plugins/Minify/locale/Minify.po create mode 100644 plugins/Minify/locale/Minify.pot create mode 100644 plugins/MobileProfile/locale/MobileProfile.po create mode 100644 plugins/MobileProfile/locale/MobileProfile.pot create mode 100644 plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.po create mode 100644 plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot create mode 100644 plugins/PostDebug/locale/PostDebug.po create mode 100644 plugins/PostDebug/locale/PostDebug.pot create mode 100644 plugins/PtitUrl/locale/PtitUrl.po create mode 100644 plugins/PtitUrl/locale/PtitUrl.pot create mode 100644 plugins/RSSCloud/locale/RSSCloud.po create mode 100644 plugins/RSSCloud/locale/RSSCloud.pot create mode 100644 plugins/Recaptcha/locale/Recaptcha.po create mode 100644 plugins/Recaptcha/locale/Recaptcha.pot create mode 100644 plugins/RegisterThrottle/locale/RegisterThrottle.po create mode 100644 plugins/RegisterThrottle/locale/RegisterThrottle.pot create mode 100644 plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.po create mode 100644 plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot create mode 100644 plugins/SimpleUrl/locale/SimpleUrl.po create mode 100644 plugins/SimpleUrl/locale/SimpleUrl.pot create mode 100644 plugins/TabFocus/locale/TabFocus.po create mode 100644 plugins/TabFocus/locale/TabFocus.pot create mode 100644 plugins/TightUrl/locale/TightUrl.po create mode 100644 plugins/TightUrl/locale/TightUrl.pot diff --git a/plugins/AutoSandbox/locale/AutoSandbox.po b/plugins/AutoSandbox/locale/AutoSandbox.po new file mode 100644 index 0000000000..d4c6c8d3e3 --- /dev/null +++ b/plugins/AutoSandbox/locale/AutoSandbox.po @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: AutoSandboxPlugin.php:66 +msgid "Automatically sandboxes newly registered members." +msgstr "" diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot new file mode 100644 index 0000000000..b01f9dc893 --- /dev/null +++ b/plugins/AutoSandbox/locale/AutoSandbox.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: AutoSandboxPlugin.php:66 +msgid "Automatically sandboxes newly registered members." +msgstr "" diff --git a/plugins/Autocomplete/locale/Autocomplete.po b/plugins/Autocomplete/locale/Autocomplete.po new file mode 100644 index 0000000000..ac64dfec5c --- /dev/null +++ b/plugins/Autocomplete/locale/Autocomplete.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: AutocompletePlugin.php:71 +msgid "" +"The autocomplete plugin allows users to autocomplete screen names in @ " +"replies. When an \"@\" is typed into the notice text area, an autocomplete " +"box is displayed populated with the user's friend' screen names." +msgstr "" diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot new file mode 100644 index 0000000000..c0274af85a --- /dev/null +++ b/plugins/Autocomplete/locale/Autocomplete.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: AutocompletePlugin.php:79 +msgid "" +"The autocomplete plugin allows users to autocomplete screen names in @ " +"replies. When an \"@\" is typed into the notice text area, an autocomplete " +"box is displayed populated with the user's friend' screen names." +msgstr "" diff --git a/plugins/BitlyUrl/locale/BitlyUrl.po b/plugins/BitlyUrl/locale/BitlyUrl.po new file mode 100644 index 0000000000..7bf06eaf74 --- /dev/null +++ b/plugins/BitlyUrl/locale/BitlyUrl.po @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: BitlyUrlPlugin.php:60 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot new file mode 100644 index 0000000000..28023759aa --- /dev/null +++ b/plugins/BitlyUrl/locale/BitlyUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: BitlyUrlPlugin.php:60 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/Blacklist/locale/Blacklist.po b/plugins/Blacklist/locale/Blacklist.po new file mode 100644 index 0000000000..beadb4cf92 --- /dev/null +++ b/plugins/Blacklist/locale/Blacklist.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: BlacklistPlugin.php:153 +#, php-format +msgid "You may not register with homepage '%s'" +msgstr "" + +#: BlacklistPlugin.php:163 +#, php-format +msgid "You may not register with nickname '%s'" +msgstr "" + +#: BlacklistPlugin.php:188 +#, php-format +msgid "You may not use homepage '%s'" +msgstr "" + +#: BlacklistPlugin.php:198 +#, php-format +msgid "You may not use nickname '%s'" +msgstr "" + +#: BlacklistPlugin.php:242 +#, php-format +msgid "You may not use url '%s' in notices" +msgstr "" + +#: BlacklistPlugin.php:351 +msgid "Keep a blacklist of forbidden nickname and URL patterns." +msgstr "" + +#: blacklistadminpanel.php:186 +msgid "Nicknames" +msgstr "" + +#: blacklistadminpanel.php:194 +msgid "URLs" +msgstr "" diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot new file mode 100644 index 0000000000..90eda0941d --- /dev/null +++ b/plugins/Blacklist/locale/Blacklist.pot @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: BlacklistPlugin.php:153 +#, php-format +msgid "You may not register with homepage '%s'" +msgstr "" + +#: BlacklistPlugin.php:163 +#, php-format +msgid "You may not register with nickname '%s'" +msgstr "" + +#: BlacklistPlugin.php:188 +#, php-format +msgid "You may not use homepage '%s'" +msgstr "" + +#: BlacklistPlugin.php:198 +#, php-format +msgid "You may not use nickname '%s'" +msgstr "" + +#: BlacklistPlugin.php:242 +#, php-format +msgid "You may not use url '%s' in notices" +msgstr "" + +#: BlacklistPlugin.php:351 +msgid "Keep a blacklist of forbidden nickname and URL patterns." +msgstr "" + +#: blacklistadminpanel.php:185 +msgid "Nicknames" +msgstr "" + +#: blacklistadminpanel.php:193 +msgid "URLs" +msgstr "" diff --git a/plugins/CasAuthentication/locale/CasAuthentication.po b/plugins/CasAuthentication/locale/CasAuthentication.po new file mode 100644 index 0000000000..ca0f038229 --- /dev/null +++ b/plugins/CasAuthentication/locale/CasAuthentication.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: CasAuthenticationPlugin.php:82 +msgid "CAS" +msgstr "" + +#: CasAuthenticationPlugin.php:83 +msgid "Login or register with CAS" +msgstr "" + +#: CasAuthenticationPlugin.php:150 +msgid "" +"The CAS Authentication plugin allows for StatusNet to handle authentication " +"through CAS (Central Authentication Service)." +msgstr "" + +#: caslogin.php:28 +msgid "Already logged in." +msgstr "" diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot new file mode 100644 index 0000000000..20a2bf2330 --- /dev/null +++ b/plugins/CasAuthentication/locale/CasAuthentication.pot @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: CasAuthenticationPlugin.php:82 +msgid "CAS" +msgstr "" + +#: CasAuthenticationPlugin.php:83 +msgid "Login or register with CAS" +msgstr "" + +#: CasAuthenticationPlugin.php:150 +msgid "" +"The CAS Authentication plugin allows for StatusNet to handle authentication " +"through CAS (Central Authentication Service)." +msgstr "" + +#: caslogin.php:28 +msgid "Already logged in." +msgstr "" diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot new file mode 100644 index 0000000000..83caff3221 --- /dev/null +++ b/plugins/ClientSideShorten/locale/ClientSideShorten.pot @@ -0,0 +1,27 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ClientSideShortenPlugin.php:74 +msgid "" +"ClientSideShorten causes the web interface's notice form to automatically " +"shorten urls as they entered, and before the notice is submitted." +msgstr "" + +#: shorten.php:55 +msgid "'text' argument must be specified." +msgstr "" diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot new file mode 100644 index 0000000000..ebeda2dc49 --- /dev/null +++ b/plugins/DirectionDetector/locale/DirectionDetector.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: DirectionDetectorPlugin.php:221 +msgid "shows notices with right-to-left content in correct direction." +msgstr "" diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.po b/plugins/EmailAuthentication/locale/EmailAuthentication.po new file mode 100644 index 0000000000..de2bed5ab2 --- /dev/null +++ b/plugins/EmailAuthentication/locale/EmailAuthentication.po @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: EmailAuthenticationPlugin.php:61 +msgid "" +"The Email Authentication plugin allows users to login using their email " +"address." +msgstr "" diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot new file mode 100644 index 0000000000..d945e2537a --- /dev/null +++ b/plugins/EmailAuthentication/locale/EmailAuthentication.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: EmailAuthenticationPlugin.php:61 +msgid "" +"The Email Authentication plugin allows users to login using their email " +"address." +msgstr "" diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot index 4bc00248c9..dce10d230f 100644 --- a/plugins/Facebook/locale/Facebook.pot +++ b/plugins/Facebook/locale/Facebook.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,201 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: facebookaction.php:171 -msgid "Home" -msgstr "" - -#: facebookaction.php:179 -msgid "Invite" -msgstr "" - -#: facebookaction.php:188 -msgid "Settings" -msgstr "" - -#: facebookaction.php:228 -#, php-format -msgid "" -"To use the %s Facebook Application you need to login with your username and " -"password. Don't have a username yet? " -msgstr "" - -#: facebookaction.php:230 -msgid " a new account." -msgstr "" - -#: facebookaction.php:236 -msgid "Register" -msgstr "" - -#: facebookaction.php:249 facebookaction.php:275 facebooklogin.php:91 -msgid "Login" -msgstr "" - -#: facebookaction.php:268 -msgid "Nickname" -msgstr "" - -#: facebookaction.php:271 FBConnectAuth.php:196 -msgid "Password" -msgstr "" - -#: facebookaction.php:281 -msgid "Lost or forgotten password?" -msgstr "" - -#: facebookaction.php:330 facebookhome.php:248 -msgid "Pagination" -msgstr "" - -#: facebookaction.php:339 facebookhome.php:257 -msgid "After" -msgstr "" - -#: facebookaction.php:347 facebookhome.php:265 -msgid "Before" -msgstr "" - -#: facebookaction.php:365 -msgid "No notice content!" -msgstr "" - -#: facebookaction.php:371 -#, php-format -msgid "That's too long. Max notice size is %d chars." -msgstr "" - -#: facebookaction.php:430 -msgid "Notices" -msgstr "" - -#: facebookhome.php:111 -msgid "Server error - couldn't get user!" -msgstr "" - -#: facebookhome.php:131 -msgid "Incorrect username or password." -msgstr "" - -#: facebookhome.php:158 -#, php-format -msgid "%s and friends, page %d" -msgstr "" - -#: facebookhome.php:160 -#, php-format -msgid "%s and friends" -msgstr "" - -#: facebookhome.php:189 -#, php-format -msgid "" -"If you would like the %s app to automatically update your Facebook status " -"with your latest notice, you need to give it permission." -msgstr "" - -#: facebookhome.php:213 -msgid "Okay, do it!" -msgstr "" - -#: facebookhome.php:219 -msgid "Skip" -msgstr "" - -#: facebookinvite.php:72 -#, php-format -msgid "Thanks for inviting your friends to use %s" -msgstr "" - -#: facebookinvite.php:74 -msgid "Invitations have been sent to the following users:" -msgstr "" - -#: facebookinvite.php:94 -#, php-format -msgid "You have been invited to %s" -msgstr "" - -#: facebookinvite.php:103 -#, php-format -msgid "Invite your friends to use %s" -msgstr "" - -#: facebookinvite.php:125 -#, php-format -msgid "Friends already using %s:" -msgstr "" - -#: facebookinvite.php:143 -msgid "Send invitations" -msgstr "" - -#: FacebookPlugin.php:413 FacebookPlugin.php:433 -msgid "Facebook" -msgstr "" - -#: FacebookPlugin.php:414 -msgid "Login or register using Facebook" -msgstr "" - -#: FacebookPlugin.php:434 FBConnectSettings.php:56 -msgid "Facebook Connect Settings" -msgstr "" - -#: FacebookPlugin.php:533 -msgid "" -"The Facebook plugin allows you to integrate your StatusNet instance with Facebook and Facebook Connect." -msgstr "" - -#: facebookremove.php:58 -msgid "Couldn't remove Facebook user." -msgstr "" - -#: facebooksettings.php:74 -msgid "There was a problem saving your sync preferences!" -msgstr "" - -#: facebooksettings.php:76 -msgid "Sync preferences saved." -msgstr "" - -#: facebooksettings.php:99 -msgid "Automatically update my Facebook status with my notices." -msgstr "" - -#: facebooksettings.php:106 -msgid "Send \"@\" replies to Facebook." -msgstr "" - -#: facebooksettings.php:115 -msgid "Prefix" -msgstr "" - -#: facebooksettings.php:117 -msgid "A string to prefix notices with." -msgstr "" - -#: facebooksettings.php:123 -msgid "Save" -msgstr "" - -#: facebooksettings.php:133 -#, php-format -msgid "" -"If you would like %s to automatically update your Facebook status with your " -"latest notice, you need to give it permission." -msgstr "" - -#: facebooksettings.php:146 -#, php-format -msgid "Allow %s to update my Facebook status" -msgstr "" - -#: facebooksettings.php:156 -msgid "Sync preferences" -msgstr "" - #: facebookutil.php:285 #, php-format msgid "" @@ -258,85 +63,180 @@ msgstr "" msgid "Facebook Account Setup" msgstr "" -#: FBConnectAuth.php:153 +#: FBConnectAuth.php:158 msgid "Connection options" msgstr "" -#: FBConnectAuth.php:162 -msgid "My text and files are available under " -msgstr "" - -#: FBConnectAuth.php:165 -msgid "" -" except this private data: password, email address, IM address, phone number." -msgstr "" - -#: FBConnectAuth.php:173 +#: FBConnectAuth.php:183 msgid "Create new account" msgstr "" -#: FBConnectAuth.php:175 +#: FBConnectAuth.php:185 msgid "Create a new user with this nickname." msgstr "" -#: FBConnectAuth.php:178 +#: FBConnectAuth.php:188 msgid "New nickname" msgstr "" -#: FBConnectAuth.php:180 +#: FBConnectAuth.php:190 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: FBConnectAuth.php:183 +#: FBConnectAuth.php:193 msgid "Create" msgstr "" -#: FBConnectAuth.php:188 +#: FBConnectAuth.php:198 msgid "Connect existing account" msgstr "" -#: FBConnectAuth.php:190 +#: FBConnectAuth.php:200 msgid "" "If you already have an account, login with your username and password to " "connect it to your Facebook." msgstr "" -#: FBConnectAuth.php:193 +#: FBConnectAuth.php:203 msgid "Existing nickname" msgstr "" -#: FBConnectAuth.php:199 +#: FBConnectAuth.php:206 facebookaction.php:271 +msgid "Password" +msgstr "" + +#: FBConnectAuth.php:209 msgid "Connect" msgstr "" -#: FBConnectAuth.php:215 FBConnectAuth.php:224 +#: FBConnectAuth.php:225 FBConnectAuth.php:234 msgid "Registration not allowed." msgstr "" -#: FBConnectAuth.php:231 +#: FBConnectAuth.php:241 msgid "Not a valid invitation code." msgstr "" -#: FBConnectAuth.php:241 +#: FBConnectAuth.php:251 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: FBConnectAuth.php:246 +#: FBConnectAuth.php:256 msgid "Nickname not allowed." msgstr "" -#: FBConnectAuth.php:251 +#: FBConnectAuth.php:261 msgid "Nickname already in use. Try another one." msgstr "" -#: FBConnectAuth.php:269 FBConnectAuth.php:303 FBConnectAuth.php:323 +#: FBConnectAuth.php:279 FBConnectAuth.php:313 FBConnectAuth.php:333 msgid "Error connecting user to Facebook." msgstr "" -#: FBConnectAuth.php:289 +#: FBConnectAuth.php:299 msgid "Invalid username or password." msgstr "" +#: facebooklogin.php:91 facebookaction.php:249 facebookaction.php:275 +msgid "Login" +msgstr "" + +#: facebookhome.php:111 +msgid "Server error - couldn't get user!" +msgstr "" + +#: facebookhome.php:131 +msgid "Incorrect username or password." +msgstr "" + +#: facebookhome.php:158 +#, php-format +msgid "%s and friends, page %d" +msgstr "" + +#: facebookhome.php:160 +#, php-format +msgid "%s and friends" +msgstr "" + +#: facebookhome.php:189 +#, php-format +msgid "" +"If you would like the %s app to automatically update your Facebook status " +"with your latest notice, you need to give it permission." +msgstr "" + +#: facebookhome.php:213 +msgid "Okay, do it!" +msgstr "" + +#: facebookhome.php:219 +msgid "Skip" +msgstr "" + +#: facebookhome.php:248 facebookaction.php:330 +msgid "Pagination" +msgstr "" + +#: facebookhome.php:257 facebookaction.php:339 +msgid "After" +msgstr "" + +#: facebookhome.php:265 facebookaction.php:347 +msgid "Before" +msgstr "" + +#: facebookinvite.php:72 +#, php-format +msgid "Thanks for inviting your friends to use %s" +msgstr "" + +#: facebookinvite.php:74 +msgid "Invitations have been sent to the following users:" +msgstr "" + +#: facebookinvite.php:94 +#, php-format +msgid "You have been invited to %s" +msgstr "" + +#: facebookinvite.php:103 +#, php-format +msgid "Invite your friends to use %s" +msgstr "" + +#: facebookinvite.php:125 +#, php-format +msgid "Friends already using %s:" +msgstr "" + +#: facebookinvite.php:143 +msgid "Send invitations" +msgstr "" + +#: FacebookPlugin.php:195 FacebookPlugin.php:488 FacebookPlugin.php:510 +#: facebookadminpanel.php:54 +msgid "Facebook" +msgstr "" + +#: FacebookPlugin.php:196 +msgid "Facebook integration configuration" +msgstr "" + +#: FacebookPlugin.php:489 +msgid "Login or register using Facebook" +msgstr "" + +#: FacebookPlugin.php:511 FBConnectSettings.php:56 +msgid "Facebook Connect Settings" +msgstr "" + +#: FacebookPlugin.php:617 +msgid "" +"The Facebook plugin allows you to integrate your StatusNet instance with Facebook and Facebook Connect." +msgstr "" + #: FBConnectLogin.php:33 msgid "Already logged in." msgstr "" @@ -349,6 +249,90 @@ msgstr "" msgid "Facebook Login" msgstr "" +#: facebookremove.php:58 +msgid "Couldn't remove Facebook user." +msgstr "" + +#: facebookaction.php:171 +msgid "Home" +msgstr "" + +#: facebookaction.php:179 +msgid "Invite" +msgstr "" + +#: facebookaction.php:188 +msgid "Settings" +msgstr "" + +#: facebookaction.php:228 +#, php-format +msgid "" +"To use the %s Facebook Application you need to login with your username and " +"password. Don't have a username yet? " +msgstr "" + +#: facebookaction.php:230 +msgid " a new account." +msgstr "" + +#: facebookaction.php:236 +msgid "Register" +msgstr "" + +#: facebookaction.php:268 +msgid "Nickname" +msgstr "" + +#: facebookaction.php:281 +msgid "Lost or forgotten password?" +msgstr "" + +#: facebookaction.php:365 +msgid "No notice content!" +msgstr "" + +#: facebookaction.php:371 +#, php-format +msgid "That's too long. Max notice size is %d chars." +msgstr "" + +#: facebookaction.php:430 +msgid "Notices" +msgstr "" + +#: facebookadminpanel.php:65 +msgid "Facebook integration settings" +msgstr "" + +#: facebookadminpanel.php:129 +msgid "Invalid Facebook API key. Max length is 255 characters." +msgstr "" + +#: facebookadminpanel.php:135 +msgid "Invalid Facebook API secret. Max length is 255 characters." +msgstr "" + +#: facebookadminpanel.php:188 +msgid "Facebook application settings" +msgstr "" + +#: facebookadminpanel.php:194 +msgid "API key" +msgstr "" + +#: facebookadminpanel.php:195 +msgid "API key provided by Facebook" +msgstr "" + +#: facebookadminpanel.php:203 +msgid "Secret" +msgstr "" + +#: facebookadminpanel.php:204 +msgid "API secret provided by Facebook" +msgstr "" + #: FBConnectSettings.php:67 msgid "Manage how your account connects to Facebook" msgstr "" @@ -393,3 +377,47 @@ msgstr "" #: FBConnectSettings.php:197 msgid "Not sure what you're trying to do." msgstr "" + +#: facebooksettings.php:74 +msgid "There was a problem saving your sync preferences!" +msgstr "" + +#: facebooksettings.php:76 +msgid "Sync preferences saved." +msgstr "" + +#: facebooksettings.php:99 +msgid "Automatically update my Facebook status with my notices." +msgstr "" + +#: facebooksettings.php:106 +msgid "Send \"@\" replies to Facebook." +msgstr "" + +#: facebooksettings.php:115 +msgid "Prefix" +msgstr "" + +#: facebooksettings.php:117 +msgid "A string to prefix notices with." +msgstr "" + +#: facebooksettings.php:123 +msgid "Save" +msgstr "" + +#: facebooksettings.php:133 +#, php-format +msgid "" +"If you would like %s to automatically update your Facebook status with your " +"latest notice, you need to give it permission." +msgstr "" + +#: facebooksettings.php:146 +#, php-format +msgid "Allow %s to update my Facebook status" +msgstr "" + +#: facebooksettings.php:156 +msgid "Sync preferences" +msgstr "" diff --git a/plugins/FirePHP/locale/FirePHP.po b/plugins/FirePHP/locale/FirePHP.po new file mode 100644 index 0000000000..6dfb03ae72 --- /dev/null +++ b/plugins/FirePHP/locale/FirePHP.po @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: FirePHPPlugin.php:66 +msgid "The FirePHP plugin writes StatusNet's log output to FirePHP." +msgstr "" diff --git a/plugins/FirePHP/locale/FirePHP.pot b/plugins/FirePHP/locale/FirePHP.pot new file mode 100644 index 0000000000..fa16f283eb --- /dev/null +++ b/plugins/FirePHP/locale/FirePHP.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: FirePHPPlugin.php:66 +msgid "The FirePHP plugin writes StatusNet's log output to FirePHP." +msgstr "" diff --git a/plugins/Gravatar/locale/Gravatar.pot b/plugins/Gravatar/locale/Gravatar.pot index d7275b9290..d3a4cd86b8 100644 --- a/plugins/Gravatar/locale/Gravatar.pot +++ b/plugins/Gravatar/locale/Gravatar.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Imap/locale/Imap.po b/plugins/Imap/locale/Imap.po new file mode 100644 index 0000000000..05e1e00a31 --- /dev/null +++ b/plugins/Imap/locale/Imap.po @@ -0,0 +1,27 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: imapmailhandler.php:28 +msgid "Error" +msgstr "" + +#: ImapPlugin.php:101 +msgid "" +"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for " +"incoming mail containing user posts." +msgstr "" diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot new file mode 100644 index 0000000000..ee8452aaaf --- /dev/null +++ b/plugins/Imap/locale/Imap.pot @@ -0,0 +1,27 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: imapmailhandler.php:28 +msgid "Error" +msgstr "" + +#: ImapPlugin.php:101 +msgid "" +"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for " +"incoming mail containing user posts." +msgstr "" diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.po b/plugins/InfiniteScroll/locale/InfiniteScroll.po new file mode 100644 index 0000000000..fcfacc5b14 --- /dev/null +++ b/plugins/InfiniteScroll/locale/InfiniteScroll.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: InfiniteScrollPlugin.php:54 +msgid "" +"Infinite Scroll adds the following functionality to your StatusNet " +"installation: When a user scrolls towards the bottom of the page, the next " +"page of notices is automatically retrieved and appended. This means they " +"never need to click \"Next Page\", which dramatically increases stickiness." +msgstr "" diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot new file mode 100644 index 0000000000..a0f466fcb4 --- /dev/null +++ b/plugins/InfiniteScroll/locale/InfiniteScroll.pot @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: InfiniteScrollPlugin.php:54 +msgid "" +"Infinite Scroll adds the following functionality to your StatusNet " +"installation: When a user scrolls towards the bottom of the page, the next " +"page of notices is automatically retrieved and appended. This means they " +"never need to click \"Next Page\", which dramatically increases stickiness." +msgstr "" diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.po b/plugins/LdapAuthentication/locale/LdapAuthentication.po new file mode 100644 index 0000000000..d7a7272fc0 --- /dev/null +++ b/plugins/LdapAuthentication/locale/LdapAuthentication.po @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LdapAuthenticationPlugin.php:141 +msgid "" +"The LDAP Authentication plugin allows for StatusNet to handle authentication " +"through LDAP." +msgstr "" diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot new file mode 100644 index 0000000000..8f09b1e51e --- /dev/null +++ b/plugins/LdapAuthentication/locale/LdapAuthentication.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LdapAuthenticationPlugin.php:146 +msgid "" +"The LDAP Authentication plugin allows for StatusNet to handle authentication " +"through LDAP." +msgstr "" diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.po b/plugins/LdapAuthorization/locale/LdapAuthorization.po new file mode 100644 index 0000000000..8486bc7821 --- /dev/null +++ b/plugins/LdapAuthorization/locale/LdapAuthorization.po @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LdapAuthorizationPlugin.php:124 +msgid "" +"The LDAP Authorization plugin allows for StatusNet to handle authorization " +"through LDAP." +msgstr "" diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot new file mode 100644 index 0000000000..8156f6146f --- /dev/null +++ b/plugins/LdapAuthorization/locale/LdapAuthorization.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LdapAuthorizationPlugin.php:124 +msgid "" +"The LDAP Authorization plugin allows for StatusNet to handle authorization " +"through LDAP." +msgstr "" diff --git a/plugins/LilUrl/locale/LilUrl.po b/plugins/LilUrl/locale/LilUrl.po new file mode 100644 index 0000000000..32a4227885 --- /dev/null +++ b/plugins/LilUrl/locale/LilUrl.po @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LilUrlPlugin.php:68 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot new file mode 100644 index 0000000000..47ed367277 --- /dev/null +++ b/plugins/LilUrl/locale/LilUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LilUrlPlugin.php:68 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot index 1dd5dbbcc9..764bf7b291 100644 --- a/plugins/Mapstraction/locale/Mapstraction.pot +++ b/plugins/Mapstraction/locale/Mapstraction.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,24 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: allmap.php:71 -#, php-format -msgid "%s friends map" -msgstr "" - -#: allmap.php:74 -#, php-format -msgid "%s friends map, page %d" -msgstr "" - -#: map.php:72 -msgid "No such user." -msgstr "" - -#: map.php:79 -msgid "User has no profile." -msgstr "" - #: MapstractionPlugin.php:182 msgid "Map" msgstr "" @@ -48,6 +30,24 @@ msgid "" "mapstraction.com/\">Mapstraction JavaScript library." msgstr "" +#: map.php:72 +msgid "No such user." +msgstr "" + +#: map.php:79 +msgid "User has no profile." +msgstr "" + +#: allmap.php:71 +#, php-format +msgid "%s friends map" +msgstr "" + +#: allmap.php:74 +#, php-format +msgid "%s friends map, page %d" +msgstr "" + #: usermap.php:71 #, php-format msgid "%s map, page %d" diff --git a/plugins/Minify/locale/Minify.po b/plugins/Minify/locale/Minify.po new file mode 100644 index 0000000000..bad383a8c7 --- /dev/null +++ b/plugins/Minify/locale/Minify.po @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: MinifyPlugin.php:179 +msgid "" +"The Minify plugin minifies your CSS and Javascript, removing whitespace and " +"comments." +msgstr "" diff --git a/plugins/Minify/locale/Minify.pot b/plugins/Minify/locale/Minify.pot new file mode 100644 index 0000000000..6f7372d405 --- /dev/null +++ b/plugins/Minify/locale/Minify.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: MinifyPlugin.php:179 +msgid "" +"The Minify plugin minifies your CSS and Javascript, removing whitespace and " +"comments." +msgstr "" diff --git a/plugins/MobileProfile/locale/MobileProfile.po b/plugins/MobileProfile/locale/MobileProfile.po new file mode 100644 index 0000000000..9e0105bb6e --- /dev/null +++ b/plugins/MobileProfile/locale/MobileProfile.po @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: MobileProfilePlugin.php:424 +msgid "XHTML MobileProfile output for supporting user agents." +msgstr "" diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot new file mode 100644 index 0000000000..9495e975b9 --- /dev/null +++ b/plugins/MobileProfile/locale/MobileProfile.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: MobileProfilePlugin.php:424 +msgid "XHTML MobileProfile output for supporting user agents." +msgstr "" diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot index 7e33a0eed6..97d593eadd 100644 --- a/plugins/OStatus/locale/OStatus.pot +++ b/plugins/OStatus/locale/OStatus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,197 +16,80 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: actions/groupsalmon.php:51 -msgid "Can't accept remote posts for a remote group." -msgstr "" - -#: actions/groupsalmon.php:123 -msgid "Can't read profile to set up group membership." -msgstr "" - -#: actions/groupsalmon.php:126 actions/groupsalmon.php:169 -msgid "Groups can't join groups." -msgstr "" - -#: actions/groupsalmon.php:153 -#, php-format -msgid "Could not join remote user %1$s to group %2$s." -msgstr "" - -#: actions/groupsalmon.php:166 -msgid "Can't read profile to cancel group membership." -msgstr "" - -#: actions/groupsalmon.php:182 -#, php-format -msgid "Could not remove remote user %1$s from group %2$s." -msgstr "" - -#: actions/ostatusinit.php:40 -msgid "You can use the local subscription!" -msgstr "" - -#: actions/ostatusinit.php:61 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - -#: actions/ostatusinit.php:79 actions/ostatussub.php:439 -msgid "Subscribe to user" -msgstr "" - -#: actions/ostatusinit.php:97 -#, php-format -msgid "Subscribe to %s" -msgstr "" - -#: actions/ostatusinit.php:102 -msgid "User nickname" -msgstr "" - -#: actions/ostatusinit.php:103 -msgid "Nickname of the user you want to follow" -msgstr "" - -#: actions/ostatusinit.php:106 -msgid "Profile Account" -msgstr "" - -#: actions/ostatusinit.php:107 -msgid "Your account id (i.e. user@identi.ca)" -msgstr "" - -#: actions/ostatusinit.php:110 actions/ostatussub.php:115 -#: OStatusPlugin.php:205 +#: OStatusPlugin.php:210 OStatusPlugin.php:913 actions/ostatusinit.php:99 msgid "Subscribe" msgstr "" -#: actions/ostatusinit.php:128 -msgid "Must provide a remote profile." -msgstr "" - -#: actions/ostatusinit.php:138 -msgid "Couldn't look up OStatus account profile." -msgstr "" - -#: actions/ostatusinit.php:153 -msgid "Couldn't confirm remote profile address." -msgstr "" - -#: actions/ostatusinit.php:171 -msgid "OStatus Connect" -msgstr "" - -#: actions/ostatussub.php:68 -msgid "Address or profile URL" -msgstr "" - -#: actions/ostatussub.php:70 -msgid "Enter the profile URL of a PubSubHubbub-enabled feed" -msgstr "" - -#: actions/ostatussub.php:74 -msgid "Continue" -msgstr "" - -#: actions/ostatussub.php:112 OStatusPlugin.php:503 +#: OStatusPlugin.php:228 OStatusPlugin.php:635 actions/ostatussub.php:105 +#: actions/ostatusinit.php:96 msgid "Join" msgstr "" -#: actions/ostatussub.php:113 -msgid "Join this group" -msgstr "" - -#: actions/ostatussub.php:116 -msgid "Subscribe to this user" -msgstr "" - -#: actions/ostatussub.php:137 -msgid "You are already subscribed to this user." -msgstr "" - -#: actions/ostatussub.php:165 -msgid "You are already a member of this group." -msgstr "" - -#: actions/ostatussub.php:286 -msgid "Empty remote profile URL!" -msgstr "" - -#: actions/ostatussub.php:297 -msgid "Invalid address format." -msgstr "" - -#: actions/ostatussub.php:302 -msgid "Invalid URL or could not reach server." -msgstr "" - -#: actions/ostatussub.php:304 -msgid "Cannot read feed; server returned error." -msgstr "" - -#: actions/ostatussub.php:306 -msgid "Cannot read feed; server returned an empty page." -msgstr "" - -#: actions/ostatussub.php:308 -msgid "Bad HTML, could not find feed link." -msgstr "" - -#: actions/ostatussub.php:310 -msgid "Could not find a feed linked from this URL." -msgstr "" - -#: actions/ostatussub.php:312 -msgid "Not a recognized feed type." -msgstr "" - -#: actions/ostatussub.php:315 +#: OStatusPlugin.php:451 #, php-format -msgid "Bad feed URL: %s %s" +msgid "Sent from %s via OStatus" msgstr "" -#. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatussub.php:336 -msgid "Already a member!" +#: OStatusPlugin.php:503 +msgid "Could not set up remote subscription." msgstr "" -#. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatussub.php:346 -msgid "Remote group join failed!" +#: OStatusPlugin.php:619 +msgid "Could not set up remote group membership." msgstr "" -#. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatussub.php:350 -msgid "Remote group join aborted!" +#: OStatusPlugin.php:636 +#, php-format +msgid "%s has joined group %s." msgstr "" -#. TRANS: OStatus remote subscription dialog error. -#: actions/ostatussub.php:356 -msgid "Already subscribed!" +#: OStatusPlugin.php:644 +msgid "Failed joining remote group." msgstr "" -#. TRANS: OStatus remote subscription dialog error. -#: actions/ostatussub.php:361 -msgid "Remote subscription failed!" +#: OStatusPlugin.php:684 +msgid "Leave" msgstr "" -#. TRANS: Page title for OStatus remote subscription form -#: actions/ostatussub.php:459 -msgid "Authorize subscription" +#: OStatusPlugin.php:685 +#, php-format +msgid "%s has left group %s." msgstr "" -#: actions/ostatussub.php:470 +#: OStatusPlugin.php:844 +msgid "Remote" +msgstr "" + +#: OStatusPlugin.php:883 +msgid "Profile update" +msgstr "" + +#: OStatusPlugin.php:884 +#, php-format +msgid "%s has updated their profile page." +msgstr "" + +#: OStatusPlugin.php:928 msgid "" -"You can subscribe to users from other supported sites. Paste their address " -"or profile URI below:" +"Follow people across social networks that implement OStatus." msgstr "" -#: classes/Ostatus_profile.php:789 +#: classes/Ostatus_profile.php:566 +msgid "Show more" +msgstr "" + +#: classes/Ostatus_profile.php:1004 +#, php-format +msgid "Invalid avatar URL %s" +msgstr "" + +#: classes/Ostatus_profile.php:1014 #, php-format msgid "Tried to update avatar for unsaved remote profile %s" msgstr "" -#: classes/Ostatus_profile.php:797 +#: classes/Ostatus_profile.php:1022 #, php-format msgid "Unable to fetch avatar from %s" msgstr "" @@ -263,50 +146,186 @@ msgstr "" msgid "This target doesn't understand leave events." msgstr "" -#: OStatusPlugin.php:319 -#, php-format -msgid "Sent from %s via OStatus" -msgstr "" - -#: OStatusPlugin.php:371 -msgid "Could not set up remote subscription." -msgstr "" - -#: OStatusPlugin.php:487 -msgid "Could not set up remote group membership." -msgstr "" - -#: OStatusPlugin.php:504 -#, php-format -msgid "%s has joined group %s." -msgstr "" - -#: OStatusPlugin.php:512 -msgid "Failed joining remote group." -msgstr "" - -#: OStatusPlugin.php:553 -msgid "Leave" -msgstr "" - -#: OStatusPlugin.php:554 -#, php-format -msgid "%s has left group %s." -msgstr "" - -#: OStatusPlugin.php:685 -msgid "Subscribe to remote user" -msgstr "" - -#: OStatusPlugin.php:726 -msgid "Profile update" -msgstr "" - -#: OStatusPlugin.php:727 -#, php-format -msgid "%s has updated their profile page." -msgstr "" - #: tests/gettext-speedtest.php:57 msgid "Feeds" msgstr "" + +#: actions/ostatusgroup.php:75 +msgid "Join group" +msgstr "" + +#: actions/ostatusgroup.php:77 +msgid "OStatus group's address, like http://example.net/group/nickname" +msgstr "" + +#: actions/ostatusgroup.php:81 actions/ostatussub.php:71 +msgid "Continue" +msgstr "" + +#: actions/ostatusgroup.php:100 +msgid "You are already a member of this group." +msgstr "" + +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatusgroup.php:135 +msgid "Already a member!" +msgstr "" + +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatusgroup.php:146 +msgid "Remote group join failed!" +msgstr "" + +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatusgroup.php:150 +msgid "Remote group join aborted!" +msgstr "" + +#. TRANS: Page title for OStatus remote group join form +#: actions/ostatusgroup.php:163 +msgid "Confirm joining remote group" +msgstr "" + +#: actions/ostatusgroup.php:174 +msgid "" +"You can subscribe to groups from other supported sites. Paste the group's " +"profile URI below:" +msgstr "" + +#: actions/groupsalmon.php:51 +msgid "Can't accept remote posts for a remote group." +msgstr "" + +#: actions/groupsalmon.php:124 +msgid "Can't read profile to set up group membership." +msgstr "" + +#: actions/groupsalmon.php:127 actions/groupsalmon.php:170 +msgid "Groups can't join groups." +msgstr "" + +#: actions/groupsalmon.php:154 +#, php-format +msgid "Could not join remote user %1$s to group %2$s." +msgstr "" + +#: actions/groupsalmon.php:167 +msgid "Can't read profile to cancel group membership." +msgstr "" + +#: actions/groupsalmon.php:183 +#, php-format +msgid "Could not remove remote user %1$s from group %2$s." +msgstr "" + +#: actions/ostatussub.php:65 +msgid "Subscribe to" +msgstr "" + +#: actions/ostatussub.php:67 +msgid "" +"OStatus user's address, like nickname@example.com or http://example.net/" +"nickname" +msgstr "" + +#: actions/ostatussub.php:106 +msgid "Join this group" +msgstr "" + +#. TRANS: Page title for OStatus remote subscription form +#: actions/ostatussub.php:108 actions/ostatussub.php:400 +msgid "Confirm" +msgstr "" + +#: actions/ostatussub.php:109 +msgid "Subscribe to this user" +msgstr "" + +#: actions/ostatussub.php:130 +msgid "You are already subscribed to this user." +msgstr "" + +#: actions/ostatussub.php:247 actions/ostatussub.php:253 +#: actions/ostatussub.php:272 +msgid "" +"Sorry, we could not reach that address. Please make sure that the OStatus " +"address is like nickname@example.com or http://example.net/nickname" +msgstr "" + +#: actions/ostatussub.php:256 actions/ostatussub.php:259 +#: actions/ostatussub.php:262 actions/ostatussub.php:265 +#: actions/ostatussub.php:268 +msgid "" +"Sorry, we could not reach that feed. Please try that OStatus address again " +"later." +msgstr "" + +#. TRANS: OStatus remote subscription dialog error. +#: actions/ostatussub.php:301 +msgid "Already subscribed!" +msgstr "" + +#. TRANS: OStatus remote subscription dialog error. +#: actions/ostatussub.php:306 +msgid "Remote subscription failed!" +msgstr "" + +#: actions/ostatussub.php:380 actions/ostatusinit.php:81 +msgid "Subscribe to user" +msgstr "" + +#: actions/ostatussub.php:411 +msgid "" +"You can subscribe to users from other supported sites. Paste their address " +"or profile URI below:" +msgstr "" + +#: actions/ostatusinit.php:41 +msgid "You can use the local subscription!" +msgstr "" + +#: actions/ostatusinit.php:63 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/ostatusinit.php:95 +#, php-format +msgid "Join group %s" +msgstr "" + +#: actions/ostatusinit.php:98 +#, php-format +msgid "Subscribe to %s" +msgstr "" + +#: actions/ostatusinit.php:111 +msgid "User nickname" +msgstr "" + +#: actions/ostatusinit.php:112 +msgid "Nickname of the user you want to follow" +msgstr "" + +#: actions/ostatusinit.php:116 +msgid "Profile Account" +msgstr "" + +#: actions/ostatusinit.php:117 +msgid "Your account id (i.e. user@identi.ca)" +msgstr "" + +#: actions/ostatusinit.php:138 +msgid "Must provide a remote profile." +msgstr "" + +#: actions/ostatusinit.php:149 +msgid "Couldn't look up OStatus account profile." +msgstr "" + +#: actions/ostatusinit.php:161 +msgid "Couldn't confirm remote profile address." +msgstr "" + +#: actions/ostatusinit.php:202 +msgid "OStatus Connect" +msgstr "" diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.po new file mode 100644 index 0000000000..9ae5cc125a --- /dev/null +++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.po @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: OpenExternalLinkTargetPlugin.php:60 +msgid "Opens external links (i.e., with rel=external) on a new window or tab" +msgstr "" diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot new file mode 100644 index 0000000000..f9bd4af10e --- /dev/null +++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: OpenExternalLinkTargetPlugin.php:60 +msgid "Opens external links (i.e., with rel=external) on a new window or tab" +msgstr "" diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot index 7ed8798355..70908422e5 100644 --- a/plugins/OpenID/locale/OpenID.pot +++ b/plugins/OpenID/locale/OpenID.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,256 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: finishaddopenid.php:67 -msgid "Not logged in." -msgstr "" - -#: finishaddopenid.php:88 finishopenidlogin.php:149 -msgid "OpenID authentication cancelled." -msgstr "" - -#: finishaddopenid.php:92 finishopenidlogin.php:153 -#, php-format -msgid "OpenID authentication failed: %s" -msgstr "" - -#: finishaddopenid.php:112 -msgid "You already have this OpenID!" -msgstr "" - -#: finishaddopenid.php:114 -msgid "Someone else already has this OpenID." -msgstr "" - -#: finishaddopenid.php:126 -msgid "Error connecting user." -msgstr "" - -#: finishaddopenid.php:131 -msgid "Error updating profile" -msgstr "" - -#: finishaddopenid.php:170 openidlogin.php:95 -msgid "OpenID Login" -msgstr "" - -#: finishopenidlogin.php:34 openidlogin.php:30 -msgid "Already logged in." -msgstr "" - -#: finishopenidlogin.php:38 openidlogin.php:37 openidsettings.php:194 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - -#: finishopenidlogin.php:43 -msgid "You can't register if you don't agree to the license." -msgstr "" - -#: finishopenidlogin.php:52 openidsettings.php:208 -msgid "Something weird happened." -msgstr "" - -#: finishopenidlogin.php:66 -#, php-format -msgid "" -"This is the first time you've logged into %s so we must connect your OpenID " -"to a local account. You can either create a new account, or connect with " -"your existing account, if you have one." -msgstr "" - -#: finishopenidlogin.php:72 -msgid "OpenID Account Setup" -msgstr "" - -#: finishopenidlogin.php:97 -msgid "Create new account" -msgstr "" - -#: finishopenidlogin.php:99 -msgid "Create a new user with this nickname." -msgstr "" - -#: finishopenidlogin.php:102 -msgid "New nickname" -msgstr "" - -#: finishopenidlogin.php:104 -msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "" - -#: finishopenidlogin.php:114 -msgid "My text and files are available under " -msgstr "" - -#: finishopenidlogin.php:117 -msgid "" -" except this private data: password, email address, IM address, phone number." -msgstr "" - -#: finishopenidlogin.php:121 -msgid "Create" -msgstr "" - -#: finishopenidlogin.php:126 -msgid "Connect existing account" -msgstr "" - -#: finishopenidlogin.php:128 -msgid "" -"If you already have an account, login with your username and password to " -"connect it to your OpenID." -msgstr "" - -#: finishopenidlogin.php:131 -msgid "Existing nickname" -msgstr "" - -#: finishopenidlogin.php:134 -msgid "Password" -msgstr "" - -#: finishopenidlogin.php:137 -msgid "Connect" -msgstr "" - -#: finishopenidlogin.php:215 finishopenidlogin.php:224 -msgid "Registration not allowed." -msgstr "" - -#: finishopenidlogin.php:231 -msgid "Not a valid invitation code." -msgstr "" - -#: finishopenidlogin.php:241 -msgid "Nickname must have only lowercase letters and numbers and no spaces." -msgstr "" - -#: finishopenidlogin.php:246 -msgid "Nickname not allowed." -msgstr "" - -#: finishopenidlogin.php:251 -msgid "Nickname already in use. Try another one." -msgstr "" - -#: finishopenidlogin.php:258 finishopenidlogin.php:338 -msgid "Stored OpenID not found." -msgstr "" - -#: finishopenidlogin.php:267 -msgid "Creating new account for OpenID that already has a user." -msgstr "" - -#: finishopenidlogin.php:327 -msgid "Invalid username or password." -msgstr "" - -#: finishopenidlogin.php:345 -msgid "Error connecting user to OpenID." -msgstr "" - -#: openid.php:141 -msgid "Cannot instantiate OpenID consumer object." -msgstr "" - -#: openid.php:151 -msgid "Not a valid OpenID." -msgstr "" - -#: openid.php:153 -#, php-format -msgid "OpenID failure: %s" -msgstr "" - -#: openid.php:180 -#, php-format -msgid "Could not redirect to server: %s" -msgstr "" - -#: openid.php:198 -#, php-format -msgid "Could not create OpenID form: %s" -msgstr "" - -#: openid.php:214 -msgid "" -"This form should automatically submit itself. If not, click the submit " -"button to go to your OpenID provider." -msgstr "" - -#: openid.php:246 -msgid "Error saving the profile." -msgstr "" - -#: openid.php:257 -msgid "Error saving the user." -msgstr "" - -#: openid.php:277 -msgid "OpenID Auto-Submit" -msgstr "" - -#: openidlogin.php:66 -#, php-format -msgid "" -"For security reasons, please re-login with your [OpenID](%%doc.openid%%) " -"before changing your settings." -msgstr "" - -#: openidlogin.php:70 -#, php-format -msgid "Login with an [OpenID](%%doc.openid%%) account." -msgstr "" - -#: openidlogin.php:112 -msgid "OpenID login" -msgstr "" - -#: openidlogin.php:117 openidsettings.php:107 -msgid "OpenID URL" -msgstr "" - -#: openidlogin.php:119 -msgid "Your OpenID URL" -msgstr "" - -#: openidlogin.php:122 -msgid "Remember me" -msgstr "" - -#: openidlogin.php:123 -msgid "Automatically login in the future; not for shared computers!" -msgstr "" - -#: openidlogin.php:127 -msgid "Login" -msgstr "" - -#: OpenIDPlugin.php:123 OpenIDPlugin.php:135 -msgid "OpenID" -msgstr "" - -#: OpenIDPlugin.php:124 -msgid "Login or register with OpenID" -msgstr "" - -#: OpenIDPlugin.php:136 -msgid "Add or remove OpenIDs" -msgstr "" - -#: OpenIDPlugin.php:324 -msgid "Use OpenID to login to the site." -msgstr "" - -#: openidserver.php:106 -#, php-format -msgid "You are not authorized to use the identity %s." -msgstr "" - -#: openidserver.php:126 -msgid "Just an OpenID provider. Nothing to see here, move along..." -msgstr "" - #: openidsettings.php:59 msgid "OpenID settings" msgstr "" @@ -287,6 +37,10 @@ msgid "" "click \"Add\"." msgstr "" +#: openidsettings.php:107 openidlogin.php:119 +msgid "OpenID URL" +msgstr "" + #: openidsettings.php:117 msgid "Add" msgstr "" @@ -307,22 +61,304 @@ msgid "" "\"Remove\"." msgstr "" -#: openidsettings.php:172 +#: openidsettings.php:172 openidsettings.php:213 msgid "Remove" msgstr "" -#: openidsettings.php:228 +#: openidsettings.php:186 +msgid "OpenID Trusted Sites" +msgstr "" + +#: openidsettings.php:189 +msgid "" +"The following sites are allowed to access your identity and log you in. You " +"can remove a site from this list to deny it access to your OpenID." +msgstr "" + +#: openidsettings.php:231 finishopenidlogin.php:38 openidlogin.php:39 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: openidsettings.php:247 finishopenidlogin.php:51 +msgid "Something weird happened." +msgstr "" + +#: openidsettings.php:271 +msgid "No such OpenID trustroot." +msgstr "" + +#: openidsettings.php:275 +msgid "Trustroots removed" +msgstr "" + +#: openidsettings.php:298 msgid "No such OpenID." msgstr "" -#: openidsettings.php:233 +#: openidsettings.php:303 msgid "That OpenID does not belong to you." msgstr "" -#: openidsettings.php:237 +#: openidsettings.php:307 msgid "OpenID removed." msgstr "" +#: openid.php:137 +msgid "Cannot instantiate OpenID consumer object." +msgstr "" + +#: openid.php:147 +msgid "Not a valid OpenID." +msgstr "" + +#: openid.php:149 +#, php-format +msgid "OpenID failure: %s" +msgstr "" + +#: openid.php:176 +#, php-format +msgid "Could not redirect to server: %s" +msgstr "" + +#: openid.php:194 +#, php-format +msgid "Could not create OpenID form: %s" +msgstr "" + +#: openid.php:210 +msgid "" +"This form should automatically submit itself. If not, click the submit " +"button to go to your OpenID provider." +msgstr "" + +#: openid.php:242 +msgid "Error saving the profile." +msgstr "" + +#: openid.php:253 +msgid "Error saving the user." +msgstr "" + +#: openid.php:282 +msgid "Unauthorized URL used for OpenID login." +msgstr "" + +#: openid.php:302 +msgid "OpenID Login Submission" +msgstr "" + +#: openid.php:312 +msgid "Requesting authorization from your login provider..." +msgstr "" + +#: openid.php:315 +msgid "" +"If you are not redirected to your login provider in a few seconds, try " +"pushing the button below." +msgstr "" + +#. TRANS: Tooltip for main menu option "Login" +#: OpenIDPlugin.php:204 +msgctxt "TOOLTIP" +msgid "Login to the site" +msgstr "" + +#: OpenIDPlugin.php:207 +msgctxt "MENU" +msgid "Login" +msgstr "" + +#. TRANS: Tooltip for main menu option "Help" +#: OpenIDPlugin.php:212 +msgctxt "TOOLTIP" +msgid "Help me!" +msgstr "" + +#: OpenIDPlugin.php:215 +msgctxt "MENU" +msgid "Help" +msgstr "" + +#. TRANS: Tooltip for main menu option "Search" +#: OpenIDPlugin.php:221 +msgctxt "TOOLTIP" +msgid "Search for people or text" +msgstr "" + +#: OpenIDPlugin.php:224 +msgctxt "MENU" +msgid "Search" +msgstr "" + +#: OpenIDPlugin.php:283 OpenIDPlugin.php:319 +msgid "OpenID" +msgstr "" + +#: OpenIDPlugin.php:284 +msgid "Login or register with OpenID" +msgstr "" + +#: OpenIDPlugin.php:320 +msgid "Add or remove OpenIDs" +msgstr "" + +#: OpenIDPlugin.php:595 +msgid "Use OpenID to login to the site." +msgstr "" + +#: openidserver.php:106 +#, php-format +msgid "You are not authorized to use the identity %s." +msgstr "" + +#: openidserver.php:126 +msgid "Just an OpenID provider. Nothing to see here, move along..." +msgstr "" + +#: finishopenidlogin.php:34 openidlogin.php:30 +msgid "Already logged in." +msgstr "" + +#: finishopenidlogin.php:43 +msgid "You can't register if you don't agree to the license." +msgstr "" + +#: finishopenidlogin.php:65 +#, php-format +msgid "" +"This is the first time you've logged into %s so we must connect your OpenID " +"to a local account. You can either create a new account, or connect with " +"your existing account, if you have one." +msgstr "" + +#: finishopenidlogin.php:71 +msgid "OpenID Account Setup" +msgstr "" + +#: finishopenidlogin.php:101 +msgid "Create new account" +msgstr "" + +#: finishopenidlogin.php:103 +msgid "Create a new user with this nickname." +msgstr "" + +#: finishopenidlogin.php:106 +msgid "New nickname" +msgstr "" + +#: finishopenidlogin.php:108 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" + +#: finishopenidlogin.php:130 +msgid "Create" +msgstr "" + +#: finishopenidlogin.php:135 +msgid "Connect existing account" +msgstr "" + +#: finishopenidlogin.php:137 +msgid "" +"If you already have an account, login with your username and password to " +"connect it to your OpenID." +msgstr "" + +#: finishopenidlogin.php:140 +msgid "Existing nickname" +msgstr "" + +#: finishopenidlogin.php:143 +msgid "Password" +msgstr "" + +#: finishopenidlogin.php:146 +msgid "Connect" +msgstr "" + +#: finishopenidlogin.php:158 finishaddopenid.php:88 +msgid "OpenID authentication cancelled." +msgstr "" + +#: finishopenidlogin.php:162 finishaddopenid.php:92 +#, php-format +msgid "OpenID authentication failed: %s" +msgstr "" + +#: finishopenidlogin.php:227 finishopenidlogin.php:236 +msgid "Registration not allowed." +msgstr "" + +#: finishopenidlogin.php:243 +msgid "Not a valid invitation code." +msgstr "" + +#: finishopenidlogin.php:253 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "" + +#: finishopenidlogin.php:258 +msgid "Nickname not allowed." +msgstr "" + +#: finishopenidlogin.php:263 +msgid "Nickname already in use. Try another one." +msgstr "" + +#: finishopenidlogin.php:270 finishopenidlogin.php:350 +msgid "Stored OpenID not found." +msgstr "" + +#: finishopenidlogin.php:279 +msgid "Creating new account for OpenID that already has a user." +msgstr "" + +#: finishopenidlogin.php:339 +msgid "Invalid username or password." +msgstr "" + +#: finishopenidlogin.php:357 +msgid "Error connecting user to OpenID." +msgstr "" + +#: openidlogin.php:68 +#, php-format +msgid "" +"For security reasons, please re-login with your [OpenID](%%doc.openid%%) " +"before changing your settings." +msgstr "" + +#: openidlogin.php:72 +#, php-format +msgid "Login with an [OpenID](%%doc.openid%%) account." +msgstr "" + +#: openidlogin.php:97 finishaddopenid.php:170 +msgid "OpenID Login" +msgstr "" + +#: openidlogin.php:114 +msgid "OpenID login" +msgstr "" + +#: openidlogin.php:121 +msgid "Your OpenID URL" +msgstr "" + +#: openidlogin.php:124 +msgid "Remember me" +msgstr "" + +#: openidlogin.php:125 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" + +#: openidlogin.php:129 +msgid "Login" +msgstr "" + #: openidtrust.php:51 msgid "OpenID Identity Verification" msgstr "" @@ -332,17 +368,37 @@ msgid "" "This page should only be reached during OpenID processing, not directly." msgstr "" -#: openidtrust.php:118 +#: openidtrust.php:117 #, php-format msgid "" "%s has asked to verify your identity. Click Continue to verify your " "identity and login without creating a new password." msgstr "" -#: openidtrust.php:136 +#: openidtrust.php:135 msgid "Continue" msgstr "" -#: openidtrust.php:137 +#: openidtrust.php:136 msgid "Cancel" msgstr "" + +#: finishaddopenid.php:67 +msgid "Not logged in." +msgstr "" + +#: finishaddopenid.php:112 +msgid "You already have this OpenID!" +msgstr "" + +#: finishaddopenid.php:114 +msgid "Someone else already has this OpenID." +msgstr "" + +#: finishaddopenid.php:126 +msgid "Error connecting user." +msgstr "" + +#: finishaddopenid.php:131 +msgid "Error updating profile" +msgstr "" diff --git a/plugins/PostDebug/locale/PostDebug.po b/plugins/PostDebug/locale/PostDebug.po new file mode 100644 index 0000000000..05f52cf008 --- /dev/null +++ b/plugins/PostDebug/locale/PostDebug.po @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: PostDebugPlugin.php:58 +msgid "Debugging tool to record request details on POST." +msgstr "" diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot new file mode 100644 index 0000000000..b7107d4c17 --- /dev/null +++ b/plugins/PostDebug/locale/PostDebug.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: PostDebugPlugin.php:58 +msgid "Debugging tool to record request details on POST." +msgstr "" diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot index 8f8434a85d..bc0e814f2c 100644 --- a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot +++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/PtitUrl/locale/PtitUrl.po b/plugins/PtitUrl/locale/PtitUrl.po new file mode 100644 index 0000000000..aed0a16d35 --- /dev/null +++ b/plugins/PtitUrl/locale/PtitUrl.po @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: PtitUrlPlugin.php:67 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot new file mode 100644 index 0000000000..a888f80e4a --- /dev/null +++ b/plugins/PtitUrl/locale/PtitUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: PtitUrlPlugin.php:67 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/RSSCloud/locale/RSSCloud.po b/plugins/RSSCloud/locale/RSSCloud.po new file mode 100644 index 0000000000..28a91218c4 --- /dev/null +++ b/plugins/RSSCloud/locale/RSSCloud.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RSSCloudPlugin.php:260 +msgid "" +"The RSSCloud plugin enables your StatusNet instance to publish real-time " +"updates for profile RSS feeds using the RSSCloud protocol\"." +msgstr "" diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot new file mode 100644 index 0000000000..4078cc749d --- /dev/null +++ b/plugins/RSSCloud/locale/RSSCloud.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RSSCloudPlugin.php:260 +msgid "" +"The RSSCloud plugin enables your StatusNet instance to publish real-time " +"updates for profile RSS feeds using the RSSCloud protocol\"." +msgstr "" diff --git a/plugins/Recaptcha/locale/Recaptcha.po b/plugins/Recaptcha/locale/Recaptcha.po new file mode 100644 index 0000000000..a37c9bea7d --- /dev/null +++ b/plugins/Recaptcha/locale/Recaptcha.po @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RecaptchaPlugin.php:97 +msgid "" +"Uses Recaptcha service to add a " +"captcha to the registration page." +msgstr "" diff --git a/plugins/Recaptcha/locale/Recaptcha.pot b/plugins/Recaptcha/locale/Recaptcha.pot new file mode 100644 index 0000000000..6611ff604a --- /dev/null +++ b/plugins/Recaptcha/locale/Recaptcha.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RecaptchaPlugin.php:97 +msgid "" +"Uses Recaptcha service to add a " +"captcha to the registration page." +msgstr "" diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.po b/plugins/RegisterThrottle/locale/RegisterThrottle.po new file mode 100644 index 0000000000..639516ced8 --- /dev/null +++ b/plugins/RegisterThrottle/locale/RegisterThrottle.po @@ -0,0 +1,29 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RegisterThrottlePlugin.php:122 RegisterThrottlePlugin.php:161 +msgid "Cannot find IP address." +msgstr "" + +#: RegisterThrottlePlugin.php:167 +msgid "Cannot find user after successful registration." +msgstr "" + +#: RegisterThrottlePlugin.php:200 +msgid "Throttles excessive registration from a single IP." +msgstr "" diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot new file mode 100644 index 0000000000..834f5fd4ad --- /dev/null +++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot @@ -0,0 +1,29 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RegisterThrottlePlugin.php:122 RegisterThrottlePlugin.php:161 +msgid "Cannot find IP address." +msgstr "" + +#: RegisterThrottlePlugin.php:167 +msgid "Cannot find user after successful registration." +msgstr "" + +#: RegisterThrottlePlugin.php:200 +msgid "Throttles excessive registration from a single IP." +msgstr "" diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot index 49ac4f6f4d..c8953a1fa3 100644 --- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot +++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-10 10:05-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.po new file mode 100644 index 0000000000..68ff7d54b6 --- /dev/null +++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ReverseUsernameAuthenticationPlugin.php:67 +msgid "" +"The Reverse Username Authentication plugin allows for StatusNet to handle " +"authentication by checking if the provided password is the same as the " +"reverse of the username." +msgstr "" diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot new file mode 100644 index 0000000000..6fa18c464c --- /dev/null +++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ReverseUsernameAuthenticationPlugin.php:67 +msgid "" +"The Reverse Username Authentication plugin allows for StatusNet to handle " +"authentication by checking if the provided password is the same as the " +"reverse of the username." +msgstr "" diff --git a/plugins/Sample/locale/Sample.pot b/plugins/Sample/locale/Sample.pot index a52c4ec01c..bd21dd3c4c 100644 --- a/plugins/Sample/locale/Sample.pot +++ b/plugins/Sample/locale/Sample.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,10 +17,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: hello.php:115 SamplePlugin.php:266 +#: User_greeting_count.php:163 +#, php-format +msgid "Could not save new greeting count for %d" +msgstr "" + +#: User_greeting_count.php:176 +#, php-format +msgid "Could not increment greeting count for %d" +msgstr "" + +#: SamplePlugin.php:266 hello.php:115 msgid "Hello" msgstr "" +#: SamplePlugin.php:266 +msgid "A warm greeting" +msgstr "" + +#: SamplePlugin.php:277 +msgid "A sample plugin to show basics of development for new hackers." +msgstr "" + #: hello.php:117 hello.php:141 #, php-format msgid "Hello, %s" @@ -36,21 +54,3 @@ msgid "I have greeted you %d time." msgid_plural "I have greeted you %d times." msgstr[0] "" msgstr[1] "" - -#: SamplePlugin.php:266 -msgid "A warm greeting" -msgstr "" - -#: SamplePlugin.php:277 -msgid "A sample plugin to show basics of development for new hackers." -msgstr "" - -#: User_greeting_count.php:163 -#, php-format -msgid "Could not save new greeting count for %d" -msgstr "" - -#: User_greeting_count.php:176 -#, php-format -msgid "Could not increment greeting count for %d" -msgstr "" diff --git a/plugins/SimpleUrl/locale/SimpleUrl.po b/plugins/SimpleUrl/locale/SimpleUrl.po new file mode 100644 index 0000000000..ddbae1af80 --- /dev/null +++ b/plugins/SimpleUrl/locale/SimpleUrl.po @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: SimpleUrlPlugin.php:58 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot new file mode 100644 index 0000000000..e3c241d538 --- /dev/null +++ b/plugins/SimpleUrl/locale/SimpleUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: SimpleUrlPlugin.php:58 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/TabFocus/locale/TabFocus.po b/plugins/TabFocus/locale/TabFocus.po new file mode 100644 index 0000000000..fc943c1d14 --- /dev/null +++ b/plugins/TabFocus/locale/TabFocus.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: TabFocusPlugin.php:54 +msgid "" +"TabFocus changes the notice form behavior so that, while in the text area, " +"pressing the tab key focuses the \"Send\" button, matching the behavor of " +"Twitter." +msgstr "" diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot new file mode 100644 index 0000000000..3b0e3c261b --- /dev/null +++ b/plugins/TabFocus/locale/TabFocus.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: TabFocusPlugin.php:54 +msgid "" +"TabFocus changes the notice form behavior so that, while in the text area, " +"pressing the tab key focuses the \"Send\" button, matching the behavor of " +"Twitter." +msgstr "" diff --git a/plugins/TightUrl/locale/TightUrl.po b/plugins/TightUrl/locale/TightUrl.po new file mode 100644 index 0000000000..364d64867c --- /dev/null +++ b/plugins/TightUrl/locale/TightUrl.po @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-06 22:38+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: TightUrlPlugin.php:68 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot new file mode 100644 index 0000000000..10f59a1e86 --- /dev/null +++ b/plugins/TightUrl/locale/TightUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: TightUrlPlugin.php:68 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot index eff1255799..c7ac8053ca 100644 --- a/plugins/TwitterBridge/locale/TwitterBridge.pot +++ b/plugins/TwitterBridge/locale/TwitterBridge.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,11 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: twitter.php:320 +#: twitter.php:342 msgid "Your Twitter bridge has been disabled." msgstr "" -#: twitter.php:324 +#: twitter.php:346 #, php-format msgid "" "Hi, %1$s. We're sorry to inform you that your link to Twitter has been " @@ -36,6 +36,89 @@ msgid "" "%3$s\n" msgstr "" +#: TwitterBridgePlugin.php:155 TwitterBridgePlugin.php:178 +#: TwitterBridgePlugin.php:291 twitteradminpanel.php:54 +msgid "Twitter" +msgstr "" + +#: TwitterBridgePlugin.php:156 +msgid "Login or register using Twitter" +msgstr "" + +#: TwitterBridgePlugin.php:179 +msgid "Twitter integration options" +msgstr "" + +#: TwitterBridgePlugin.php:292 +msgid "Twitter bridge configuration" +msgstr "" + +#: TwitterBridgePlugin.php:317 +msgid "" +"The Twitter \"bridge\" plugin allows you to integrate your StatusNet " +"instance with Twitter." +msgstr "" + +#: twitteradminpanel.php:65 +msgid "Twitter bridge settings" +msgstr "" + +#: twitteradminpanel.php:148 +msgid "Invalid consumer key. Max length is 255 characters." +msgstr "" + +#: twitteradminpanel.php:154 +msgid "Invalid consumer secret. Max length is 255 characters." +msgstr "" + +#: twitteradminpanel.php:207 +msgid "Twitter application settings" +msgstr "" + +#: twitteradminpanel.php:213 +msgid "Consumer key" +msgstr "" + +#: twitteradminpanel.php:214 +msgid "Consumer key assigned by Twitter" +msgstr "" + +#: twitteradminpanel.php:222 +msgid "Consumer secret" +msgstr "" + +#: twitteradminpanel.php:223 +msgid "Consumer secret assigned by Twitter" +msgstr "" + +#: twitteradminpanel.php:240 +msgid "Integration source" +msgstr "" + +#: twitteradminpanel.php:241 +msgid "Name of your Twitter application" +msgstr "" + +#: twitteradminpanel.php:253 +msgid "Options" +msgstr "" + +#: twitteradminpanel.php:260 +msgid "Enable \"Sign-in with Twitter\"" +msgstr "" + +#: twitteradminpanel.php:262 +msgid "Allow users to login with their Twitter credentials" +msgstr "" + +#: twitteradminpanel.php:268 +msgid "Enable Twitter import" +msgstr "" + +#: twitteradminpanel.php:270 +msgid "Allow users to import their Twitter friends' timelines" +msgstr "" + #: twitterauthorization.php:181 twitterauthorization.php:229 msgid "Couldn't link your Twitter account." msgstr "" @@ -44,20 +127,6 @@ msgstr "" msgid "Couldn't link your Twitter account: oauth_token mismatch." msgstr "" -#: TwitterBridgePlugin.php:114 -msgid "Twitter" -msgstr "" - -#: TwitterBridgePlugin.php:115 -msgid "Twitter integration options" -msgstr "" - -#: TwitterBridgePlugin.php:207 -msgid "" -"The Twitter \"bridge\" plugin allows you to integrate your StatusNet " -"instance with Twitter." -msgstr "" - #: twittersettings.php:59 msgid "Twitter settings" msgstr "" From d811f14bedc260adcfdd0eb8216eba06e9610144 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 30 Apr 2010 01:57:22 +0200 Subject: [PATCH 063/730] Remove .po source files. Using pot files. --- plugins/AutoSandbox/locale/AutoSandbox.po | 21 -- plugins/Autocomplete/locale/Autocomplete.po | 24 -- plugins/BitlyUrl/locale/BitlyUrl.po | 22 -- plugins/Blacklist/locale/Blacklist.po | 54 --- .../locale/CasAuthentication.po | 35 -- .../locale/EmailAuthentication.po | 23 -- plugins/FirePHP/locale/FirePHP.po | 21 -- plugins/Imap/locale/Imap.po | 27 -- .../InfiniteScroll/locale/InfiniteScroll.po | 25 -- .../locale/LdapAuthentication.po | 23 -- .../locale/LdapAuthorization.po | 23 -- plugins/LilUrl/locale/LilUrl.po | 22 -- plugins/Minify/locale/Minify.po | 23 -- plugins/MobileProfile/locale/MobileProfile.po | 21 -- .../OStatus/locale/fr/LC_MESSAGES/OStatus.po | 109 ------ .../locale/OpenExternalLinkTarget.po | 21 -- .../OpenID/locale/nl/LC_MESSAGES/OpenID.po | 340 ------------------ plugins/PostDebug/locale/PostDebug.po | 21 -- plugins/PtitUrl/locale/PtitUrl.po | 22 -- plugins/RSSCloud/locale/RSSCloud.po | 24 -- plugins/Recaptcha/locale/Recaptcha.po | 23 -- .../locale/RegisterThrottle.po | 29 -- .../locale/ReverseUsernameAuthentication.po | 24 -- plugins/SimpleUrl/locale/SimpleUrl.po | 22 -- plugins/TabFocus/locale/TabFocus.po | 24 -- plugins/TightUrl/locale/TightUrl.po | 22 -- 26 files changed, 1045 deletions(-) delete mode 100644 plugins/AutoSandbox/locale/AutoSandbox.po delete mode 100644 plugins/Autocomplete/locale/Autocomplete.po delete mode 100644 plugins/BitlyUrl/locale/BitlyUrl.po delete mode 100644 plugins/Blacklist/locale/Blacklist.po delete mode 100644 plugins/CasAuthentication/locale/CasAuthentication.po delete mode 100644 plugins/EmailAuthentication/locale/EmailAuthentication.po delete mode 100644 plugins/FirePHP/locale/FirePHP.po delete mode 100644 plugins/Imap/locale/Imap.po delete mode 100644 plugins/InfiniteScroll/locale/InfiniteScroll.po delete mode 100644 plugins/LdapAuthentication/locale/LdapAuthentication.po delete mode 100644 plugins/LdapAuthorization/locale/LdapAuthorization.po delete mode 100644 plugins/LilUrl/locale/LilUrl.po delete mode 100644 plugins/Minify/locale/Minify.po delete mode 100644 plugins/MobileProfile/locale/MobileProfile.po delete mode 100644 plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po delete mode 100644 plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.po delete mode 100644 plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po delete mode 100644 plugins/PostDebug/locale/PostDebug.po delete mode 100644 plugins/PtitUrl/locale/PtitUrl.po delete mode 100644 plugins/RSSCloud/locale/RSSCloud.po delete mode 100644 plugins/Recaptcha/locale/Recaptcha.po delete mode 100644 plugins/RegisterThrottle/locale/RegisterThrottle.po delete mode 100644 plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.po delete mode 100644 plugins/SimpleUrl/locale/SimpleUrl.po delete mode 100644 plugins/TabFocus/locale/TabFocus.po delete mode 100644 plugins/TightUrl/locale/TightUrl.po diff --git a/plugins/AutoSandbox/locale/AutoSandbox.po b/plugins/AutoSandbox/locale/AutoSandbox.po deleted file mode 100644 index d4c6c8d3e3..0000000000 --- a/plugins/AutoSandbox/locale/AutoSandbox.po +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: AutoSandboxPlugin.php:66 -msgid "Automatically sandboxes newly registered members." -msgstr "" diff --git a/plugins/Autocomplete/locale/Autocomplete.po b/plugins/Autocomplete/locale/Autocomplete.po deleted file mode 100644 index ac64dfec5c..0000000000 --- a/plugins/Autocomplete/locale/Autocomplete.po +++ /dev/null @@ -1,24 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: AutocompletePlugin.php:71 -msgid "" -"The autocomplete plugin allows users to autocomplete screen names in @ " -"replies. When an \"@\" is typed into the notice text area, an autocomplete " -"box is displayed populated with the user's friend' screen names." -msgstr "" diff --git a/plugins/BitlyUrl/locale/BitlyUrl.po b/plugins/BitlyUrl/locale/BitlyUrl.po deleted file mode 100644 index 7bf06eaf74..0000000000 --- a/plugins/BitlyUrl/locale/BitlyUrl.po +++ /dev/null @@ -1,22 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: BitlyUrlPlugin.php:60 -#, php-format -msgid "Uses %1$s URL-shortener service." -msgstr "" diff --git a/plugins/Blacklist/locale/Blacklist.po b/plugins/Blacklist/locale/Blacklist.po deleted file mode 100644 index beadb4cf92..0000000000 --- a/plugins/Blacklist/locale/Blacklist.po +++ /dev/null @@ -1,54 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: BlacklistPlugin.php:153 -#, php-format -msgid "You may not register with homepage '%s'" -msgstr "" - -#: BlacklistPlugin.php:163 -#, php-format -msgid "You may not register with nickname '%s'" -msgstr "" - -#: BlacklistPlugin.php:188 -#, php-format -msgid "You may not use homepage '%s'" -msgstr "" - -#: BlacklistPlugin.php:198 -#, php-format -msgid "You may not use nickname '%s'" -msgstr "" - -#: BlacklistPlugin.php:242 -#, php-format -msgid "You may not use url '%s' in notices" -msgstr "" - -#: BlacklistPlugin.php:351 -msgid "Keep a blacklist of forbidden nickname and URL patterns." -msgstr "" - -#: blacklistadminpanel.php:186 -msgid "Nicknames" -msgstr "" - -#: blacklistadminpanel.php:194 -msgid "URLs" -msgstr "" diff --git a/plugins/CasAuthentication/locale/CasAuthentication.po b/plugins/CasAuthentication/locale/CasAuthentication.po deleted file mode 100644 index ca0f038229..0000000000 --- a/plugins/CasAuthentication/locale/CasAuthentication.po +++ /dev/null @@ -1,35 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: CasAuthenticationPlugin.php:82 -msgid "CAS" -msgstr "" - -#: CasAuthenticationPlugin.php:83 -msgid "Login or register with CAS" -msgstr "" - -#: CasAuthenticationPlugin.php:150 -msgid "" -"The CAS Authentication plugin allows for StatusNet to handle authentication " -"through CAS (Central Authentication Service)." -msgstr "" - -#: caslogin.php:28 -msgid "Already logged in." -msgstr "" diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.po b/plugins/EmailAuthentication/locale/EmailAuthentication.po deleted file mode 100644 index de2bed5ab2..0000000000 --- a/plugins/EmailAuthentication/locale/EmailAuthentication.po +++ /dev/null @@ -1,23 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: EmailAuthenticationPlugin.php:61 -msgid "" -"The Email Authentication plugin allows users to login using their email " -"address." -msgstr "" diff --git a/plugins/FirePHP/locale/FirePHP.po b/plugins/FirePHP/locale/FirePHP.po deleted file mode 100644 index 6dfb03ae72..0000000000 --- a/plugins/FirePHP/locale/FirePHP.po +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: FirePHPPlugin.php:66 -msgid "The FirePHP plugin writes StatusNet's log output to FirePHP." -msgstr "" diff --git a/plugins/Imap/locale/Imap.po b/plugins/Imap/locale/Imap.po deleted file mode 100644 index 05e1e00a31..0000000000 --- a/plugins/Imap/locale/Imap.po +++ /dev/null @@ -1,27 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: imapmailhandler.php:28 -msgid "Error" -msgstr "" - -#: ImapPlugin.php:101 -msgid "" -"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for " -"incoming mail containing user posts." -msgstr "" diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.po b/plugins/InfiniteScroll/locale/InfiniteScroll.po deleted file mode 100644 index fcfacc5b14..0000000000 --- a/plugins/InfiniteScroll/locale/InfiniteScroll.po +++ /dev/null @@ -1,25 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: InfiniteScrollPlugin.php:54 -msgid "" -"Infinite Scroll adds the following functionality to your StatusNet " -"installation: When a user scrolls towards the bottom of the page, the next " -"page of notices is automatically retrieved and appended. This means they " -"never need to click \"Next Page\", which dramatically increases stickiness." -msgstr "" diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.po b/plugins/LdapAuthentication/locale/LdapAuthentication.po deleted file mode 100644 index d7a7272fc0..0000000000 --- a/plugins/LdapAuthentication/locale/LdapAuthentication.po +++ /dev/null @@ -1,23 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: LdapAuthenticationPlugin.php:141 -msgid "" -"The LDAP Authentication plugin allows for StatusNet to handle authentication " -"through LDAP." -msgstr "" diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.po b/plugins/LdapAuthorization/locale/LdapAuthorization.po deleted file mode 100644 index 8486bc7821..0000000000 --- a/plugins/LdapAuthorization/locale/LdapAuthorization.po +++ /dev/null @@ -1,23 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: LdapAuthorizationPlugin.php:124 -msgid "" -"The LDAP Authorization plugin allows for StatusNet to handle authorization " -"through LDAP." -msgstr "" diff --git a/plugins/LilUrl/locale/LilUrl.po b/plugins/LilUrl/locale/LilUrl.po deleted file mode 100644 index 32a4227885..0000000000 --- a/plugins/LilUrl/locale/LilUrl.po +++ /dev/null @@ -1,22 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: LilUrlPlugin.php:68 -#, php-format -msgid "Uses %1$s URL-shortener service." -msgstr "" diff --git a/plugins/Minify/locale/Minify.po b/plugins/Minify/locale/Minify.po deleted file mode 100644 index bad383a8c7..0000000000 --- a/plugins/Minify/locale/Minify.po +++ /dev/null @@ -1,23 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: MinifyPlugin.php:179 -msgid "" -"The Minify plugin minifies your CSS and Javascript, removing whitespace and " -"comments." -msgstr "" diff --git a/plugins/MobileProfile/locale/MobileProfile.po b/plugins/MobileProfile/locale/MobileProfile.po deleted file mode 100644 index 9e0105bb6e..0000000000 --- a/plugins/MobileProfile/locale/MobileProfile.po +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: MobileProfilePlugin.php:424 -msgid "XHTML MobileProfile output for supporting user agents." -msgstr "" diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po deleted file mode 100644 index 0956d2f9b7..0000000000 --- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po +++ /dev/null @@ -1,109 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 14:14-0800\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: FeedSubPlugin.php:77 -msgid "Feeds" -msgstr "Flux" - -#: FeedSubPlugin.php:78 -msgid "Feed subscription options" -msgstr "Préférences pour abonnement flux" - -#: feedmunger.php:215 -#, php-format -msgid "New post: \"%1$s\" %2$s" -msgstr "Nouveau: \"%1$s\" %2$s" - -#: actions/feedsubsettings.php:41 -msgid "Feed subscriptions" -msgstr "Abonnements aux fluxes" - -#: actions/feedsubsettings.php:52 -msgid "" -"You can subscribe to feeds from other sites; updates will appear in your " -"personal timeline." -msgstr "" -"Abonner aux fluxes RSS ou Atom des autres sites web; les temps se trouverair" -"en votre flux personnel." - -#: actions/feedsubsettings.php:96 -msgid "Subscribe" -msgstr "Abonner" - -#: actions/feedsubsettings.php:98 -msgid "Continue" -msgstr "Prochaine" - -#: actions/feedsubsettings.php:151 -msgid "Empty feed URL!" -msgstr "" - -#: actions/feedsubsettings.php:161 -msgid "Invalid URL or could not reach server." -msgstr "" - -#: actions/feedsubsettings.php:164 -msgid "Cannot read feed; server returned error." -msgstr "" - -#: actions/feedsubsettings.php:167 -msgid "Cannot read feed; server returned an empty page." -msgstr "" - -#: actions/feedsubsettings.php:170 -msgid "Bad HTML, could not find feed link." -msgstr "" - -#: actions/feedsubsettings.php:173 -msgid "Could not find a feed linked from this URL." -msgstr "" - -#: actions/feedsubsettings.php:176 -msgid "Not a recognized feed type." -msgstr "" - -#: actions/feedsubsettings.php:180 -msgid "Bad feed URL." -msgstr "" - -#: actions/feedsubsettings.php:188 -msgid "Feed is not PuSH-enabled; cannot subscribe." -msgstr "" - -#: actions/feedsubsettings.php:208 -msgid "Feed subscription failed! Bad response from hub." -msgstr "" - -#: actions/feedsubsettings.php:218 -msgid "Already subscribed!" -msgstr "" - -#: actions/feedsubsettings.php:220 -msgid "Feed subscribed!" -msgstr "" - -#: actions/feedsubsettings.php:222 -msgid "Feed subscription failed!" -msgstr "" - -#: actions/feedsubsettings.php:231 -msgid "Previewing feed:" -msgstr "" - -msgid "Confirm" -msgstr "Confirmer" diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.po deleted file mode 100644 index 9ae5cc125a..0000000000 --- a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.po +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: OpenExternalLinkTargetPlugin.php:60 -msgid "Opens external links (i.e., with rel=external) on a new window or tab" -msgstr "" diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po deleted file mode 100644 index ae0329376c..0000000000 --- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po +++ /dev/null @@ -1,340 +0,0 @@ -# Translation of StatusNet plugin OpenID to Dutch -# -# Author@translatewiki.net: Siebrand -# -- -# This file is distributed under the same license as the StatusNet package. -# -msgid "" -msgstr "" -"Project-Id-Version: StatusNet\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-11 21:42+0000\n" -"PO-Revision-Date: 2010-04-12 00:53+0100\n" -"Language-Team: Dutch\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Last-Translator: Siebrand Mazeland \n" -"MIME-Version: 1.0\n" - -#: finishaddopenid.php:67 -msgid "Not logged in." -msgstr "Niet aangemeld." - -#: finishaddopenid.php:88 -#: finishopenidlogin.php:149 -msgid "OpenID authentication cancelled." -msgstr "De authenticatie via OpenID is afgebroken." - -#: finishaddopenid.php:92 -#: finishopenidlogin.php:153 -#, php-format -msgid "OpenID authentication failed: %s" -msgstr "De authenticatie via OpenID is mislukt: %s" - -#: finishaddopenid.php:112 -msgid "You already have this OpenID!" -msgstr "U hebt deze OpenID al!" - -#: finishaddopenid.php:114 -msgid "Someone else already has this OpenID." -msgstr "Iemand anders gebruikt deze OpenID al." - -#: finishaddopenid.php:126 -msgid "Error connecting user." -msgstr "Fout bij het verbinden met de gebruiker." - -#: finishaddopenid.php:131 -msgid "Error updating profile" -msgstr "Fout bij het bijwerken van het profiel." - -#: finishaddopenid.php:170 -#: openidlogin.php:95 -msgid "OpenID Login" -msgstr "Aanmelden via OpenID" - -#: finishopenidlogin.php:34 -#: openidlogin.php:30 -msgid "Already logged in." -msgstr "U bent al aangemeld." - -#: finishopenidlogin.php:38 -#: openidlogin.php:37 -#: openidsettings.php:194 -msgid "There was a problem with your session token. Try again, please." -msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw." - -#: finishopenidlogin.php:43 -msgid "You can't register if you don't agree to the license." -msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie." - -#: finishopenidlogin.php:52 -#: openidsettings.php:208 -msgid "Something weird happened." -msgstr "Er is iets vreemds gebeurd." - -#: finishopenidlogin.php:66 -#, php-format -msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one." -msgstr "Dit is de eerste keer dat u aameldt bij %s en uw OpenID moet gekoppeld worden aan uw lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of koppelen met uw bestaande gebruiker als u die al hebt." - -#: finishopenidlogin.php:72 -msgid "OpenID Account Setup" -msgstr "Instellingen OpenID" - -#: finishopenidlogin.php:97 -msgid "Create new account" -msgstr "Nieuwe gebruiker aanmaken" - -#: finishopenidlogin.php:99 -msgid "Create a new user with this nickname." -msgstr "Nieuwe gebruiker met deze naam aanmaken." - -#: finishopenidlogin.php:102 -msgid "New nickname" -msgstr "Nieuwe gebruiker" - -#: finishopenidlogin.php:104 -msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "1-64 kleine letters of getallen; geen leestekens of spaties" - -#: finishopenidlogin.php:114 -msgid "My text and files are available under " -msgstr "Mijn teksten en bestanden zijn beschikbaar onder" - -#: finishopenidlogin.php:117 -msgid " except this private data: password, email address, IM address, phone number." -msgstr "behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer." - -#: finishopenidlogin.php:121 -msgid "Create" -msgstr "Aanmaken" - -#: finishopenidlogin.php:126 -msgid "Connect existing account" -msgstr "Koppelen met bestaande gebruiker" - -#: finishopenidlogin.php:128 -msgid "If you already have an account, login with your username and password to connect it to your OpenID." -msgstr "Als u al een gebruiker hebt, meld u dan aan met uw gebruikersnaam en wachtwoord om de gebruiker te koppelen met uw OpenID." - -#: finishopenidlogin.php:131 -msgid "Existing nickname" -msgstr "Bestaande gebruiker" - -#: finishopenidlogin.php:134 -msgid "Password" -msgstr "Wachtwoord" - -#: finishopenidlogin.php:137 -msgid "Connect" -msgstr "Koppelen" - -#: finishopenidlogin.php:215 -#: finishopenidlogin.php:224 -msgid "Registration not allowed." -msgstr "Registreren is niet mogelijk." - -#: finishopenidlogin.php:231 -msgid "Not a valid invitation code." -msgstr "De uitnodigingscode is niet geldig." - -#: finishopenidlogin.php:241 -msgid "Nickname must have only lowercase letters and numbers and no spaces." -msgstr "De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en geen spaties bevatten." - -#: finishopenidlogin.php:246 -msgid "Nickname not allowed." -msgstr "Deze gebruikersnaam is niet toegestaan." - -#: finishopenidlogin.php:251 -msgid "Nickname already in use. Try another one." -msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere." - -#: finishopenidlogin.php:258 -#: finishopenidlogin.php:338 -msgid "Stored OpenID not found." -msgstr "Het opgeslagen OpenID is niet aangetroffen." - -#: finishopenidlogin.php:267 -msgid "Creating new account for OpenID that already has a user." -msgstr "Bezig met het aanmaken van een gebruiker voor OpenID die al een gebruiker heeft." - -#: finishopenidlogin.php:327 -msgid "Invalid username or password." -msgstr "Ongeldige gebruikersnaam of wachtwoord." - -#: finishopenidlogin.php:345 -msgid "Error connecting user to OpenID." -msgstr "Fout bij het koppelen met OpenID." - -#: openid.php:141 -msgid "Cannot instantiate OpenID consumer object." -msgstr "Het was niet mogelijk een OpenID-object aan te maken." - -#: openid.php:151 -msgid "Not a valid OpenID." -msgstr "Geen geldige OpenID." - -#: openid.php:153 -#, php-format -msgid "OpenID failure: %s" -msgstr "OpenID-fout: %s" - -#: openid.php:180 -#, php-format -msgid "Could not redirect to server: %s" -msgstr "Het was niet mogelijk door te verwijzen naar de server: %s" - -#: openid.php:198 -#, php-format -msgid "Could not create OpenID form: %s" -msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s" - -#: openid.php:214 -msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider." -msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan." - -#: openid.php:246 -msgid "Error saving the profile." -msgstr "Fout bij het opslaan van het profiel." - -#: openid.php:257 -msgid "Error saving the user." -msgstr "Fout bij het opslaan van de gebruiker." - -#: openid.php:277 -msgid "OpenID Auto-Submit" -msgstr "OpenID automatisch opslaan" - -#: openidlogin.php:66 -#, php-format -msgid "For security reasons, please re-login with your [OpenID](%%doc.openid%%) before changing your settings." -msgstr "Om veiligheidsreden moet u opnieuw aanmelden met uw [OpenID](%%doc.openid%%) voordat u uw instellingen kunt wijzigen." - -#: openidlogin.php:70 -#, php-format -msgid "Login with an [OpenID](%%doc.openid%%) account." -msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker." - -#: openidlogin.php:112 -msgid "OpenID login" -msgstr "Aanmelden via OpenID" - -#: openidlogin.php:117 -#: openidsettings.php:107 -msgid "OpenID URL" -msgstr "OpenID-URL" - -#: openidlogin.php:119 -msgid "Your OpenID URL" -msgstr "Uw OpenID-URL" - -#: openidlogin.php:122 -msgid "Remember me" -msgstr "Aanmeldgegevens onthouden" - -#: openidlogin.php:123 -msgid "Automatically login in the future; not for shared computers!" -msgstr "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!" - -#: openidlogin.php:127 -msgid "Login" -msgstr "Aanmelden" - -#: OpenIDPlugin.php:123 -#: OpenIDPlugin.php:135 -msgid "OpenID" -msgstr "OpenID" - -#: OpenIDPlugin.php:124 -msgid "Login or register with OpenID" -msgstr "Aanmelden of registreren met OpenID" - -#: OpenIDPlugin.php:136 -msgid "Add or remove OpenIDs" -msgstr "OpenID's toevoegen of verwijderen" - -#: OpenIDPlugin.php:324 -msgid "Use OpenID to login to the site." -msgstr "Gebruik OpenID om aan te melden bij de site." - -#: openidserver.php:106 -#, php-format -msgid "You are not authorized to use the identity %s." -msgstr "U mag de identiteit %s niet gebruiken." - -#: openidserver.php:126 -msgid "Just an OpenID provider. Nothing to see here, move along..." -msgstr "Gewoon een OpenID-provider. Niets te zien hier..." - -#: openidsettings.php:59 -msgid "OpenID settings" -msgstr "OpenID-instellingen" - -#: openidsettings.php:70 -#, php-format -msgid "[OpenID](%%doc.openid%%) lets you log into many sites with the same user account. Manage your associated OpenIDs from here." -msgstr "Met [OpenID](%%doc.openid%%) kunt u aanmelden bij veel websites met dezelfde gebruiker. U kunt hier uw gekoppelde OpenID's beheren." - -#: openidsettings.php:99 -msgid "Add OpenID" -msgstr "OpenID toevoegen" - -#: openidsettings.php:102 -msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"." -msgstr "Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in en klik op \"Toevoegen\"." - -#: openidsettings.php:117 -msgid "Add" -msgstr "Toevoegen" - -#: openidsettings.php:129 -msgid "Remove OpenID" -msgstr "OpenID verwijderen" - -#: openidsettings.php:134 -msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first." -msgstr "Door uw enige OpenID te verwijderen zou het niet meer mogelijk zijn om aan te melden. Als u het wilt verwijderen, voeg dan eerst een andere OpenID toe." - -#: openidsettings.php:149 -msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"." -msgstr "U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop \"Verwijderen\"." - -#: openidsettings.php:172 -msgid "Remove" -msgstr "Verwijderen" - -#: openidsettings.php:228 -msgid "No such OpenID." -msgstr "De OpenID bestaat niet." - -#: openidsettings.php:233 -msgid "That OpenID does not belong to you." -msgstr "Die OpenID is niet van u." - -#: openidsettings.php:237 -msgid "OpenID removed." -msgstr "OpenID verwijderd." - -#: openidtrust.php:51 -msgid "OpenID Identity Verification" -msgstr "OpenID-identiteitscontrole" - -#: openidtrust.php:69 -msgid "This page should only be reached during OpenID processing, not directly." -msgstr "Deze pagina hoort alleen bezocht te worden tijdens het verwerken van een OpenID, en niet direct." - -#: openidtrust.php:118 -#, php-format -msgid "%s has asked to verify your identity. Click Continue to verify your identity and login without creating a new password." -msgstr "%s heeft gevraagd uw identiteit te bevestigen. Klik op \"Doorgaan\" om uw indentiteit te controleren en aan te melden zonder een wachtwoord te hoeven invoeren." - -#: openidtrust.php:136 -msgid "Continue" -msgstr "Doorgaan" - -#: openidtrust.php:137 -msgid "Cancel" -msgstr "Annuleren" - diff --git a/plugins/PostDebug/locale/PostDebug.po b/plugins/PostDebug/locale/PostDebug.po deleted file mode 100644 index 05f52cf008..0000000000 --- a/plugins/PostDebug/locale/PostDebug.po +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: PostDebugPlugin.php:58 -msgid "Debugging tool to record request details on POST." -msgstr "" diff --git a/plugins/PtitUrl/locale/PtitUrl.po b/plugins/PtitUrl/locale/PtitUrl.po deleted file mode 100644 index aed0a16d35..0000000000 --- a/plugins/PtitUrl/locale/PtitUrl.po +++ /dev/null @@ -1,22 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: PtitUrlPlugin.php:67 -#, php-format -msgid "Uses %1$s URL-shortener service." -msgstr "" diff --git a/plugins/RSSCloud/locale/RSSCloud.po b/plugins/RSSCloud/locale/RSSCloud.po deleted file mode 100644 index 28a91218c4..0000000000 --- a/plugins/RSSCloud/locale/RSSCloud.po +++ /dev/null @@ -1,24 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: RSSCloudPlugin.php:260 -msgid "" -"The RSSCloud plugin enables your StatusNet instance to publish real-time " -"updates for profile RSS feeds using the RSSCloud protocol\"." -msgstr "" diff --git a/plugins/Recaptcha/locale/Recaptcha.po b/plugins/Recaptcha/locale/Recaptcha.po deleted file mode 100644 index a37c9bea7d..0000000000 --- a/plugins/Recaptcha/locale/Recaptcha.po +++ /dev/null @@ -1,23 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: RecaptchaPlugin.php:97 -msgid "" -"Uses Recaptcha service to add a " -"captcha to the registration page." -msgstr "" diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.po b/plugins/RegisterThrottle/locale/RegisterThrottle.po deleted file mode 100644 index 639516ced8..0000000000 --- a/plugins/RegisterThrottle/locale/RegisterThrottle.po +++ /dev/null @@ -1,29 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: RegisterThrottlePlugin.php:122 RegisterThrottlePlugin.php:161 -msgid "Cannot find IP address." -msgstr "" - -#: RegisterThrottlePlugin.php:167 -msgid "Cannot find user after successful registration." -msgstr "" - -#: RegisterThrottlePlugin.php:200 -msgid "Throttles excessive registration from a single IP." -msgstr "" diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.po deleted file mode 100644 index 68ff7d54b6..0000000000 --- a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.po +++ /dev/null @@ -1,24 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ReverseUsernameAuthenticationPlugin.php:67 -msgid "" -"The Reverse Username Authentication plugin allows for StatusNet to handle " -"authentication by checking if the provided password is the same as the " -"reverse of the username." -msgstr "" diff --git a/plugins/SimpleUrl/locale/SimpleUrl.po b/plugins/SimpleUrl/locale/SimpleUrl.po deleted file mode 100644 index ddbae1af80..0000000000 --- a/plugins/SimpleUrl/locale/SimpleUrl.po +++ /dev/null @@ -1,22 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: SimpleUrlPlugin.php:58 -#, php-format -msgid "Uses %1$s URL-shortener service." -msgstr "" diff --git a/plugins/TabFocus/locale/TabFocus.po b/plugins/TabFocus/locale/TabFocus.po deleted file mode 100644 index fc943c1d14..0000000000 --- a/plugins/TabFocus/locale/TabFocus.po +++ /dev/null @@ -1,24 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: TabFocusPlugin.php:54 -msgid "" -"TabFocus changes the notice form behavior so that, while in the text area, " -"pressing the tab key focuses the \"Send\" button, matching the behavor of " -"Twitter." -msgstr "" diff --git a/plugins/TightUrl/locale/TightUrl.po b/plugins/TightUrl/locale/TightUrl.po deleted file mode 100644 index 364d64867c..0000000000 --- a/plugins/TightUrl/locale/TightUrl.po +++ /dev/null @@ -1,22 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-06 22:38+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: TightUrlPlugin.php:68 -#, php-format -msgid "Uses %1$s URL-shortener service." -msgstr "" From 83dcdf3b080c484eb8eac5d58a10826f75c4ab56 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 30 Apr 2010 02:01:55 +0200 Subject: [PATCH 064/730] Re-add OpenID/locale/nl/LC_MESSAGES/OpenID.po which was accidentally removed in Commit:d811f14bedc260adcfdd0eb8216eba06e9610144 Signed-off-by: Siebrand Mazeland --- .../OpenID/locale/nl/LC_MESSAGES/OpenID.po | 340 ++++++++++++++++++ 1 file changed, 340 insertions(+) create mode 100644 plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po new file mode 100644 index 0000000000..ae0329376c --- /dev/null +++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po @@ -0,0 +1,340 @@ +# Translation of StatusNet plugin OpenID to Dutch +# +# Author@translatewiki.net: Siebrand +# -- +# This file is distributed under the same license as the StatusNet package. +# +msgid "" +msgstr "" +"Project-Id-Version: StatusNet\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-11 21:42+0000\n" +"PO-Revision-Date: 2010-04-12 00:53+0100\n" +"Language-Team: Dutch\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Last-Translator: Siebrand Mazeland \n" +"MIME-Version: 1.0\n" + +#: finishaddopenid.php:67 +msgid "Not logged in." +msgstr "Niet aangemeld." + +#: finishaddopenid.php:88 +#: finishopenidlogin.php:149 +msgid "OpenID authentication cancelled." +msgstr "De authenticatie via OpenID is afgebroken." + +#: finishaddopenid.php:92 +#: finishopenidlogin.php:153 +#, php-format +msgid "OpenID authentication failed: %s" +msgstr "De authenticatie via OpenID is mislukt: %s" + +#: finishaddopenid.php:112 +msgid "You already have this OpenID!" +msgstr "U hebt deze OpenID al!" + +#: finishaddopenid.php:114 +msgid "Someone else already has this OpenID." +msgstr "Iemand anders gebruikt deze OpenID al." + +#: finishaddopenid.php:126 +msgid "Error connecting user." +msgstr "Fout bij het verbinden met de gebruiker." + +#: finishaddopenid.php:131 +msgid "Error updating profile" +msgstr "Fout bij het bijwerken van het profiel." + +#: finishaddopenid.php:170 +#: openidlogin.php:95 +msgid "OpenID Login" +msgstr "Aanmelden via OpenID" + +#: finishopenidlogin.php:34 +#: openidlogin.php:30 +msgid "Already logged in." +msgstr "U bent al aangemeld." + +#: finishopenidlogin.php:38 +#: openidlogin.php:37 +#: openidsettings.php:194 +msgid "There was a problem with your session token. Try again, please." +msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw." + +#: finishopenidlogin.php:43 +msgid "You can't register if you don't agree to the license." +msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie." + +#: finishopenidlogin.php:52 +#: openidsettings.php:208 +msgid "Something weird happened." +msgstr "Er is iets vreemds gebeurd." + +#: finishopenidlogin.php:66 +#, php-format +msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one." +msgstr "Dit is de eerste keer dat u aameldt bij %s en uw OpenID moet gekoppeld worden aan uw lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of koppelen met uw bestaande gebruiker als u die al hebt." + +#: finishopenidlogin.php:72 +msgid "OpenID Account Setup" +msgstr "Instellingen OpenID" + +#: finishopenidlogin.php:97 +msgid "Create new account" +msgstr "Nieuwe gebruiker aanmaken" + +#: finishopenidlogin.php:99 +msgid "Create a new user with this nickname." +msgstr "Nieuwe gebruiker met deze naam aanmaken." + +#: finishopenidlogin.php:102 +msgid "New nickname" +msgstr "Nieuwe gebruiker" + +#: finishopenidlogin.php:104 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "1-64 kleine letters of getallen; geen leestekens of spaties" + +#: finishopenidlogin.php:114 +msgid "My text and files are available under " +msgstr "Mijn teksten en bestanden zijn beschikbaar onder" + +#: finishopenidlogin.php:117 +msgid " except this private data: password, email address, IM address, phone number." +msgstr "behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer." + +#: finishopenidlogin.php:121 +msgid "Create" +msgstr "Aanmaken" + +#: finishopenidlogin.php:126 +msgid "Connect existing account" +msgstr "Koppelen met bestaande gebruiker" + +#: finishopenidlogin.php:128 +msgid "If you already have an account, login with your username and password to connect it to your OpenID." +msgstr "Als u al een gebruiker hebt, meld u dan aan met uw gebruikersnaam en wachtwoord om de gebruiker te koppelen met uw OpenID." + +#: finishopenidlogin.php:131 +msgid "Existing nickname" +msgstr "Bestaande gebruiker" + +#: finishopenidlogin.php:134 +msgid "Password" +msgstr "Wachtwoord" + +#: finishopenidlogin.php:137 +msgid "Connect" +msgstr "Koppelen" + +#: finishopenidlogin.php:215 +#: finishopenidlogin.php:224 +msgid "Registration not allowed." +msgstr "Registreren is niet mogelijk." + +#: finishopenidlogin.php:231 +msgid "Not a valid invitation code." +msgstr "De uitnodigingscode is niet geldig." + +#: finishopenidlogin.php:241 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en geen spaties bevatten." + +#: finishopenidlogin.php:246 +msgid "Nickname not allowed." +msgstr "Deze gebruikersnaam is niet toegestaan." + +#: finishopenidlogin.php:251 +msgid "Nickname already in use. Try another one." +msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere." + +#: finishopenidlogin.php:258 +#: finishopenidlogin.php:338 +msgid "Stored OpenID not found." +msgstr "Het opgeslagen OpenID is niet aangetroffen." + +#: finishopenidlogin.php:267 +msgid "Creating new account for OpenID that already has a user." +msgstr "Bezig met het aanmaken van een gebruiker voor OpenID die al een gebruiker heeft." + +#: finishopenidlogin.php:327 +msgid "Invalid username or password." +msgstr "Ongeldige gebruikersnaam of wachtwoord." + +#: finishopenidlogin.php:345 +msgid "Error connecting user to OpenID." +msgstr "Fout bij het koppelen met OpenID." + +#: openid.php:141 +msgid "Cannot instantiate OpenID consumer object." +msgstr "Het was niet mogelijk een OpenID-object aan te maken." + +#: openid.php:151 +msgid "Not a valid OpenID." +msgstr "Geen geldige OpenID." + +#: openid.php:153 +#, php-format +msgid "OpenID failure: %s" +msgstr "OpenID-fout: %s" + +#: openid.php:180 +#, php-format +msgid "Could not redirect to server: %s" +msgstr "Het was niet mogelijk door te verwijzen naar de server: %s" + +#: openid.php:198 +#, php-format +msgid "Could not create OpenID form: %s" +msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s" + +#: openid.php:214 +msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider." +msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan." + +#: openid.php:246 +msgid "Error saving the profile." +msgstr "Fout bij het opslaan van het profiel." + +#: openid.php:257 +msgid "Error saving the user." +msgstr "Fout bij het opslaan van de gebruiker." + +#: openid.php:277 +msgid "OpenID Auto-Submit" +msgstr "OpenID automatisch opslaan" + +#: openidlogin.php:66 +#, php-format +msgid "For security reasons, please re-login with your [OpenID](%%doc.openid%%) before changing your settings." +msgstr "Om veiligheidsreden moet u opnieuw aanmelden met uw [OpenID](%%doc.openid%%) voordat u uw instellingen kunt wijzigen." + +#: openidlogin.php:70 +#, php-format +msgid "Login with an [OpenID](%%doc.openid%%) account." +msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker." + +#: openidlogin.php:112 +msgid "OpenID login" +msgstr "Aanmelden via OpenID" + +#: openidlogin.php:117 +#: openidsettings.php:107 +msgid "OpenID URL" +msgstr "OpenID-URL" + +#: openidlogin.php:119 +msgid "Your OpenID URL" +msgstr "Uw OpenID-URL" + +#: openidlogin.php:122 +msgid "Remember me" +msgstr "Aanmeldgegevens onthouden" + +#: openidlogin.php:123 +msgid "Automatically login in the future; not for shared computers!" +msgstr "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!" + +#: openidlogin.php:127 +msgid "Login" +msgstr "Aanmelden" + +#: OpenIDPlugin.php:123 +#: OpenIDPlugin.php:135 +msgid "OpenID" +msgstr "OpenID" + +#: OpenIDPlugin.php:124 +msgid "Login or register with OpenID" +msgstr "Aanmelden of registreren met OpenID" + +#: OpenIDPlugin.php:136 +msgid "Add or remove OpenIDs" +msgstr "OpenID's toevoegen of verwijderen" + +#: OpenIDPlugin.php:324 +msgid "Use OpenID to login to the site." +msgstr "Gebruik OpenID om aan te melden bij de site." + +#: openidserver.php:106 +#, php-format +msgid "You are not authorized to use the identity %s." +msgstr "U mag de identiteit %s niet gebruiken." + +#: openidserver.php:126 +msgid "Just an OpenID provider. Nothing to see here, move along..." +msgstr "Gewoon een OpenID-provider. Niets te zien hier..." + +#: openidsettings.php:59 +msgid "OpenID settings" +msgstr "OpenID-instellingen" + +#: openidsettings.php:70 +#, php-format +msgid "[OpenID](%%doc.openid%%) lets you log into many sites with the same user account. Manage your associated OpenIDs from here." +msgstr "Met [OpenID](%%doc.openid%%) kunt u aanmelden bij veel websites met dezelfde gebruiker. U kunt hier uw gekoppelde OpenID's beheren." + +#: openidsettings.php:99 +msgid "Add OpenID" +msgstr "OpenID toevoegen" + +#: openidsettings.php:102 +msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"." +msgstr "Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in en klik op \"Toevoegen\"." + +#: openidsettings.php:117 +msgid "Add" +msgstr "Toevoegen" + +#: openidsettings.php:129 +msgid "Remove OpenID" +msgstr "OpenID verwijderen" + +#: openidsettings.php:134 +msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first." +msgstr "Door uw enige OpenID te verwijderen zou het niet meer mogelijk zijn om aan te melden. Als u het wilt verwijderen, voeg dan eerst een andere OpenID toe." + +#: openidsettings.php:149 +msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"." +msgstr "U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop \"Verwijderen\"." + +#: openidsettings.php:172 +msgid "Remove" +msgstr "Verwijderen" + +#: openidsettings.php:228 +msgid "No such OpenID." +msgstr "De OpenID bestaat niet." + +#: openidsettings.php:233 +msgid "That OpenID does not belong to you." +msgstr "Die OpenID is niet van u." + +#: openidsettings.php:237 +msgid "OpenID removed." +msgstr "OpenID verwijderd." + +#: openidtrust.php:51 +msgid "OpenID Identity Verification" +msgstr "OpenID-identiteitscontrole" + +#: openidtrust.php:69 +msgid "This page should only be reached during OpenID processing, not directly." +msgstr "Deze pagina hoort alleen bezocht te worden tijdens het verwerken van een OpenID, en niet direct." + +#: openidtrust.php:118 +#, php-format +msgid "%s has asked to verify your identity. Click Continue to verify your identity and login without creating a new password." +msgstr "%s heeft gevraagd uw identiteit te bevestigen. Klik op \"Doorgaan\" om uw indentiteit te controleren en aan te melden zonder een wachtwoord te hoeven invoeren." + +#: openidtrust.php:136 +msgid "Continue" +msgstr "Doorgaan" + +#: openidtrust.php:137 +msgid "Cancel" +msgstr "Annuleren" + From 193fdd807152e0b5f2508a15dd2462085913aa96 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 30 Apr 2010 02:17:30 +0200 Subject: [PATCH 065/730] Update Dutch translation for OpenID plugin. --- .../OpenID/locale/nl/LC_MESSAGES/OpenID.po | 577 ++++++++++-------- 1 file changed, 316 insertions(+), 261 deletions(-) diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po index ae0329376c..5cda9b129a 100644 --- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po +++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po @@ -8,265 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-11 21:42+0000\n" -"PO-Revision-Date: 2010-04-12 00:53+0100\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: 2010-04-30 02:16+0100\n" +"Last-Translator: Siebrand Mazeland \n" "Language-Team: Dutch\n" +"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Last-Translator: Siebrand Mazeland \n" -"MIME-Version: 1.0\n" - -#: finishaddopenid.php:67 -msgid "Not logged in." -msgstr "Niet aangemeld." - -#: finishaddopenid.php:88 -#: finishopenidlogin.php:149 -msgid "OpenID authentication cancelled." -msgstr "De authenticatie via OpenID is afgebroken." - -#: finishaddopenid.php:92 -#: finishopenidlogin.php:153 -#, php-format -msgid "OpenID authentication failed: %s" -msgstr "De authenticatie via OpenID is mislukt: %s" - -#: finishaddopenid.php:112 -msgid "You already have this OpenID!" -msgstr "U hebt deze OpenID al!" - -#: finishaddopenid.php:114 -msgid "Someone else already has this OpenID." -msgstr "Iemand anders gebruikt deze OpenID al." - -#: finishaddopenid.php:126 -msgid "Error connecting user." -msgstr "Fout bij het verbinden met de gebruiker." - -#: finishaddopenid.php:131 -msgid "Error updating profile" -msgstr "Fout bij het bijwerken van het profiel." - -#: finishaddopenid.php:170 -#: openidlogin.php:95 -msgid "OpenID Login" -msgstr "Aanmelden via OpenID" - -#: finishopenidlogin.php:34 -#: openidlogin.php:30 -msgid "Already logged in." -msgstr "U bent al aangemeld." - -#: finishopenidlogin.php:38 -#: openidlogin.php:37 -#: openidsettings.php:194 -msgid "There was a problem with your session token. Try again, please." -msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw." - -#: finishopenidlogin.php:43 -msgid "You can't register if you don't agree to the license." -msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie." - -#: finishopenidlogin.php:52 -#: openidsettings.php:208 -msgid "Something weird happened." -msgstr "Er is iets vreemds gebeurd." - -#: finishopenidlogin.php:66 -#, php-format -msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one." -msgstr "Dit is de eerste keer dat u aameldt bij %s en uw OpenID moet gekoppeld worden aan uw lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of koppelen met uw bestaande gebruiker als u die al hebt." - -#: finishopenidlogin.php:72 -msgid "OpenID Account Setup" -msgstr "Instellingen OpenID" - -#: finishopenidlogin.php:97 -msgid "Create new account" -msgstr "Nieuwe gebruiker aanmaken" - -#: finishopenidlogin.php:99 -msgid "Create a new user with this nickname." -msgstr "Nieuwe gebruiker met deze naam aanmaken." - -#: finishopenidlogin.php:102 -msgid "New nickname" -msgstr "Nieuwe gebruiker" - -#: finishopenidlogin.php:104 -msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "1-64 kleine letters of getallen; geen leestekens of spaties" - -#: finishopenidlogin.php:114 -msgid "My text and files are available under " -msgstr "Mijn teksten en bestanden zijn beschikbaar onder" - -#: finishopenidlogin.php:117 -msgid " except this private data: password, email address, IM address, phone number." -msgstr "behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer." - -#: finishopenidlogin.php:121 -msgid "Create" -msgstr "Aanmaken" - -#: finishopenidlogin.php:126 -msgid "Connect existing account" -msgstr "Koppelen met bestaande gebruiker" - -#: finishopenidlogin.php:128 -msgid "If you already have an account, login with your username and password to connect it to your OpenID." -msgstr "Als u al een gebruiker hebt, meld u dan aan met uw gebruikersnaam en wachtwoord om de gebruiker te koppelen met uw OpenID." - -#: finishopenidlogin.php:131 -msgid "Existing nickname" -msgstr "Bestaande gebruiker" - -#: finishopenidlogin.php:134 -msgid "Password" -msgstr "Wachtwoord" - -#: finishopenidlogin.php:137 -msgid "Connect" -msgstr "Koppelen" - -#: finishopenidlogin.php:215 -#: finishopenidlogin.php:224 -msgid "Registration not allowed." -msgstr "Registreren is niet mogelijk." - -#: finishopenidlogin.php:231 -msgid "Not a valid invitation code." -msgstr "De uitnodigingscode is niet geldig." - -#: finishopenidlogin.php:241 -msgid "Nickname must have only lowercase letters and numbers and no spaces." -msgstr "De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en geen spaties bevatten." - -#: finishopenidlogin.php:246 -msgid "Nickname not allowed." -msgstr "Deze gebruikersnaam is niet toegestaan." - -#: finishopenidlogin.php:251 -msgid "Nickname already in use. Try another one." -msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere." - -#: finishopenidlogin.php:258 -#: finishopenidlogin.php:338 -msgid "Stored OpenID not found." -msgstr "Het opgeslagen OpenID is niet aangetroffen." - -#: finishopenidlogin.php:267 -msgid "Creating new account for OpenID that already has a user." -msgstr "Bezig met het aanmaken van een gebruiker voor OpenID die al een gebruiker heeft." - -#: finishopenidlogin.php:327 -msgid "Invalid username or password." -msgstr "Ongeldige gebruikersnaam of wachtwoord." - -#: finishopenidlogin.php:345 -msgid "Error connecting user to OpenID." -msgstr "Fout bij het koppelen met OpenID." - -#: openid.php:141 -msgid "Cannot instantiate OpenID consumer object." -msgstr "Het was niet mogelijk een OpenID-object aan te maken." - -#: openid.php:151 -msgid "Not a valid OpenID." -msgstr "Geen geldige OpenID." - -#: openid.php:153 -#, php-format -msgid "OpenID failure: %s" -msgstr "OpenID-fout: %s" - -#: openid.php:180 -#, php-format -msgid "Could not redirect to server: %s" -msgstr "Het was niet mogelijk door te verwijzen naar de server: %s" - -#: openid.php:198 -#, php-format -msgid "Could not create OpenID form: %s" -msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s" - -#: openid.php:214 -msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider." -msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan." - -#: openid.php:246 -msgid "Error saving the profile." -msgstr "Fout bij het opslaan van het profiel." - -#: openid.php:257 -msgid "Error saving the user." -msgstr "Fout bij het opslaan van de gebruiker." - -#: openid.php:277 -msgid "OpenID Auto-Submit" -msgstr "OpenID automatisch opslaan" - -#: openidlogin.php:66 -#, php-format -msgid "For security reasons, please re-login with your [OpenID](%%doc.openid%%) before changing your settings." -msgstr "Om veiligheidsreden moet u opnieuw aanmelden met uw [OpenID](%%doc.openid%%) voordat u uw instellingen kunt wijzigen." - -#: openidlogin.php:70 -#, php-format -msgid "Login with an [OpenID](%%doc.openid%%) account." -msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker." - -#: openidlogin.php:112 -msgid "OpenID login" -msgstr "Aanmelden via OpenID" - -#: openidlogin.php:117 -#: openidsettings.php:107 -msgid "OpenID URL" -msgstr "OpenID-URL" - -#: openidlogin.php:119 -msgid "Your OpenID URL" -msgstr "Uw OpenID-URL" - -#: openidlogin.php:122 -msgid "Remember me" -msgstr "Aanmeldgegevens onthouden" - -#: openidlogin.php:123 -msgid "Automatically login in the future; not for shared computers!" -msgstr "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!" - -#: openidlogin.php:127 -msgid "Login" -msgstr "Aanmelden" - -#: OpenIDPlugin.php:123 -#: OpenIDPlugin.php:135 -msgid "OpenID" -msgstr "OpenID" - -#: OpenIDPlugin.php:124 -msgid "Login or register with OpenID" -msgstr "Aanmelden of registreren met OpenID" - -#: OpenIDPlugin.php:136 -msgid "Add or remove OpenIDs" -msgstr "OpenID's toevoegen of verwijderen" - -#: OpenIDPlugin.php:324 -msgid "Use OpenID to login to the site." -msgstr "Gebruik OpenID om aan te melden bij de site." - -#: openidserver.php:106 -#, php-format -msgid "You are not authorized to use the identity %s." -msgstr "U mag de identiteit %s niet gebruiken." - -#: openidserver.php:126 -msgid "Just an OpenID provider. Nothing to see here, move along..." -msgstr "Gewoon een OpenID-provider. Niets te zien hier..." #: openidsettings.php:59 msgid "OpenID settings" @@ -285,6 +34,11 @@ msgstr "OpenID toevoegen" msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"." msgstr "Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in en klik op \"Toevoegen\"." +#: openidsettings.php:107 +#: openidlogin.php:119 +msgid "OpenID URL" +msgstr "OpenID-URL" + #: openidsettings.php:117 msgid "Add" msgstr "Toevoegen" @@ -302,21 +56,303 @@ msgid "You can remove an OpenID from your account by clicking the button marked msgstr "U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop \"Verwijderen\"." #: openidsettings.php:172 +#: openidsettings.php:213 msgid "Remove" msgstr "Verwijderen" -#: openidsettings.php:228 +#: openidsettings.php:186 +msgid "OpenID Trusted Sites" +msgstr "Vertrouwde OpenID-sites" + +#: openidsettings.php:189 +msgid "The following sites are allowed to access your identity and log you in. You can remove a site from this list to deny it access to your OpenID." +msgstr "De volgende sites hebben toegang tot uw indentiteit en kunnen u aanmelden. U kunt een site verwijderen uit deze lijst zodat deze niet langer toegang heeft tot uw OpenID." + +#: openidsettings.php:231 +#: finishopenidlogin.php:38 +#: openidlogin.php:39 +msgid "There was a problem with your session token. Try again, please." +msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw." + +#: openidsettings.php:247 +#: finishopenidlogin.php:51 +msgid "Something weird happened." +msgstr "Er is iets vreemds gebeurd." + +#: openidsettings.php:271 +msgid "No such OpenID trustroot." +msgstr "Die OpenID trustroot bestaat niet." + +#: openidsettings.php:275 +msgid "Trustroots removed" +msgstr "De trustroots zijn verwijderd" + +#: openidsettings.php:298 msgid "No such OpenID." msgstr "De OpenID bestaat niet." -#: openidsettings.php:233 +#: openidsettings.php:303 msgid "That OpenID does not belong to you." msgstr "Die OpenID is niet van u." -#: openidsettings.php:237 +#: openidsettings.php:307 msgid "OpenID removed." msgstr "OpenID verwijderd." +#: openid.php:137 +msgid "Cannot instantiate OpenID consumer object." +msgstr "Het was niet mogelijk een OpenID-object aan te maken." + +#: openid.php:147 +msgid "Not a valid OpenID." +msgstr "Geen geldige OpenID." + +#: openid.php:149 +#, php-format +msgid "OpenID failure: %s" +msgstr "OpenID-fout: %s" + +#: openid.php:176 +#, php-format +msgid "Could not redirect to server: %s" +msgstr "Het was niet mogelijk door te verwijzen naar de server: %s" + +#: openid.php:194 +#, php-format +msgid "Could not create OpenID form: %s" +msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s" + +#: openid.php:210 +msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider." +msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan." + +#: openid.php:242 +msgid "Error saving the profile." +msgstr "Fout bij het opslaan van het profiel." + +#: openid.php:253 +msgid "Error saving the user." +msgstr "Fout bij het opslaan van de gebruiker." + +#: openid.php:282 +msgid "Unauthorized URL used for OpenID login." +msgstr "Ongeautoriseerde URL gebruikt voor aanmelden via OpenID" + +#: openid.php:302 +#, fuzzy +msgid "OpenID Login Submission" +msgstr "Aanmelden via OpenID" + +#: openid.php:312 +msgid "Requesting authorization from your login provider..." +msgstr "Bezig met het vragen van autorisatie van uw aanmeldprovider..." + +#: openid.php:315 +msgid "If you are not redirected to your login provider in a few seconds, try pushing the button below." +msgstr "Als u binnen een aantal seconden niet wordt doorverwezen naar uw aanmeldprovider, klik dan op de onderstaande knop." + +#. TRANS: Tooltip for main menu option "Login" +#: OpenIDPlugin.php:204 +msgctxt "TOOLTIP" +msgid "Login to the site" +msgstr "Aanmelden bij de site" + +#: OpenIDPlugin.php:207 +#, fuzzy +msgctxt "MENU" +msgid "Login" +msgstr "Aanmelden" + +#. TRANS: Tooltip for main menu option "Help" +#: OpenIDPlugin.php:212 +msgctxt "TOOLTIP" +msgid "Help me!" +msgstr "Help me" + +#: OpenIDPlugin.php:215 +msgctxt "MENU" +msgid "Help" +msgstr "Hulp" + +#. TRANS: Tooltip for main menu option "Search" +#: OpenIDPlugin.php:221 +msgctxt "TOOLTIP" +msgid "Search for people or text" +msgstr "Zoeken naar mensen of tekst" + +#: OpenIDPlugin.php:224 +msgctxt "MENU" +msgid "Search" +msgstr "Zoeken" + +#: OpenIDPlugin.php:283 +#: OpenIDPlugin.php:319 +msgid "OpenID" +msgstr "OpenID" + +#: OpenIDPlugin.php:284 +msgid "Login or register with OpenID" +msgstr "Aanmelden of registreren met OpenID" + +#: OpenIDPlugin.php:320 +msgid "Add or remove OpenIDs" +msgstr "OpenID's toevoegen of verwijderen" + +#: OpenIDPlugin.php:595 +msgid "Use OpenID to login to the site." +msgstr "Gebruik OpenID om aan te melden bij de site." + +#: openidserver.php:106 +#, php-format +msgid "You are not authorized to use the identity %s." +msgstr "U mag de identiteit %s niet gebruiken." + +#: openidserver.php:126 +msgid "Just an OpenID provider. Nothing to see here, move along..." +msgstr "Gewoon een OpenID-provider. Niets te zien hier..." + +#: finishopenidlogin.php:34 +#: openidlogin.php:30 +msgid "Already logged in." +msgstr "U bent al aangemeld." + +#: finishopenidlogin.php:43 +msgid "You can't register if you don't agree to the license." +msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie." + +#: finishopenidlogin.php:65 +#, php-format +msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one." +msgstr "Dit is de eerste keer dat u aameldt bij %s en uw OpenID moet gekoppeld worden aan uw lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of koppelen met uw bestaande gebruiker als u die al hebt." + +#: finishopenidlogin.php:71 +msgid "OpenID Account Setup" +msgstr "Instellingen OpenID" + +#: finishopenidlogin.php:101 +msgid "Create new account" +msgstr "Nieuwe gebruiker aanmaken" + +#: finishopenidlogin.php:103 +msgid "Create a new user with this nickname." +msgstr "Nieuwe gebruiker met deze naam aanmaken." + +#: finishopenidlogin.php:106 +msgid "New nickname" +msgstr "Nieuwe gebruiker" + +#: finishopenidlogin.php:108 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "1-64 kleine letters of getallen; geen leestekens of spaties" + +#: finishopenidlogin.php:130 +msgid "Create" +msgstr "Aanmaken" + +#: finishopenidlogin.php:135 +msgid "Connect existing account" +msgstr "Koppelen met bestaande gebruiker" + +#: finishopenidlogin.php:137 +msgid "If you already have an account, login with your username and password to connect it to your OpenID." +msgstr "Als u al een gebruiker hebt, meld u dan aan met uw gebruikersnaam en wachtwoord om de gebruiker te koppelen met uw OpenID." + +#: finishopenidlogin.php:140 +msgid "Existing nickname" +msgstr "Bestaande gebruiker" + +#: finishopenidlogin.php:143 +msgid "Password" +msgstr "Wachtwoord" + +#: finishopenidlogin.php:146 +msgid "Connect" +msgstr "Koppelen" + +#: finishopenidlogin.php:158 +#: finishaddopenid.php:88 +msgid "OpenID authentication cancelled." +msgstr "De authenticatie via OpenID is afgebroken." + +#: finishopenidlogin.php:162 +#: finishaddopenid.php:92 +#, php-format +msgid "OpenID authentication failed: %s" +msgstr "De authenticatie via OpenID is mislukt: %s" + +#: finishopenidlogin.php:227 +#: finishopenidlogin.php:236 +msgid "Registration not allowed." +msgstr "Registreren is niet mogelijk." + +#: finishopenidlogin.php:243 +msgid "Not a valid invitation code." +msgstr "De uitnodigingscode is niet geldig." + +#: finishopenidlogin.php:253 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en geen spaties bevatten." + +#: finishopenidlogin.php:258 +msgid "Nickname not allowed." +msgstr "Deze gebruikersnaam is niet toegestaan." + +#: finishopenidlogin.php:263 +msgid "Nickname already in use. Try another one." +msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere." + +#: finishopenidlogin.php:270 +#: finishopenidlogin.php:350 +msgid "Stored OpenID not found." +msgstr "Het opgeslagen OpenID is niet aangetroffen." + +#: finishopenidlogin.php:279 +msgid "Creating new account for OpenID that already has a user." +msgstr "Bezig met het aanmaken van een gebruiker voor OpenID die al een gebruiker heeft." + +#: finishopenidlogin.php:339 +msgid "Invalid username or password." +msgstr "Ongeldige gebruikersnaam of wachtwoord." + +#: finishopenidlogin.php:357 +msgid "Error connecting user to OpenID." +msgstr "Fout bij het koppelen met OpenID." + +#: openidlogin.php:68 +#, php-format +msgid "For security reasons, please re-login with your [OpenID](%%doc.openid%%) before changing your settings." +msgstr "Om veiligheidsreden moet u opnieuw aanmelden met uw [OpenID](%%doc.openid%%) voordat u uw instellingen kunt wijzigen." + +#: openidlogin.php:72 +#, php-format +msgid "Login with an [OpenID](%%doc.openid%%) account." +msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker." + +#: openidlogin.php:97 +#: finishaddopenid.php:170 +msgid "OpenID Login" +msgstr "Aanmelden via OpenID" + +#: openidlogin.php:114 +msgid "OpenID login" +msgstr "Aanmelden via OpenID" + +#: openidlogin.php:121 +msgid "Your OpenID URL" +msgstr "Uw OpenID-URL" + +#: openidlogin.php:124 +msgid "Remember me" +msgstr "Aanmeldgegevens onthouden" + +#: openidlogin.php:125 +msgid "Automatically login in the future; not for shared computers!" +msgstr "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!" + +#: openidlogin.php:129 +msgid "Login" +msgstr "Aanmelden" + #: openidtrust.php:51 msgid "OpenID Identity Verification" msgstr "OpenID-identiteitscontrole" @@ -325,16 +361,35 @@ msgstr "OpenID-identiteitscontrole" msgid "This page should only be reached during OpenID processing, not directly." msgstr "Deze pagina hoort alleen bezocht te worden tijdens het verwerken van een OpenID, en niet direct." -#: openidtrust.php:118 +#: openidtrust.php:117 #, php-format msgid "%s has asked to verify your identity. Click Continue to verify your identity and login without creating a new password." msgstr "%s heeft gevraagd uw identiteit te bevestigen. Klik op \"Doorgaan\" om uw indentiteit te controleren en aan te melden zonder een wachtwoord te hoeven invoeren." -#: openidtrust.php:136 +#: openidtrust.php:135 msgid "Continue" msgstr "Doorgaan" -#: openidtrust.php:137 +#: openidtrust.php:136 msgid "Cancel" msgstr "Annuleren" +#: finishaddopenid.php:67 +msgid "Not logged in." +msgstr "Niet aangemeld." + +#: finishaddopenid.php:112 +msgid "You already have this OpenID!" +msgstr "U hebt deze OpenID al!" + +#: finishaddopenid.php:114 +msgid "Someone else already has this OpenID." +msgstr "Iemand anders gebruikt deze OpenID al." + +#: finishaddopenid.php:126 +msgid "Error connecting user." +msgstr "Fout bij het verbinden met de gebruiker." + +#: finishaddopenid.php:131 +msgid "Error updating profile" +msgstr "Fout bij het bijwerken van het profiel." From a39efbd8d8996f4e9375c397b2f5e8c149fcff68 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 30 Apr 2010 13:37:40 -0700 Subject: [PATCH 066/730] Update XMPPHP to last upstream release (r77), includes an XML quoting fix. --- extlib/XMPPHP/XMPP.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extlib/XMPPHP/XMPP.php b/extlib/XMPPHP/XMPP.php index 429f45e565..c0f8963396 100644 --- a/extlib/XMPPHP/XMPP.php +++ b/extlib/XMPPHP/XMPP.php @@ -171,7 +171,7 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream { $body = htmlspecialchars($body); $subject = htmlspecialchars($subject); - $out = ""; + $out = "fulljid}\" to=\"$to\" type='$type'>"; if($subject) $out .= "$subject"; $out .= "$body"; if($payload) $out .= $payload; @@ -194,7 +194,7 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream { if($show == 'unavailable') $type = 'unavailable'; $out = " Date: Fri, 30 Apr 2010 13:47:46 -0700 Subject: [PATCH 067/730] Update PEAR::Mail to 1.2.0 release; fixes deprecation warnings running under PHP 5.3. --- extlib/Mail.php | 82 +++++++++++++++++++++++++++------------ extlib/Mail/RFC822.php | 83 +++++++++++++++++++++++----------------- extlib/Mail/mail.php | 63 +++++++++++++++++++++--------- extlib/Mail/mock.php | 64 +++++++++++++++++++++---------- extlib/Mail/null.php | 64 +++++++++++++++++++++---------- extlib/Mail/sendmail.php | 7 ++-- extlib/Mail/smtp.php | 73 ++++++++++++++++++++++++++--------- extlib/Mail/smtpmx.php | 44 ++++++++++++++++----- 8 files changed, 329 insertions(+), 151 deletions(-) mode change 100644 => 100755 extlib/Mail.php mode change 100644 => 100755 extlib/Mail/RFC822.php mode change 100644 => 100755 extlib/Mail/mail.php mode change 100644 => 100755 extlib/Mail/mock.php mode change 100644 => 100755 extlib/Mail/null.php mode change 100644 => 100755 extlib/Mail/sendmail.php mode change 100644 => 100755 extlib/Mail/smtp.php mode change 100644 => 100755 extlib/Mail/smtpmx.php diff --git a/extlib/Mail.php b/extlib/Mail.php old mode 100644 new mode 100755 index 3a0c1a9cb8..75132ac2a6 --- a/extlib/Mail.php +++ b/extlib/Mail.php @@ -1,22 +1,47 @@ | -// +----------------------------------------------------------------------+ -// -// $Id: Mail.php,v 1.17 2006/09/15 03:41:18 jon Exp $ +/** + * PEAR's Mail:: interface. + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2002-2007, Richard Heyes + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category Mail + * @package Mail + * @author Chuck Hagenbuch + * @copyright 1997-2010 Chuck Hagenbuch + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: Mail.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ + */ require_once 'PEAR.php'; @@ -26,7 +51,7 @@ require_once 'PEAR.php'; * useful in multiple mailer backends. * * @access public - * @version $Revision: 1.17 $ + * @version $Revision: 294747 $ * @package Mail */ class Mail @@ -82,12 +107,20 @@ class Mail * @return mixed Returns true on success, or a PEAR_Error * containing a descriptive error message on * failure. + * * @access public * @deprecated use Mail_mail::send instead */ function send($recipients, $headers, $body) { - $this->_sanitizeHeaders($headers); + if (!is_array($headers)) { + return PEAR::raiseError('$headers must be an array'); + } + + $result = $this->_sanitizeHeaders($headers); + if (is_a($result, 'PEAR_Error')) { + return $result; + } // if we're passed an array of recipients, implode it. if (is_array($recipients)) { @@ -103,10 +136,9 @@ class Mail } // flatten the headers out. - list(,$text_headers) = Mail::prepareHeaders($headers); + list(, $text_headers) = Mail::prepareHeaders($headers); return mail($recipients, $subject, $body, $text_headers); - } /** @@ -151,9 +183,9 @@ class Mail foreach ($headers as $key => $value) { if (strcasecmp($key, 'From') === 0) { include_once 'Mail/RFC822.php'; - $parser = &new Mail_RFC822(); + $parser = new Mail_RFC822(); $addresses = $parser->parseAddressList($value, 'localhost', false); - if (PEAR::isError($addresses)) { + if (is_a($addresses, 'PEAR_Error')) { return $addresses; } @@ -221,7 +253,7 @@ class Mail $addresses = Mail_RFC822::parseAddressList($recipients, 'localhost', false); // If parseAddressList() returned a PEAR_Error object, just return it. - if (PEAR::isError($addresses)) { + if (is_a($addresses, 'PEAR_Error')) { return $addresses; } diff --git a/extlib/Mail/RFC822.php b/extlib/Mail/RFC822.php old mode 100644 new mode 100755 index 8714df2e29..58d36465cb --- a/extlib/Mail/RFC822.php +++ b/extlib/Mail/RFC822.php @@ -1,37 +1,48 @@ | -// | Chuck Hagenbuch | -// +-----------------------------------------------------------------------+ +/** + * RFC 822 Email address list validation Utility + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2001-2010, Richard Heyes + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category Mail + * @package Mail + * @author Richard Heyes + * @author Chuck Hagenbuch * @author Chuck Hagenbuch - * @version $Revision: 1.24 $ + * @version $Revision: 294749 $ * @license BSD * @package Mail */ @@ -635,8 +646,8 @@ class Mail_RFC822 { $comment = $this->_splitCheck($parts, ')'); $comments[] = $comment; - // +1 is for the trailing ) - $_mailbox = substr($_mailbox, strpos($_mailbox, $comment)+strlen($comment)+1); + // +2 is for the brackets + $_mailbox = substr($_mailbox, strpos($_mailbox, '('.$comment)+strlen($comment)+2); } else { break; } diff --git a/extlib/Mail/mail.php b/extlib/Mail/mail.php old mode 100644 new mode 100755 index b13d695656..a8b4b5dbee --- a/extlib/Mail/mail.php +++ b/extlib/Mail/mail.php @@ -1,27 +1,52 @@ | -// +----------------------------------------------------------------------+ -// -// $Id: mail.php,v 1.20 2007/10/06 17:00:00 chagenbu Exp $ +/** + * internal PHP-mail() implementation of the PEAR Mail:: interface. + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2010 Chuck Hagenbuch + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category Mail + * @package Mail + * @author Chuck Hagenbuch + * @copyright 2010 Chuck Hagenbuch + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: mail.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ + */ /** * internal PHP-mail() implementation of the PEAR Mail:: interface. * @package Mail - * @version $Revision: 1.20 $ + * @version $Revision: 294747 $ */ class Mail_mail extends Mail { diff --git a/extlib/Mail/mock.php b/extlib/Mail/mock.php old mode 100644 new mode 100755 index 971dae6a0e..61570ba408 --- a/extlib/Mail/mock.php +++ b/extlib/Mail/mock.php @@ -1,29 +1,53 @@ | -// +----------------------------------------------------------------------+ -// -// $Id: mock.php,v 1.1 2007/12/08 17:57:54 chagenbu Exp $ -// +/** + * Mock implementation + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2010 Chuck Hagenbuch + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category Mail + * @package Mail + * @author Chuck Hagenbuch + * @copyright 2010 Chuck Hagenbuch + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: mock.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ + */ /** * Mock implementation of the PEAR Mail:: interface for testing. * @access public * @package Mail - * @version $Revision: 1.1 $ + * @version $Revision: 294747 $ */ class Mail_mock extends Mail { diff --git a/extlib/Mail/null.php b/extlib/Mail/null.php old mode 100644 new mode 100755 index 982bfa45b6..f8d58272ee --- a/extlib/Mail/null.php +++ b/extlib/Mail/null.php @@ -1,29 +1,53 @@ | -// +----------------------------------------------------------------------+ -// -// $Id: null.php,v 1.2 2004/04/06 05:19:03 jon Exp $ -// +/** + * Null implementation of the PEAR Mail interface + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2010 Phil Kernick + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category Mail + * @package Mail + * @author Phil Kernick + * @copyright 2010 Phil Kernick + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: null.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ + */ /** * Null implementation of the PEAR Mail:: interface. * @access public * @package Mail - * @version $Revision: 1.2 $ + * @version $Revision: 294747 $ */ class Mail_null extends Mail { diff --git a/extlib/Mail/sendmail.php b/extlib/Mail/sendmail.php old mode 100644 new mode 100755 index cd248e61d2..b056575e99 --- a/extlib/Mail/sendmail.php +++ b/extlib/Mail/sendmail.php @@ -20,7 +20,7 @@ * Sendmail implementation of the PEAR Mail:: interface. * @access public * @package Mail - * @version $Revision: 1.19 $ + * @version $Revision: 294744 $ */ class Mail_sendmail extends Mail { @@ -117,7 +117,7 @@ class Mail_sendmail extends Mail { if (is_a($recipients, 'PEAR_Error')) { return $recipients; } - $recipients = escapeShellCmd(implode(' ', $recipients)); + $recipients = implode(' ', array_map('escapeshellarg', $recipients)); $headerElements = $this->prepareHeaders($headers); if (is_a($headerElements, 'PEAR_Error')) { @@ -141,7 +141,8 @@ class Mail_sendmail extends Mail { return PEAR::raiseError('From address specified with dangerous characters.'); } - $from = escapeShellCmd($from); + $from = escapeshellarg($from); // Security bug #16200 + $mail = @popen($this->sendmail_path . (!empty($this->sendmail_args) ? ' ' . $this->sendmail_args : '') . " -f$from -- $recipients", 'w'); if (!$mail) { return PEAR::raiseError('Failed to open sendmail [' . $this->sendmail_path . '] for execution.'); diff --git a/extlib/Mail/smtp.php b/extlib/Mail/smtp.php old mode 100644 new mode 100755 index baf3a962ba..52ea602086 --- a/extlib/Mail/smtp.php +++ b/extlib/Mail/smtp.php @@ -1,21 +1,48 @@ | -// | Jon Parise | -// +----------------------------------------------------------------------+ +/** + * SMTP implementation of the PEAR Mail interface. Requires the Net_SMTP class. + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2010, Chuck Hagenbuch + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category HTTP + * @package HTTP_Request + * @author Jon Parise + * @author Chuck Hagenbuch + * @copyright 2010 Chuck Hagenbuch + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: smtp.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ + */ /** Error: Failed to create a Net_SMTP object */ define('PEAR_MAIL_SMTP_ERROR_CREATE', 10000); @@ -42,7 +69,7 @@ define('PEAR_MAIL_SMTP_ERROR_DATA', 10006); * SMTP implementation of the PEAR Mail interface. Requires the Net_SMTP class. * @access public * @package Mail - * @version $Revision: 1.33 $ + * @version $Revision: 294747 $ */ class Mail_smtp extends Mail { @@ -278,6 +305,16 @@ class Mail_smtp extends Mail { /* Send the message's headers and the body as SMTP data. */ $res = $this->_smtp->data($textHeaders . "\r\n\r\n" . $body); + list(,$args) = $this->_smtp->getResponse(); + + if (preg_match("/Ok: queued as (.*)/", $args, $queued)) { + $this->queued_as = $queued[1]; + } + + /* we need the greeting; from it we can extract the authorative name of the mail server we've really connected to. + * ideal if we're connecting to a round-robin of relay servers and need to track which exact one took the email */ + $this->greeting = $this->_smtp->getGreeting(); + if (is_a($res, 'PEAR_Error')) { $error = $this->_error('Failed to send data', $res); $this->_smtp->rset(); diff --git a/extlib/Mail/smtpmx.php b/extlib/Mail/smtpmx.php old mode 100644 new mode 100755 index 9d2dccfb13..f0b6940868 --- a/extlib/Mail/smtpmx.php +++ b/extlib/Mail/smtpmx.php @@ -8,19 +8,43 @@ * * PHP versions 4 and 5 * - * LICENSE: This source file is subject to version 3.0 of the PHP license - * that is available through the world-wide-web at the following URI: - * http://www.php.net/license/3_0.txt. If you did not receive a copy of - * the PHP License and are unable to obtain it through the web, please - * send a note to license@php.net so we can mail you a copy immediately. + * LICENSE: + * + * Copyright (c) 2010, gERD Schaufelberger + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @category Mail * @package Mail_smtpmx * @author gERD Schaufelberger - * @copyright 1997-2005 The PHP Group - * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: smtpmx.php,v 1.2 2007/10/06 17:00:00 chagenbu Exp $ - * @see Mail + * @copyright 2010 gERD Schaufelberger + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: smtpmx.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ */ require_once 'Net/SMTP.php'; @@ -32,7 +56,7 @@ require_once 'Net/SMTP.php'; * @access public * @author gERD Schaufelberger * @package Mail - * @version $Revision: 1.2 $ + * @version $Revision: 294747 $ */ class Mail_smtpmx extends Mail { From 7ec5e7cd7668c2d34f8cb8e7c22faecc13bc0a13 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 30 Apr 2010 23:07:19 +0200 Subject: [PATCH 068/730] Update translator documentation for OpenID plugin. --- plugins/OpenID/OpenIDPlugin.php | 15 ++++++++---- plugins/OpenID/finishaddopenid.php | 10 +++++++- plugins/OpenID/finishopenidlogin.php | 35 ++++++++++++++++++++++++---- plugins/OpenID/openid.php | 15 ++++++++++++ plugins/OpenID/openidlogin.php | 15 +++++++++++- plugins/OpenID/openidserver.php | 2 ++ 6 files changed, 81 insertions(+), 11 deletions(-) diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 270e2c624b..6b723ad10f 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -202,16 +202,16 @@ class OpenIDPlugin extends Plugin if ($this->openidOnly && !common_logged_in()) { // TRANS: Tooltip for main menu option "Login" $tooltip = _m('TOOLTIP', 'Login to the site'); - // TRANS: Main menu option when not logged in to log in $action->menuItem(common_local_url('openidlogin'), + // TRANS: Main menu option when not logged in to log in _m('MENU', 'Login'), $tooltip, false, 'nav_login'); // TRANS: Tooltip for main menu option "Help" $tooltip = _m('TOOLTIP', 'Help me!'); - // TRANS: Main menu option for help on the StatusNet site $action->menuItem(common_local_url('doc', array('title' => 'help')), + // TRANS: Main menu option for help on the StatusNet site _m('MENU', 'Help'), $tooltip, false, @@ -219,8 +219,8 @@ class OpenIDPlugin extends Plugin if (!common_config('site', 'private')) { // TRANS: Tooltip for main menu option "Search" $tooltip = _m('TOOLTIP', 'Search for people or text'); - // TRANS: Main menu option when logged in or when the StatusNet instance is not private $action->menuItem(common_local_url('peoplesearch'), + // TRANS: Main menu option when logged in or when the StatusNet instance is not private _m('MENU', 'Search'), $tooltip, false, 'nav_search'); } Event::handle('EndPrimaryNav', array($action)); @@ -280,7 +280,9 @@ class OpenIDPlugin extends Plugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('openidlogin'), - _m('OpenID'), + // TRANS: OpenID plugin menu item on site logon page. + _m('MENU', 'OpenID'), + // TRANS: OpenID plugin tooltip for logon menu item. _m('Login or register with OpenID'), $action_name === 'openidlogin'); } @@ -316,7 +318,9 @@ class OpenIDPlugin extends Plugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('openidsettings'), - _m('OpenID'), + // TRANS: OpenID plugin menu item on user settings page. + _m('MENU', 'OpenID'), + // TRANS: OpenID plugin tooltip for user settings menu item. _m('Add or remove OpenIDs'), $action_name === 'openidsettings'); @@ -592,6 +596,7 @@ class OpenIDPlugin extends Plugin 'author' => 'Evan Prodromou, Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:OpenID', 'rawdescription' => + // TRANS: OpenID plugin description. _m('Use OpenID to login to the site.')); return true; } diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php index 991e6584ee..77fcc3805d 100644 --- a/plugins/OpenID/finishaddopenid.php +++ b/plugins/OpenID/finishaddopenid.php @@ -64,6 +64,7 @@ class FinishaddopenidAction extends Action { parent::handle($args); if (!common_logged_in()) { + // TRANS: Client error message $this->clientError(_m('Not logged in.')); } else { $this->tryLogin(); @@ -85,10 +86,12 @@ class FinishaddopenidAction extends Action $response = $consumer->complete(common_local_url('finishaddopenid')); if ($response->status == Auth_OpenID_CANCEL) { + // TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled. $this->message(_m('OpenID authentication cancelled.')); return; } else if ($response->status == Auth_OpenID_FAILURE) { - // Authentication failed; display the error message. + // TRANS: OpenID authentication failed; display the error message. + // TRANS: %s is the error message. $this->message(sprintf(_m('OpenID authentication failed: %s'), $response->message)); } else if ($response->status == Auth_OpenID_SUCCESS) { @@ -109,8 +112,10 @@ class FinishaddopenidAction extends Action if ($other) { if ($other->id == $cur->id) { + // TRANS: message in case a user tries to add an OpenID that is already connected to them. $this->message(_m('You already have this OpenID!')); } else { + // TRANS: message in case a user tries to add an OpenID that is already used by another user. $this->message(_m('Someone else already has this OpenID.')); } return; @@ -123,11 +128,13 @@ class FinishaddopenidAction extends Action $result = oid_link_user($cur->id, $canonical, $display); if (!$result) { + // TRANS: message in case the OpenID object cannot be connected to the user. $this->message(_m('Error connecting user.')); return; } if ($sreg) { if (!oid_update_user($cur, $sreg)) { + // TRANS: message in case the user or the user profile cannot be saved in StatusNet. $this->message(_m('Error updating profile')); return; } @@ -167,6 +174,7 @@ class FinishaddopenidAction extends Action function title() { + // TRANS: Title after getting the status of the OpenID authorisation request. return _m('OpenID Login'); } diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index 32b092a0bd..5b1a7cee09 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -31,15 +31,18 @@ class FinishopenidloginAction extends Action { parent::handle($args); if (common_is_real_login()) { + // TRANS: Client error message trying to log on with OpenID while already logged on. $this->clientError(_m('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { + // TRANS: Message given when there is a problem with the user's session token. $this->showForm(_m('There was a problem with your session token. Try again, please.')); return; } if ($this->arg('create')) { if (!$this->boolean('license')) { + // TRANS: Message given if user does not agree with the site's license. $this->showForm(_m('You can\'t register if you don\'t agree to the license.'), $this->trimmed('newname')); return; @@ -48,7 +51,8 @@ class FinishopenidloginAction extends Action } else if ($this->arg('connect')) { $this->connectUser(); } else { - $this->showForm(_m('Something weird happened.'), + // TRANS: Messag given on an unknown error. + $this->showForm(_m('An unknown error has occured.'), $this->trimmed('newname')); } } else { @@ -62,12 +66,15 @@ class FinishopenidloginAction extends Action $this->element('div', array('class' => 'error'), $this->error); } else { $this->element('div', 'instructions', + // TRANS: Instructions given after a first successful logon using OpenID. + // TRANS: %s is the site name. sprintf(_m('This is the first time you\'ve logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name'))); } } function title() { + // TRANS: Title return _m('OpenID Account Setup'); } @@ -115,6 +122,8 @@ class FinishopenidloginAction extends Action 'value' => 'true')); $this->elementStart('label', array('for' => 'license', 'class' => 'checkbox')); + // TRANS: OpenID plugin link text. + // TRANS: %s is a link to a licese with the license name as link text. $message = _('My text and files are available under %s ' . 'except this private data: password, ' . 'email address, IM address, and phone number.'); @@ -127,23 +136,29 @@ class FinishopenidloginAction extends Action $this->elementEnd('label'); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('create', _m('Create')); + // TRANS: Button label in form in which to create a new user on the site for an OpenID. + $this->submit('create', _m('BUTTON', 'Create')); $this->elementEnd('fieldset'); $this->elementStart('fieldset', array('id' => 'form_openid_createaccount')); $this->element('legend', null, + // TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site. _m('Connect existing account')); $this->element('p', null, + // TRANS: User instructions for form in which to connect an OpenID to an existing user on the site. _m('If you already have an account, login with your username and password to connect it to your OpenID.')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); + // TRANS: Field label in form in which to connect an OpenID to an existing user on the site. $this->input('nickname', _m('Existing nickname')); $this->elementEnd('li'); $this->elementStart('li'); + // TRANS: Field label in form in which to connect an OpenID to an existing user on the site. $this->password('password', _m('Password')); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('connect', _m('Connect')); + // TRANS: Button label in form in which to connect an OpenID to an existing user on the site. + $this->submit('connect', _m('BUTTON', 'Connect')); $this->elementEnd('fieldset'); $this->elementEnd('form'); } @@ -155,10 +170,11 @@ class FinishopenidloginAction extends Action $response = $consumer->complete(common_local_url('finishopenidlogin')); if ($response->status == Auth_OpenID_CANCEL) { + // TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled. $this->message(_m('OpenID authentication cancelled.')); return; } else if ($response->status == Auth_OpenID_FAILURE) { - // Authentication failed; display the error message. + // TRANS: OpenID authentication failed; display the error message. %s is the error message. $this->message(sprintf(_m('OpenID authentication failed: %s'), $response->message)); } else if ($response->status == Auth_OpenID_SUCCESS) { // This means the authentication succeeded; extract the @@ -224,6 +240,7 @@ class FinishopenidloginAction extends Action # FIXME: save invite code before redirect, and check here if (common_config('site', 'closed')) { + // TRANS: OpenID plugin message. No new user registration is allowed on the site. $this->clientError(_m('Registration not allowed.')); return; } @@ -233,6 +250,7 @@ class FinishopenidloginAction extends Action if (common_config('site', 'inviteonly')) { $code = $_SESSION['invitecode']; if (empty($code)) { + // TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided. $this->clientError(_m('Registration not allowed.')); return; } @@ -240,6 +258,7 @@ class FinishopenidloginAction extends Action $invite = Invitation::staticGet($code); if (empty($invite)) { + // TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid. $this->clientError(_m('Not a valid invitation code.')); return; } @@ -250,16 +269,19 @@ class FinishopenidloginAction extends Action if (!Validate::string($nickname, array('min_length' => 1, 'max_length' => 64, 'format' => NICKNAME_FMT))) { + // TRANS: OpenID plugin message. The entered new user name did not conform to the requirements. $this->showForm(_m('Nickname must have only lowercase letters and numbers and no spaces.')); return; } if (!User::allowed_nickname($nickname)) { + // TRANS: OpenID plugin message. The entered new user name is blacklisted. $this->showForm(_m('Nickname not allowed.')); return; } if (User::staticGet('nickname', $nickname)) { + // TRANS: OpenID plugin message. The entered new user name is already used. $this->showForm(_m('Nickname already in use. Try another one.')); return; } @@ -267,6 +289,7 @@ class FinishopenidloginAction extends Action list($display, $canonical, $sreg) = $this->getSavedValues(); if (!$display || !$canonical) { + // TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved. $this->serverError(_m('Stored OpenID not found.')); return; } @@ -276,6 +299,7 @@ class FinishopenidloginAction extends Action $other = oid_get_user($canonical); if ($other) { + // TRANS: OpenID plugin server error. $this->serverError(_m('Creating new account for OpenID that already has a user.')); return; } @@ -336,6 +360,7 @@ class FinishopenidloginAction extends Action $password = $this->trimmed('password'); if (!common_check_user($nickname, $password)) { + // TRANS: OpenID plugin message. $this->showForm(_m('Invalid username or password.')); return; } @@ -347,6 +372,7 @@ class FinishopenidloginAction extends Action list($display, $canonical, $sreg) = $this->getSavedValues(); if (!$display || !$canonical) { + // TRANS: OpenID plugin server error. A stored OpenID cannot be found. $this->serverError(_m('Stored OpenID not found.')); return; } @@ -354,6 +380,7 @@ class FinishopenidloginAction extends Action $result = oid_link_user($user->id, $canonical, $display); if (!$result) { + // TRANS: OpenID plugin server error. The user or user profile could not be saved. $this->serverError(_m('Error connecting user to OpenID.')); return; } diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 4ec336e1c3..68b5c29e24 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -134,6 +134,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $consumer = oid_consumer(); if (!$consumer) { + // TRANS: OpenID plugin server error. common_server_error(_m('Cannot instantiate OpenID consumer object.')); return false; } @@ -144,8 +145,11 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) // Handle failure status return values. if (!$auth_request) { + // TRANS: OpenID plugin message. Given when an OpenID is not valid. return _m('Not a valid OpenID.'); } else if (Auth_OpenID::isFailure($auth_request)) { + // TRANS: OpenID plugin server error. Given when the OpenID authentication request fails. + // TRANS: %s is the failure message. return sprintf(_m('OpenID failure: %s'), $auth_request->message); } @@ -173,6 +177,8 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $immediate); if (!$redirect_url) { } else if (Auth_OpenID::isFailure($redirect_url)) { + // TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected. + // TRANS: %s is the failure message. return sprintf(_m('Could not redirect to server: %s'), $redirect_url->message); } else { common_redirect($redirect_url, 303); @@ -191,6 +197,8 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) // Display an error if the form markup couldn't be generated; // otherwise, render the HTML. if (Auth_OpenID::isFailure($form_html)) { + // TRANS: OpenID plugin server error if the form markup could not be generated. + // TRANS: %s is the failure message. common_server_error(sprintf(_m('Could not create OpenID form: %s'), $form_html->message)); } else { $action = new AutosubmitAction(); // see below @@ -207,6 +215,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) function _oid_print_instructions() { common_element('div', 'instructions', + // TRANS: OpenID plugin user instructions. _m('This form should automatically submit itself. '. 'If not, click the submit button to go to your '. 'OpenID provider.')); @@ -239,6 +248,7 @@ function oid_update_user(&$user, &$sreg) # XXX save timezone if it's passed if (!$profile->update($orig_profile)) { + // TRANS: OpenID plugin server error. common_server_error(_m('Error saving the profile.')); return false; } @@ -250,6 +260,7 @@ function oid_update_user(&$user, &$sreg) } if (!$user->update($orig_user)) { + // TRANS: OpenID plugin server error. common_server_error(_m('Error saving the user.')); return false; } @@ -279,6 +290,7 @@ function oid_assert_allowed($url) return; } } + // TRANS: OpenID plugin client exception (403). throw new ClientException(_m("Unauthorized URL used for OpenID login."), 403); } } @@ -299,6 +311,7 @@ class AutosubmitAction extends Action function title() { + // TRANS: Title return _m('OpenID Login Submission'); } @@ -309,9 +322,11 @@ class AutosubmitAction extends Action $this->element('img', array('src' => Theme::path('images/icons/icon_processing.gif', 'base'), // for some reason the base CSS sets s as block display?! 'style' => 'display: inline')); + // TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider. $this->text(_m('Requesting authorization from your login provider...')); $this->raw('

'); $this->raw('

'); + // TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider. $this->text(_m('If you are not redirected to your login provider in a few seconds, try pushing the button below.')); $this->raw('

'); $this->raw($this->form_html); diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php index 2a743672cf..ec05daeb18 100644 --- a/plugins/OpenID/openidlogin.php +++ b/plugins/OpenID/openidlogin.php @@ -27,6 +27,7 @@ class OpenidloginAction extends Action { parent::handle($args); if (common_is_real_login()) { + // TRANS: Client error message trying to log on with OpenID while already logged on. $this->clientError(_m('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $openid_url = $this->trimmed('openid_url'); @@ -36,6 +37,7 @@ class OpenidloginAction extends Action # CSRF protection $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { + // TRANS: Message given when there is a problem with the user's session token. $this->showForm(_m('There was a problem with your session token. Try again, please.'), $openid_url); return; } @@ -65,10 +67,14 @@ class OpenidloginAction extends Action common_get_returnto()) { // rememberme logins have to reauthenticate before // changing any profile settings (cookie-stealing protection) + // TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings. + // TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)". return _m('For security reasons, please re-login with your ' . '[OpenID](%%doc.openid%%) ' . 'before changing your settings.'); } else { + // TRANS: OpenID plugin message. + // TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)". return _m('Login with an [OpenID](%%doc.openid%%) account.'); } } @@ -94,6 +100,7 @@ class OpenidloginAction extends Action function title() { + // TRANS: OpenID plugin message. Title. return _m('OpenID Login'); } @@ -111,22 +118,28 @@ class OpenidloginAction extends Action 'class' => 'form_settings', 'action' => $formaction)); $this->elementStart('fieldset'); + // TRANS: OpenID plugin logon form legend. $this->element('legend', null, _m('OpenID login')); $this->hidden('token', common_session_token()); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); + // TRANS: OpenID plugin logon form field label. $this->input('openid_url', _m('OpenID URL'), $this->openid_url, + // TRANS: OpenID plugin logon form field instructions. _m('Your OpenID URL')); $this->elementEnd('li'); $this->elementStart('li', array('id' => 'settings_rememberme')); + // TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie. $this->checkbox('rememberme', _m('Remember me'), false, + // TRANS: OpenID plugin logon form field instructions. _m('Automatically login in the future; ' . 'not for shared computers!')); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('submit', _m('Login')); + // TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form. + $this->submit('submit', _m('BUTTON', 'Login')); $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php index a31596a107..f7e3a45f20 100644 --- a/plugins/OpenID/openidserver.php +++ b/plugins/OpenID/openidserver.php @@ -103,6 +103,7 @@ class OpenidserverAction extends Action $response = $this->generateDenyResponse($request); } else { //invalid + // TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403). $this->clientError(sprintf(_m('You are not authorized to use the identity %s.'),$request->identity),$code=403); } } else { @@ -123,6 +124,7 @@ class OpenidserverAction extends Action } $this->raw($response->body); }else{ + // TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500). $this->clientError(_m('Just an OpenID provider. Nothing to see here, move along...'),$code=500); } } From 5414396a2ee9f1401d69b60969e04a1941e24e21 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 30 Apr 2010 14:41:54 -0700 Subject: [PATCH 069/730] IM cleanup on 1.0.x branch: * Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them. * fix fatal error in IM settings while waiting for a Jabber confirmation. * Caching fix for user_im_prefs * fix for saving multiple transport settings * some fixes for AIM & using normalized addresses for lookups --- actions/imsettings.php | 17 ++++++------ classes/User_im_prefs.php | 23 ++++++++++++++++ classes/statusnet.ini | 6 +++-- lib/implugin.php | 25 ++++++++++++----- plugins/Aim/AimPlugin.php | 9 ++++++- plugins/Aim/README | 2 +- .../Xmpp/{Fake_XMPP.php => Queued_XMPP.php} | 17 ++++++++---- plugins/Xmpp/XmppPlugin.php | 27 ++++++++++--------- 8 files changed, 89 insertions(+), 37 deletions(-) rename plugins/Xmpp/{Fake_XMPP.php => Queued_XMPP.php} (87%) diff --git a/actions/imsettings.php b/actions/imsettings.php index 2c2606b76c..662b1063e7 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -133,8 +133,7 @@ class ImsettingsAction extends ConnectSettingsAction 'message with further instructions. '. '(Did you add %s to your buddy list?)'), $transport_info['display'], - $transport_info['daemon_screenname'], - jabber_daemon_address())); + $transport_info['daemon_screenname'])); $this->hidden('screenname', $confirm->address); // TRANS: Button label to cancel an IM address confirmation procedure. $this->submit('cancel', _m('BUTTON','Cancel')); @@ -163,12 +162,11 @@ class ImsettingsAction extends ConnectSettingsAction 'action' => common_local_url('imsettings'))); $this->elementStart('fieldset', array('id' => 'settings_im_preferences')); - $this->element('legend', null, _('Preferences')); + // TRANS: Header for IM preferences form. + $this->element('legend', null, _('IM Preferences')); $this->hidden('token', common_session_token()); $this->elementStart('table'); $this->elementStart('tr'); - // TRANS: Header for IM preferences form. - $this->element('th', null, _('IM Preferences')); foreach($user_im_prefs_by_transport as $transport=>$user_im_prefs) { $this->element('th', null, $transports[$transport]['display']); @@ -278,19 +276,20 @@ class ImsettingsAction extends ConnectSettingsAction $user = common_current_user(); $user_im_prefs = new User_im_prefs(); + $user_im_prefs->query('BEGIN'); $user_im_prefs->user_id = $user->id; if($user_im_prefs->find() && $user_im_prefs->fetch()) { $preferences = array('notify', 'updatefrompresence', 'replies', 'microid'); - $user_im_prefs->query('BEGIN'); do { $original = clone($user_im_prefs); + $new = clone($user_im_prefs); foreach($preferences as $preference) { - $user_im_prefs->$preference = $this->boolean($user_im_prefs->transport . '_' . $preference); + $new->$preference = $this->boolean($new->transport . '_' . $preference); } - $result = $user_im_prefs->update($original); + $result = $new->update($original); if ($result === false) { common_log_db_error($user, 'UPDATE', __FILE__); @@ -299,8 +298,8 @@ class ImsettingsAction extends ConnectSettingsAction return; } }while($user_im_prefs->fetch()); - $user_im_prefs->query('COMMIT'); } + $user_im_prefs->query('COMMIT'); // TRANS: Confirmation message for successful IM preferences save. $this->showForm(_('Preferences saved.'), true); } diff --git a/classes/User_im_prefs.php b/classes/User_im_prefs.php index 8ecdfe9fab..75be8969e0 100644 --- a/classes/User_im_prefs.php +++ b/classes/User_im_prefs.php @@ -68,4 +68,27 @@ class User_im_prefs extends Memcached_DataObject { return array(false,false); } + + /** + * We have two compound keys with unique constraints: + * (transport, user_id) which is our primary key, and + * (transport, screenname) which is an additional constraint. + * + * Currently there's not a way to represent that second key + * in the general keys list, so we're adding it here to the + * list of keys to use for caching, ensuring that it gets + * cleared as well when we change. + * + * @return array of cache keys + */ + function _allCacheKeys() + { + $ukeys = 'transport,screenname'; + $uvals = $this->transport . ',' . $this->screenname; + + $ckeys = parent::_allCacheKeys(); + $ckeys[] = $this->cacheKey($this->tableName(), $ukeys, $uvals); + return $ckeys; + } + } diff --git a/classes/statusnet.ini b/classes/statusnet.ini index d13fdfa526..b57d862263 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -647,8 +647,10 @@ modified = 384 [user_im_prefs__keys] user_id = K transport = K -transport = U -screenname = U +; There's another unique index on (transport, screenname) +; but we have no way to represent a compound index other than +; the primary key in here. To ensure proper cache purging, +; we need to tweak the class. [user_urlshortener_prefs] user_id = 129 diff --git a/lib/implugin.php b/lib/implugin.php index 7302859a47..7125aaee8d 100644 --- a/lib/implugin.php +++ b/lib/implugin.php @@ -107,10 +107,15 @@ abstract class ImPlugin extends Plugin * receive a raw message * Raw IM data is taken from the incoming queue, and passed to this function. * It should parse the raw message and call handle_incoming() + * + * Returning false may CAUSE REPROCESSING OF THE QUEUE ITEM, and should + * be used for temporary failures only. For permanent failures such as + * unrecognized addresses, return true to indicate your processing has + * completed. * * @param object $data raw IM data * - * @return boolean success value + * @return boolean true if processing completed, false for temporary failures */ abstract function receive_raw_message($data); @@ -185,9 +190,12 @@ abstract class ImPlugin extends Plugin */ function get_user_im_prefs_from_screenname($screenname) { - if($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $this->transport, 'screenname' => $screenname) )){ + $user_im_prefs = User_im_prefs::pkeyGet( + array('transport' => $this->transport, + 'screenname' => $this->normalize($screenname))); + if ($user_im_prefs) { return $user_im_prefs; - }else{ + } else { return false; } } @@ -203,9 +211,9 @@ abstract class ImPlugin extends Plugin function get_screenname($user) { $user_im_prefs = $this->get_user_im_prefs_from_user($user); - if($user_im_prefs){ + if ($user_im_prefs) { return $user_im_prefs->screenname; - }else{ + } else { return false; } } @@ -220,9 +228,12 @@ abstract class ImPlugin extends Plugin */ function get_user_im_prefs_from_user($user) { - if($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $this->transport, 'user_id' => $user->id) )){ + $user_im_prefs = User_im_prefs::pkeyGet( + array('transport' => $this->transport, + 'user_id' => $user->id)); + if ($user_im_prefs){ return $user_im_prefs; - }else{ + } else { return false; } } diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php index 3855d1fb05..30da1dbc79 100644 --- a/plugins/Aim/AimPlugin.php +++ b/plugins/Aim/AimPlugin.php @@ -126,6 +126,11 @@ class AimPlugin extends ImPlugin return true; } + /** + * Accept a queued input message. + * + * @return true if processing completed, false if message should be reprocessed + */ function receive_raw_message($message) { $info=Aim::getMessageInfo($message); @@ -133,7 +138,9 @@ class AimPlugin extends ImPlugin $user = $this->get_user($from); $notice_text = $info['message']; - return $this->handle_incoming($from, $notice_text); + $this->handle_incoming($from, $notice_text); + + return true; } function initialize(){ diff --git a/plugins/Aim/README b/plugins/Aim/README index 0465917383..7d486a0366 100644 --- a/plugins/Aim/README +++ b/plugins/Aim/README @@ -6,7 +6,7 @@ add "addPlugin('aim', array('setting'=>'value', 'setting2'=>'value2', ...);" to the bottom of your config.php -The daemon included with this plugin must be running. It will be started by +scripts/imdaemon.php included with StatusNet must be running. It will be started by the plugin along with their other daemons when you run scripts/startdaemons.sh. See the StatusNet README for more about queuing and daemons. diff --git a/plugins/Xmpp/Fake_XMPP.php b/plugins/Xmpp/Queued_XMPP.php similarity index 87% rename from plugins/Xmpp/Fake_XMPP.php rename to plugins/Xmpp/Queued_XMPP.php index 0f7cfd3b4d..73eff22467 100644 --- a/plugins/Xmpp/Fake_XMPP.php +++ b/plugins/Xmpp/Queued_XMPP.php @@ -2,7 +2,7 @@ /** * StatusNet, the distributed open-source microblogging tool * - * Instead of sending XMPP messages, retrieve the raw XML that would be sent + * Queue-mediated proxy class for outgoing XMPP messages. * * PHP version 5 * @@ -31,13 +31,17 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -class Fake_XMPP extends XMPPHP_XMPP +class Queued_XMPP extends XMPPHP_XMPP { - public $would_be_sent = null; + /** + * Reference to the XmppPlugin object we're hooked up to. + */ + public $plugin; /** * Constructor * + * @param XmppPlugin $plugin * @param string $host * @param integer $port * @param string $user @@ -47,8 +51,10 @@ class Fake_XMPP extends XMPPHP_XMPP * @param boolean $printlog * @param string $loglevel */ - public function __construct($host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null) + public function __construct($plugin, $host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null) { + $this->plugin = $plugin; + parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel); // We use $host to connect, but $server to build JIDs if specified. @@ -73,7 +79,7 @@ class Fake_XMPP extends XMPPHP_XMPP */ public function send($msg, $timeout=NULL) { - $this->would_be_sent = $msg; + $this->plugin->enqueue_outgoing_raw($msg); } //@{ @@ -110,5 +116,6 @@ class Fake_XMPP extends XMPPHP_XMPP throw new Exception("Can't read stream from fake XMPP."); } //@} + } diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php index 03bf47feac..a2521536bc 100644 --- a/plugins/Xmpp/XmppPlugin.php +++ b/plugins/Xmpp/XmppPlugin.php @@ -60,8 +60,6 @@ class XmppPlugin extends ImPlugin public $transport = 'xmpp'; - protected $fake_xmpp; - function getDisplayName(){ return _m('XMPP/Jabber/GTalk'); } @@ -292,7 +290,7 @@ class XmppPlugin extends ImPlugin require_once 'XMPP.php'; return false; case 'Sharing_XMPP': - case 'Fake_XMPP': + case 'Queued_XMPP': require_once $dir . '/'.$cls.'.php'; return false; case 'XmppManager': @@ -317,9 +315,7 @@ class XmppPlugin extends ImPlugin function send_message($screenname, $body) { - $this->fake_xmpp->message($screenname, $body, 'chat'); - $this->enqueue_outgoing_raw($this->fake_xmpp->would_be_sent); - return true; + $this->queuedConnection()->message($screenname, $body, 'chat'); } function send_notice($screenname, $notice) @@ -327,8 +323,7 @@ class XmppPlugin extends ImPlugin $msg = $this->format_notice($notice); $entry = $this->format_entry($notice); - $this->fake_xmpp->message($screenname, $msg, 'chat', null, $entry); - $this->enqueue_outgoing_raw($this->fake_xmpp->would_be_sent); + $this->queuedConnection()->message($screenname, $msg, 'chat', null, $entry); return true; } @@ -385,10 +380,19 @@ class XmppPlugin extends ImPlugin return true; } - return $this->handle_incoming($from, $pl['body']); + $this->handle_incoming($from, $pl['body']); + + return true; } - function initialize(){ + /** + * Build a queue-proxied XMPP interface object. Any outgoing messages + * will be run back through us for enqueing rather than sent directly. + * + * @return Queued_XMPP + * @throws Exception if server settings are invalid. + */ + function queuedConnection(){ if(!isset($this->server)){ throw new Exception("must specify a server"); } @@ -402,7 +406,7 @@ class XmppPlugin extends ImPlugin throw new Exception("must specify a password"); } - $this->fake_xmpp = new Fake_XMPP($this->host ? + return new Queued_XMPP($this, $this->host ? $this->host : $this->server, $this->port, @@ -415,7 +419,6 @@ class XmppPlugin extends ImPlugin $this->debug ? XMPPHP_Log::LEVEL_VERBOSE : null ); - return true; } function onPluginVersion(&$versions) From df4462611cc71f785c4d8f05d7cebe695c12f6b9 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 1 May 2010 09:51:07 -0700 Subject: [PATCH 070/730] Revert "Update PEAR::Mail to 1.2.0 release; fixes deprecation warnings running under PHP 5.3." This reverts commit 9fd02a4f11881b3e0e1b3029c7c9e85a799c5ced. Looks like there's some changes I missed in there and getting this in'll involve updating some other packages. Will poke it after 0.9.2. --- extlib/Mail.php | 82 ++++++++++++--------------------------- extlib/Mail/RFC822.php | 83 +++++++++++++++++----------------------- extlib/Mail/mail.php | 63 +++++++++--------------------- extlib/Mail/mock.php | 64 ++++++++++--------------------- extlib/Mail/null.php | 64 ++++++++++--------------------- extlib/Mail/sendmail.php | 7 ++-- extlib/Mail/smtp.php | 73 +++++++++-------------------------- extlib/Mail/smtpmx.php | 44 +++++---------------- 8 files changed, 151 insertions(+), 329 deletions(-) mode change 100755 => 100644 extlib/Mail.php mode change 100755 => 100644 extlib/Mail/RFC822.php mode change 100755 => 100644 extlib/Mail/mail.php mode change 100755 => 100644 extlib/Mail/mock.php mode change 100755 => 100644 extlib/Mail/null.php mode change 100755 => 100644 extlib/Mail/sendmail.php mode change 100755 => 100644 extlib/Mail/smtp.php mode change 100755 => 100644 extlib/Mail/smtpmx.php diff --git a/extlib/Mail.php b/extlib/Mail.php old mode 100755 new mode 100644 index 75132ac2a6..3a0c1a9cb8 --- a/extlib/Mail.php +++ b/extlib/Mail.php @@ -1,47 +1,22 @@ - * @copyright 1997-2010 Chuck Hagenbuch - * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version CVS: $Id: Mail.php 294747 2010-02-08 08:18:33Z clockwerx $ - * @link http://pear.php.net/package/Mail/ - */ +// +// +----------------------------------------------------------------------+ +// | PHP Version 4 | +// +----------------------------------------------------------------------+ +// | Copyright (c) 1997-2003 The PHP Group | +// +----------------------------------------------------------------------+ +// | This source file is subject to version 2.02 of the PHP license, | +// | that is bundled with this package in the file LICENSE, and is | +// | available at through the world-wide-web at | +// | http://www.php.net/license/2_02.txt. | +// | If you did not receive a copy of the PHP license and are unable to | +// | obtain it through the world-wide-web, please send a note to | +// | license@php.net so we can mail you a copy immediately. | +// +----------------------------------------------------------------------+ +// | Author: Chuck Hagenbuch | +// +----------------------------------------------------------------------+ +// +// $Id: Mail.php,v 1.17 2006/09/15 03:41:18 jon Exp $ require_once 'PEAR.php'; @@ -51,7 +26,7 @@ require_once 'PEAR.php'; * useful in multiple mailer backends. * * @access public - * @version $Revision: 294747 $ + * @version $Revision: 1.17 $ * @package Mail */ class Mail @@ -107,20 +82,12 @@ class Mail * @return mixed Returns true on success, or a PEAR_Error * containing a descriptive error message on * failure. - * * @access public * @deprecated use Mail_mail::send instead */ function send($recipients, $headers, $body) { - if (!is_array($headers)) { - return PEAR::raiseError('$headers must be an array'); - } - - $result = $this->_sanitizeHeaders($headers); - if (is_a($result, 'PEAR_Error')) { - return $result; - } + $this->_sanitizeHeaders($headers); // if we're passed an array of recipients, implode it. if (is_array($recipients)) { @@ -136,9 +103,10 @@ class Mail } // flatten the headers out. - list(, $text_headers) = Mail::prepareHeaders($headers); + list(,$text_headers) = Mail::prepareHeaders($headers); return mail($recipients, $subject, $body, $text_headers); + } /** @@ -183,9 +151,9 @@ class Mail foreach ($headers as $key => $value) { if (strcasecmp($key, 'From') === 0) { include_once 'Mail/RFC822.php'; - $parser = new Mail_RFC822(); + $parser = &new Mail_RFC822(); $addresses = $parser->parseAddressList($value, 'localhost', false); - if (is_a($addresses, 'PEAR_Error')) { + if (PEAR::isError($addresses)) { return $addresses; } @@ -253,7 +221,7 @@ class Mail $addresses = Mail_RFC822::parseAddressList($recipients, 'localhost', false); // If parseAddressList() returned a PEAR_Error object, just return it. - if (is_a($addresses, 'PEAR_Error')) { + if (PEAR::isError($addresses)) { return $addresses; } diff --git a/extlib/Mail/RFC822.php b/extlib/Mail/RFC822.php old mode 100755 new mode 100644 index 58d36465cb..8714df2e29 --- a/extlib/Mail/RFC822.php +++ b/extlib/Mail/RFC822.php @@ -1,48 +1,37 @@ - * @author Chuck Hagenbuch | +// | Chuck Hagenbuch | +// +-----------------------------------------------------------------------+ /** * RFC 822 Email address list validation Utility @@ -63,7 +52,7 @@ * * @author Richard Heyes * @author Chuck Hagenbuch - * @version $Revision: 294749 $ + * @version $Revision: 1.24 $ * @license BSD * @package Mail */ @@ -646,8 +635,8 @@ class Mail_RFC822 { $comment = $this->_splitCheck($parts, ')'); $comments[] = $comment; - // +2 is for the brackets - $_mailbox = substr($_mailbox, strpos($_mailbox, '('.$comment)+strlen($comment)+2); + // +1 is for the trailing ) + $_mailbox = substr($_mailbox, strpos($_mailbox, $comment)+strlen($comment)+1); } else { break; } diff --git a/extlib/Mail/mail.php b/extlib/Mail/mail.php old mode 100755 new mode 100644 index a8b4b5dbee..b13d695656 --- a/extlib/Mail/mail.php +++ b/extlib/Mail/mail.php @@ -1,52 +1,27 @@ - * @copyright 2010 Chuck Hagenbuch - * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version CVS: $Id: mail.php 294747 2010-02-08 08:18:33Z clockwerx $ - * @link http://pear.php.net/package/Mail/ - */ +// +// +----------------------------------------------------------------------+ +// | PHP Version 4 | +// +----------------------------------------------------------------------+ +// | Copyright (c) 1997-2003 The PHP Group | +// +----------------------------------------------------------------------+ +// | This source file is subject to version 2.02 of the PHP license, | +// | that is bundled with this package in the file LICENSE, and is | +// | available at through the world-wide-web at | +// | http://www.php.net/license/2_02.txt. | +// | If you did not receive a copy of the PHP license and are unable to | +// | obtain it through the world-wide-web, please send a note to | +// | license@php.net so we can mail you a copy immediately. | +// +----------------------------------------------------------------------+ +// | Author: Chuck Hagenbuch | +// +----------------------------------------------------------------------+ +// +// $Id: mail.php,v 1.20 2007/10/06 17:00:00 chagenbu Exp $ /** * internal PHP-mail() implementation of the PEAR Mail:: interface. * @package Mail - * @version $Revision: 294747 $ + * @version $Revision: 1.20 $ */ class Mail_mail extends Mail { diff --git a/extlib/Mail/mock.php b/extlib/Mail/mock.php old mode 100755 new mode 100644 index 61570ba408..971dae6a0e --- a/extlib/Mail/mock.php +++ b/extlib/Mail/mock.php @@ -1,53 +1,29 @@ - * @copyright 2010 Chuck Hagenbuch - * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version CVS: $Id: mock.php 294747 2010-02-08 08:18:33Z clockwerx $ - * @link http://pear.php.net/package/Mail/ - */ +// +// +----------------------------------------------------------------------+ +// | PHP Version 4 | +// +----------------------------------------------------------------------+ +// | Copyright (c) 1997-2003 The PHP Group | +// +----------------------------------------------------------------------+ +// | This source file is subject to version 2.02 of the PHP license, | +// | that is bundled with this package in the file LICENSE, and is | +// | available at through the world-wide-web at | +// | http://www.php.net/license/2_02.txt. | +// | If you did not receive a copy of the PHP license and are unable to | +// | obtain it through the world-wide-web, please send a note to | +// | license@php.net so we can mail you a copy immediately. | +// +----------------------------------------------------------------------+ +// | Author: Chuck Hagenbuch | +// +----------------------------------------------------------------------+ +// +// $Id: mock.php,v 1.1 2007/12/08 17:57:54 chagenbu Exp $ +// /** * Mock implementation of the PEAR Mail:: interface for testing. * @access public * @package Mail - * @version $Revision: 294747 $ + * @version $Revision: 1.1 $ */ class Mail_mock extends Mail { diff --git a/extlib/Mail/null.php b/extlib/Mail/null.php old mode 100755 new mode 100644 index f8d58272ee..982bfa45b6 --- a/extlib/Mail/null.php +++ b/extlib/Mail/null.php @@ -1,53 +1,29 @@ - * @copyright 2010 Phil Kernick - * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version CVS: $Id: null.php 294747 2010-02-08 08:18:33Z clockwerx $ - * @link http://pear.php.net/package/Mail/ - */ +// +// +----------------------------------------------------------------------+ +// | PHP Version 4 | +// +----------------------------------------------------------------------+ +// | Copyright (c) 1997-2003 The PHP Group | +// +----------------------------------------------------------------------+ +// | This source file is subject to version 2.02 of the PHP license, | +// | that is bundled with this package in the file LICENSE, and is | +// | available at through the world-wide-web at | +// | http://www.php.net/license/2_02.txt. | +// | If you did not receive a copy of the PHP license and are unable to | +// | obtain it through the world-wide-web, please send a note to | +// | license@php.net so we can mail you a copy immediately. | +// +----------------------------------------------------------------------+ +// | Author: Phil Kernick | +// +----------------------------------------------------------------------+ +// +// $Id: null.php,v 1.2 2004/04/06 05:19:03 jon Exp $ +// /** * Null implementation of the PEAR Mail:: interface. * @access public * @package Mail - * @version $Revision: 294747 $ + * @version $Revision: 1.2 $ */ class Mail_null extends Mail { diff --git a/extlib/Mail/sendmail.php b/extlib/Mail/sendmail.php old mode 100755 new mode 100644 index b056575e99..cd248e61d2 --- a/extlib/Mail/sendmail.php +++ b/extlib/Mail/sendmail.php @@ -20,7 +20,7 @@ * Sendmail implementation of the PEAR Mail:: interface. * @access public * @package Mail - * @version $Revision: 294744 $ + * @version $Revision: 1.19 $ */ class Mail_sendmail extends Mail { @@ -117,7 +117,7 @@ class Mail_sendmail extends Mail { if (is_a($recipients, 'PEAR_Error')) { return $recipients; } - $recipients = implode(' ', array_map('escapeshellarg', $recipients)); + $recipients = escapeShellCmd(implode(' ', $recipients)); $headerElements = $this->prepareHeaders($headers); if (is_a($headerElements, 'PEAR_Error')) { @@ -141,8 +141,7 @@ class Mail_sendmail extends Mail { return PEAR::raiseError('From address specified with dangerous characters.'); } - $from = escapeshellarg($from); // Security bug #16200 - + $from = escapeShellCmd($from); $mail = @popen($this->sendmail_path . (!empty($this->sendmail_args) ? ' ' . $this->sendmail_args : '') . " -f$from -- $recipients", 'w'); if (!$mail) { return PEAR::raiseError('Failed to open sendmail [' . $this->sendmail_path . '] for execution.'); diff --git a/extlib/Mail/smtp.php b/extlib/Mail/smtp.php old mode 100755 new mode 100644 index 52ea602086..baf3a962ba --- a/extlib/Mail/smtp.php +++ b/extlib/Mail/smtp.php @@ -1,48 +1,21 @@ - * @author Chuck Hagenbuch - * @copyright 2010 Chuck Hagenbuch - * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version CVS: $Id: smtp.php 294747 2010-02-08 08:18:33Z clockwerx $ - * @link http://pear.php.net/package/Mail/ - */ +// +// +----------------------------------------------------------------------+ +// | PHP Version 4 | +// +----------------------------------------------------------------------+ +// | Copyright (c) 1997-2003 The PHP Group | +// +----------------------------------------------------------------------+ +// | This source file is subject to version 2.02 of the PHP license, | +// | that is bundled with this package in the file LICENSE, and is | +// | available at through the world-wide-web at | +// | http://www.php.net/license/2_02.txt. | +// | If you did not receive a copy of the PHP license and are unable to | +// | obtain it through the world-wide-web, please send a note to | +// | license@php.net so we can mail you a copy immediately. | +// +----------------------------------------------------------------------+ +// | Authors: Chuck Hagenbuch | +// | Jon Parise | +// +----------------------------------------------------------------------+ /** Error: Failed to create a Net_SMTP object */ define('PEAR_MAIL_SMTP_ERROR_CREATE', 10000); @@ -69,7 +42,7 @@ define('PEAR_MAIL_SMTP_ERROR_DATA', 10006); * SMTP implementation of the PEAR Mail interface. Requires the Net_SMTP class. * @access public * @package Mail - * @version $Revision: 294747 $ + * @version $Revision: 1.33 $ */ class Mail_smtp extends Mail { @@ -305,16 +278,6 @@ class Mail_smtp extends Mail { /* Send the message's headers and the body as SMTP data. */ $res = $this->_smtp->data($textHeaders . "\r\n\r\n" . $body); - list(,$args) = $this->_smtp->getResponse(); - - if (preg_match("/Ok: queued as (.*)/", $args, $queued)) { - $this->queued_as = $queued[1]; - } - - /* we need the greeting; from it we can extract the authorative name of the mail server we've really connected to. - * ideal if we're connecting to a round-robin of relay servers and need to track which exact one took the email */ - $this->greeting = $this->_smtp->getGreeting(); - if (is_a($res, 'PEAR_Error')) { $error = $this->_error('Failed to send data', $res); $this->_smtp->rset(); diff --git a/extlib/Mail/smtpmx.php b/extlib/Mail/smtpmx.php old mode 100755 new mode 100644 index f0b6940868..9d2dccfb13 --- a/extlib/Mail/smtpmx.php +++ b/extlib/Mail/smtpmx.php @@ -8,43 +8,19 @@ * * PHP versions 4 and 5 * - * LICENSE: - * - * Copyright (c) 2010, gERD Schaufelberger - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * o Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * o Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * o The names of the authors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * LICENSE: This source file is subject to version 3.0 of the PHP license + * that is available through the world-wide-web at the following URI: + * http://www.php.net/license/3_0.txt. If you did not receive a copy of + * the PHP License and are unable to obtain it through the web, please + * send a note to license@php.net so we can mail you a copy immediately. * * @category Mail * @package Mail_smtpmx * @author gERD Schaufelberger - * @copyright 2010 gERD Schaufelberger - * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version CVS: $Id: smtpmx.php 294747 2010-02-08 08:18:33Z clockwerx $ - * @link http://pear.php.net/package/Mail/ + * @copyright 1997-2005 The PHP Group + * @license http://www.php.net/license/3_0.txt PHP License 3.0 + * @version CVS: $Id: smtpmx.php,v 1.2 2007/10/06 17:00:00 chagenbu Exp $ + * @see Mail */ require_once 'Net/SMTP.php'; @@ -56,7 +32,7 @@ require_once 'Net/SMTP.php'; * @access public * @author gERD Schaufelberger * @package Mail - * @version $Revision: 294747 $ + * @version $Revision: 1.2 $ */ class Mail_smtpmx extends Mail { From d276f637f3d0d997882968b79e57b5d8f663bbbc Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 2 May 2010 12:34:10 +0200 Subject: [PATCH 071/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/br/LC_MESSAGES/statusnet.po | 82 ++++--- locale/ca/LC_MESSAGES/statusnet.po | 343 +++++++++++++---------------- locale/de/LC_MESSAGES/statusnet.po | 8 +- locale/statusnet.pot | 2 +- 4 files changed, 205 insertions(+), 230 deletions(-) diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 9e0994529c..d43ce86f2e 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:12+0000\n" +"PO-Revision-Date: 2010-05-02 10:29:49+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65799); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -2105,7 +2105,7 @@ msgstr "Kemennadenn bersonel" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." -msgstr "" +msgstr "Ouzhpennañ ur gemennadenn bersonel d'ar bedadenn (diret)." #. TRANS: Send button for inviting friends #: actions/invite.php:198 @@ -2772,6 +2772,8 @@ msgstr "Danvez direizh an ali." #, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al " +"lec'hienn \"%2$s\"." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2781,6 +2783,8 @@ msgstr "Arventennoù ar profil" msgid "" "You can update your personal profile info here so people know more about you." msgstr "" +"Gellout a reoc'h hizivaat titouroù ho profil evit ma ouifemp muioc'h a draoù " +"diwar ho penn." #: actions/profilesettings.php:99 msgid "Profile information" @@ -2788,7 +2792,7 @@ msgstr "Titouroù ar profil" #: actions/profilesettings.php:108 lib/groupeditform.php:154 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "" +msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn" #: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:256 actions/tagother.php:104 @@ -2804,12 +2808,12 @@ msgstr "Pajenn degemer" #: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" -msgstr "" +msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all" #: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "" +msgstr "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn" #: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" @@ -2844,6 +2848,8 @@ msgstr "Balizennoù" msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" +"Merkoù evidoc'h oc'h unan (lizherennoù, sifroù, -, ., ha _), dispartiet gant " +"virgulennoù pe esaouennoù" #: actions/profilesettings.php:151 msgid "Language" @@ -2859,12 +2865,14 @@ msgstr "Takad eur" #: actions/profilesettings.php:162 msgid "What timezone are you normally in?" -msgstr "" +msgstr "Pehini eo gwerzhid-eur boaz ?" #: actions/profilesettings.php:167 msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" +"En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet " +"evit an implijerien nann-denel)" #: actions/profilesettings.php:228 actions/register.php:223 #, php-format @@ -2886,7 +2894,7 @@ msgstr "Balizenn direizh : \"%s\"" #: actions/profilesettings.php:306 msgid "Couldn't update user for autosubscribe." -msgstr "" +msgstr "Dibosupl eo hizivaat ar c'houmanant ez emgefre." #: actions/profilesettings.php:363 msgid "Couldn't save location prefs." @@ -2912,16 +2920,16 @@ msgstr "Dreist da bevennoù ar bajenn (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." -msgstr "" +msgstr "Dibosupl eo adtapout al lanv foran." #: actions/public.php:130 #, php-format msgid "Public timeline, page %d" -msgstr "" +msgstr "Lanv foran - pajenn %d" #: actions/public.php:132 lib/publicgroupnav.php:79 msgid "Public timeline" -msgstr "" +msgstr "Lanv foran" #: actions/public.php:160 msgid "Public Stream Feed (RSS 1.0)" @@ -2941,6 +2949,7 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Kronologiezh foran %%site.name%% eo, met den n'en deus skrivet tra ebet." #: actions/public.php:191 msgid "Be the first to post!" @@ -2951,6 +2960,8 @@ msgstr "Bezit an hini gentañ da bostañ !" msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" +"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini " +"gentañ da embann un dra !" #: actions/public.php:242 #, php-format @@ -2968,10 +2979,12 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/" +"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" -msgstr "" +msgstr "Koumoulenn a merkoù foran" #: actions/publictagcloud.php:63 #, php-format @@ -2993,10 +3006,12 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini " +"gentañ da embann un dra !" #: actions/publictagcloud.php:134 msgid "Tag cloud" -msgstr "" +msgstr "Koumoulenn merkoù" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -3024,17 +3039,19 @@ msgstr "Re gozh eo ar c'hod gwiriañ. Adkrogit mar plij." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." -msgstr "" +msgstr "Dibosupl eo hizivaat an implijer gant ar chomlec'h postel gwiriekaet." #: actions/recoverpassword.php:152 msgid "" "If you have forgotten or lost your password, you can get a new one sent to " "the email address you have stored in your account." msgstr "" +"M'o peus disoñjet pe kollet ho ger-tremen, e c'helloc'h kaout unan nevez hag " +"a vo kaset deoc'h d'ar chomlec'h postel termenet en ho kont." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Diskleriet oc'h bet. Lakait ur ger-tremen nevez amañ da heul. " #: actions/recoverpassword.php:188 msgid "Password recovery" @@ -3046,7 +3063,7 @@ msgstr "Lesanv pe chomlec'h postel" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." -msgstr "" +msgstr "Ho lesanv war ar servijer-mañ, pe ar chomlec'h postel o peus enrollet." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" @@ -3097,10 +3114,12 @@ msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" +"Kaset eo bet deoc'h, d'ar chomlec'h postel termenet en ho kont, an titouroù " +"ret evit gouzout penaos adtapout o ger-tremen." #: actions/recoverpassword.php:357 msgid "Unexpected password reset." -msgstr "" +msgstr "Adderaouekadur dic'hortoz ar ger-tremen." #: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." @@ -3217,6 +3236,8 @@ msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" msgstr "" +"(Resevout a reoc'h a-benn nebeut ur postel gant an titouroù evit kadarnaat " +"ho chomlec'h.)" #: actions/remotesubscribe.php:98 #, php-format @@ -3265,7 +3286,7 @@ msgstr "" #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "Lec'hel eo ar profil-mañ ! Kevreit evit koumananti." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." @@ -3461,11 +3482,11 @@ msgstr "Sekred an implijer" #: actions/showapplication.php:273 msgid "Request token URL" -msgstr "" +msgstr "URL ar jedouer reked" #: actions/showapplication.php:278 msgid "Access token URL" -msgstr "" +msgstr "URL ar jedouer moned" #: actions/showapplication.php:283 msgid "Authorize URL" @@ -3480,6 +3501,7 @@ msgstr "" #: actions/showapplication.php:309 msgid "Are you sure you want to reset your consumer key and secret?" msgstr "" +"Ha sur oc'h o peus c'hoant adderaouekaat ho alc'hwez bevezer ha sekred ?" #: actions/showfavorites.php:79 #, php-format @@ -4614,7 +4636,7 @@ msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4908,7 +4930,7 @@ msgstr "" #: lib/action.php:820 #, php-format msgid "**%%site.name%%** is a microblogging service." -msgstr "" +msgstr "**%%site.name%%** a zo ur servij microblogging." #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. #: lib/action.php:824 @@ -4967,7 +4989,7 @@ msgid "Before" msgstr "Kent" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4975,11 +4997,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -5532,7 +5554,7 @@ msgstr "" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "" +msgstr "Hizivadennoù dre SMS" #: lib/connectsettingsaction.php:120 msgid "Connections" @@ -5759,7 +5781,7 @@ msgstr "Digeriñ ur gont nevez" #. TRANS: Subject for address confirmation email #: lib/mail.php:174 msgid "Email address confirmation" -msgstr "" +msgstr "Kadarnadur ar chomlec'h postel" #. TRANS: Body for address confirmation email. #: lib/mail.php:177 @@ -5811,7 +5833,7 @@ msgstr "" #: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" -msgstr "" +msgstr "Chomlec'h postel nevez evit embann e %s" #. TRANS: Body of notification mail for new posting email address #: lib/mail.php:302 @@ -6018,7 +6040,7 @@ msgstr "" #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "Mankout a ra un doser padennek." #: lib/mediafile.php:162 msgid "Failed to write file to disk." @@ -6216,7 +6238,7 @@ msgstr "Ar c'hemenadennoù kaset ganeoc'h" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Dianav" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 7b59c0ef44..410470a42c 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:15+0000\n" +"PO-Revision-Date: 2010-05-02 10:29:52+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65799); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -279,15 +279,13 @@ msgstr "" #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy msgid "Unable to save your design settings." -msgstr "No s'ha pogut guardar la teva configuració de Twitter!" +msgstr "No s'han pogut desar els paràmetres de disseny." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." -msgstr "No s'ha pogut actualitzar l'usuari." +msgstr "No s'ha pogut actualitzar el vostre disseny." #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" @@ -388,9 +386,8 @@ msgid "Could not determine source user." msgstr "No s'ha pogut determinar l'usuari d'origen." #: actions/apifriendshipsshow.php:142 -#, fuzzy msgid "Could not find target user." -msgstr "No es pot trobar cap estatus." +msgstr "No s'ha pogut trobar l'usuari de destinació." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 @@ -516,9 +513,8 @@ msgid "No oauth_token parameter provided." msgstr "" #: actions/apioauthauthorize.php:106 -#, fuzzy msgid "Invalid token." -msgstr "Mida invàlida." +msgstr "El testimoni no és vàlid." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 @@ -665,7 +661,7 @@ msgstr "No s'ha trobat." #: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." -msgstr "" +msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 msgid "Unsupported format." @@ -677,14 +673,14 @@ msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Preferits de %2$s" #: actions/apitimelinefavorites.php:118 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s actualitzacions favorites per %s / %s." +msgstr "%1$s actualitzacions preferides per %2$s / %2$s." #: actions/apitimelinementions.php:117 -#, fuzzy, php-format +#, php-format msgid "%1$s / Updates mentioning %2$s" -msgstr "%1$s / Notificacions contestant a %2$s" +msgstr "%1$s / Actualitzacions que mencionen %2$s" #: actions/apitimelinementions.php:130 #, php-format @@ -1278,9 +1274,8 @@ msgid "Callback URL is not valid." msgstr "" #: actions/editapplication.php:258 -#, fuzzy msgid "Could not update application." -msgstr "No s'ha pogut actualitzar el grup." +msgstr "No s'ha pogut actualitzar l'aplicació." #: actions/editgroup.php:56 #, php-format @@ -1293,9 +1288,8 @@ msgstr "Has d'haver entrat per crear un grup." #: actions/editgroup.php:107 actions/editgroup.php:172 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109 -#, fuzzy msgid "You must be an admin to edit the group." -msgstr "Has de ser admin per editar aquest grup" +msgstr "Heu de ser administrador per a editar el grup." #: actions/editgroup.php:158 msgid "Use this form to edit the group." @@ -1887,13 +1881,13 @@ msgid "Create a new group" msgstr "Crea un grup nou" #: actions/groupsearch.php:52 -#, fuzzy, php-format +#, php-format msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes " -"de cerca amb espais; han de ser majors a 3 caràcters." +"Cerca grups a %%site.name%% per nom, ubicació o descripció. Separeu els " +"termes de cerca amb espais; han de contenir com a mínim 3 caràcters." #: actions/groupsearch.php:58 msgid "Group search" @@ -2061,9 +2055,8 @@ msgstr "Aquesta adreça de missatgeria instantània és incorrecta." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "No s'ha pogut eliminar la confirmació de correu electrònic." +msgstr "No s'ha pogut suprimir la confirmació de MI." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 @@ -2082,9 +2075,9 @@ msgid "The IM address was removed." msgstr "S'ha suprimit l'adreça de MI." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Safata d'entrada per %s" +msgstr "Safata d'entrada per a %1$s - pàgina %2$d" #: actions/inbox.php:62 #, php-format @@ -2102,11 +2095,10 @@ msgid "Invites have been disabled." msgstr "S'han inhabilitat les invitacions." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." msgstr "" -"Has d'estar dins del servei per poder convidar altres usuaris a utilitzar-lo " -"%s" +"Heu d'haver iniciat una sessió per a convidar altres usuaris a utilitzar %s" #: actions/invite.php:72 #, php-format @@ -2181,9 +2173,9 @@ msgstr "Envia" #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. #: actions/invite.php:228 -#, fuzzy, php-format +#, php-format msgid "%1$s has invited you to join them on %2$s" -msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %2$s" +msgstr "%1$s us ha convidat a unir-vos al grup %2$s" #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. #: actions/invite.php:231 @@ -2322,13 +2314,12 @@ msgid "Login with your username and password." msgstr "Inicieu una sessió amb nom d'usuari i contrasenya" #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Inicia una sessió amb el teu nom d'usuari i la teva contrasenya. Encara no " -"tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova " -"[OpenID] (%%action.openidlogin%%)." +"No teniu cap nom d'usuari encara? [Registreu-hi](%%action.register%%) un nou " +"compte." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2340,14 +2331,14 @@ msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%1$s ja és un administrador del grup «%2$s»." #: actions/makeadmin.php:133 -#, fuzzy, php-format +#, php-format msgid "Can't get membership record for %1$s in group %2$s." -msgstr "No s'ha pogut eliminar l'usuari %s del grup %s" +msgstr "No s'ha pogut obtenir el registre de pertinència de %1$s al grup %2$s." #: actions/makeadmin.php:146 -#, fuzzy, php-format +#, php-format msgid "Can't make %1$s an admin for group %2$s." -msgstr "No es pot fer %s un administrador del grup %s" +msgstr "No es pot fer %1$s administrador del grup %2$s." #: actions/microsummary.php:69 msgid "No current status." @@ -2358,9 +2349,8 @@ msgid "New Application" msgstr "Nova Aplicació" #: actions/newapplication.php:64 -#, fuzzy msgid "You must be logged in to register an application." -msgstr "Has d'haver entrat per crear un grup." +msgstr "Heu d'haver iniciat una sessió per a registrar-hi una aplicació." #: actions/newapplication.php:143 msgid "Use this form to register a new application." @@ -2484,9 +2474,8 @@ msgid "Nudge sent!" msgstr "Reclamació enviada!" #: actions/oauthappssettings.php:59 -#, fuzzy msgid "You must be logged in to list your applications." -msgstr "Heu d'iniciar una sessió per editar un grup." +msgstr "Heu d'haver iniciat una sessió per a llistar les vostres aplicacions." #: actions/oauthappssettings.php:74 msgid "OAuth applications" @@ -2537,9 +2526,9 @@ msgstr "estat de %1$s a %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') #: actions/oembed.php:158 -#, fuzzy, php-format +#, php-format msgid "Content type %s not supported." -msgstr "tipus de contingut " +msgstr "El tipus de contingut %s no està permès." #. TRANS: Error message displaying attachments. %s is the site's base URL. #: actions/oembed.php:162 @@ -2867,9 +2856,9 @@ msgid "Not a valid people tag: %s." msgstr "Etiqueta no vàlida per a la gent: %s" #: actions/peopletag.php:142 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Usuaris que s'han etiquetat %s - pàgina %d" +msgstr "Usuaris que s'han etiquetat amb %1$s - pàgina %2$d" #: actions/postnotice.php:95 msgid "Invalid notice content." @@ -3422,14 +3411,12 @@ msgid "Couldn’t get a request token." msgstr "No s'ha pogut obtenir un senyal de petició." #: actions/repeat.php:57 -#, fuzzy msgid "Only logged-in users can repeat notices." -msgstr "Només l'usuari pot llegir les seves safates de correu." +msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "No s'ha especificat perfil." +msgstr "No s'ha especificat cap avís." #: actions/repeat.php:76 #, fuzzy @@ -3460,14 +3447,14 @@ msgid "Replies to %1$s, page %2$d" msgstr "Respostes a %1$s, pàgina %2$d" #: actions/replies.php:145 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "Feed d'avisos de %s" +msgstr "Canal de respostes de %s (RSS 1.0)" #: actions/replies.php:152 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Feed d'avisos de %s" +msgstr "Canal de respostes de %s (RSS 2.0)" #: actions/replies.php:159 #, php-format @@ -3609,7 +3596,7 @@ msgstr "" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Informació de l'aplicació" #: actions/showapplication.php:263 msgid "Consumer key" @@ -3724,19 +3711,19 @@ msgid "Group actions" msgstr "Accions del grup" #: actions/showgroup.php:338 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Feed d'avisos del grup %s" +msgstr "Canal d'avisos del grup %s (RSS 1.0)" #: actions/showgroup.php:344 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Feed d'avisos del grup %s" +msgstr "Canal d'avisos del grup %s (RSS 2.0)" #: actions/showgroup.php:350 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Feed d'avisos del grup %s" +msgstr "Canal d'avisos del grup %s (Atom)" #: actions/showgroup.php:355 #, php-format @@ -4003,9 +3990,8 @@ msgid "Site Notice" msgstr "Avís del lloc" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nou missatge" +msgstr "Edita el missatge per a tot el lloc" #: actions/sitenoticeadminpanel.php:103 msgid "Unable to save site notice." @@ -4073,10 +4059,9 @@ msgstr "Escriu el codi que has rebut en el teu telèfon mòbil." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" -msgstr "Confirmar" +msgstr "Confirma" #. TRANS: Field label for SMS phone number input in SMS settings form. #: actions/smssettings.php:153 @@ -4090,9 +4075,8 @@ msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Preferències" +msgstr "Preferències de l'SMS" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4105,9 +4089,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "S'han desat les preferències." +msgstr "S'han desat les preferències de l'SMS." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4263,9 +4246,8 @@ msgid "This action only accepts POST requests." msgstr "" #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "No existeix el fitxer." +msgstr "No existeix el perfil." #: actions/subscribe.php:117 #, fuzzy @@ -4282,9 +4264,9 @@ msgid "%s subscribers" msgstr "%s subscriptors" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "%s subscriptors, pàgina %d" +msgstr "%1$s subscriptors, pàgina %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -4685,9 +4667,9 @@ msgid "Updates from %1$s on %2$s!" msgstr "Actualitzacions de %1$s a %2$s!" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Estadístiques" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -4729,12 +4711,10 @@ msgstr "Connectors" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. #: actions/version.php:196 lib/action.php:779 -#, fuzzy msgid "Version" -msgstr "Sessions" +msgstr "Versió" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" msgstr "Autoria" @@ -4756,19 +4736,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" #: classes/Group_member.php:41 -#, fuzzy msgid "Group join failed." -msgstr "Perfil del grup" +msgstr "No s'ha pogut unir al grup." #: classes/Group_member.php:53 -#, fuzzy msgid "Not part of group." -msgstr "No s'ha pogut actualitzar el grup." +msgstr "No s'és part del grup." #: classes/Group_member.php:60 -#, fuzzy msgid "Group leave failed." -msgstr "Perfil del grup" +msgstr "La sortida del grup ha fallat." #: classes/Local_group.php:41 #, fuzzy @@ -4837,7 +4814,7 @@ msgstr "Problema en guardar l'avís." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4917,9 +4894,8 @@ msgstr "Canvieu la gestió del correu" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:137 -#, fuzzy msgid "Design your profile" -msgstr "Perfil de l'usuari" +msgstr "Dissenyeu el vostre perfil" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:144 @@ -4967,10 +4943,9 @@ msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:442 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "No s'ha pogut redirigir al servidor: %s" +msgstr "Connecta als serveis" #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services #: lib/action.php:445 @@ -4979,63 +4954,55 @@ msgstr "Connexió" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:448 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Canvia la configuració del lloc" #. TRANS: Main menu option when logged in and site admin for access to site configuration #: lib/action.php:451 -#, fuzzy msgctxt "MENU" msgid "Admin" -msgstr "Admin" +msgstr "Administrador" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:455 -#, fuzzy, php-format +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "Convidar amics i companys perquè participin a %s" +msgstr "Convida amics i coneguts perquè participin a %s" #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users #: lib/action.php:458 -#, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Convida" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:464 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Finalitza la sessió del lloc" #. TRANS: Main menu option when logged in to log out the current user #: lib/action.php:467 -#, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Finalitza la sessió" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:472 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Crea un compte" #. TRANS: Main menu option when not logged in to register a new account #: lib/action.php:475 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "Registre" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:478 -#, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Inicia una sessió al lloc" @@ -5208,7 +5175,7 @@ msgid "Before" msgstr "Anteriors" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5216,11 +5183,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -5261,7 +5228,6 @@ msgstr "Configuració bàsica del lloc" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:351 -#, fuzzy msgctxt "MENU" msgid "Site" msgstr "Lloc" @@ -5273,16 +5239,14 @@ msgstr "Configuració del disseny" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:359 -#, fuzzy msgctxt "MENU" msgid "Design" msgstr "Disseny" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:365 -#, fuzzy msgid "User configuration" -msgstr "Configuració dels camins" +msgstr "Configuració de l'usuari" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 @@ -5291,9 +5255,8 @@ msgstr "Usuari" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:373 -#, fuzzy msgid "Access configuration" -msgstr "Configuració del disseny" +msgstr "Configuració de l'accés" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:381 @@ -5302,9 +5265,8 @@ msgstr "Configuració dels camins" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:389 -#, fuzzy msgid "Sessions configuration" -msgstr "Configuració del disseny" +msgstr "Configuració de les sessions" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:397 @@ -5326,36 +5288,33 @@ msgstr "" #. TRANS: Form legend. #: lib/applicationeditform.php:137 msgid "Edit application" -msgstr "" +msgstr "Edita l'aplicació" #. TRANS: Form guide. #: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Icona de l'aplicació" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:209 -#, fuzzy, php-format +#, php-format msgid "Describe your application in %d characters" -msgstr "Descriu el grup amb 140 caràcters" +msgstr "Descriviu la vostra aplicació en %d caràcters" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:213 -#, fuzzy msgid "Describe your application" -msgstr "Descriu el grup amb 140 caràcters" +msgstr "Descriviu la vostra aplicació" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:224 -#, fuzzy msgid "URL of the homepage of this application" -msgstr "URL del teu web, blog del grup u tema" +msgstr "URL de la pàgina d'inici de l'aplicació" #. TRANS: Form input field label. #: lib/applicationeditform.php:226 -#, fuzzy msgid "Source URL" -msgstr "Font" +msgstr "URL d'origen" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:233 @@ -5376,32 +5335,33 @@ msgstr "" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:278 msgid "Browser" -msgstr "" +msgstr "Navegador" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:295 msgid "Desktop" -msgstr "" +msgstr "Escriptori" #. TRANS: Form guide. #: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Tipus d'aplicació, navegador o escriptori" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:320 msgid "Read-only" -msgstr "" +msgstr "Només lectura" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:339 msgid "Read-write" -msgstr "" +msgstr "Lectura i escriptura" #. TRANS: Form guide. #: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" +"Accés per defecte per a l'aplicació: només lectura, o lectura i escriptura" #. TRANS: Submit button title #: lib/applicationeditform.php:359 @@ -5411,25 +5371,24 @@ msgstr "Cancel·la" #. TRANS: Application access type #: lib/applicationlist.php:136 msgid "read-write" -msgstr "" +msgstr "lectura i escriptura" #. TRANS: Application access type #: lib/applicationlist.php:138 msgid "read-only" -msgstr "" +msgstr "només lectura" #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) #: lib/applicationlist.php:144 #, php-format msgid "Approved %1$s - \"%2$s\" access." -msgstr "" +msgstr "Aprovat: %1$s - accés «%2$s»." #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" -msgstr "Suprimeix" +msgstr "Revoca" #. TRANS: DT element label in attachment list. #: lib/attachmentlist.php:88 @@ -5448,7 +5407,7 @@ msgstr "Proveïdor" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Avisos on apareix l'adjunt" #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" @@ -5509,9 +5468,9 @@ msgstr "" #. TRANS: Message given having nudged another user. #. TRANS: %s is the nickname of the user that was nudged. #: lib/command.php:234 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "Reclamació enviada" +msgstr "S'ha enviat un avís a %s" #: lib/command.php:260 #, php-format @@ -5520,6 +5479,9 @@ msgid "" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Subscripcions: %1$s\n" +"Subscriptors: %2$s\n" +"Avisos: %3$s" #: lib/command.php:302 msgid "Notice marked as fave." @@ -5539,7 +5501,7 @@ msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" msgstr "No s'ha pogut suprimir l'usuari %1$s del grup %2$s." @@ -5575,13 +5537,16 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s és un perfil remot; només podeu enviar missatges directess a usuaris del " +"mateix servidor." #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" -msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" +msgstr "" +"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -5595,26 +5560,23 @@ msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." #: lib/command.php:514 -#, fuzzy msgid "Cannot repeat your own notice" -msgstr "No es poden posar en on les notificacions." +msgstr "No es pot repetir el vostre propi avís" #: lib/command.php:519 -#, fuzzy msgid "Already repeated that notice" -msgstr "Eliminar aquesta nota" +msgstr "Ja s'ha repetit l'avís" #. TRANS: Message given having repeated a notice from another user. #. TRANS: %s is the name of the user for which the notice was repeated. #: lib/command.php:529 -#, fuzzy, php-format +#, php-format msgid "Notice from %s repeated" -msgstr "Notificació publicada" +msgstr "S'ha repetit l'avís de %s" #: lib/command.php:531 -#, fuzzy msgid "Error repeating notice." -msgstr "Problema en guardar l'avís." +msgstr "S'ha produït un error en repetir l'avís." #: lib/command.php:562 #, fuzzy, php-format @@ -5627,9 +5589,8 @@ msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" #: lib/command.php:573 -#, fuzzy msgid "Error saving notice." -msgstr "Problema en guardar l'avís." +msgstr "S'ha produït un error en desar l'avís." #: lib/command.php:620 msgid "Specify the name of the user to subscribe to" @@ -5676,12 +5637,14 @@ msgstr "No es poden posar en on les notificacions." #: lib/command.php:723 msgid "Login command is disabled" -msgstr "" +msgstr "L'ordre d'inici de sessió està inhabilitada" #: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"L'enllaç només es pot fer servir una vegada, i només funciona durant 2 " +"minuts: %s" #: lib/command.php:761 #, fuzzy, php-format @@ -5768,7 +5731,7 @@ msgstr "No s'ha trobat cap fitxer de configuració. " #: lib/common.php:136 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "S'han cercat fitxers de configuracions en els llocs següents: " #: lib/common.php:138 msgid "You may wish to run the installer to fix this." @@ -5956,9 +5919,9 @@ msgid "Unsupported image file format." msgstr "Format d'imatge no suportat." #: lib/imagefile.php:88 -#, fuzzy, php-format +#, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "Pots pujar una imatge de logo per al grup." +msgstr "La mida del fitxer és massa gran, La mida màxima és %s." #: lib/imagefile.php:93 msgid "Partial upload." @@ -5991,12 +5954,12 @@ msgstr "kB" #: lib/jabber.php:387 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/jabber.php:567 -#, fuzzy, php-format +#, php-format msgid "Unknown inbox source %d." -msgstr "Llengua desconeguda «%s»" +msgstr "Font %d de la safata d'entrada desconeguda." #: lib/joinform.php:114 msgid "Join" @@ -6067,11 +6030,9 @@ msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail #: lib/mail.php:269 -#, fuzzy, php-format +#, php-format msgid "Bio: %s" -msgstr "" -"Biografia: %s\n" -"\n" +msgstr "Biografia: %s" #. TRANS: Subject of notification mail for new posting email address #: lib/mail.php:298 @@ -6114,9 +6075,9 @@ msgstr "Confirmació SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:457 -#, fuzzy, php-format +#, php-format msgid "%s: confirm you own this phone number with this code:" -msgstr "Esperant confirmació per aquest número de telèfon." +msgstr "%s: confirmeu-ho si teniu aquest número de telèfon amb aquest codi:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:478 @@ -6169,9 +6130,9 @@ msgstr "" #. TRANS: Subject for favorite notification email #: lib/mail.php:583 -#, fuzzy, php-format +#, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "%s ha afegit la teva nota com a favorita" +msgstr "%s (@%s) ha afegit el vostre avís com a preferit" #. TRANS: Body for favorite notification email #: lib/mail.php:586 @@ -6268,9 +6229,9 @@ msgid "Sorry, no incoming email allowed." msgstr "Ho sentim, no s'hi permet correu d'entrada." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Format d'imatge no suportat." +msgstr "Tipus de missatge no permès: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -6296,7 +6257,7 @@ msgstr "Manca una carpeta temporal." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "No s'ha pogut escriure el fitxer al disc." #: lib/mediafile.php:165 msgid "File upload stopped by extension." @@ -6311,9 +6272,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -#, fuzzy msgid "Could not determine file's MIME type." -msgstr "No s'ha pogut recuperar la conversa pública." +msgstr "No s'ha pogut determinar el tipus MIME del fitxer." #: lib/mediafile.php:270 #, php-format @@ -6338,7 +6298,6 @@ msgid "Available characters" msgstr "Caràcters disponibles" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Envia" @@ -6361,50 +6320,49 @@ msgid "Attach a file" msgstr "Adjunta un fitxer" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "Comparteix la vostra ubicació" +msgstr "Comparteix la meva ubicació" #: lib/noticeform.php:215 -#, fuzzy msgid "Do not share my location" -msgstr "Comparteix la vostra ubicació" +msgstr "No comparteixis la meva ubicació" #: lib/noticeform.php:216 msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"Ho sentim, la obtenció de la vostra ubicació geogràfic està trigant més de " +"l'esperat; torneu-ho a provar més tard" #. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 -#, fuzzy msgid "N" -msgstr "No" +msgstr "N" #. TRANS: Used in coordinates as abbreviation of south #: lib/noticelist.php:432 msgid "S" -msgstr "" +msgstr "S" #. TRANS: Used in coordinates as abbreviation of east #: lib/noticelist.php:434 msgid "E" -msgstr "" +msgstr "E" #. TRANS: Used in coordinates as abbreviation of west #: lib/noticelist.php:436 msgid "W" -msgstr "" +msgstr "O" #: lib/noticelist.php:438 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:447 msgid "at" -msgstr "" +msgstr "a" #: lib/noticelist.php:567 msgid "in context" @@ -6423,9 +6381,8 @@ msgid "Reply" msgstr "Respon" #: lib/noticelist.php:674 -#, fuzzy msgid "Notice repeated" -msgstr "Notificació publicada" +msgstr "Avís repetit" #: lib/nudgeform.php:116 msgid "Nudge this user" @@ -6456,9 +6413,8 @@ msgid "Error inserting remote profile" msgstr "Error en inserir perfil remot" #: lib/oauthstore.php:345 -#, fuzzy msgid "Duplicate notice" -msgstr "Eliminar nota." +msgstr "Duplica l'avís" #: lib/oauthstore.php:490 msgid "Couldn't insert new subscription." @@ -6497,10 +6453,9 @@ msgstr "Els teus missatges enviats" msgid "Tags in %s's notices" msgstr "Etiquetes en les notificacions de %s's" -#: lib/plugin.php:114 -#, fuzzy +#: lib/plugin.php:115 msgid "Unknown" -msgstr "Acció desconeguda" +msgstr "Desconegut" #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -6560,14 +6515,12 @@ msgid "Popular" msgstr "Popular" #: lib/redirectingaction.php:94 -#, fuzzy msgid "No return-to arguments." -msgstr "No argument de la id." +msgstr "No hi ha arguments de retorn." #: lib/repeatform.php:107 -#, fuzzy msgid "Repeat this notice?" -msgstr "Repeteix l'avís" +msgstr "Voleu repetir l'avís?" #: lib/repeatform.php:132 msgid "Yes" @@ -6578,9 +6531,9 @@ msgid "Repeat this notice" msgstr "Repeteix l'avís" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Bloca l'usuari del grup" +msgstr "Revoca el rol «%s» de l'usuari" #: lib/router.php:704 msgid "No single user defined for single-user mode." @@ -6712,9 +6665,9 @@ msgid "Unsubscribe" msgstr "Cancel·lar subscripció" #: lib/usernoprofileexception.php:58 -#, fuzzy, php-format +#, php-format msgid "User %s (%d) has no profile record." -msgstr "L'usuari no té perfil." +msgstr "L'usuari %s (%d) no té un registre de perfil." #: lib/userprofile.php:117 msgid "Edit Avatar" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index e12cf33785..fe96e9f65a 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-04-29 23:22:18+0000\n" +"PO-Revision-Date: 2010-05-02 10:29:58+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65675); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65799); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -506,9 +506,9 @@ msgstr "%s’s Gruppen" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s #: actions/apigrouplist.php:107 -#, fuzzy, php-format +#, php-format msgid "%1$s groups %2$s is a member of." -msgstr "Gruppen in denen %s Mitglied ist" +msgstr "%1$s Gruppen in denen %2$s Mitglied ist" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 82463a73dd..ff02fdb859 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"POT-Creation-Date: 2010-05-02 10:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From c2f620ed670eebe14dc6e8f8a294ac3b0d3ba51c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 3 May 2010 11:46:01 -0700 Subject: [PATCH 072/730] Update release date --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index ddc725d3c7..3ea363ff1a 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ README ------ StatusNet 0.9.2 ("King of Birds") -21 Apr 2010 +3 May 2010 This is the README file for StatusNet, the Open Source microblogging platform. It includes installation instructions, descriptions of From 940a8c2c1ead41648af2e1054de91080e757c231 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 3 May 2010 12:02:50 -0700 Subject: [PATCH 073/730] Updated README to include one-liner about fixed installer in the noteable changes section --- README | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/README b/README index 3ea363ff1a..c47d3499fa 100644 --- a/README +++ b/README @@ -85,18 +85,27 @@ public sites upgrade to the new version immediately. Notable changes this version: +- Installer no longer fails with a PHP fatal error when trying to set up the + subscription to update@status.net - Fixed email notifications for @-replies that come in via OStatus -- OStatus related Fixes to the cloudy theme -- Pass geo locations over Twitter bridge (will only be used if enabled on the Twitter side) -- scripts/showplugins.php - script to dump the list of activated plugins and their settings -- scripts/fixup_blocks.php - script to finds any stray subscriptions in violation of blocks, and removes them -- Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future) -- Default 2-second timeout on Geonames web service lookups +- OStatus related Fixes to the cloudy theme +- Pass geo locations over Twitter bridge (will only be used if enabled on the + Twitter side) +- scripts/showplugins.php - script to dump the list of activated plugins and + their settings +- scripts/fixup_blocks.php - script to finds any stray subscriptions in + violation of blocks, and removes them +- Allow blocking someone who's not currently subscribed to you (prevents + seeing @-replies from them, or them subbing to you in future) +- Default 2-second timeout on Geonames web service lookups - Improved localization for plugins -- New anti-spam measures: added nofollow rels to group members list, subscribers list -- Shared cache key option for Geonames plugin (lets multi-instance sites share their cached geoname lookups) +- New anti-spam measures: added nofollow rels to group members list, + subscribers list +- Shared cache key option for Geonames plugin (lets multi-instance sites + share their cached geoname lookups) - Stability fixes to the TwitterStatusFetcher -- If user allows location sharing but turned off browser location use profile location +- If user allows location sharing but turned off browser location use profile + location - Improved group listing via the API - Improved FOAF output - Several other bugfixes From 13132d47701111cb3d80ad5e2985356e24a59f3a Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 3 May 2010 21:21:04 +0200 Subject: [PATCH 074/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/af/LC_MESSAGES/statusnet.po | 14 +++---- locale/ar/LC_MESSAGES/statusnet.po | 4 +- locale/arz/LC_MESSAGES/statusnet.po | 14 +++---- locale/bg/LC_MESSAGES/statusnet.po | 14 +++---- locale/br/LC_MESSAGES/statusnet.po | 4 +- locale/ca/LC_MESSAGES/statusnet.po | 21 +++++++---- locale/cs/LC_MESSAGES/statusnet.po | 14 +++---- locale/de/LC_MESSAGES/statusnet.po | 4 +- locale/el/LC_MESSAGES/statusnet.po | 14 +++---- locale/en_GB/LC_MESSAGES/statusnet.po | 14 +++---- locale/es/LC_MESSAGES/statusnet.po | 14 +++---- locale/fa/LC_MESSAGES/statusnet.po | 14 +++---- locale/fi/LC_MESSAGES/statusnet.po | 14 +++---- locale/fr/LC_MESSAGES/statusnet.po | 14 +++---- locale/ga/LC_MESSAGES/statusnet.po | 14 +++---- locale/gl/LC_MESSAGES/statusnet.po | 4 +- locale/he/LC_MESSAGES/statusnet.po | 14 +++---- locale/hsb/LC_MESSAGES/statusnet.po | 14 +++---- locale/ia/LC_MESSAGES/statusnet.po | 14 +++---- locale/is/LC_MESSAGES/statusnet.po | 14 +++---- locale/it/LC_MESSAGES/statusnet.po | 14 +++---- locale/ja/LC_MESSAGES/statusnet.po | 14 +++---- locale/ko/LC_MESSAGES/statusnet.po | 14 +++---- locale/mk/LC_MESSAGES/statusnet.po | 14 +++---- locale/nb/LC_MESSAGES/statusnet.po | 22 +++++------ locale/nl/LC_MESSAGES/statusnet.po | 14 +++---- locale/nn/LC_MESSAGES/statusnet.po | 14 +++---- locale/pl/LC_MESSAGES/statusnet.po | 14 +++---- locale/pt/LC_MESSAGES/statusnet.po | 14 +++---- locale/pt_BR/LC_MESSAGES/statusnet.po | 54 +++++++++++---------------- locale/ru/LC_MESSAGES/statusnet.po | 14 +++---- locale/statusnet.pot | 2 +- locale/sv/LC_MESSAGES/statusnet.po | 14 +++---- locale/te/LC_MESSAGES/statusnet.po | 4 +- locale/tr/LC_MESSAGES/statusnet.po | 14 +++---- locale/uk/LC_MESSAGES/statusnet.po | 14 +++---- locale/vi/LC_MESSAGES/statusnet.po | 14 +++---- locale/zh_CN/LC_MESSAGES/statusnet.po | 14 +++---- locale/zh_TW/LC_MESSAGES/statusnet.po | 14 +++---- 39 files changed, 267 insertions(+), 272 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index 10dab614ef..b6ca4a23eb 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:15:59+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:08+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -4616,7 +4616,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4968,7 +4968,7 @@ msgid "Before" msgstr "Voor" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4976,11 +4976,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6212,7 +6212,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Onbekend" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index ce7cc188c9..44a1607dad 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-04-29 23:22:00+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:11+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65675); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index e67405582f..30763d3e02 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:06+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:20+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -4658,7 +4658,7 @@ msgstr "مشكله أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" @@ -5035,7 +5035,7 @@ msgid "Before" msgstr "قبل" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5043,11 +5043,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6298,7 +6298,7 @@ msgstr "رسائلك المُرسلة" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "مش معروف" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index c96b66ee6e..650bfdc93f 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:09+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:24+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -4816,7 +4816,7 @@ msgstr "Проблем при записване на бележката." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5188,7 +5188,7 @@ msgid "Before" msgstr "Преди" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5196,11 +5196,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6472,7 +6472,7 @@ msgstr "Изпратените от вас съобщения" msgid "Tags in %s's notices" msgstr "Етикети в бележките на %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Непознато действие" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index d43ce86f2e..2ab02917ba 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-02 10:29:49+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:27+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65799); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 410470a42c..b12c03a1ce 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-02 10:29:52+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:30+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65799); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -166,6 +166,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Proveu de subscriure més gent, [uniu-vos a un grup](%%action.groups%%) o " +"envieu quelcom personal." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" #: actions/all.php:142 @@ -239,9 +241,10 @@ msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" +"Heu d'especificar un paràmetre anomenat 'device' (dispositiu) amb un valor " +"dels següents: sms, im, none (cap)" #: actions/apiaccountupdatedeliverydevice.php:132 -#, fuzzy msgid "Could not update user." msgstr "No s'ha pogut actualitzar l'usuari." @@ -256,9 +259,8 @@ msgid "User has no profile." msgstr "L'usuari no té perfil." #: actions/apiaccountupdateprofile.php:147 -#, fuzzy msgid "Could not save profile." -msgstr "No s'ha pogut guardar el perfil." +msgstr "No s'ha pogut desar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 @@ -271,6 +273,8 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"El servidor no ha pogut gestionar tantes dades POST (%s bytes) a causa de la " +"configuració actual." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 @@ -510,7 +514,7 @@ msgstr "grups sobre %s" #: actions/apioauthauthorize.php:101 msgid "No oauth_token parameter provided." -msgstr "" +msgstr "No s'ha proporcionat cap paràmetre oauth_token." #: actions/apioauthauthorize.php:106 msgid "Invalid token." @@ -1071,6 +1075,8 @@ msgid "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." msgstr "" +"Esteu segur que voleu suprimir l'usuari? S'esborraran totes les dades de " +"l'usuari de la base de dades, sense cap còpia de seguretat." #. TRANS: Submit button title for 'Yes' when deleting a user. #: actions/deleteuser.php:163 lib/deleteuserform.php:77 @@ -1665,9 +1671,8 @@ msgid "Could not convert request token to access token." msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés." #: actions/finishremotesubscribe.php:118 -#, fuzzy msgid "Remote service uses unknown version of OMB protocol." -msgstr "Versió desconeguda del protocol OMB." +msgstr "El servei remot utilitza una versió desconeguda del protocol OMB." #: actions/finishremotesubscribe.php:138 msgid "Error updating remote profile." diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index e619430aa9..2180ad6cec 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:18+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:33+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -4846,7 +4846,7 @@ msgstr "Problém při ukládání sdělení" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5231,7 +5231,7 @@ msgid "Before" msgstr "Starší »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5239,11 +5239,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6532,7 +6532,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index fe96e9f65a..eda01937ab 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-02 10:29:58+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:36+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65799); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 8fa761ae81..a75fef345b 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:29+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:39+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -4769,7 +4769,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5142,7 +5142,7 @@ msgid "Before" msgstr "" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5150,11 +5150,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6409,7 +6409,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index a52c4b5701..38caf74c60 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:33+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:42+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -4779,7 +4779,7 @@ msgstr "Problem saving group inbox." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5137,7 +5137,7 @@ msgid "Before" msgstr "Before" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5145,11 +5145,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6396,7 +6396,7 @@ msgstr "Your sent messages" msgid "Tags in %s's notices" msgstr "Tags in %s's notices" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Unknown" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 4e4d4bf06d..7147c728f9 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -15,11 +15,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:36+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:46+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -4883,7 +4883,7 @@ msgstr "Hubo un problema al guarda la bandeja de entrada del grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5246,7 +5246,7 @@ msgid "Before" msgstr "Antes" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "A espera de un elemento de alimentación de raíz, pero se obtuvo un documento " @@ -5256,11 +5256,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Aún no se puede manejar contenido remoto." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Aún no se puede manejar contenido XML incrustado." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Aún no se puede manejar contenido incrustado Base64." @@ -6652,7 +6652,7 @@ msgstr "Mensajes enviados" msgid "Tags in %s's notices" msgstr "Etiquetas en avisos de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Desconocido" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 76e68fda7c..77e38b3a80 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:48+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:52+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -4775,7 +4775,7 @@ msgstr "مشکل در ذخیره کردن آگهی." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5146,7 +5146,7 @@ msgid "Before" msgstr "قبل از" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5154,11 +5154,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6415,7 +6415,7 @@ msgstr "پیام های فرستاده شده به وسیله ی شما" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index b015ccdbe7..a09c1415df 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:45+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:49+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -4949,7 +4949,7 @@ msgstr "Ongelma päivityksen tallentamisessa." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5332,7 +5332,7 @@ msgid "Before" msgstr "Aiemmin" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5340,11 +5340,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6643,7 +6643,7 @@ msgstr "Lähettämäsi viestit" msgid "Tags in %s's notices" msgstr "Tagit käyttäjän %s päivityksissä" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Tuntematon toiminto" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 07c850bdd0..cf3f5d3b5b 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:52+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:56+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -4913,7 +4913,7 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5275,7 +5275,7 @@ msgid "Before" msgstr "Avant" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Attendait un élément racine mais a reçu tout un document XML." @@ -5283,11 +5283,11 @@ msgstr "Attendait un élément racine mais a reçu tout un document XML." msgid "Can't handle remote content yet." msgstr "Impossible de gérer le contenu distant pour le moment." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Impossible de gérer le contenu XML embarqué pour le moment." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Impossible de gérer le contenu en Base64 embarqué pour le moment." @@ -6685,7 +6685,7 @@ msgstr "Vos messages envoyés" msgid "Tags in %s's notices" msgstr "Marques dans les avis de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Inconnu" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index d16b9d2d96..6fd5580455 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:55+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:04+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -5004,7 +5004,7 @@ msgstr "Aconteceu un erro ó gardar o chío." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5391,7 +5391,7 @@ msgid "Before" msgstr "Antes »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5399,11 +5399,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6800,7 +6800,7 @@ msgstr "As túas mensaxes enviadas" msgid "Tags in %s's notices" msgstr "O usuario non ten último chio." -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Acción descoñecida" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index 1ade2156de..0b59b9adb8 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-04-29 23:22:44+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:08+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65675); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 857ce5a2c3..2c9927ebfe 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:10+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:12+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -4849,7 +4849,7 @@ msgstr "בעיה בשמירת ההודעה." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5234,7 +5234,7 @@ msgid "Before" msgstr "לפני >>" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5242,11 +5242,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6533,7 +6533,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 5d226be60a..a5126d75ad 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:15+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -4589,7 +4589,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4941,7 +4941,7 @@ msgid "Before" msgstr "" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4949,11 +4949,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6186,7 +6186,7 @@ msgstr "Twoje pósłane powěsće" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Njeznaty" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 62ec146c31..1b05490b9e 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:24+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:18+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -4857,7 +4857,7 @@ msgstr "Problema salveguardar le cassa de entrata del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5215,7 +5215,7 @@ msgid "Before" msgstr "Ante" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "Expectava le elemento-radice de un syndication, ma recipeva un documento XML " @@ -5225,11 +5225,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Non pote ancora tractar contento remote." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Non pote ancora tractar contento XML incastrate." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Non pote ancora tractar contento Base64 incastrate." @@ -6615,7 +6615,7 @@ msgstr "Tu messages inviate" msgid "Tags in %s's notices" msgstr "Etiquettas in le notas de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Incognite" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 34f87d2441..2b2f19f5d6 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:27+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:21+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -4899,7 +4899,7 @@ msgstr "Vandamál komu upp við að vista babl." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5282,7 +5282,7 @@ msgid "Before" msgstr "Áður" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5290,11 +5290,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6577,7 +6577,7 @@ msgstr "Skilaboð sem þú hefur sent" msgid "Tags in %s's notices" msgstr "Merki í babli %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Óþekkt aðgerð" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index de429fe9b6..6b6351f89b 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:37+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:25+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -4857,7 +4857,7 @@ msgstr "Problema nel salvare la casella della posta del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5219,7 +5219,7 @@ msgid "Before" msgstr "Precedenti" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero." @@ -5227,11 +5227,11 @@ msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero." msgid "Can't handle remote content yet." msgstr "Impossibile gestire contenuti remoti." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Impossibile gestire contenuti XML incorporati." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Impossibile gestire contenuti Base64." @@ -6621,7 +6621,7 @@ msgstr "I tuoi messaggi inviati" msgid "Tags in %s's notices" msgstr "Etichette nei messaggi di %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Sconosciuto" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 76ca28c248..d3943819ab 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:40+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:28+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -4890,7 +4890,7 @@ msgstr "グループ受信箱を保存する際に問題が発生しました。 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5267,7 +5267,7 @@ msgid "Before" msgstr "前>>" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5275,11 +5275,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6610,7 +6610,7 @@ msgstr "あなたが送ったメッセージ" msgid "Tags in %s's notices" msgstr "%s のつぶやきのタグ" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "不明" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 8411920419..835611a9fd 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:43+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:31+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -4871,7 +4871,7 @@ msgstr "통지를 저장하는데 문제가 발생했습니다." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5252,7 +5252,7 @@ msgid "Before" msgstr "앞 페이지" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5260,11 +5260,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6546,7 +6546,7 @@ msgstr "당신의 보낸 메시지들" msgid "Tags in %s's notices" msgstr "%s의 게시글의 태그" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "알려지지 않은 행동" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 76cd8f711f..215f5089cd 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:47+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:38+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -4878,7 +4878,7 @@ msgstr "Проблем при зачувувањето на групното п #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5240,7 +5240,7 @@ msgid "Before" msgstr "Пред" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Се очекува коренски каналски елемент, но добив цел XML документ." @@ -5248,11 +5248,11 @@ msgstr "Се очекува коренски каналски елемент, н msgid "Can't handle remote content yet." msgstr "Сè уште не е поддржана обработката на далечинска содржина." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Сè уште не е поддржана обработката на XML содржина." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Сè уште не е достапна обработката на вметната Base64 содржина." @@ -6642,7 +6642,7 @@ msgstr "Ваши испратени пораки" msgid "Tags in %s's notices" msgstr "Ознаки во забелешките на %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Непознато" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 4ac3bff575..c36addf558 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:50+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:41+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -4273,12 +4273,12 @@ msgstr "Alle abonnementer" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." -msgstr "" +msgstr "Dette er personene som lytter til dine notiser." #: actions/subscribers.php:67 #, php-format msgid "These are the people who listen to %s's notices." -msgstr "" +msgstr "Dette er personene som lytter til %ss notiser." #: actions/subscribers.php:108 msgid "" @@ -4310,12 +4310,12 @@ msgstr "Alle abonnementer" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "Dette er personene hvis notiser du lytter til." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "Dette er personene hvis notiser %s lytter til." #: actions/subscriptions.php:126 #, php-format @@ -4792,7 +4792,7 @@ msgstr "Problem ved lagring av gruppeinnboks." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5150,7 +5150,7 @@ msgid "Before" msgstr "Før" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5158,11 +5158,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6500,7 +6500,7 @@ msgstr "Dine sendte meldinger" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Ukjent" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index cef426ff5a..f42b339413 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:57+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:47+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -4920,7 +4920,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5283,7 +5283,7 @@ msgid "Before" msgstr "Eerder" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document." @@ -5291,11 +5291,11 @@ msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document." msgid "Can't handle remote content yet." msgstr "Het is nog niet mogelijk inhoud uit andere omgevingen te verwerken." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Het is nog niet mogelijk ingebedde XML-inhoud te verwerken" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Het is nog niet mogelijk ingebedde Base64-inhoud te verwerken" @@ -6696,7 +6696,7 @@ msgstr "Uw verzonden berichten" msgid "Tags in %s's notices" msgstr "Labels in de mededelingen van %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Onbekend" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 6a2a705d75..ddff427729 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:54+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:44+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -4938,7 +4938,7 @@ msgstr "Eit problem oppstod ved lagring av notis." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5321,7 +5321,7 @@ msgid "Before" msgstr "Før »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5329,11 +5329,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6624,7 +6624,7 @@ msgstr "Dine sende meldingar" msgid "Tags in %s's notices" msgstr "Merkelappar i %s sine notisar" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Uventa handling." diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index cd23aea291..c816475e19 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:01+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:50+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -4851,7 +4851,7 @@ msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5214,7 +5214,7 @@ msgid "Before" msgstr "Wcześniej" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML." @@ -5222,11 +5222,11 @@ msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML." msgid "Can't handle remote content yet." msgstr "Nie można jeszcze obsługiwać zdalnej treści." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści XML." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści Base64." @@ -6615,7 +6615,7 @@ msgstr "Wysłane wiadomości" msgid "Tags in %s's notices" msgstr "Znaczniki we wpisach użytkownika %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Nieznane" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 048664eb81..2d65717674 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:04+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:53+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -4849,7 +4849,7 @@ msgstr "Problema na gravação da caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5212,7 +5212,7 @@ msgid "Before" msgstr "Anteriores" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "Era esperado um elemento raiz da fonte, mas foi recebido um documento XML " @@ -5222,11 +5222,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Ainda não é possível processar conteúdos remotos." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Ainda não é possível processar conteúdo XML embutido." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Ainda não é possível processar conteúdo Base64 embutido." @@ -6608,7 +6608,7 @@ msgstr "Mensagens enviadas" msgid "Tags in %s's notices" msgstr "Categorias nas notas de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Desconhecida" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 4263dde6b5..1409dc6146 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:12+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:56+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -1536,9 +1536,8 @@ msgstr "Esse é o endereço de e-mail errado." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "A confirmação foi cancelada." +msgstr "A confirmação por e-mail foi cancelada." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1548,9 +1547,8 @@ msgstr "Esse não é seu endereço de email." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "O endereço foi removido." +msgstr "O endereço de e-mail foi removido." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1690,9 +1688,8 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "O serviço remoto usa uma versão desconhecida do protocolo OMB." #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." -msgstr "Ocorreu um erro na atualização do perfil remoto" +msgstr "Ocorreu um erro durante a atualização do perfil remoto." #: actions/getfile.php:79 msgid "No such file." @@ -2014,9 +2011,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Preferências" +msgstr "Preferências do mensageiro instantâneo" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2088,15 +2084,13 @@ msgstr "Isso é um endereço de MI errado." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "Não foi possível excluir a confirmação de e-mail." +msgstr "Não foi possível excluir a confirmação do mensageiro instantâneo." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "A confirmação foi cancelada." +msgstr "A confirmação do mensageiro instantâneo foi cancelada." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2106,9 +2100,8 @@ msgstr "Essa não é sua ID do Jabber." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "O endereço foi removido." +msgstr "O endereço de mensageiro instantâneo foi removido." #: actions/inbox.php:59 #, php-format @@ -2131,10 +2124,10 @@ msgid "Invites have been disabled." msgstr "Os convites foram desabilitados." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." msgstr "" -"Você deve estar autenticado para convidar outros usuários para usar o %s" +"Você deve estar autenticado para convidar outros usuários para usar o %s." #: actions/invite.php:72 #, php-format @@ -2344,17 +2337,15 @@ msgstr "" "senha antes de alterar suas configurações." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Autentique-se com um nome de usuário e uma senha" +msgstr "Autentique-se com seu nome de usuário e senha." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Digite seu nome de usuário e senha. Ainda não possui um usuário? [Registre](%" -"%action.register%%) uma nova conta." +"Ainda não possui um usuário? [Registre](%%action.register%%) uma nova conta." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2378,9 +2369,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Não foi possível tornar %1$s um administrador do grupo %2$s." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "Nenhuma mensagem atual" +msgstr "Nenhuma mensagem atual." #: actions/newapplication.php:52 msgid "New Application" @@ -2547,9 +2537,9 @@ msgid "You are not a user of that application." msgstr "Você não é um usuário dessa aplicação." #: actions/oauthconnectionssettings.php:186 -#, fuzzy, php-format +#, php-format msgid "Unable to revoke access for app: %s." -msgstr "Não foi possível revogar o acesso para a aplicação: " +msgstr "Não foi possível revogar o acesso para a aplicação: %s." #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." @@ -4903,7 +4893,7 @@ msgstr "Problema no salvamento das mensagens recebidas do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5262,7 +5252,7 @@ msgid "Before" msgstr "Anterior" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "Era esperado um elemento raiz da fonte, mas foi obtido o documento XML " @@ -5272,11 +5262,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Ainda não é possível manipular conteúdo remoto." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Ainda não é possível manipular conteúdo XML incorporado." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Ainda não é possível manipular conteúdo Base64." @@ -6643,7 +6633,7 @@ msgstr "Suas mensagens enviadas" msgid "Tags in %s's notices" msgstr "Etiquetas nas mensagens de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Desconhecido" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 7f697bd8d5..054ed2bc2a 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:15+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:59+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -4869,7 +4869,7 @@ msgstr "Проблемы с сохранением входящих сообще #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5230,7 +5230,7 @@ msgid "Before" msgstr "Туда" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком." @@ -5238,11 +5238,11 @@ msgstr "Ожидался корневой элемент потока, а пол msgid "Can't handle remote content yet." msgstr "Пока ещё нельзя обрабатывать удалённое содержимое." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Пока ещё нельзя обрабатывать встроенный XML." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Пока ещё нельзя обрабатывать встроенное содержание Base64." @@ -6629,7 +6629,7 @@ msgstr "Ваши исходящие сообщения" msgid "Tags in %s's notices" msgstr "Теги записей пользователя %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Неизвестно" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index ff02fdb859..caa8258f97 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-02 10:29+0000\n" +"POT-Creation-Date: 2010-05-03 19:17+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 65a64dc320..e50bf1a328 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:20+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:02+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -4846,7 +4846,7 @@ msgstr "Problem med att spara gruppinkorg." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5204,7 +5204,7 @@ msgid "Before" msgstr "Tidigare" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument." @@ -5212,11 +5212,11 @@ msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument." msgid "Can't handle remote content yet." msgstr "Kan inte hantera fjärrinnehåll ännu." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Kan inte hantera inbäddat XML-innehåll ännu." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Kan inte hantera inbäddat Base64-innehåll ännu." @@ -6596,7 +6596,7 @@ msgstr "Dina skickade meddelanden" msgid "Tags in %s's notices" msgstr "Taggar i %ss notiser" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Okänd" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 96ac240840..7084c9114a 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-04-29 23:23:35+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:06+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65675); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 8514f78d5d..28869e63fb 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:42+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:10+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -4852,7 +4852,7 @@ msgstr "Durum mesajını kaydederken hata oluştu." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5237,7 +5237,7 @@ msgid "Before" msgstr "Önce »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5245,11 +5245,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6538,7 +6538,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index efdcae240f..349e2da72e 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:45+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:13+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -4854,7 +4854,7 @@ msgstr "Проблема при збереженні вхідних дописі #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5212,7 +5212,7 @@ msgid "Before" msgstr "Назад" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML." @@ -5221,11 +5221,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Поки що не можу обробити віддалений контент." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Поки що не можу обробити вбудований XML контент." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Поки що не можу обробити вбудований контент Base64." @@ -6611,7 +6611,7 @@ msgstr "Надіслані вами повідомлення" msgid "Tags in %s's notices" msgstr "Теґи у дописах %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Невідомо" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 4dd5e6ceb8..5c22fbad66 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:48+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:17+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -5006,7 +5006,7 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" @@ -5395,7 +5395,7 @@ msgid "Before" msgstr "Trước" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5403,11 +5403,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6768,7 +6768,7 @@ msgstr "Thư bạn đã gửi" msgid "Tags in %s's notices" msgstr "cảnh báo tin nhắn" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Không tìm thấy action" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index e38cda2ec6..71d3293f41 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:51+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:20+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -4935,7 +4935,7 @@ msgstr "保存通告时出错。" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5325,7 +5325,7 @@ msgid "Before" msgstr "之前 »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5333,11 +5333,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6643,7 +6643,7 @@ msgstr "您发送的消息" msgid "Tags in %s's notices" msgstr "%s's 的消息的标签" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "未知动作" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 4240b921ab..b7aca62bc3 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:54+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:23+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -4760,7 +4760,7 @@ msgstr "儲存使用者發生錯誤" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5138,7 +5138,7 @@ msgid "Before" msgstr "之前的內容»" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5146,11 +5146,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6420,7 +6420,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" From 67eeaa9cf46b0c68565c84e6c2747344ba66a860 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 3 May 2010 12:27:44 -0700 Subject: [PATCH 075/730] Pull localization updates from 0.9.x branch --- locale/af/LC_MESSAGES/statusnet.po | 14 +- locale/ar/LC_MESSAGES/statusnet.po | 62 +- locale/arz/LC_MESSAGES/statusnet.po | 14 +- locale/bg/LC_MESSAGES/statusnet.po | 14 +- locale/br/LC_MESSAGES/statusnet.po | 82 ++- locale/ca/LC_MESSAGES/statusnet.po | 360 +++++------ locale/cs/LC_MESSAGES/statusnet.po | 14 +- locale/de/LC_MESSAGES/statusnet.po | 31 +- locale/el/LC_MESSAGES/statusnet.po | 14 +- locale/en_GB/LC_MESSAGES/statusnet.po | 14 +- locale/es/LC_MESSAGES/statusnet.po | 14 +- locale/fa/LC_MESSAGES/statusnet.po | 14 +- locale/fi/LC_MESSAGES/statusnet.po | 14 +- locale/fr/LC_MESSAGES/statusnet.po | 14 +- locale/ga/LC_MESSAGES/statusnet.po | 14 +- locale/gl/LC_MESSAGES/statusnet.po | 78 +-- locale/he/LC_MESSAGES/statusnet.po | 14 +- locale/hsb/LC_MESSAGES/statusnet.po | 14 +- locale/ia/LC_MESSAGES/statusnet.po | 14 +- locale/is/LC_MESSAGES/statusnet.po | 14 +- locale/it/LC_MESSAGES/statusnet.po | 14 +- locale/ja/LC_MESSAGES/statusnet.po | 14 +- locale/ko/LC_MESSAGES/statusnet.po | 14 +- locale/mk/LC_MESSAGES/statusnet.po | 14 +- locale/nb/LC_MESSAGES/statusnet.po | 22 +- locale/nl/LC_MESSAGES/statusnet.po | 14 +- locale/nn/LC_MESSAGES/statusnet.po | 14 +- locale/pl/LC_MESSAGES/statusnet.po | 14 +- locale/pt/LC_MESSAGES/statusnet.po | 14 +- locale/pt_BR/LC_MESSAGES/statusnet.po | 54 +- locale/ru/LC_MESSAGES/statusnet.po | 14 +- locale/statusnet.pot | 12 +- locale/sv/LC_MESSAGES/statusnet.po | 14 +- locale/te/LC_MESSAGES/statusnet.po | 36 +- locale/tr/LC_MESSAGES/statusnet.po | 14 +- locale/uk/LC_MESSAGES/statusnet.po | 14 +- locale/vi/LC_MESSAGES/statusnet.po | 14 +- locale/zh_CN/LC_MESSAGES/statusnet.po | 14 +- locale/zh_TW/LC_MESSAGES/statusnet.po | 14 +- plugins/AutoSandbox/locale/AutoSandbox.pot | 21 + plugins/Autocomplete/locale/Autocomplete.pot | 24 + plugins/BitlyUrl/locale/BitlyUrl.pot | 22 + plugins/Blacklist/locale/Blacklist.pot | 54 ++ .../locale/CasAuthentication.pot | 35 ++ .../locale/ClientSideShorten.pot | 27 + .../locale/DirectionDetector.pot | 21 + .../locale/EmailAuthentication.pot | 23 + plugins/Facebook/locale/Facebook.pot | 472 +++++++------- plugins/FirePHP/locale/FirePHP.pot | 21 + plugins/Gravatar/locale/Gravatar.pot | 2 +- plugins/Imap/locale/Imap.pot | 27 + .../InfiniteScroll/locale/InfiniteScroll.pot | 25 + .../locale/LdapAuthentication.pot | 23 + .../locale/LdapAuthorization.pot | 23 + plugins/LilUrl/locale/LilUrl.pot | 22 + plugins/Mapstraction/locale/Mapstraction.pot | 38 +- plugins/Minify/locale/Minify.pot | 23 + .../MobileProfile/locale/MobileProfile.pot | 21 + plugins/OStatus/locale/OStatus.pot | 435 ++++++------- .../locale/OpenExternalLinkTarget.pot | 21 + plugins/OpenID/locale/OpenID.pot | 572 +++++++++-------- .../OpenID/locale/nl/LC_MESSAGES/OpenID.po | 577 ++++++++++-------- plugins/PostDebug/locale/PostDebug.pot | 21 + .../locale/PoweredByStatusNet.pot | 2 +- plugins/PtitUrl/locale/PtitUrl.pot | 22 + plugins/RSSCloud/locale/RSSCloud.pot | 24 + plugins/Recaptcha/locale/Recaptcha.pot | 23 + .../locale/RegisterThrottle.pot | 29 + .../locale/RequireValidatedEmail.pot | 2 +- .../locale/ReverseUsernameAuthentication.pot | 24 + plugins/Sample/locale/Sample.pot | 40 +- plugins/SimpleUrl/locale/SimpleUrl.pot | 22 + plugins/TabFocus/locale/TabFocus.pot | 24 + plugins/TightUrl/locale/TightUrl.pot | 22 + .../TwitterBridge/locale/TwitterBridge.pot | 103 +++- 75 files changed, 2441 insertions(+), 1603 deletions(-) create mode 100644 plugins/AutoSandbox/locale/AutoSandbox.pot create mode 100644 plugins/Autocomplete/locale/Autocomplete.pot create mode 100644 plugins/BitlyUrl/locale/BitlyUrl.pot create mode 100644 plugins/Blacklist/locale/Blacklist.pot create mode 100644 plugins/CasAuthentication/locale/CasAuthentication.pot create mode 100644 plugins/ClientSideShorten/locale/ClientSideShorten.pot create mode 100644 plugins/DirectionDetector/locale/DirectionDetector.pot create mode 100644 plugins/EmailAuthentication/locale/EmailAuthentication.pot create mode 100644 plugins/FirePHP/locale/FirePHP.pot create mode 100644 plugins/Imap/locale/Imap.pot create mode 100644 plugins/InfiniteScroll/locale/InfiniteScroll.pot create mode 100644 plugins/LdapAuthentication/locale/LdapAuthentication.pot create mode 100644 plugins/LdapAuthorization/locale/LdapAuthorization.pot create mode 100644 plugins/LilUrl/locale/LilUrl.pot create mode 100644 plugins/Minify/locale/Minify.pot create mode 100644 plugins/MobileProfile/locale/MobileProfile.pot create mode 100644 plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot create mode 100644 plugins/PostDebug/locale/PostDebug.pot create mode 100644 plugins/PtitUrl/locale/PtitUrl.pot create mode 100644 plugins/RSSCloud/locale/RSSCloud.pot create mode 100644 plugins/Recaptcha/locale/Recaptcha.pot create mode 100644 plugins/RegisterThrottle/locale/RegisterThrottle.pot create mode 100644 plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot create mode 100644 plugins/SimpleUrl/locale/SimpleUrl.pot create mode 100644 plugins/TabFocus/locale/TabFocus.pot create mode 100644 plugins/TightUrl/locale/TightUrl.pot diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index 10dab614ef..b6ca4a23eb 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:15:59+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:08+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -4616,7 +4616,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4968,7 +4968,7 @@ msgid "Before" msgstr "Voor" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4976,11 +4976,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6212,7 +6212,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Onbekend" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 84c856ba8c..44a1607dad 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:02+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:11+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -1227,7 +1227,7 @@ msgstr "الوصف مطلوب." #: actions/editapplication.php:194 msgid "Source URL is too long." -msgstr "" +msgstr "المسار المصدر طويل جدًا." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Source URL is not valid." @@ -2008,15 +2008,13 @@ msgstr "هذا عنوان محادثة فورية خاطئ." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "تعذّر حذف تأكيد البريد الإلكتروني." +msgstr "تعذّر حذف تأكيد البريد المراسلة الفورية." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "أُلغي التأكيد." +msgstr "أُلغي تأكيد المراسلة الفورية." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2026,9 +2024,8 @@ msgstr "هذه ليست هويتك في جابر." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "أزيل هذا العنوان." +msgstr "أزيل عنوان المراسلة الفورية هذا." #: actions/inbox.php:59 #, php-format @@ -2046,7 +2043,7 @@ msgstr "هذا صندوق بريدك الوارد، والذي يسرد رسائ #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "تم تعطيل الدعوات." #: actions/invite.php:41 #, fuzzy, php-format @@ -2258,9 +2255,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "لم يمكن جعل %1$s إداريا للمجموعة %2$s." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "لا حالة حالية" +msgstr "لا حالة جارية." #: actions/newapplication.php:52 msgid "New Application" @@ -2603,24 +2599,24 @@ msgid "Path and server settings for this StatusNet site." msgstr "" #: actions/pathsadminpanel.php:157 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s." -msgstr "لا يمكن قراءة دليل السمات: %s" +msgstr "لا يمكن قراءة دليل السمات: %s." #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "لا يمكن الكتابة في دليل الأفتارات: %s" +msgstr "لا يمكن الكتابة في دليل الأفتارات: %s." #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." -msgstr "لا يمكن الكتابة في دليل الخلفيات: %s" +msgstr "لا يمكن الكتابة في دليل الخلفيات: %s." #: actions/pathsadminpanel.php:177 -#, fuzzy, php-format +#, php-format msgid "Locales directory not readable: %s." -msgstr "لا يمكن قراءة دليل المحليات: %s" +msgstr "لا يمكن قراءة دليل المحليات: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2760,9 +2756,9 @@ msgid "People search" msgstr "بحث في الأشخاص" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "ليس وسم أشخاص صالح: %s" +msgstr "ليس وسم أشخاص صالح: %s." #: actions/peopletag.php:142 #, php-format @@ -2770,9 +2766,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "المستخدمون الذين وسموا أنفسهم ب%1$s - الصفحة %2$d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "محتوى إشعار غير صالح" +msgstr "محتوى إشعار غير صالح." #: actions/postnotice.php:101 #, php-format @@ -2913,9 +2908,9 @@ msgid "Settings saved." msgstr "حُفظت الإعدادات." #: actions/public.php:83 -#, fuzzy, php-format +#, php-format msgid "Beyond the page limit (%s)." -msgstr "وراء حد الصفحة (%s)" +msgstr "بعد حد الصفحة (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3385,9 +3380,8 @@ msgid "Sessions" msgstr "الجلسات" #: actions/sessionsadminpanel.php:65 -#, fuzzy msgid "Session settings for this StatusNet site." -msgstr "الإعدادات الأساسية لموقع StatusNet هذا." +msgstr "إعدادات جلسة موقع StatusNet هذا." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" @@ -4641,7 +4635,7 @@ msgstr "مشكلة أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" @@ -5002,7 +4996,7 @@ msgid "Before" msgstr "قبل" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5010,11 +5004,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6318,7 +6312,7 @@ msgstr "رسائلك المُرسلة" msgid "Tags in %s's notices" msgstr "وسوم في إشعارات %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "غير معروفة" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index e67405582f..30763d3e02 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:06+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:20+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -4658,7 +4658,7 @@ msgstr "مشكله أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" @@ -5035,7 +5035,7 @@ msgid "Before" msgstr "قبل" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5043,11 +5043,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6298,7 +6298,7 @@ msgstr "رسائلك المُرسلة" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "مش معروف" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index c96b66ee6e..650bfdc93f 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:09+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:24+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -4816,7 +4816,7 @@ msgstr "Проблем при записване на бележката." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5188,7 +5188,7 @@ msgid "Before" msgstr "Преди" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5196,11 +5196,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6472,7 +6472,7 @@ msgstr "Изпратените от вас съобщения" msgid "Tags in %s's notices" msgstr "Етикети в бележките на %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Непознато действие" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 9e0994529c..2ab02917ba 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:12+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:27+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -2105,7 +2105,7 @@ msgstr "Kemennadenn bersonel" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." -msgstr "" +msgstr "Ouzhpennañ ur gemennadenn bersonel d'ar bedadenn (diret)." #. TRANS: Send button for inviting friends #: actions/invite.php:198 @@ -2772,6 +2772,8 @@ msgstr "Danvez direizh an ali." #, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al " +"lec'hienn \"%2$s\"." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2781,6 +2783,8 @@ msgstr "Arventennoù ar profil" msgid "" "You can update your personal profile info here so people know more about you." msgstr "" +"Gellout a reoc'h hizivaat titouroù ho profil evit ma ouifemp muioc'h a draoù " +"diwar ho penn." #: actions/profilesettings.php:99 msgid "Profile information" @@ -2788,7 +2792,7 @@ msgstr "Titouroù ar profil" #: actions/profilesettings.php:108 lib/groupeditform.php:154 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "" +msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn" #: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:256 actions/tagother.php:104 @@ -2804,12 +2808,12 @@ msgstr "Pajenn degemer" #: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" -msgstr "" +msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all" #: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "" +msgstr "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn" #: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" @@ -2844,6 +2848,8 @@ msgstr "Balizennoù" msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" +"Merkoù evidoc'h oc'h unan (lizherennoù, sifroù, -, ., ha _), dispartiet gant " +"virgulennoù pe esaouennoù" #: actions/profilesettings.php:151 msgid "Language" @@ -2859,12 +2865,14 @@ msgstr "Takad eur" #: actions/profilesettings.php:162 msgid "What timezone are you normally in?" -msgstr "" +msgstr "Pehini eo gwerzhid-eur boaz ?" #: actions/profilesettings.php:167 msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" +"En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet " +"evit an implijerien nann-denel)" #: actions/profilesettings.php:228 actions/register.php:223 #, php-format @@ -2886,7 +2894,7 @@ msgstr "Balizenn direizh : \"%s\"" #: actions/profilesettings.php:306 msgid "Couldn't update user for autosubscribe." -msgstr "" +msgstr "Dibosupl eo hizivaat ar c'houmanant ez emgefre." #: actions/profilesettings.php:363 msgid "Couldn't save location prefs." @@ -2912,16 +2920,16 @@ msgstr "Dreist da bevennoù ar bajenn (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." -msgstr "" +msgstr "Dibosupl eo adtapout al lanv foran." #: actions/public.php:130 #, php-format msgid "Public timeline, page %d" -msgstr "" +msgstr "Lanv foran - pajenn %d" #: actions/public.php:132 lib/publicgroupnav.php:79 msgid "Public timeline" -msgstr "" +msgstr "Lanv foran" #: actions/public.php:160 msgid "Public Stream Feed (RSS 1.0)" @@ -2941,6 +2949,7 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Kronologiezh foran %%site.name%% eo, met den n'en deus skrivet tra ebet." #: actions/public.php:191 msgid "Be the first to post!" @@ -2951,6 +2960,8 @@ msgstr "Bezit an hini gentañ da bostañ !" msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" +"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini " +"gentañ da embann un dra !" #: actions/public.php:242 #, php-format @@ -2968,10 +2979,12 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/" +"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" -msgstr "" +msgstr "Koumoulenn a merkoù foran" #: actions/publictagcloud.php:63 #, php-format @@ -2993,10 +3006,12 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini " +"gentañ da embann un dra !" #: actions/publictagcloud.php:134 msgid "Tag cloud" -msgstr "" +msgstr "Koumoulenn merkoù" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -3024,17 +3039,19 @@ msgstr "Re gozh eo ar c'hod gwiriañ. Adkrogit mar plij." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." -msgstr "" +msgstr "Dibosupl eo hizivaat an implijer gant ar chomlec'h postel gwiriekaet." #: actions/recoverpassword.php:152 msgid "" "If you have forgotten or lost your password, you can get a new one sent to " "the email address you have stored in your account." msgstr "" +"M'o peus disoñjet pe kollet ho ger-tremen, e c'helloc'h kaout unan nevez hag " +"a vo kaset deoc'h d'ar chomlec'h postel termenet en ho kont." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Diskleriet oc'h bet. Lakait ur ger-tremen nevez amañ da heul. " #: actions/recoverpassword.php:188 msgid "Password recovery" @@ -3046,7 +3063,7 @@ msgstr "Lesanv pe chomlec'h postel" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." -msgstr "" +msgstr "Ho lesanv war ar servijer-mañ, pe ar chomlec'h postel o peus enrollet." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" @@ -3097,10 +3114,12 @@ msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" +"Kaset eo bet deoc'h, d'ar chomlec'h postel termenet en ho kont, an titouroù " +"ret evit gouzout penaos adtapout o ger-tremen." #: actions/recoverpassword.php:357 msgid "Unexpected password reset." -msgstr "" +msgstr "Adderaouekadur dic'hortoz ar ger-tremen." #: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." @@ -3217,6 +3236,8 @@ msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" msgstr "" +"(Resevout a reoc'h a-benn nebeut ur postel gant an titouroù evit kadarnaat " +"ho chomlec'h.)" #: actions/remotesubscribe.php:98 #, php-format @@ -3265,7 +3286,7 @@ msgstr "" #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "Lec'hel eo ar profil-mañ ! Kevreit evit koumananti." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." @@ -3461,11 +3482,11 @@ msgstr "Sekred an implijer" #: actions/showapplication.php:273 msgid "Request token URL" -msgstr "" +msgstr "URL ar jedouer reked" #: actions/showapplication.php:278 msgid "Access token URL" -msgstr "" +msgstr "URL ar jedouer moned" #: actions/showapplication.php:283 msgid "Authorize URL" @@ -3480,6 +3501,7 @@ msgstr "" #: actions/showapplication.php:309 msgid "Are you sure you want to reset your consumer key and secret?" msgstr "" +"Ha sur oc'h o peus c'hoant adderaouekaat ho alc'hwez bevezer ha sekred ?" #: actions/showfavorites.php:79 #, php-format @@ -4614,7 +4636,7 @@ msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4908,7 +4930,7 @@ msgstr "" #: lib/action.php:820 #, php-format msgid "**%%site.name%%** is a microblogging service." -msgstr "" +msgstr "**%%site.name%%** a zo ur servij microblogging." #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. #: lib/action.php:824 @@ -4967,7 +4989,7 @@ msgid "Before" msgstr "Kent" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4975,11 +4997,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -5532,7 +5554,7 @@ msgstr "" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "" +msgstr "Hizivadennoù dre SMS" #: lib/connectsettingsaction.php:120 msgid "Connections" @@ -5759,7 +5781,7 @@ msgstr "Digeriñ ur gont nevez" #. TRANS: Subject for address confirmation email #: lib/mail.php:174 msgid "Email address confirmation" -msgstr "" +msgstr "Kadarnadur ar chomlec'h postel" #. TRANS: Body for address confirmation email. #: lib/mail.php:177 @@ -5811,7 +5833,7 @@ msgstr "" #: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" -msgstr "" +msgstr "Chomlec'h postel nevez evit embann e %s" #. TRANS: Body of notification mail for new posting email address #: lib/mail.php:302 @@ -6018,7 +6040,7 @@ msgstr "" #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "Mankout a ra un doser padennek." #: lib/mediafile.php:162 msgid "Failed to write file to disk." @@ -6216,7 +6238,7 @@ msgstr "Ar c'hemenadennoù kaset ganeoc'h" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Dianav" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 7b59c0ef44..b12c03a1ce 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:15+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:30+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -166,6 +166,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Proveu de subscriure més gent, [uniu-vos a un grup](%%action.groups%%) o " +"envieu quelcom personal." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" #: actions/all.php:142 @@ -239,9 +241,10 @@ msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" +"Heu d'especificar un paràmetre anomenat 'device' (dispositiu) amb un valor " +"dels següents: sms, im, none (cap)" #: actions/apiaccountupdatedeliverydevice.php:132 -#, fuzzy msgid "Could not update user." msgstr "No s'ha pogut actualitzar l'usuari." @@ -256,9 +259,8 @@ msgid "User has no profile." msgstr "L'usuari no té perfil." #: actions/apiaccountupdateprofile.php:147 -#, fuzzy msgid "Could not save profile." -msgstr "No s'ha pogut guardar el perfil." +msgstr "No s'ha pogut desar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 @@ -271,6 +273,8 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"El servidor no ha pogut gestionar tantes dades POST (%s bytes) a causa de la " +"configuració actual." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 @@ -279,15 +283,13 @@ msgstr "" #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy msgid "Unable to save your design settings." -msgstr "No s'ha pogut guardar la teva configuració de Twitter!" +msgstr "No s'han pogut desar els paràmetres de disseny." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." -msgstr "No s'ha pogut actualitzar l'usuari." +msgstr "No s'ha pogut actualitzar el vostre disseny." #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" @@ -388,9 +390,8 @@ msgid "Could not determine source user." msgstr "No s'ha pogut determinar l'usuari d'origen." #: actions/apifriendshipsshow.php:142 -#, fuzzy msgid "Could not find target user." -msgstr "No es pot trobar cap estatus." +msgstr "No s'ha pogut trobar l'usuari de destinació." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 @@ -513,12 +514,11 @@ msgstr "grups sobre %s" #: actions/apioauthauthorize.php:101 msgid "No oauth_token parameter provided." -msgstr "" +msgstr "No s'ha proporcionat cap paràmetre oauth_token." #: actions/apioauthauthorize.php:106 -#, fuzzy msgid "Invalid token." -msgstr "Mida invàlida." +msgstr "El testimoni no és vàlid." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 @@ -665,7 +665,7 @@ msgstr "No s'ha trobat." #: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." -msgstr "" +msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 msgid "Unsupported format." @@ -677,14 +677,14 @@ msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Preferits de %2$s" #: actions/apitimelinefavorites.php:118 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s actualitzacions favorites per %s / %s." +msgstr "%1$s actualitzacions preferides per %2$s / %2$s." #: actions/apitimelinementions.php:117 -#, fuzzy, php-format +#, php-format msgid "%1$s / Updates mentioning %2$s" -msgstr "%1$s / Notificacions contestant a %2$s" +msgstr "%1$s / Actualitzacions que mencionen %2$s" #: actions/apitimelinementions.php:130 #, php-format @@ -1075,6 +1075,8 @@ msgid "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." msgstr "" +"Esteu segur que voleu suprimir l'usuari? S'esborraran totes les dades de " +"l'usuari de la base de dades, sense cap còpia de seguretat." #. TRANS: Submit button title for 'Yes' when deleting a user. #: actions/deleteuser.php:163 lib/deleteuserform.php:77 @@ -1278,9 +1280,8 @@ msgid "Callback URL is not valid." msgstr "" #: actions/editapplication.php:258 -#, fuzzy msgid "Could not update application." -msgstr "No s'ha pogut actualitzar el grup." +msgstr "No s'ha pogut actualitzar l'aplicació." #: actions/editgroup.php:56 #, php-format @@ -1293,9 +1294,8 @@ msgstr "Has d'haver entrat per crear un grup." #: actions/editgroup.php:107 actions/editgroup.php:172 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109 -#, fuzzy msgid "You must be an admin to edit the group." -msgstr "Has de ser admin per editar aquest grup" +msgstr "Heu de ser administrador per a editar el grup." #: actions/editgroup.php:158 msgid "Use this form to edit the group." @@ -1671,9 +1671,8 @@ msgid "Could not convert request token to access token." msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés." #: actions/finishremotesubscribe.php:118 -#, fuzzy msgid "Remote service uses unknown version of OMB protocol." -msgstr "Versió desconeguda del protocol OMB." +msgstr "El servei remot utilitza una versió desconeguda del protocol OMB." #: actions/finishremotesubscribe.php:138 msgid "Error updating remote profile." @@ -1887,13 +1886,13 @@ msgid "Create a new group" msgstr "Crea un grup nou" #: actions/groupsearch.php:52 -#, fuzzy, php-format +#, php-format msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes " -"de cerca amb espais; han de ser majors a 3 caràcters." +"Cerca grups a %%site.name%% per nom, ubicació o descripció. Separeu els " +"termes de cerca amb espais; han de contenir com a mínim 3 caràcters." #: actions/groupsearch.php:58 msgid "Group search" @@ -2061,9 +2060,8 @@ msgstr "Aquesta adreça de missatgeria instantània és incorrecta." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "No s'ha pogut eliminar la confirmació de correu electrònic." +msgstr "No s'ha pogut suprimir la confirmació de MI." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 @@ -2082,9 +2080,9 @@ msgid "The IM address was removed." msgstr "S'ha suprimit l'adreça de MI." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Safata d'entrada per %s" +msgstr "Safata d'entrada per a %1$s - pàgina %2$d" #: actions/inbox.php:62 #, php-format @@ -2102,11 +2100,10 @@ msgid "Invites have been disabled." msgstr "S'han inhabilitat les invitacions." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." msgstr "" -"Has d'estar dins del servei per poder convidar altres usuaris a utilitzar-lo " -"%s" +"Heu d'haver iniciat una sessió per a convidar altres usuaris a utilitzar %s" #: actions/invite.php:72 #, php-format @@ -2181,9 +2178,9 @@ msgstr "Envia" #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. #: actions/invite.php:228 -#, fuzzy, php-format +#, php-format msgid "%1$s has invited you to join them on %2$s" -msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %2$s" +msgstr "%1$s us ha convidat a unir-vos al grup %2$s" #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. #: actions/invite.php:231 @@ -2322,13 +2319,12 @@ msgid "Login with your username and password." msgstr "Inicieu una sessió amb nom d'usuari i contrasenya" #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Inicia una sessió amb el teu nom d'usuari i la teva contrasenya. Encara no " -"tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova " -"[OpenID] (%%action.openidlogin%%)." +"No teniu cap nom d'usuari encara? [Registreu-hi](%%action.register%%) un nou " +"compte." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2340,14 +2336,14 @@ msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%1$s ja és un administrador del grup «%2$s»." #: actions/makeadmin.php:133 -#, fuzzy, php-format +#, php-format msgid "Can't get membership record for %1$s in group %2$s." -msgstr "No s'ha pogut eliminar l'usuari %s del grup %s" +msgstr "No s'ha pogut obtenir el registre de pertinència de %1$s al grup %2$s." #: actions/makeadmin.php:146 -#, fuzzy, php-format +#, php-format msgid "Can't make %1$s an admin for group %2$s." -msgstr "No es pot fer %s un administrador del grup %s" +msgstr "No es pot fer %1$s administrador del grup %2$s." #: actions/microsummary.php:69 msgid "No current status." @@ -2358,9 +2354,8 @@ msgid "New Application" msgstr "Nova Aplicació" #: actions/newapplication.php:64 -#, fuzzy msgid "You must be logged in to register an application." -msgstr "Has d'haver entrat per crear un grup." +msgstr "Heu d'haver iniciat una sessió per a registrar-hi una aplicació." #: actions/newapplication.php:143 msgid "Use this form to register a new application." @@ -2484,9 +2479,8 @@ msgid "Nudge sent!" msgstr "Reclamació enviada!" #: actions/oauthappssettings.php:59 -#, fuzzy msgid "You must be logged in to list your applications." -msgstr "Heu d'iniciar una sessió per editar un grup." +msgstr "Heu d'haver iniciat una sessió per a llistar les vostres aplicacions." #: actions/oauthappssettings.php:74 msgid "OAuth applications" @@ -2537,9 +2531,9 @@ msgstr "estat de %1$s a %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') #: actions/oembed.php:158 -#, fuzzy, php-format +#, php-format msgid "Content type %s not supported." -msgstr "tipus de contingut " +msgstr "El tipus de contingut %s no està permès." #. TRANS: Error message displaying attachments. %s is the site's base URL. #: actions/oembed.php:162 @@ -2867,9 +2861,9 @@ msgid "Not a valid people tag: %s." msgstr "Etiqueta no vàlida per a la gent: %s" #: actions/peopletag.php:142 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Usuaris que s'han etiquetat %s - pàgina %d" +msgstr "Usuaris que s'han etiquetat amb %1$s - pàgina %2$d" #: actions/postnotice.php:95 msgid "Invalid notice content." @@ -3422,14 +3416,12 @@ msgid "Couldn’t get a request token." msgstr "No s'ha pogut obtenir un senyal de petició." #: actions/repeat.php:57 -#, fuzzy msgid "Only logged-in users can repeat notices." -msgstr "Només l'usuari pot llegir les seves safates de correu." +msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "No s'ha especificat perfil." +msgstr "No s'ha especificat cap avís." #: actions/repeat.php:76 #, fuzzy @@ -3460,14 +3452,14 @@ msgid "Replies to %1$s, page %2$d" msgstr "Respostes a %1$s, pàgina %2$d" #: actions/replies.php:145 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "Feed d'avisos de %s" +msgstr "Canal de respostes de %s (RSS 1.0)" #: actions/replies.php:152 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Feed d'avisos de %s" +msgstr "Canal de respostes de %s (RSS 2.0)" #: actions/replies.php:159 #, php-format @@ -3609,7 +3601,7 @@ msgstr "" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Informació de l'aplicació" #: actions/showapplication.php:263 msgid "Consumer key" @@ -3724,19 +3716,19 @@ msgid "Group actions" msgstr "Accions del grup" #: actions/showgroup.php:338 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Feed d'avisos del grup %s" +msgstr "Canal d'avisos del grup %s (RSS 1.0)" #: actions/showgroup.php:344 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Feed d'avisos del grup %s" +msgstr "Canal d'avisos del grup %s (RSS 2.0)" #: actions/showgroup.php:350 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Feed d'avisos del grup %s" +msgstr "Canal d'avisos del grup %s (Atom)" #: actions/showgroup.php:355 #, php-format @@ -4003,9 +3995,8 @@ msgid "Site Notice" msgstr "Avís del lloc" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nou missatge" +msgstr "Edita el missatge per a tot el lloc" #: actions/sitenoticeadminpanel.php:103 msgid "Unable to save site notice." @@ -4073,10 +4064,9 @@ msgstr "Escriu el codi que has rebut en el teu telèfon mòbil." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" -msgstr "Confirmar" +msgstr "Confirma" #. TRANS: Field label for SMS phone number input in SMS settings form. #: actions/smssettings.php:153 @@ -4090,9 +4080,8 @@ msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Preferències" +msgstr "Preferències de l'SMS" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4105,9 +4094,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "S'han desat les preferències." +msgstr "S'han desat les preferències de l'SMS." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4263,9 +4251,8 @@ msgid "This action only accepts POST requests." msgstr "" #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "No existeix el fitxer." +msgstr "No existeix el perfil." #: actions/subscribe.php:117 #, fuzzy @@ -4282,9 +4269,9 @@ msgid "%s subscribers" msgstr "%s subscriptors" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "%s subscriptors, pàgina %d" +msgstr "%1$s subscriptors, pàgina %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -4685,9 +4672,9 @@ msgid "Updates from %1$s on %2$s!" msgstr "Actualitzacions de %1$s a %2$s!" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Estadístiques" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -4729,12 +4716,10 @@ msgstr "Connectors" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. #: actions/version.php:196 lib/action.php:779 -#, fuzzy msgid "Version" -msgstr "Sessions" +msgstr "Versió" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" msgstr "Autoria" @@ -4756,19 +4741,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" #: classes/Group_member.php:41 -#, fuzzy msgid "Group join failed." -msgstr "Perfil del grup" +msgstr "No s'ha pogut unir al grup." #: classes/Group_member.php:53 -#, fuzzy msgid "Not part of group." -msgstr "No s'ha pogut actualitzar el grup." +msgstr "No s'és part del grup." #: classes/Group_member.php:60 -#, fuzzy msgid "Group leave failed." -msgstr "Perfil del grup" +msgstr "La sortida del grup ha fallat." #: classes/Local_group.php:41 #, fuzzy @@ -4837,7 +4819,7 @@ msgstr "Problema en guardar l'avís." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4917,9 +4899,8 @@ msgstr "Canvieu la gestió del correu" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:137 -#, fuzzy msgid "Design your profile" -msgstr "Perfil de l'usuari" +msgstr "Dissenyeu el vostre perfil" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:144 @@ -4967,10 +4948,9 @@ msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:442 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "No s'ha pogut redirigir al servidor: %s" +msgstr "Connecta als serveis" #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services #: lib/action.php:445 @@ -4979,63 +4959,55 @@ msgstr "Connexió" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:448 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Canvia la configuració del lloc" #. TRANS: Main menu option when logged in and site admin for access to site configuration #: lib/action.php:451 -#, fuzzy msgctxt "MENU" msgid "Admin" -msgstr "Admin" +msgstr "Administrador" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:455 -#, fuzzy, php-format +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "Convidar amics i companys perquè participin a %s" +msgstr "Convida amics i coneguts perquè participin a %s" #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users #: lib/action.php:458 -#, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Convida" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:464 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Finalitza la sessió del lloc" #. TRANS: Main menu option when logged in to log out the current user #: lib/action.php:467 -#, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Finalitza la sessió" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:472 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Crea un compte" #. TRANS: Main menu option when not logged in to register a new account #: lib/action.php:475 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "Registre" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:478 -#, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Inicia una sessió al lloc" @@ -5208,7 +5180,7 @@ msgid "Before" msgstr "Anteriors" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5216,11 +5188,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -5261,7 +5233,6 @@ msgstr "Configuració bàsica del lloc" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:351 -#, fuzzy msgctxt "MENU" msgid "Site" msgstr "Lloc" @@ -5273,16 +5244,14 @@ msgstr "Configuració del disseny" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:359 -#, fuzzy msgctxt "MENU" msgid "Design" msgstr "Disseny" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:365 -#, fuzzy msgid "User configuration" -msgstr "Configuració dels camins" +msgstr "Configuració de l'usuari" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 @@ -5291,9 +5260,8 @@ msgstr "Usuari" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:373 -#, fuzzy msgid "Access configuration" -msgstr "Configuració del disseny" +msgstr "Configuració de l'accés" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:381 @@ -5302,9 +5270,8 @@ msgstr "Configuració dels camins" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:389 -#, fuzzy msgid "Sessions configuration" -msgstr "Configuració del disseny" +msgstr "Configuració de les sessions" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:397 @@ -5326,36 +5293,33 @@ msgstr "" #. TRANS: Form legend. #: lib/applicationeditform.php:137 msgid "Edit application" -msgstr "" +msgstr "Edita l'aplicació" #. TRANS: Form guide. #: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Icona de l'aplicació" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:209 -#, fuzzy, php-format +#, php-format msgid "Describe your application in %d characters" -msgstr "Descriu el grup amb 140 caràcters" +msgstr "Descriviu la vostra aplicació en %d caràcters" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:213 -#, fuzzy msgid "Describe your application" -msgstr "Descriu el grup amb 140 caràcters" +msgstr "Descriviu la vostra aplicació" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:224 -#, fuzzy msgid "URL of the homepage of this application" -msgstr "URL del teu web, blog del grup u tema" +msgstr "URL de la pàgina d'inici de l'aplicació" #. TRANS: Form input field label. #: lib/applicationeditform.php:226 -#, fuzzy msgid "Source URL" -msgstr "Font" +msgstr "URL d'origen" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:233 @@ -5376,32 +5340,33 @@ msgstr "" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:278 msgid "Browser" -msgstr "" +msgstr "Navegador" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:295 msgid "Desktop" -msgstr "" +msgstr "Escriptori" #. TRANS: Form guide. #: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Tipus d'aplicació, navegador o escriptori" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:320 msgid "Read-only" -msgstr "" +msgstr "Només lectura" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:339 msgid "Read-write" -msgstr "" +msgstr "Lectura i escriptura" #. TRANS: Form guide. #: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" +"Accés per defecte per a l'aplicació: només lectura, o lectura i escriptura" #. TRANS: Submit button title #: lib/applicationeditform.php:359 @@ -5411,25 +5376,24 @@ msgstr "Cancel·la" #. TRANS: Application access type #: lib/applicationlist.php:136 msgid "read-write" -msgstr "" +msgstr "lectura i escriptura" #. TRANS: Application access type #: lib/applicationlist.php:138 msgid "read-only" -msgstr "" +msgstr "només lectura" #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) #: lib/applicationlist.php:144 #, php-format msgid "Approved %1$s - \"%2$s\" access." -msgstr "" +msgstr "Aprovat: %1$s - accés «%2$s»." #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" -msgstr "Suprimeix" +msgstr "Revoca" #. TRANS: DT element label in attachment list. #: lib/attachmentlist.php:88 @@ -5448,7 +5412,7 @@ msgstr "Proveïdor" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Avisos on apareix l'adjunt" #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" @@ -5509,9 +5473,9 @@ msgstr "" #. TRANS: Message given having nudged another user. #. TRANS: %s is the nickname of the user that was nudged. #: lib/command.php:234 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "Reclamació enviada" +msgstr "S'ha enviat un avís a %s" #: lib/command.php:260 #, php-format @@ -5520,6 +5484,9 @@ msgid "" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Subscripcions: %1$s\n" +"Subscriptors: %2$s\n" +"Avisos: %3$s" #: lib/command.php:302 msgid "Notice marked as fave." @@ -5539,7 +5506,7 @@ msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" msgstr "No s'ha pogut suprimir l'usuari %1$s del grup %2$s." @@ -5575,13 +5542,16 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s és un perfil remot; només podeu enviar missatges directess a usuaris del " +"mateix servidor." #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" -msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" +msgstr "" +"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -5595,26 +5565,23 @@ msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." #: lib/command.php:514 -#, fuzzy msgid "Cannot repeat your own notice" -msgstr "No es poden posar en on les notificacions." +msgstr "No es pot repetir el vostre propi avís" #: lib/command.php:519 -#, fuzzy msgid "Already repeated that notice" -msgstr "Eliminar aquesta nota" +msgstr "Ja s'ha repetit l'avís" #. TRANS: Message given having repeated a notice from another user. #. TRANS: %s is the name of the user for which the notice was repeated. #: lib/command.php:529 -#, fuzzy, php-format +#, php-format msgid "Notice from %s repeated" -msgstr "Notificació publicada" +msgstr "S'ha repetit l'avís de %s" #: lib/command.php:531 -#, fuzzy msgid "Error repeating notice." -msgstr "Problema en guardar l'avís." +msgstr "S'ha produït un error en repetir l'avís." #: lib/command.php:562 #, fuzzy, php-format @@ -5627,9 +5594,8 @@ msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" #: lib/command.php:573 -#, fuzzy msgid "Error saving notice." -msgstr "Problema en guardar l'avís." +msgstr "S'ha produït un error en desar l'avís." #: lib/command.php:620 msgid "Specify the name of the user to subscribe to" @@ -5676,12 +5642,14 @@ msgstr "No es poden posar en on les notificacions." #: lib/command.php:723 msgid "Login command is disabled" -msgstr "" +msgstr "L'ordre d'inici de sessió està inhabilitada" #: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"L'enllaç només es pot fer servir una vegada, i només funciona durant 2 " +"minuts: %s" #: lib/command.php:761 #, fuzzy, php-format @@ -5768,7 +5736,7 @@ msgstr "No s'ha trobat cap fitxer de configuració. " #: lib/common.php:136 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "S'han cercat fitxers de configuracions en els llocs següents: " #: lib/common.php:138 msgid "You may wish to run the installer to fix this." @@ -5956,9 +5924,9 @@ msgid "Unsupported image file format." msgstr "Format d'imatge no suportat." #: lib/imagefile.php:88 -#, fuzzy, php-format +#, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "Pots pujar una imatge de logo per al grup." +msgstr "La mida del fitxer és massa gran, La mida màxima és %s." #: lib/imagefile.php:93 msgid "Partial upload." @@ -5991,12 +5959,12 @@ msgstr "kB" #: lib/jabber.php:387 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/jabber.php:567 -#, fuzzy, php-format +#, php-format msgid "Unknown inbox source %d." -msgstr "Llengua desconeguda «%s»" +msgstr "Font %d de la safata d'entrada desconeguda." #: lib/joinform.php:114 msgid "Join" @@ -6067,11 +6035,9 @@ msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail #: lib/mail.php:269 -#, fuzzy, php-format +#, php-format msgid "Bio: %s" -msgstr "" -"Biografia: %s\n" -"\n" +msgstr "Biografia: %s" #. TRANS: Subject of notification mail for new posting email address #: lib/mail.php:298 @@ -6114,9 +6080,9 @@ msgstr "Confirmació SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:457 -#, fuzzy, php-format +#, php-format msgid "%s: confirm you own this phone number with this code:" -msgstr "Esperant confirmació per aquest número de telèfon." +msgstr "%s: confirmeu-ho si teniu aquest número de telèfon amb aquest codi:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:478 @@ -6169,9 +6135,9 @@ msgstr "" #. TRANS: Subject for favorite notification email #: lib/mail.php:583 -#, fuzzy, php-format +#, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "%s ha afegit la teva nota com a favorita" +msgstr "%s (@%s) ha afegit el vostre avís com a preferit" #. TRANS: Body for favorite notification email #: lib/mail.php:586 @@ -6268,9 +6234,9 @@ msgid "Sorry, no incoming email allowed." msgstr "Ho sentim, no s'hi permet correu d'entrada." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Format d'imatge no suportat." +msgstr "Tipus de missatge no permès: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -6296,7 +6262,7 @@ msgstr "Manca una carpeta temporal." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "No s'ha pogut escriure el fitxer al disc." #: lib/mediafile.php:165 msgid "File upload stopped by extension." @@ -6311,9 +6277,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -#, fuzzy msgid "Could not determine file's MIME type." -msgstr "No s'ha pogut recuperar la conversa pública." +msgstr "No s'ha pogut determinar el tipus MIME del fitxer." #: lib/mediafile.php:270 #, php-format @@ -6338,7 +6303,6 @@ msgid "Available characters" msgstr "Caràcters disponibles" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Envia" @@ -6361,50 +6325,49 @@ msgid "Attach a file" msgstr "Adjunta un fitxer" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "Comparteix la vostra ubicació" +msgstr "Comparteix la meva ubicació" #: lib/noticeform.php:215 -#, fuzzy msgid "Do not share my location" -msgstr "Comparteix la vostra ubicació" +msgstr "No comparteixis la meva ubicació" #: lib/noticeform.php:216 msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"Ho sentim, la obtenció de la vostra ubicació geogràfic està trigant més de " +"l'esperat; torneu-ho a provar més tard" #. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 -#, fuzzy msgid "N" -msgstr "No" +msgstr "N" #. TRANS: Used in coordinates as abbreviation of south #: lib/noticelist.php:432 msgid "S" -msgstr "" +msgstr "S" #. TRANS: Used in coordinates as abbreviation of east #: lib/noticelist.php:434 msgid "E" -msgstr "" +msgstr "E" #. TRANS: Used in coordinates as abbreviation of west #: lib/noticelist.php:436 msgid "W" -msgstr "" +msgstr "O" #: lib/noticelist.php:438 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:447 msgid "at" -msgstr "" +msgstr "a" #: lib/noticelist.php:567 msgid "in context" @@ -6423,9 +6386,8 @@ msgid "Reply" msgstr "Respon" #: lib/noticelist.php:674 -#, fuzzy msgid "Notice repeated" -msgstr "Notificació publicada" +msgstr "Avís repetit" #: lib/nudgeform.php:116 msgid "Nudge this user" @@ -6456,9 +6418,8 @@ msgid "Error inserting remote profile" msgstr "Error en inserir perfil remot" #: lib/oauthstore.php:345 -#, fuzzy msgid "Duplicate notice" -msgstr "Eliminar nota." +msgstr "Duplica l'avís" #: lib/oauthstore.php:490 msgid "Couldn't insert new subscription." @@ -6497,10 +6458,9 @@ msgstr "Els teus missatges enviats" msgid "Tags in %s's notices" msgstr "Etiquetes en les notificacions de %s's" -#: lib/plugin.php:114 -#, fuzzy +#: lib/plugin.php:115 msgid "Unknown" -msgstr "Acció desconeguda" +msgstr "Desconegut" #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -6560,14 +6520,12 @@ msgid "Popular" msgstr "Popular" #: lib/redirectingaction.php:94 -#, fuzzy msgid "No return-to arguments." -msgstr "No argument de la id." +msgstr "No hi ha arguments de retorn." #: lib/repeatform.php:107 -#, fuzzy msgid "Repeat this notice?" -msgstr "Repeteix l'avís" +msgstr "Voleu repetir l'avís?" #: lib/repeatform.php:132 msgid "Yes" @@ -6578,9 +6536,9 @@ msgid "Repeat this notice" msgstr "Repeteix l'avís" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Bloca l'usuari del grup" +msgstr "Revoca el rol «%s» de l'usuari" #: lib/router.php:704 msgid "No single user defined for single-user mode." @@ -6712,9 +6670,9 @@ msgid "Unsubscribe" msgstr "Cancel·lar subscripció" #: lib/usernoprofileexception.php:58 -#, fuzzy, php-format +#, php-format msgid "User %s (%d) has no profile record." -msgstr "L'usuari no té perfil." +msgstr "L'usuari %s (%d) no té un registre de perfil." #: lib/userprofile.php:117 msgid "Edit Avatar" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index e619430aa9..2180ad6cec 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:18+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:33+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -4846,7 +4846,7 @@ msgstr "Problém při ukládání sdělení" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5231,7 +5231,7 @@ msgid "Before" msgstr "Starší »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5239,11 +5239,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6532,7 +6532,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index f0225630f4..eda01937ab 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:22+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:36+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -506,9 +506,9 @@ msgstr "%s’s Gruppen" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s #: actions/apigrouplist.php:107 -#, fuzzy, php-format +#, php-format msgid "%1$s groups %2$s is a member of." -msgstr "Gruppen in denen %s Mitglied ist" +msgstr "%1$s Gruppen in denen %2$s Mitglied ist" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. @@ -3316,13 +3316,12 @@ msgid "Invalid username or password." msgstr "Benutzername oder Passwort falsch." #: actions/register.php:343 -#, fuzzy msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -"Hier kannst du einen neuen Zugang einrichten. Danach kannst du Nachrichten " -"und Links an deine Freunde und Kollegen schicken. " +"Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du " +"Nachrichten und Links mit deinen Freunden und Kollegen teilen. " #: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -3355,13 +3354,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Längerer Name, bevorzugt dein „echter“ Name" #: actions/register.php:494 -#, fuzzy, php-format +#, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -"außer folgende private Daten: Passwort, E-Mail-Adresse, IM-Adresse und " -"Telefonnummer." +"Abgesehen von folgenden Daten: Passwort, Email Adresse, IM Adresse und " +"Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar." #: actions/register.php:542 #, php-format @@ -4898,7 +4897,7 @@ msgstr "Problem bei Speichern der Nachricht." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5260,7 +5259,7 @@ msgid "Before" msgstr "Vorher" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten." @@ -5268,11 +5267,11 @@ msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten." msgid "Can't handle remote content yet." msgstr "Fremdinhalt kann noch nicht eingebunden werden." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Eingebundener Base64 Inhalt kann noch nicht verarbeitet werden." @@ -6657,7 +6656,7 @@ msgstr "Deine gesendeten Nachrichten" msgid "Tags in %s's notices" msgstr "Stichworte in %ss Nachrichten" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Unbekannter Befehl" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 8fa761ae81..a75fef345b 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:29+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:39+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -4769,7 +4769,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5142,7 +5142,7 @@ msgid "Before" msgstr "" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5150,11 +5150,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6409,7 +6409,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index a52c4b5701..38caf74c60 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:33+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:42+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -4779,7 +4779,7 @@ msgstr "Problem saving group inbox." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5137,7 +5137,7 @@ msgid "Before" msgstr "Before" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5145,11 +5145,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6396,7 +6396,7 @@ msgstr "Your sent messages" msgid "Tags in %s's notices" msgstr "Tags in %s's notices" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Unknown" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 4e4d4bf06d..7147c728f9 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -15,11 +15,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:36+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:46+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -4883,7 +4883,7 @@ msgstr "Hubo un problema al guarda la bandeja de entrada del grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5246,7 +5246,7 @@ msgid "Before" msgstr "Antes" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "A espera de un elemento de alimentación de raíz, pero se obtuvo un documento " @@ -5256,11 +5256,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Aún no se puede manejar contenido remoto." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Aún no se puede manejar contenido XML incrustado." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Aún no se puede manejar contenido incrustado Base64." @@ -6652,7 +6652,7 @@ msgstr "Mensajes enviados" msgid "Tags in %s's notices" msgstr "Etiquetas en avisos de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Desconocido" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 76e68fda7c..77e38b3a80 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:48+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:52+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -4775,7 +4775,7 @@ msgstr "مشکل در ذخیره کردن آگهی." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5146,7 +5146,7 @@ msgid "Before" msgstr "قبل از" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5154,11 +5154,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6415,7 +6415,7 @@ msgstr "پیام های فرستاده شده به وسیله ی شما" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index b015ccdbe7..a09c1415df 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:45+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:49+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -4949,7 +4949,7 @@ msgstr "Ongelma päivityksen tallentamisessa." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5332,7 +5332,7 @@ msgid "Before" msgstr "Aiemmin" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5340,11 +5340,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6643,7 +6643,7 @@ msgstr "Lähettämäsi viestit" msgid "Tags in %s's notices" msgstr "Tagit käyttäjän %s päivityksissä" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Tuntematon toiminto" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 07c850bdd0..cf3f5d3b5b 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:52+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:56+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -4913,7 +4913,7 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5275,7 +5275,7 @@ msgid "Before" msgstr "Avant" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Attendait un élément racine mais a reçu tout un document XML." @@ -5283,11 +5283,11 @@ msgstr "Attendait un élément racine mais a reçu tout un document XML." msgid "Can't handle remote content yet." msgstr "Impossible de gérer le contenu distant pour le moment." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Impossible de gérer le contenu XML embarqué pour le moment." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Impossible de gérer le contenu en Base64 embarqué pour le moment." @@ -6685,7 +6685,7 @@ msgstr "Vos messages envoyés" msgid "Tags in %s's notices" msgstr "Marques dans les avis de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Inconnu" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index d16b9d2d96..6fd5580455 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:55+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:04+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -5004,7 +5004,7 @@ msgstr "Aconteceu un erro ó gardar o chío." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5391,7 +5391,7 @@ msgid "Before" msgstr "Antes »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5399,11 +5399,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6800,7 +6800,7 @@ msgstr "As túas mensaxes enviadas" msgid "Tags in %s's notices" msgstr "O usuario non ten último chio." -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Acción descoñecida" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index ee17dbd292..0b59b9adb8 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:07+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:08+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -4880,7 +4880,7 @@ msgstr "Houbo un problema ao gardar a caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "♻ @%1$s %2$s" @@ -5242,7 +5242,7 @@ msgid "Before" msgstr "Anteriores" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "Esperábase unha fonte de novas raíz pero recibiuse un documento XML completo." @@ -5251,11 +5251,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Aínda non é posible manexar contidos remotos." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Aínda non se poden manexar contidos XML integrados." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Aínda non se poden manexar contidos Base64." @@ -5793,8 +5793,8 @@ msgstr "" "get - obter a última nota do usuario\n" "whois - obtén a información do perfil do usuario\n" "lose - facer que o usuario deixe de seguilo\n" -"fav - marcar como “favorita” a última nota do usuario\n" -"fav # - marcar como “favorita” a nota coa id indicada\n" +"fav - marcar como \"favorita\" a última nota do usuario\n" +"fav # - marcar como \"favorita\" a nota coa id indicada\n" "repeat # - repetir a nota doa id indicada\n" "repeat - repetir a última nota do usuario\n" "reply # - responder a unha nota coa id indicada\n" @@ -5803,11 +5803,11 @@ msgstr "" "login - obter un enderezo para identificarse na interface web\n" "drop - deixar o grupo indicado\n" "stats - obter as súas estatísticas\n" -"stop - idéntico a “off”\n" -"quit - idéntico a “off”\n" -"sub - idéntico a “follow”\n" -"unsub - idéntico a “leave”\n" -"last - idéntico a “get”\n" +"stop - idéntico a \"off\"\n" +"quit - idéntico a \"off\"\n" +"sub - idéntico a \"follow\"\n" +"unsub - idéntico a \"leave\"\n" +"last - idéntico a \"get\"\n" "on - aínda non se integrou\n" "off - aínda non se integrou\n" "nudge - facerlle un aceno ao usuario indicado\n" @@ -5841,7 +5841,7 @@ msgstr "MI" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "" +msgstr "Actualizacións por mensaxería instantánea (MI)" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" @@ -5868,7 +5868,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "" "Pode cargar a súa imaxe de fondo persoal. O ficheiro non pode ocupar máis de " -"2 MiB." +"2MB." #: lib/designsettings.php:418 msgid "Design defaults restored." @@ -5900,7 +5900,7 @@ msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "FOAF" +msgstr "Amigo dun amigo" #: lib/feedlist.php:64 msgid "Export data" @@ -5908,7 +5908,7 @@ msgstr "Exportar os datos" #: lib/galleryaction.php:121 msgid "Filter tags" -msgstr "Filtrar etiquetas" +msgstr "Filtrar as etiquetas" #: lib/galleryaction.php:131 msgid "All" @@ -5933,7 +5933,7 @@ msgstr "Continuar" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "Atribuírlle a este usuario o rol «%s»" +msgstr "Outorgarlle a este usuario o rol \"%s\"" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5952,8 +5952,8 @@ msgstr "Describa o grupo ou o tema en %d caracteres" msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" msgstr "" -"Localidade do grupo, e a ten, como por exemplo «Cidade, Provincia, " -"Comunidade, País»." +"Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, " +"Comunidade, País\"" #: lib/groupeditform.php:187 #, php-format @@ -6043,11 +6043,11 @@ msgstr "Non se coñece o tipo de ficheiro" #: lib/imagefile.php:244 msgid "MB" -msgstr "MiB" +msgstr "MB" #: lib/imagefile.php:246 msgid "kB" -msgstr "KiB" +msgstr "kB" #: lib/jabber.php:387 #, php-format @@ -6264,7 +6264,7 @@ msgstr "" "\n" "%4$s\n" "\n" -"Non responda a este correo, non lle chegará ao remitente.\n" +"Non responda a esta mensaxe, non lle chegará ao remitente.\n" "\n" "Atentamente,\n" "%5$s\n" @@ -6322,7 +6322,7 @@ msgid "" "\n" "\t%s" msgstr "" -"Pode ler a conversación completa en:\n" +"Pode ler a conversa completa en:\n" "\n" "%s" @@ -6358,7 +6358,7 @@ msgid "" "\n" "P.S. You can turn off these email notifications here: %8$s\n" msgstr "" -"%1$s (@%9$s) acaba de enviar unha nota á súa atención (un “respost@”) en %2" +"%1$s (@%9$s) acaba de enviar unha nota á súa atención (unha resposta) en %2" "$s.\n" "\n" "A nota está en:\n" @@ -6373,14 +6373,14 @@ msgstr "" "\n" "%6$s\n" "\n" -"A lista de todas as notas á súa @tención está en:\n" +"A lista de todas as respostas está en:\n" "\n" "%7$s\n" "\n" "Atentamente,\n" "%2$s\n" "\n" -"P.S: pode desactivar estas notificacións por correo electrónico en %8$s\n" +"P.S.: pode desactivar estas notificacións por correo electrónico en %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6417,7 +6417,7 @@ msgstr "Non se permite recibir correo electrónico." #: lib/mailhandler.php:228 #, php-format msgid "Unsupported message type: %s" -msgstr "Non se soporta o tipo de mensaxe %s" +msgstr "Non se soporta o tipo de mensaxe: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -6446,7 +6446,7 @@ msgstr "Falta un cartafol temporal." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "Non se puido escribir o ficheiro en disco." +msgstr "Non se puido escribir o ficheiro no disco." #: lib/mediafile.php:165 msgid "File upload stopped by extension." @@ -6480,7 +6480,7 @@ msgstr "Enviar unha nota directa" #: lib/messageform.php:146 msgid "To" -msgstr "a" +msgstr "A" #: lib/messageform.php:159 lib/noticeform.php:185 msgid "Available characters" @@ -6522,7 +6522,7 @@ msgid "" "try again later" msgstr "" "Estase tardando máis do esperado en obter a súa xeolocalización, vólvao " -"intentar máis tarde." +"intentar máis tarde" #. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 @@ -6547,7 +6547,7 @@ msgstr "O" #: lib/noticelist.php:438 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "1% u $ ½% 2 $ u '% 3 $ u \"s% 4% 5 $ u $ ½% 6 $ u' 7% $ u\" 8% $ s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:447 msgid "at" @@ -6642,7 +6642,7 @@ msgstr "As mensaxes enviadas" msgid "Tags in %s's notices" msgstr "Etiquetas nas notas de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Descoñecida" @@ -6705,11 +6705,11 @@ msgstr "Populares" #: lib/redirectingaction.php:94 msgid "No return-to arguments." -msgstr "Sen argumentos “return-to”." +msgstr "Sen argumentos \"return-to\"." #: lib/repeatform.php:107 msgid "Repeat this notice?" -msgstr "Quere repetir esta nova?" +msgstr "Quere repetir esta nota?" #: lib/repeatform.php:132 msgid "Yes" @@ -6717,12 +6717,12 @@ msgstr "Si" #: lib/repeatform.php:132 msgid "Repeat this notice" -msgstr "Repetir esta nova" +msgstr "Repetir esta nota" #: lib/revokeroleform.php:91 #, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Revogarlle o rol “%s” a este usuario" +msgstr "Revogarlle o rol \"%s\" a este usuario" #: lib/router.php:704 msgid "No single user defined for single-user mode." @@ -6806,7 +6806,7 @@ msgstr "Convidar" #: lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "Convida a amigos e compañeiros a unírseche en %s" +msgstr "Convide a amigos e compañeiros a unírselle en %s" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 857ce5a2c3..2c9927ebfe 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:10+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:12+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -4849,7 +4849,7 @@ msgstr "בעיה בשמירת ההודעה." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5234,7 +5234,7 @@ msgid "Before" msgstr "לפני >>" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5242,11 +5242,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6533,7 +6533,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 5d226be60a..a5126d75ad 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:15+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -4589,7 +4589,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4941,7 +4941,7 @@ msgid "Before" msgstr "" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4949,11 +4949,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6186,7 +6186,7 @@ msgstr "Twoje pósłane powěsće" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Njeznaty" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 62ec146c31..1b05490b9e 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:24+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:18+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -4857,7 +4857,7 @@ msgstr "Problema salveguardar le cassa de entrata del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5215,7 +5215,7 @@ msgid "Before" msgstr "Ante" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "Expectava le elemento-radice de un syndication, ma recipeva un documento XML " @@ -5225,11 +5225,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Non pote ancora tractar contento remote." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Non pote ancora tractar contento XML incastrate." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Non pote ancora tractar contento Base64 incastrate." @@ -6615,7 +6615,7 @@ msgstr "Tu messages inviate" msgid "Tags in %s's notices" msgstr "Etiquettas in le notas de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Incognite" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 34f87d2441..2b2f19f5d6 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:27+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:21+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -4899,7 +4899,7 @@ msgstr "Vandamál komu upp við að vista babl." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5282,7 +5282,7 @@ msgid "Before" msgstr "Áður" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5290,11 +5290,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6577,7 +6577,7 @@ msgstr "Skilaboð sem þú hefur sent" msgid "Tags in %s's notices" msgstr "Merki í babli %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Óþekkt aðgerð" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index de429fe9b6..6b6351f89b 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:37+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:25+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -4857,7 +4857,7 @@ msgstr "Problema nel salvare la casella della posta del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5219,7 +5219,7 @@ msgid "Before" msgstr "Precedenti" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero." @@ -5227,11 +5227,11 @@ msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero." msgid "Can't handle remote content yet." msgstr "Impossibile gestire contenuti remoti." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Impossibile gestire contenuti XML incorporati." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Impossibile gestire contenuti Base64." @@ -6621,7 +6621,7 @@ msgstr "I tuoi messaggi inviati" msgid "Tags in %s's notices" msgstr "Etichette nei messaggi di %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Sconosciuto" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 76ca28c248..d3943819ab 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:40+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:28+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -4890,7 +4890,7 @@ msgstr "グループ受信箱を保存する際に問題が発生しました。 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5267,7 +5267,7 @@ msgid "Before" msgstr "前>>" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5275,11 +5275,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6610,7 +6610,7 @@ msgstr "あなたが送ったメッセージ" msgid "Tags in %s's notices" msgstr "%s のつぶやきのタグ" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "不明" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 8411920419..835611a9fd 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:43+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:31+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -4871,7 +4871,7 @@ msgstr "통지를 저장하는데 문제가 발생했습니다." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5252,7 +5252,7 @@ msgid "Before" msgstr "앞 페이지" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5260,11 +5260,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6546,7 +6546,7 @@ msgstr "당신의 보낸 메시지들" msgid "Tags in %s's notices" msgstr "%s의 게시글의 태그" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "알려지지 않은 행동" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 76cd8f711f..215f5089cd 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:47+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:38+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -4878,7 +4878,7 @@ msgstr "Проблем при зачувувањето на групното п #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5240,7 +5240,7 @@ msgid "Before" msgstr "Пред" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Се очекува коренски каналски елемент, но добив цел XML документ." @@ -5248,11 +5248,11 @@ msgstr "Се очекува коренски каналски елемент, н msgid "Can't handle remote content yet." msgstr "Сè уште не е поддржана обработката на далечинска содржина." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Сè уште не е поддржана обработката на XML содржина." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Сè уште не е достапна обработката на вметната Base64 содржина." @@ -6642,7 +6642,7 @@ msgstr "Ваши испратени пораки" msgid "Tags in %s's notices" msgstr "Ознаки во забелешките на %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Непознато" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 4ac3bff575..c36addf558 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:50+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:41+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -4273,12 +4273,12 @@ msgstr "Alle abonnementer" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." -msgstr "" +msgstr "Dette er personene som lytter til dine notiser." #: actions/subscribers.php:67 #, php-format msgid "These are the people who listen to %s's notices." -msgstr "" +msgstr "Dette er personene som lytter til %ss notiser." #: actions/subscribers.php:108 msgid "" @@ -4310,12 +4310,12 @@ msgstr "Alle abonnementer" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "Dette er personene hvis notiser du lytter til." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "Dette er personene hvis notiser %s lytter til." #: actions/subscriptions.php:126 #, php-format @@ -4792,7 +4792,7 @@ msgstr "Problem ved lagring av gruppeinnboks." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5150,7 +5150,7 @@ msgid "Before" msgstr "Før" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5158,11 +5158,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6500,7 +6500,7 @@ msgstr "Dine sendte meldinger" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Ukjent" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index cef426ff5a..f42b339413 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:57+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:47+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -4920,7 +4920,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5283,7 +5283,7 @@ msgid "Before" msgstr "Eerder" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document." @@ -5291,11 +5291,11 @@ msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document." msgid "Can't handle remote content yet." msgstr "Het is nog niet mogelijk inhoud uit andere omgevingen te verwerken." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Het is nog niet mogelijk ingebedde XML-inhoud te verwerken" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Het is nog niet mogelijk ingebedde Base64-inhoud te verwerken" @@ -6696,7 +6696,7 @@ msgstr "Uw verzonden berichten" msgid "Tags in %s's notices" msgstr "Labels in de mededelingen van %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Onbekend" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 6a2a705d75..ddff427729 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:54+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:44+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -4938,7 +4938,7 @@ msgstr "Eit problem oppstod ved lagring av notis." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5321,7 +5321,7 @@ msgid "Before" msgstr "Før »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5329,11 +5329,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6624,7 +6624,7 @@ msgstr "Dine sende meldingar" msgid "Tags in %s's notices" msgstr "Merkelappar i %s sine notisar" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Uventa handling." diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index cd23aea291..c816475e19 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:01+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:50+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -4851,7 +4851,7 @@ msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5214,7 +5214,7 @@ msgid "Before" msgstr "Wcześniej" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML." @@ -5222,11 +5222,11 @@ msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML." msgid "Can't handle remote content yet." msgstr "Nie można jeszcze obsługiwać zdalnej treści." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści XML." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści Base64." @@ -6615,7 +6615,7 @@ msgstr "Wysłane wiadomości" msgid "Tags in %s's notices" msgstr "Znaczniki we wpisach użytkownika %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Nieznane" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 048664eb81..2d65717674 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:04+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:53+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -4849,7 +4849,7 @@ msgstr "Problema na gravação da caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5212,7 +5212,7 @@ msgid "Before" msgstr "Anteriores" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "Era esperado um elemento raiz da fonte, mas foi recebido um documento XML " @@ -5222,11 +5222,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Ainda não é possível processar conteúdos remotos." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Ainda não é possível processar conteúdo XML embutido." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Ainda não é possível processar conteúdo Base64 embutido." @@ -6608,7 +6608,7 @@ msgstr "Mensagens enviadas" msgid "Tags in %s's notices" msgstr "Categorias nas notas de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Desconhecida" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 4263dde6b5..1409dc6146 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:12+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:56+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -1536,9 +1536,8 @@ msgstr "Esse é o endereço de e-mail errado." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "A confirmação foi cancelada." +msgstr "A confirmação por e-mail foi cancelada." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1548,9 +1547,8 @@ msgstr "Esse não é seu endereço de email." #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 -#, fuzzy msgid "The email address was removed." -msgstr "O endereço foi removido." +msgstr "O endereço de e-mail foi removido." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1690,9 +1688,8 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "O serviço remoto usa uma versão desconhecida do protocolo OMB." #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." -msgstr "Ocorreu um erro na atualização do perfil remoto" +msgstr "Ocorreu um erro durante a atualização do perfil remoto." #: actions/getfile.php:79 msgid "No such file." @@ -2014,9 +2011,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Preferências" +msgstr "Preferências do mensageiro instantâneo" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2088,15 +2084,13 @@ msgstr "Isso é um endereço de MI errado." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "Não foi possível excluir a confirmação de e-mail." +msgstr "Não foi possível excluir a confirmação do mensageiro instantâneo." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "A confirmação foi cancelada." +msgstr "A confirmação do mensageiro instantâneo foi cancelada." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2106,9 +2100,8 @@ msgstr "Essa não é sua ID do Jabber." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "O endereço foi removido." +msgstr "O endereço de mensageiro instantâneo foi removido." #: actions/inbox.php:59 #, php-format @@ -2131,10 +2124,10 @@ msgid "Invites have been disabled." msgstr "Os convites foram desabilitados." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." msgstr "" -"Você deve estar autenticado para convidar outros usuários para usar o %s" +"Você deve estar autenticado para convidar outros usuários para usar o %s." #: actions/invite.php:72 #, php-format @@ -2344,17 +2337,15 @@ msgstr "" "senha antes de alterar suas configurações." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Autentique-se com um nome de usuário e uma senha" +msgstr "Autentique-se com seu nome de usuário e senha." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Digite seu nome de usuário e senha. Ainda não possui um usuário? [Registre](%" -"%action.register%%) uma nova conta." +"Ainda não possui um usuário? [Registre](%%action.register%%) uma nova conta." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2378,9 +2369,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Não foi possível tornar %1$s um administrador do grupo %2$s." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "Nenhuma mensagem atual" +msgstr "Nenhuma mensagem atual." #: actions/newapplication.php:52 msgid "New Application" @@ -2547,9 +2537,9 @@ msgid "You are not a user of that application." msgstr "Você não é um usuário dessa aplicação." #: actions/oauthconnectionssettings.php:186 -#, fuzzy, php-format +#, php-format msgid "Unable to revoke access for app: %s." -msgstr "Não foi possível revogar o acesso para a aplicação: " +msgstr "Não foi possível revogar o acesso para a aplicação: %s." #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." @@ -4903,7 +4893,7 @@ msgstr "Problema no salvamento das mensagens recebidas do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5262,7 +5252,7 @@ msgid "Before" msgstr "Anterior" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "Era esperado um elemento raiz da fonte, mas foi obtido o documento XML " @@ -5272,11 +5262,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Ainda não é possível manipular conteúdo remoto." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Ainda não é possível manipular conteúdo XML incorporado." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Ainda não é possível manipular conteúdo Base64." @@ -6643,7 +6633,7 @@ msgstr "Suas mensagens enviadas" msgid "Tags in %s's notices" msgstr "Etiquetas nas mensagens de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Desconhecido" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 7f697bd8d5..054ed2bc2a 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:15+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:59+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -4869,7 +4869,7 @@ msgstr "Проблемы с сохранением входящих сообще #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5230,7 +5230,7 @@ msgid "Before" msgstr "Туда" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком." @@ -5238,11 +5238,11 @@ msgstr "Ожидался корневой элемент потока, а пол msgid "Can't handle remote content yet." msgstr "Пока ещё нельзя обрабатывать удалённое содержимое." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Пока ещё нельзя обрабатывать встроенный XML." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Пока ещё нельзя обрабатывать встроенное содержание Base64." @@ -6629,7 +6629,7 @@ msgstr "Ваши исходящие сообщения" msgid "Tags in %s's notices" msgstr "Теги записей пользователя %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Неизвестно" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index e0aad71466..caa8258f97 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-26 22:15+0000\n" +"POT-Creation-Date: 2010-05-03 19:17+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4575,7 +4575,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4927,7 +4927,7 @@ msgid "Before" msgstr "" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4935,11 +4935,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6166,7 +6166,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 65a64dc320..e50bf1a328 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:20+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:02+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -4846,7 +4846,7 @@ msgstr "Problem med att spara gruppinkorg." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5204,7 +5204,7 @@ msgid "Before" msgstr "Tidigare" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument." @@ -5212,11 +5212,11 @@ msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument." msgid "Can't handle remote content yet." msgstr "Kan inte hantera fjärrinnehåll ännu." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Kan inte hantera inbäddat XML-innehåll ännu." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Kan inte hantera inbäddat Base64-innehåll ännu." @@ -6596,7 +6596,7 @@ msgstr "Dina skickade meddelanden" msgid "Tags in %s's notices" msgstr "Taggar i %ss notiser" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Okänd" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 54e7d0de18..7084c9114a 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:38+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:06+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -2113,6 +2113,8 @@ msgid "" "You will be notified when your invitees accept the invitation and register " "on the site. Thanks for growing the community!" msgstr "" +"ఆహ్వానితులు మీ ఆహ్వానాన్ని అంగీకరించి సైటులో నమోదైనప్పుడు మీకు తెలియజేస్తాము. ఇక్కడి ప్రజని " +"పెంచుతున్నందుకు ధన్యవాదాలు!" #: actions/invite.php:162 msgid "" @@ -2450,7 +2452,7 @@ msgstr "మీరు నమోదు చేసివున్న ఉపకరణ #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "మీరు ఇంకా ఏ ఉపకరణాన్నీ నమోదు చేసుకోలేదు." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" @@ -2471,7 +2473,7 @@ msgstr "" #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "మీ ఖాతాని ఉపయోగించుకోడానికి మీరు ఏ ఉపకరణాన్నీ అధీకరించలేదు." #: actions/oauthconnectionssettings.php:211 msgid "Developers can edit the registration settings for their applications " @@ -3907,7 +3909,7 @@ msgstr "అప్రమేయ భాష" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" -msgstr "" +msgstr "విహారిణి అమరికల నుండి భాషని స్వయంచాలకంగా పొందలేకపోయినప్పుడు ఉపయోగించే సైటు భాష" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3927,7 +3929,7 @@ msgstr "" #: actions/siteadminpanel.php:278 msgid "How long users must wait (in seconds) to post the same thing again." -msgstr "" +msgstr "అదే విషయాన్ని మళ్ళీ టపా చేయడానికి వాడుకరులు ఎంత సమయం (క్షణాల్లో) వేచివుండాలి." #: actions/sitenoticeadminpanel.php:56 msgid "Site Notice" @@ -4234,6 +4236,8 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%sకి చందాదార్లు ఎవరూ లేరు. [ఒక ఖాతాని నమోదు చేసుకుని](%%%%action.register%%%%) మీరు " +"ఎందుకు మొదటి చందాదారు కాకూడదు?" #: actions/subscriptions.php:52 #, php-format @@ -4247,12 +4251,12 @@ msgstr "%1$s చందాలు, పేజీ %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "మీరు ఈ వ్యక్తుల నోటీసులని వింటున్నారు." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "%s వీరి నోటీసులని వింటున్నారు." #: actions/subscriptions.php:126 #, php-format @@ -4729,7 +4733,7 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5096,7 +5100,7 @@ msgid "Before" msgstr "ఇంతక్రితం" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5104,11 +5108,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -5465,9 +5469,9 @@ msgstr "" #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" -msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు." +msgstr "సందేశం చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -6452,7 +6456,7 @@ msgstr "మీరు పంపిన సందేశాలు" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 8514f78d5d..28869e63fb 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:42+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:10+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -4852,7 +4852,7 @@ msgstr "Durum mesajını kaydederken hata oluştu." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5237,7 +5237,7 @@ msgid "Before" msgstr "Önce »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5245,11 +5245,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6538,7 +6538,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index efdcae240f..349e2da72e 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:45+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:13+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -4854,7 +4854,7 @@ msgstr "Проблема при збереженні вхідних дописі #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5212,7 +5212,7 @@ msgid "Before" msgstr "Назад" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML." @@ -5221,11 +5221,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Поки що не можу обробити віддалений контент." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Поки що не можу обробити вбудований XML контент." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Поки що не можу обробити вбудований контент Base64." @@ -6611,7 +6611,7 @@ msgstr "Надіслані вами повідомлення" msgid "Tags in %s's notices" msgstr "Теґи у дописах %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Невідомо" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 4dd5e6ceb8..5c22fbad66 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:48+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:17+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -5006,7 +5006,7 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" @@ -5395,7 +5395,7 @@ msgid "Before" msgstr "Trước" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5403,11 +5403,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6768,7 +6768,7 @@ msgstr "Thư bạn đã gửi" msgid "Tags in %s's notices" msgstr "cảnh báo tin nhắn" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Không tìm thấy action" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index e38cda2ec6..71d3293f41 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:51+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:20+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -4935,7 +4935,7 @@ msgstr "保存通告时出错。" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5325,7 +5325,7 @@ msgid "Before" msgstr "之前 »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5333,11 +5333,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6643,7 +6643,7 @@ msgstr "您发送的消息" msgid "Tags in %s's notices" msgstr "%s's 的消息的标签" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "未知动作" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 4240b921ab..b7aca62bc3 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:54+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:23+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -4760,7 +4760,7 @@ msgstr "儲存使用者發生錯誤" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5138,7 +5138,7 @@ msgid "Before" msgstr "之前的內容»" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5146,11 +5146,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6420,7 +6420,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot new file mode 100644 index 0000000000..b01f9dc893 --- /dev/null +++ b/plugins/AutoSandbox/locale/AutoSandbox.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: AutoSandboxPlugin.php:66 +msgid "Automatically sandboxes newly registered members." +msgstr "" diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot new file mode 100644 index 0000000000..c0274af85a --- /dev/null +++ b/plugins/Autocomplete/locale/Autocomplete.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: AutocompletePlugin.php:79 +msgid "" +"The autocomplete plugin allows users to autocomplete screen names in @ " +"replies. When an \"@\" is typed into the notice text area, an autocomplete " +"box is displayed populated with the user's friend' screen names." +msgstr "" diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot new file mode 100644 index 0000000000..28023759aa --- /dev/null +++ b/plugins/BitlyUrl/locale/BitlyUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: BitlyUrlPlugin.php:60 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot new file mode 100644 index 0000000000..90eda0941d --- /dev/null +++ b/plugins/Blacklist/locale/Blacklist.pot @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: BlacklistPlugin.php:153 +#, php-format +msgid "You may not register with homepage '%s'" +msgstr "" + +#: BlacklistPlugin.php:163 +#, php-format +msgid "You may not register with nickname '%s'" +msgstr "" + +#: BlacklistPlugin.php:188 +#, php-format +msgid "You may not use homepage '%s'" +msgstr "" + +#: BlacklistPlugin.php:198 +#, php-format +msgid "You may not use nickname '%s'" +msgstr "" + +#: BlacklistPlugin.php:242 +#, php-format +msgid "You may not use url '%s' in notices" +msgstr "" + +#: BlacklistPlugin.php:351 +msgid "Keep a blacklist of forbidden nickname and URL patterns." +msgstr "" + +#: blacklistadminpanel.php:185 +msgid "Nicknames" +msgstr "" + +#: blacklistadminpanel.php:193 +msgid "URLs" +msgstr "" diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot new file mode 100644 index 0000000000..20a2bf2330 --- /dev/null +++ b/plugins/CasAuthentication/locale/CasAuthentication.pot @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: CasAuthenticationPlugin.php:82 +msgid "CAS" +msgstr "" + +#: CasAuthenticationPlugin.php:83 +msgid "Login or register with CAS" +msgstr "" + +#: CasAuthenticationPlugin.php:150 +msgid "" +"The CAS Authentication plugin allows for StatusNet to handle authentication " +"through CAS (Central Authentication Service)." +msgstr "" + +#: caslogin.php:28 +msgid "Already logged in." +msgstr "" diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot new file mode 100644 index 0000000000..83caff3221 --- /dev/null +++ b/plugins/ClientSideShorten/locale/ClientSideShorten.pot @@ -0,0 +1,27 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ClientSideShortenPlugin.php:74 +msgid "" +"ClientSideShorten causes the web interface's notice form to automatically " +"shorten urls as they entered, and before the notice is submitted." +msgstr "" + +#: shorten.php:55 +msgid "'text' argument must be specified." +msgstr "" diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot new file mode 100644 index 0000000000..ebeda2dc49 --- /dev/null +++ b/plugins/DirectionDetector/locale/DirectionDetector.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: DirectionDetectorPlugin.php:221 +msgid "shows notices with right-to-left content in correct direction." +msgstr "" diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot new file mode 100644 index 0000000000..d945e2537a --- /dev/null +++ b/plugins/EmailAuthentication/locale/EmailAuthentication.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: EmailAuthenticationPlugin.php:61 +msgid "" +"The Email Authentication plugin allows users to login using their email " +"address." +msgstr "" diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot index 4bc00248c9..dce10d230f 100644 --- a/plugins/Facebook/locale/Facebook.pot +++ b/plugins/Facebook/locale/Facebook.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,201 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: facebookaction.php:171 -msgid "Home" -msgstr "" - -#: facebookaction.php:179 -msgid "Invite" -msgstr "" - -#: facebookaction.php:188 -msgid "Settings" -msgstr "" - -#: facebookaction.php:228 -#, php-format -msgid "" -"To use the %s Facebook Application you need to login with your username and " -"password. Don't have a username yet? " -msgstr "" - -#: facebookaction.php:230 -msgid " a new account." -msgstr "" - -#: facebookaction.php:236 -msgid "Register" -msgstr "" - -#: facebookaction.php:249 facebookaction.php:275 facebooklogin.php:91 -msgid "Login" -msgstr "" - -#: facebookaction.php:268 -msgid "Nickname" -msgstr "" - -#: facebookaction.php:271 FBConnectAuth.php:196 -msgid "Password" -msgstr "" - -#: facebookaction.php:281 -msgid "Lost or forgotten password?" -msgstr "" - -#: facebookaction.php:330 facebookhome.php:248 -msgid "Pagination" -msgstr "" - -#: facebookaction.php:339 facebookhome.php:257 -msgid "After" -msgstr "" - -#: facebookaction.php:347 facebookhome.php:265 -msgid "Before" -msgstr "" - -#: facebookaction.php:365 -msgid "No notice content!" -msgstr "" - -#: facebookaction.php:371 -#, php-format -msgid "That's too long. Max notice size is %d chars." -msgstr "" - -#: facebookaction.php:430 -msgid "Notices" -msgstr "" - -#: facebookhome.php:111 -msgid "Server error - couldn't get user!" -msgstr "" - -#: facebookhome.php:131 -msgid "Incorrect username or password." -msgstr "" - -#: facebookhome.php:158 -#, php-format -msgid "%s and friends, page %d" -msgstr "" - -#: facebookhome.php:160 -#, php-format -msgid "%s and friends" -msgstr "" - -#: facebookhome.php:189 -#, php-format -msgid "" -"If you would like the %s app to automatically update your Facebook status " -"with your latest notice, you need to give it permission." -msgstr "" - -#: facebookhome.php:213 -msgid "Okay, do it!" -msgstr "" - -#: facebookhome.php:219 -msgid "Skip" -msgstr "" - -#: facebookinvite.php:72 -#, php-format -msgid "Thanks for inviting your friends to use %s" -msgstr "" - -#: facebookinvite.php:74 -msgid "Invitations have been sent to the following users:" -msgstr "" - -#: facebookinvite.php:94 -#, php-format -msgid "You have been invited to %s" -msgstr "" - -#: facebookinvite.php:103 -#, php-format -msgid "Invite your friends to use %s" -msgstr "" - -#: facebookinvite.php:125 -#, php-format -msgid "Friends already using %s:" -msgstr "" - -#: facebookinvite.php:143 -msgid "Send invitations" -msgstr "" - -#: FacebookPlugin.php:413 FacebookPlugin.php:433 -msgid "Facebook" -msgstr "" - -#: FacebookPlugin.php:414 -msgid "Login or register using Facebook" -msgstr "" - -#: FacebookPlugin.php:434 FBConnectSettings.php:56 -msgid "Facebook Connect Settings" -msgstr "" - -#: FacebookPlugin.php:533 -msgid "" -"The Facebook plugin allows you to integrate your StatusNet instance with Facebook and Facebook Connect." -msgstr "" - -#: facebookremove.php:58 -msgid "Couldn't remove Facebook user." -msgstr "" - -#: facebooksettings.php:74 -msgid "There was a problem saving your sync preferences!" -msgstr "" - -#: facebooksettings.php:76 -msgid "Sync preferences saved." -msgstr "" - -#: facebooksettings.php:99 -msgid "Automatically update my Facebook status with my notices." -msgstr "" - -#: facebooksettings.php:106 -msgid "Send \"@\" replies to Facebook." -msgstr "" - -#: facebooksettings.php:115 -msgid "Prefix" -msgstr "" - -#: facebooksettings.php:117 -msgid "A string to prefix notices with." -msgstr "" - -#: facebooksettings.php:123 -msgid "Save" -msgstr "" - -#: facebooksettings.php:133 -#, php-format -msgid "" -"If you would like %s to automatically update your Facebook status with your " -"latest notice, you need to give it permission." -msgstr "" - -#: facebooksettings.php:146 -#, php-format -msgid "Allow %s to update my Facebook status" -msgstr "" - -#: facebooksettings.php:156 -msgid "Sync preferences" -msgstr "" - #: facebookutil.php:285 #, php-format msgid "" @@ -258,85 +63,180 @@ msgstr "" msgid "Facebook Account Setup" msgstr "" -#: FBConnectAuth.php:153 +#: FBConnectAuth.php:158 msgid "Connection options" msgstr "" -#: FBConnectAuth.php:162 -msgid "My text and files are available under " -msgstr "" - -#: FBConnectAuth.php:165 -msgid "" -" except this private data: password, email address, IM address, phone number." -msgstr "" - -#: FBConnectAuth.php:173 +#: FBConnectAuth.php:183 msgid "Create new account" msgstr "" -#: FBConnectAuth.php:175 +#: FBConnectAuth.php:185 msgid "Create a new user with this nickname." msgstr "" -#: FBConnectAuth.php:178 +#: FBConnectAuth.php:188 msgid "New nickname" msgstr "" -#: FBConnectAuth.php:180 +#: FBConnectAuth.php:190 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: FBConnectAuth.php:183 +#: FBConnectAuth.php:193 msgid "Create" msgstr "" -#: FBConnectAuth.php:188 +#: FBConnectAuth.php:198 msgid "Connect existing account" msgstr "" -#: FBConnectAuth.php:190 +#: FBConnectAuth.php:200 msgid "" "If you already have an account, login with your username and password to " "connect it to your Facebook." msgstr "" -#: FBConnectAuth.php:193 +#: FBConnectAuth.php:203 msgid "Existing nickname" msgstr "" -#: FBConnectAuth.php:199 +#: FBConnectAuth.php:206 facebookaction.php:271 +msgid "Password" +msgstr "" + +#: FBConnectAuth.php:209 msgid "Connect" msgstr "" -#: FBConnectAuth.php:215 FBConnectAuth.php:224 +#: FBConnectAuth.php:225 FBConnectAuth.php:234 msgid "Registration not allowed." msgstr "" -#: FBConnectAuth.php:231 +#: FBConnectAuth.php:241 msgid "Not a valid invitation code." msgstr "" -#: FBConnectAuth.php:241 +#: FBConnectAuth.php:251 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: FBConnectAuth.php:246 +#: FBConnectAuth.php:256 msgid "Nickname not allowed." msgstr "" -#: FBConnectAuth.php:251 +#: FBConnectAuth.php:261 msgid "Nickname already in use. Try another one." msgstr "" -#: FBConnectAuth.php:269 FBConnectAuth.php:303 FBConnectAuth.php:323 +#: FBConnectAuth.php:279 FBConnectAuth.php:313 FBConnectAuth.php:333 msgid "Error connecting user to Facebook." msgstr "" -#: FBConnectAuth.php:289 +#: FBConnectAuth.php:299 msgid "Invalid username or password." msgstr "" +#: facebooklogin.php:91 facebookaction.php:249 facebookaction.php:275 +msgid "Login" +msgstr "" + +#: facebookhome.php:111 +msgid "Server error - couldn't get user!" +msgstr "" + +#: facebookhome.php:131 +msgid "Incorrect username or password." +msgstr "" + +#: facebookhome.php:158 +#, php-format +msgid "%s and friends, page %d" +msgstr "" + +#: facebookhome.php:160 +#, php-format +msgid "%s and friends" +msgstr "" + +#: facebookhome.php:189 +#, php-format +msgid "" +"If you would like the %s app to automatically update your Facebook status " +"with your latest notice, you need to give it permission." +msgstr "" + +#: facebookhome.php:213 +msgid "Okay, do it!" +msgstr "" + +#: facebookhome.php:219 +msgid "Skip" +msgstr "" + +#: facebookhome.php:248 facebookaction.php:330 +msgid "Pagination" +msgstr "" + +#: facebookhome.php:257 facebookaction.php:339 +msgid "After" +msgstr "" + +#: facebookhome.php:265 facebookaction.php:347 +msgid "Before" +msgstr "" + +#: facebookinvite.php:72 +#, php-format +msgid "Thanks for inviting your friends to use %s" +msgstr "" + +#: facebookinvite.php:74 +msgid "Invitations have been sent to the following users:" +msgstr "" + +#: facebookinvite.php:94 +#, php-format +msgid "You have been invited to %s" +msgstr "" + +#: facebookinvite.php:103 +#, php-format +msgid "Invite your friends to use %s" +msgstr "" + +#: facebookinvite.php:125 +#, php-format +msgid "Friends already using %s:" +msgstr "" + +#: facebookinvite.php:143 +msgid "Send invitations" +msgstr "" + +#: FacebookPlugin.php:195 FacebookPlugin.php:488 FacebookPlugin.php:510 +#: facebookadminpanel.php:54 +msgid "Facebook" +msgstr "" + +#: FacebookPlugin.php:196 +msgid "Facebook integration configuration" +msgstr "" + +#: FacebookPlugin.php:489 +msgid "Login or register using Facebook" +msgstr "" + +#: FacebookPlugin.php:511 FBConnectSettings.php:56 +msgid "Facebook Connect Settings" +msgstr "" + +#: FacebookPlugin.php:617 +msgid "" +"The Facebook plugin allows you to integrate your StatusNet instance with Facebook and Facebook Connect." +msgstr "" + #: FBConnectLogin.php:33 msgid "Already logged in." msgstr "" @@ -349,6 +249,90 @@ msgstr "" msgid "Facebook Login" msgstr "" +#: facebookremove.php:58 +msgid "Couldn't remove Facebook user." +msgstr "" + +#: facebookaction.php:171 +msgid "Home" +msgstr "" + +#: facebookaction.php:179 +msgid "Invite" +msgstr "" + +#: facebookaction.php:188 +msgid "Settings" +msgstr "" + +#: facebookaction.php:228 +#, php-format +msgid "" +"To use the %s Facebook Application you need to login with your username and " +"password. Don't have a username yet? " +msgstr "" + +#: facebookaction.php:230 +msgid " a new account." +msgstr "" + +#: facebookaction.php:236 +msgid "Register" +msgstr "" + +#: facebookaction.php:268 +msgid "Nickname" +msgstr "" + +#: facebookaction.php:281 +msgid "Lost or forgotten password?" +msgstr "" + +#: facebookaction.php:365 +msgid "No notice content!" +msgstr "" + +#: facebookaction.php:371 +#, php-format +msgid "That's too long. Max notice size is %d chars." +msgstr "" + +#: facebookaction.php:430 +msgid "Notices" +msgstr "" + +#: facebookadminpanel.php:65 +msgid "Facebook integration settings" +msgstr "" + +#: facebookadminpanel.php:129 +msgid "Invalid Facebook API key. Max length is 255 characters." +msgstr "" + +#: facebookadminpanel.php:135 +msgid "Invalid Facebook API secret. Max length is 255 characters." +msgstr "" + +#: facebookadminpanel.php:188 +msgid "Facebook application settings" +msgstr "" + +#: facebookadminpanel.php:194 +msgid "API key" +msgstr "" + +#: facebookadminpanel.php:195 +msgid "API key provided by Facebook" +msgstr "" + +#: facebookadminpanel.php:203 +msgid "Secret" +msgstr "" + +#: facebookadminpanel.php:204 +msgid "API secret provided by Facebook" +msgstr "" + #: FBConnectSettings.php:67 msgid "Manage how your account connects to Facebook" msgstr "" @@ -393,3 +377,47 @@ msgstr "" #: FBConnectSettings.php:197 msgid "Not sure what you're trying to do." msgstr "" + +#: facebooksettings.php:74 +msgid "There was a problem saving your sync preferences!" +msgstr "" + +#: facebooksettings.php:76 +msgid "Sync preferences saved." +msgstr "" + +#: facebooksettings.php:99 +msgid "Automatically update my Facebook status with my notices." +msgstr "" + +#: facebooksettings.php:106 +msgid "Send \"@\" replies to Facebook." +msgstr "" + +#: facebooksettings.php:115 +msgid "Prefix" +msgstr "" + +#: facebooksettings.php:117 +msgid "A string to prefix notices with." +msgstr "" + +#: facebooksettings.php:123 +msgid "Save" +msgstr "" + +#: facebooksettings.php:133 +#, php-format +msgid "" +"If you would like %s to automatically update your Facebook status with your " +"latest notice, you need to give it permission." +msgstr "" + +#: facebooksettings.php:146 +#, php-format +msgid "Allow %s to update my Facebook status" +msgstr "" + +#: facebooksettings.php:156 +msgid "Sync preferences" +msgstr "" diff --git a/plugins/FirePHP/locale/FirePHP.pot b/plugins/FirePHP/locale/FirePHP.pot new file mode 100644 index 0000000000..fa16f283eb --- /dev/null +++ b/plugins/FirePHP/locale/FirePHP.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: FirePHPPlugin.php:66 +msgid "The FirePHP plugin writes StatusNet's log output to FirePHP." +msgstr "" diff --git a/plugins/Gravatar/locale/Gravatar.pot b/plugins/Gravatar/locale/Gravatar.pot index d7275b9290..d3a4cd86b8 100644 --- a/plugins/Gravatar/locale/Gravatar.pot +++ b/plugins/Gravatar/locale/Gravatar.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot new file mode 100644 index 0000000000..ee8452aaaf --- /dev/null +++ b/plugins/Imap/locale/Imap.pot @@ -0,0 +1,27 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: imapmailhandler.php:28 +msgid "Error" +msgstr "" + +#: ImapPlugin.php:101 +msgid "" +"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for " +"incoming mail containing user posts." +msgstr "" diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot new file mode 100644 index 0000000000..a0f466fcb4 --- /dev/null +++ b/plugins/InfiniteScroll/locale/InfiniteScroll.pot @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: InfiniteScrollPlugin.php:54 +msgid "" +"Infinite Scroll adds the following functionality to your StatusNet " +"installation: When a user scrolls towards the bottom of the page, the next " +"page of notices is automatically retrieved and appended. This means they " +"never need to click \"Next Page\", which dramatically increases stickiness." +msgstr "" diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot new file mode 100644 index 0000000000..8f09b1e51e --- /dev/null +++ b/plugins/LdapAuthentication/locale/LdapAuthentication.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LdapAuthenticationPlugin.php:146 +msgid "" +"The LDAP Authentication plugin allows for StatusNet to handle authentication " +"through LDAP." +msgstr "" diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot new file mode 100644 index 0000000000..8156f6146f --- /dev/null +++ b/plugins/LdapAuthorization/locale/LdapAuthorization.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LdapAuthorizationPlugin.php:124 +msgid "" +"The LDAP Authorization plugin allows for StatusNet to handle authorization " +"through LDAP." +msgstr "" diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot new file mode 100644 index 0000000000..47ed367277 --- /dev/null +++ b/plugins/LilUrl/locale/LilUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LilUrlPlugin.php:68 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot index 1dd5dbbcc9..764bf7b291 100644 --- a/plugins/Mapstraction/locale/Mapstraction.pot +++ b/plugins/Mapstraction/locale/Mapstraction.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,24 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: allmap.php:71 -#, php-format -msgid "%s friends map" -msgstr "" - -#: allmap.php:74 -#, php-format -msgid "%s friends map, page %d" -msgstr "" - -#: map.php:72 -msgid "No such user." -msgstr "" - -#: map.php:79 -msgid "User has no profile." -msgstr "" - #: MapstractionPlugin.php:182 msgid "Map" msgstr "" @@ -48,6 +30,24 @@ msgid "" "mapstraction.com/\">Mapstraction JavaScript library." msgstr "" +#: map.php:72 +msgid "No such user." +msgstr "" + +#: map.php:79 +msgid "User has no profile." +msgstr "" + +#: allmap.php:71 +#, php-format +msgid "%s friends map" +msgstr "" + +#: allmap.php:74 +#, php-format +msgid "%s friends map, page %d" +msgstr "" + #: usermap.php:71 #, php-format msgid "%s map, page %d" diff --git a/plugins/Minify/locale/Minify.pot b/plugins/Minify/locale/Minify.pot new file mode 100644 index 0000000000..6f7372d405 --- /dev/null +++ b/plugins/Minify/locale/Minify.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: MinifyPlugin.php:179 +msgid "" +"The Minify plugin minifies your CSS and Javascript, removing whitespace and " +"comments." +msgstr "" diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot new file mode 100644 index 0000000000..9495e975b9 --- /dev/null +++ b/plugins/MobileProfile/locale/MobileProfile.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: MobileProfilePlugin.php:424 +msgid "XHTML MobileProfile output for supporting user agents." +msgstr "" diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot index 7e33a0eed6..97d593eadd 100644 --- a/plugins/OStatus/locale/OStatus.pot +++ b/plugins/OStatus/locale/OStatus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,197 +16,80 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: actions/groupsalmon.php:51 -msgid "Can't accept remote posts for a remote group." -msgstr "" - -#: actions/groupsalmon.php:123 -msgid "Can't read profile to set up group membership." -msgstr "" - -#: actions/groupsalmon.php:126 actions/groupsalmon.php:169 -msgid "Groups can't join groups." -msgstr "" - -#: actions/groupsalmon.php:153 -#, php-format -msgid "Could not join remote user %1$s to group %2$s." -msgstr "" - -#: actions/groupsalmon.php:166 -msgid "Can't read profile to cancel group membership." -msgstr "" - -#: actions/groupsalmon.php:182 -#, php-format -msgid "Could not remove remote user %1$s from group %2$s." -msgstr "" - -#: actions/ostatusinit.php:40 -msgid "You can use the local subscription!" -msgstr "" - -#: actions/ostatusinit.php:61 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - -#: actions/ostatusinit.php:79 actions/ostatussub.php:439 -msgid "Subscribe to user" -msgstr "" - -#: actions/ostatusinit.php:97 -#, php-format -msgid "Subscribe to %s" -msgstr "" - -#: actions/ostatusinit.php:102 -msgid "User nickname" -msgstr "" - -#: actions/ostatusinit.php:103 -msgid "Nickname of the user you want to follow" -msgstr "" - -#: actions/ostatusinit.php:106 -msgid "Profile Account" -msgstr "" - -#: actions/ostatusinit.php:107 -msgid "Your account id (i.e. user@identi.ca)" -msgstr "" - -#: actions/ostatusinit.php:110 actions/ostatussub.php:115 -#: OStatusPlugin.php:205 +#: OStatusPlugin.php:210 OStatusPlugin.php:913 actions/ostatusinit.php:99 msgid "Subscribe" msgstr "" -#: actions/ostatusinit.php:128 -msgid "Must provide a remote profile." -msgstr "" - -#: actions/ostatusinit.php:138 -msgid "Couldn't look up OStatus account profile." -msgstr "" - -#: actions/ostatusinit.php:153 -msgid "Couldn't confirm remote profile address." -msgstr "" - -#: actions/ostatusinit.php:171 -msgid "OStatus Connect" -msgstr "" - -#: actions/ostatussub.php:68 -msgid "Address or profile URL" -msgstr "" - -#: actions/ostatussub.php:70 -msgid "Enter the profile URL of a PubSubHubbub-enabled feed" -msgstr "" - -#: actions/ostatussub.php:74 -msgid "Continue" -msgstr "" - -#: actions/ostatussub.php:112 OStatusPlugin.php:503 +#: OStatusPlugin.php:228 OStatusPlugin.php:635 actions/ostatussub.php:105 +#: actions/ostatusinit.php:96 msgid "Join" msgstr "" -#: actions/ostatussub.php:113 -msgid "Join this group" -msgstr "" - -#: actions/ostatussub.php:116 -msgid "Subscribe to this user" -msgstr "" - -#: actions/ostatussub.php:137 -msgid "You are already subscribed to this user." -msgstr "" - -#: actions/ostatussub.php:165 -msgid "You are already a member of this group." -msgstr "" - -#: actions/ostatussub.php:286 -msgid "Empty remote profile URL!" -msgstr "" - -#: actions/ostatussub.php:297 -msgid "Invalid address format." -msgstr "" - -#: actions/ostatussub.php:302 -msgid "Invalid URL or could not reach server." -msgstr "" - -#: actions/ostatussub.php:304 -msgid "Cannot read feed; server returned error." -msgstr "" - -#: actions/ostatussub.php:306 -msgid "Cannot read feed; server returned an empty page." -msgstr "" - -#: actions/ostatussub.php:308 -msgid "Bad HTML, could not find feed link." -msgstr "" - -#: actions/ostatussub.php:310 -msgid "Could not find a feed linked from this URL." -msgstr "" - -#: actions/ostatussub.php:312 -msgid "Not a recognized feed type." -msgstr "" - -#: actions/ostatussub.php:315 +#: OStatusPlugin.php:451 #, php-format -msgid "Bad feed URL: %s %s" +msgid "Sent from %s via OStatus" msgstr "" -#. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatussub.php:336 -msgid "Already a member!" +#: OStatusPlugin.php:503 +msgid "Could not set up remote subscription." msgstr "" -#. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatussub.php:346 -msgid "Remote group join failed!" +#: OStatusPlugin.php:619 +msgid "Could not set up remote group membership." msgstr "" -#. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatussub.php:350 -msgid "Remote group join aborted!" +#: OStatusPlugin.php:636 +#, php-format +msgid "%s has joined group %s." msgstr "" -#. TRANS: OStatus remote subscription dialog error. -#: actions/ostatussub.php:356 -msgid "Already subscribed!" +#: OStatusPlugin.php:644 +msgid "Failed joining remote group." msgstr "" -#. TRANS: OStatus remote subscription dialog error. -#: actions/ostatussub.php:361 -msgid "Remote subscription failed!" +#: OStatusPlugin.php:684 +msgid "Leave" msgstr "" -#. TRANS: Page title for OStatus remote subscription form -#: actions/ostatussub.php:459 -msgid "Authorize subscription" +#: OStatusPlugin.php:685 +#, php-format +msgid "%s has left group %s." msgstr "" -#: actions/ostatussub.php:470 +#: OStatusPlugin.php:844 +msgid "Remote" +msgstr "" + +#: OStatusPlugin.php:883 +msgid "Profile update" +msgstr "" + +#: OStatusPlugin.php:884 +#, php-format +msgid "%s has updated their profile page." +msgstr "" + +#: OStatusPlugin.php:928 msgid "" -"You can subscribe to users from other supported sites. Paste their address " -"or profile URI below:" +"Follow people across social networks that implement OStatus." msgstr "" -#: classes/Ostatus_profile.php:789 +#: classes/Ostatus_profile.php:566 +msgid "Show more" +msgstr "" + +#: classes/Ostatus_profile.php:1004 +#, php-format +msgid "Invalid avatar URL %s" +msgstr "" + +#: classes/Ostatus_profile.php:1014 #, php-format msgid "Tried to update avatar for unsaved remote profile %s" msgstr "" -#: classes/Ostatus_profile.php:797 +#: classes/Ostatus_profile.php:1022 #, php-format msgid "Unable to fetch avatar from %s" msgstr "" @@ -263,50 +146,186 @@ msgstr "" msgid "This target doesn't understand leave events." msgstr "" -#: OStatusPlugin.php:319 -#, php-format -msgid "Sent from %s via OStatus" -msgstr "" - -#: OStatusPlugin.php:371 -msgid "Could not set up remote subscription." -msgstr "" - -#: OStatusPlugin.php:487 -msgid "Could not set up remote group membership." -msgstr "" - -#: OStatusPlugin.php:504 -#, php-format -msgid "%s has joined group %s." -msgstr "" - -#: OStatusPlugin.php:512 -msgid "Failed joining remote group." -msgstr "" - -#: OStatusPlugin.php:553 -msgid "Leave" -msgstr "" - -#: OStatusPlugin.php:554 -#, php-format -msgid "%s has left group %s." -msgstr "" - -#: OStatusPlugin.php:685 -msgid "Subscribe to remote user" -msgstr "" - -#: OStatusPlugin.php:726 -msgid "Profile update" -msgstr "" - -#: OStatusPlugin.php:727 -#, php-format -msgid "%s has updated their profile page." -msgstr "" - #: tests/gettext-speedtest.php:57 msgid "Feeds" msgstr "" + +#: actions/ostatusgroup.php:75 +msgid "Join group" +msgstr "" + +#: actions/ostatusgroup.php:77 +msgid "OStatus group's address, like http://example.net/group/nickname" +msgstr "" + +#: actions/ostatusgroup.php:81 actions/ostatussub.php:71 +msgid "Continue" +msgstr "" + +#: actions/ostatusgroup.php:100 +msgid "You are already a member of this group." +msgstr "" + +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatusgroup.php:135 +msgid "Already a member!" +msgstr "" + +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatusgroup.php:146 +msgid "Remote group join failed!" +msgstr "" + +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatusgroup.php:150 +msgid "Remote group join aborted!" +msgstr "" + +#. TRANS: Page title for OStatus remote group join form +#: actions/ostatusgroup.php:163 +msgid "Confirm joining remote group" +msgstr "" + +#: actions/ostatusgroup.php:174 +msgid "" +"You can subscribe to groups from other supported sites. Paste the group's " +"profile URI below:" +msgstr "" + +#: actions/groupsalmon.php:51 +msgid "Can't accept remote posts for a remote group." +msgstr "" + +#: actions/groupsalmon.php:124 +msgid "Can't read profile to set up group membership." +msgstr "" + +#: actions/groupsalmon.php:127 actions/groupsalmon.php:170 +msgid "Groups can't join groups." +msgstr "" + +#: actions/groupsalmon.php:154 +#, php-format +msgid "Could not join remote user %1$s to group %2$s." +msgstr "" + +#: actions/groupsalmon.php:167 +msgid "Can't read profile to cancel group membership." +msgstr "" + +#: actions/groupsalmon.php:183 +#, php-format +msgid "Could not remove remote user %1$s from group %2$s." +msgstr "" + +#: actions/ostatussub.php:65 +msgid "Subscribe to" +msgstr "" + +#: actions/ostatussub.php:67 +msgid "" +"OStatus user's address, like nickname@example.com or http://example.net/" +"nickname" +msgstr "" + +#: actions/ostatussub.php:106 +msgid "Join this group" +msgstr "" + +#. TRANS: Page title for OStatus remote subscription form +#: actions/ostatussub.php:108 actions/ostatussub.php:400 +msgid "Confirm" +msgstr "" + +#: actions/ostatussub.php:109 +msgid "Subscribe to this user" +msgstr "" + +#: actions/ostatussub.php:130 +msgid "You are already subscribed to this user." +msgstr "" + +#: actions/ostatussub.php:247 actions/ostatussub.php:253 +#: actions/ostatussub.php:272 +msgid "" +"Sorry, we could not reach that address. Please make sure that the OStatus " +"address is like nickname@example.com or http://example.net/nickname" +msgstr "" + +#: actions/ostatussub.php:256 actions/ostatussub.php:259 +#: actions/ostatussub.php:262 actions/ostatussub.php:265 +#: actions/ostatussub.php:268 +msgid "" +"Sorry, we could not reach that feed. Please try that OStatus address again " +"later." +msgstr "" + +#. TRANS: OStatus remote subscription dialog error. +#: actions/ostatussub.php:301 +msgid "Already subscribed!" +msgstr "" + +#. TRANS: OStatus remote subscription dialog error. +#: actions/ostatussub.php:306 +msgid "Remote subscription failed!" +msgstr "" + +#: actions/ostatussub.php:380 actions/ostatusinit.php:81 +msgid "Subscribe to user" +msgstr "" + +#: actions/ostatussub.php:411 +msgid "" +"You can subscribe to users from other supported sites. Paste their address " +"or profile URI below:" +msgstr "" + +#: actions/ostatusinit.php:41 +msgid "You can use the local subscription!" +msgstr "" + +#: actions/ostatusinit.php:63 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/ostatusinit.php:95 +#, php-format +msgid "Join group %s" +msgstr "" + +#: actions/ostatusinit.php:98 +#, php-format +msgid "Subscribe to %s" +msgstr "" + +#: actions/ostatusinit.php:111 +msgid "User nickname" +msgstr "" + +#: actions/ostatusinit.php:112 +msgid "Nickname of the user you want to follow" +msgstr "" + +#: actions/ostatusinit.php:116 +msgid "Profile Account" +msgstr "" + +#: actions/ostatusinit.php:117 +msgid "Your account id (i.e. user@identi.ca)" +msgstr "" + +#: actions/ostatusinit.php:138 +msgid "Must provide a remote profile." +msgstr "" + +#: actions/ostatusinit.php:149 +msgid "Couldn't look up OStatus account profile." +msgstr "" + +#: actions/ostatusinit.php:161 +msgid "Couldn't confirm remote profile address." +msgstr "" + +#: actions/ostatusinit.php:202 +msgid "OStatus Connect" +msgstr "" diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot new file mode 100644 index 0000000000..f9bd4af10e --- /dev/null +++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: OpenExternalLinkTargetPlugin.php:60 +msgid "Opens external links (i.e., with rel=external) on a new window or tab" +msgstr "" diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot index 7ed8798355..70908422e5 100644 --- a/plugins/OpenID/locale/OpenID.pot +++ b/plugins/OpenID/locale/OpenID.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,256 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: finishaddopenid.php:67 -msgid "Not logged in." -msgstr "" - -#: finishaddopenid.php:88 finishopenidlogin.php:149 -msgid "OpenID authentication cancelled." -msgstr "" - -#: finishaddopenid.php:92 finishopenidlogin.php:153 -#, php-format -msgid "OpenID authentication failed: %s" -msgstr "" - -#: finishaddopenid.php:112 -msgid "You already have this OpenID!" -msgstr "" - -#: finishaddopenid.php:114 -msgid "Someone else already has this OpenID." -msgstr "" - -#: finishaddopenid.php:126 -msgid "Error connecting user." -msgstr "" - -#: finishaddopenid.php:131 -msgid "Error updating profile" -msgstr "" - -#: finishaddopenid.php:170 openidlogin.php:95 -msgid "OpenID Login" -msgstr "" - -#: finishopenidlogin.php:34 openidlogin.php:30 -msgid "Already logged in." -msgstr "" - -#: finishopenidlogin.php:38 openidlogin.php:37 openidsettings.php:194 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - -#: finishopenidlogin.php:43 -msgid "You can't register if you don't agree to the license." -msgstr "" - -#: finishopenidlogin.php:52 openidsettings.php:208 -msgid "Something weird happened." -msgstr "" - -#: finishopenidlogin.php:66 -#, php-format -msgid "" -"This is the first time you've logged into %s so we must connect your OpenID " -"to a local account. You can either create a new account, or connect with " -"your existing account, if you have one." -msgstr "" - -#: finishopenidlogin.php:72 -msgid "OpenID Account Setup" -msgstr "" - -#: finishopenidlogin.php:97 -msgid "Create new account" -msgstr "" - -#: finishopenidlogin.php:99 -msgid "Create a new user with this nickname." -msgstr "" - -#: finishopenidlogin.php:102 -msgid "New nickname" -msgstr "" - -#: finishopenidlogin.php:104 -msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "" - -#: finishopenidlogin.php:114 -msgid "My text and files are available under " -msgstr "" - -#: finishopenidlogin.php:117 -msgid "" -" except this private data: password, email address, IM address, phone number." -msgstr "" - -#: finishopenidlogin.php:121 -msgid "Create" -msgstr "" - -#: finishopenidlogin.php:126 -msgid "Connect existing account" -msgstr "" - -#: finishopenidlogin.php:128 -msgid "" -"If you already have an account, login with your username and password to " -"connect it to your OpenID." -msgstr "" - -#: finishopenidlogin.php:131 -msgid "Existing nickname" -msgstr "" - -#: finishopenidlogin.php:134 -msgid "Password" -msgstr "" - -#: finishopenidlogin.php:137 -msgid "Connect" -msgstr "" - -#: finishopenidlogin.php:215 finishopenidlogin.php:224 -msgid "Registration not allowed." -msgstr "" - -#: finishopenidlogin.php:231 -msgid "Not a valid invitation code." -msgstr "" - -#: finishopenidlogin.php:241 -msgid "Nickname must have only lowercase letters and numbers and no spaces." -msgstr "" - -#: finishopenidlogin.php:246 -msgid "Nickname not allowed." -msgstr "" - -#: finishopenidlogin.php:251 -msgid "Nickname already in use. Try another one." -msgstr "" - -#: finishopenidlogin.php:258 finishopenidlogin.php:338 -msgid "Stored OpenID not found." -msgstr "" - -#: finishopenidlogin.php:267 -msgid "Creating new account for OpenID that already has a user." -msgstr "" - -#: finishopenidlogin.php:327 -msgid "Invalid username or password." -msgstr "" - -#: finishopenidlogin.php:345 -msgid "Error connecting user to OpenID." -msgstr "" - -#: openid.php:141 -msgid "Cannot instantiate OpenID consumer object." -msgstr "" - -#: openid.php:151 -msgid "Not a valid OpenID." -msgstr "" - -#: openid.php:153 -#, php-format -msgid "OpenID failure: %s" -msgstr "" - -#: openid.php:180 -#, php-format -msgid "Could not redirect to server: %s" -msgstr "" - -#: openid.php:198 -#, php-format -msgid "Could not create OpenID form: %s" -msgstr "" - -#: openid.php:214 -msgid "" -"This form should automatically submit itself. If not, click the submit " -"button to go to your OpenID provider." -msgstr "" - -#: openid.php:246 -msgid "Error saving the profile." -msgstr "" - -#: openid.php:257 -msgid "Error saving the user." -msgstr "" - -#: openid.php:277 -msgid "OpenID Auto-Submit" -msgstr "" - -#: openidlogin.php:66 -#, php-format -msgid "" -"For security reasons, please re-login with your [OpenID](%%doc.openid%%) " -"before changing your settings." -msgstr "" - -#: openidlogin.php:70 -#, php-format -msgid "Login with an [OpenID](%%doc.openid%%) account." -msgstr "" - -#: openidlogin.php:112 -msgid "OpenID login" -msgstr "" - -#: openidlogin.php:117 openidsettings.php:107 -msgid "OpenID URL" -msgstr "" - -#: openidlogin.php:119 -msgid "Your OpenID URL" -msgstr "" - -#: openidlogin.php:122 -msgid "Remember me" -msgstr "" - -#: openidlogin.php:123 -msgid "Automatically login in the future; not for shared computers!" -msgstr "" - -#: openidlogin.php:127 -msgid "Login" -msgstr "" - -#: OpenIDPlugin.php:123 OpenIDPlugin.php:135 -msgid "OpenID" -msgstr "" - -#: OpenIDPlugin.php:124 -msgid "Login or register with OpenID" -msgstr "" - -#: OpenIDPlugin.php:136 -msgid "Add or remove OpenIDs" -msgstr "" - -#: OpenIDPlugin.php:324 -msgid "Use OpenID to login to the site." -msgstr "" - -#: openidserver.php:106 -#, php-format -msgid "You are not authorized to use the identity %s." -msgstr "" - -#: openidserver.php:126 -msgid "Just an OpenID provider. Nothing to see here, move along..." -msgstr "" - #: openidsettings.php:59 msgid "OpenID settings" msgstr "" @@ -287,6 +37,10 @@ msgid "" "click \"Add\"." msgstr "" +#: openidsettings.php:107 openidlogin.php:119 +msgid "OpenID URL" +msgstr "" + #: openidsettings.php:117 msgid "Add" msgstr "" @@ -307,22 +61,304 @@ msgid "" "\"Remove\"." msgstr "" -#: openidsettings.php:172 +#: openidsettings.php:172 openidsettings.php:213 msgid "Remove" msgstr "" -#: openidsettings.php:228 +#: openidsettings.php:186 +msgid "OpenID Trusted Sites" +msgstr "" + +#: openidsettings.php:189 +msgid "" +"The following sites are allowed to access your identity and log you in. You " +"can remove a site from this list to deny it access to your OpenID." +msgstr "" + +#: openidsettings.php:231 finishopenidlogin.php:38 openidlogin.php:39 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: openidsettings.php:247 finishopenidlogin.php:51 +msgid "Something weird happened." +msgstr "" + +#: openidsettings.php:271 +msgid "No such OpenID trustroot." +msgstr "" + +#: openidsettings.php:275 +msgid "Trustroots removed" +msgstr "" + +#: openidsettings.php:298 msgid "No such OpenID." msgstr "" -#: openidsettings.php:233 +#: openidsettings.php:303 msgid "That OpenID does not belong to you." msgstr "" -#: openidsettings.php:237 +#: openidsettings.php:307 msgid "OpenID removed." msgstr "" +#: openid.php:137 +msgid "Cannot instantiate OpenID consumer object." +msgstr "" + +#: openid.php:147 +msgid "Not a valid OpenID." +msgstr "" + +#: openid.php:149 +#, php-format +msgid "OpenID failure: %s" +msgstr "" + +#: openid.php:176 +#, php-format +msgid "Could not redirect to server: %s" +msgstr "" + +#: openid.php:194 +#, php-format +msgid "Could not create OpenID form: %s" +msgstr "" + +#: openid.php:210 +msgid "" +"This form should automatically submit itself. If not, click the submit " +"button to go to your OpenID provider." +msgstr "" + +#: openid.php:242 +msgid "Error saving the profile." +msgstr "" + +#: openid.php:253 +msgid "Error saving the user." +msgstr "" + +#: openid.php:282 +msgid "Unauthorized URL used for OpenID login." +msgstr "" + +#: openid.php:302 +msgid "OpenID Login Submission" +msgstr "" + +#: openid.php:312 +msgid "Requesting authorization from your login provider..." +msgstr "" + +#: openid.php:315 +msgid "" +"If you are not redirected to your login provider in a few seconds, try " +"pushing the button below." +msgstr "" + +#. TRANS: Tooltip for main menu option "Login" +#: OpenIDPlugin.php:204 +msgctxt "TOOLTIP" +msgid "Login to the site" +msgstr "" + +#: OpenIDPlugin.php:207 +msgctxt "MENU" +msgid "Login" +msgstr "" + +#. TRANS: Tooltip for main menu option "Help" +#: OpenIDPlugin.php:212 +msgctxt "TOOLTIP" +msgid "Help me!" +msgstr "" + +#: OpenIDPlugin.php:215 +msgctxt "MENU" +msgid "Help" +msgstr "" + +#. TRANS: Tooltip for main menu option "Search" +#: OpenIDPlugin.php:221 +msgctxt "TOOLTIP" +msgid "Search for people or text" +msgstr "" + +#: OpenIDPlugin.php:224 +msgctxt "MENU" +msgid "Search" +msgstr "" + +#: OpenIDPlugin.php:283 OpenIDPlugin.php:319 +msgid "OpenID" +msgstr "" + +#: OpenIDPlugin.php:284 +msgid "Login or register with OpenID" +msgstr "" + +#: OpenIDPlugin.php:320 +msgid "Add or remove OpenIDs" +msgstr "" + +#: OpenIDPlugin.php:595 +msgid "Use OpenID to login to the site." +msgstr "" + +#: openidserver.php:106 +#, php-format +msgid "You are not authorized to use the identity %s." +msgstr "" + +#: openidserver.php:126 +msgid "Just an OpenID provider. Nothing to see here, move along..." +msgstr "" + +#: finishopenidlogin.php:34 openidlogin.php:30 +msgid "Already logged in." +msgstr "" + +#: finishopenidlogin.php:43 +msgid "You can't register if you don't agree to the license." +msgstr "" + +#: finishopenidlogin.php:65 +#, php-format +msgid "" +"This is the first time you've logged into %s so we must connect your OpenID " +"to a local account. You can either create a new account, or connect with " +"your existing account, if you have one." +msgstr "" + +#: finishopenidlogin.php:71 +msgid "OpenID Account Setup" +msgstr "" + +#: finishopenidlogin.php:101 +msgid "Create new account" +msgstr "" + +#: finishopenidlogin.php:103 +msgid "Create a new user with this nickname." +msgstr "" + +#: finishopenidlogin.php:106 +msgid "New nickname" +msgstr "" + +#: finishopenidlogin.php:108 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" + +#: finishopenidlogin.php:130 +msgid "Create" +msgstr "" + +#: finishopenidlogin.php:135 +msgid "Connect existing account" +msgstr "" + +#: finishopenidlogin.php:137 +msgid "" +"If you already have an account, login with your username and password to " +"connect it to your OpenID." +msgstr "" + +#: finishopenidlogin.php:140 +msgid "Existing nickname" +msgstr "" + +#: finishopenidlogin.php:143 +msgid "Password" +msgstr "" + +#: finishopenidlogin.php:146 +msgid "Connect" +msgstr "" + +#: finishopenidlogin.php:158 finishaddopenid.php:88 +msgid "OpenID authentication cancelled." +msgstr "" + +#: finishopenidlogin.php:162 finishaddopenid.php:92 +#, php-format +msgid "OpenID authentication failed: %s" +msgstr "" + +#: finishopenidlogin.php:227 finishopenidlogin.php:236 +msgid "Registration not allowed." +msgstr "" + +#: finishopenidlogin.php:243 +msgid "Not a valid invitation code." +msgstr "" + +#: finishopenidlogin.php:253 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "" + +#: finishopenidlogin.php:258 +msgid "Nickname not allowed." +msgstr "" + +#: finishopenidlogin.php:263 +msgid "Nickname already in use. Try another one." +msgstr "" + +#: finishopenidlogin.php:270 finishopenidlogin.php:350 +msgid "Stored OpenID not found." +msgstr "" + +#: finishopenidlogin.php:279 +msgid "Creating new account for OpenID that already has a user." +msgstr "" + +#: finishopenidlogin.php:339 +msgid "Invalid username or password." +msgstr "" + +#: finishopenidlogin.php:357 +msgid "Error connecting user to OpenID." +msgstr "" + +#: openidlogin.php:68 +#, php-format +msgid "" +"For security reasons, please re-login with your [OpenID](%%doc.openid%%) " +"before changing your settings." +msgstr "" + +#: openidlogin.php:72 +#, php-format +msgid "Login with an [OpenID](%%doc.openid%%) account." +msgstr "" + +#: openidlogin.php:97 finishaddopenid.php:170 +msgid "OpenID Login" +msgstr "" + +#: openidlogin.php:114 +msgid "OpenID login" +msgstr "" + +#: openidlogin.php:121 +msgid "Your OpenID URL" +msgstr "" + +#: openidlogin.php:124 +msgid "Remember me" +msgstr "" + +#: openidlogin.php:125 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" + +#: openidlogin.php:129 +msgid "Login" +msgstr "" + #: openidtrust.php:51 msgid "OpenID Identity Verification" msgstr "" @@ -332,17 +368,37 @@ msgid "" "This page should only be reached during OpenID processing, not directly." msgstr "" -#: openidtrust.php:118 +#: openidtrust.php:117 #, php-format msgid "" "%s has asked to verify your identity. Click Continue to verify your " "identity and login without creating a new password." msgstr "" -#: openidtrust.php:136 +#: openidtrust.php:135 msgid "Continue" msgstr "" -#: openidtrust.php:137 +#: openidtrust.php:136 msgid "Cancel" msgstr "" + +#: finishaddopenid.php:67 +msgid "Not logged in." +msgstr "" + +#: finishaddopenid.php:112 +msgid "You already have this OpenID!" +msgstr "" + +#: finishaddopenid.php:114 +msgid "Someone else already has this OpenID." +msgstr "" + +#: finishaddopenid.php:126 +msgid "Error connecting user." +msgstr "" + +#: finishaddopenid.php:131 +msgid "Error updating profile" +msgstr "" diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po index ae0329376c..5cda9b129a 100644 --- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po +++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po @@ -8,265 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-11 21:42+0000\n" -"PO-Revision-Date: 2010-04-12 00:53+0100\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: 2010-04-30 02:16+0100\n" +"Last-Translator: Siebrand Mazeland \n" "Language-Team: Dutch\n" +"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Last-Translator: Siebrand Mazeland \n" -"MIME-Version: 1.0\n" - -#: finishaddopenid.php:67 -msgid "Not logged in." -msgstr "Niet aangemeld." - -#: finishaddopenid.php:88 -#: finishopenidlogin.php:149 -msgid "OpenID authentication cancelled." -msgstr "De authenticatie via OpenID is afgebroken." - -#: finishaddopenid.php:92 -#: finishopenidlogin.php:153 -#, php-format -msgid "OpenID authentication failed: %s" -msgstr "De authenticatie via OpenID is mislukt: %s" - -#: finishaddopenid.php:112 -msgid "You already have this OpenID!" -msgstr "U hebt deze OpenID al!" - -#: finishaddopenid.php:114 -msgid "Someone else already has this OpenID." -msgstr "Iemand anders gebruikt deze OpenID al." - -#: finishaddopenid.php:126 -msgid "Error connecting user." -msgstr "Fout bij het verbinden met de gebruiker." - -#: finishaddopenid.php:131 -msgid "Error updating profile" -msgstr "Fout bij het bijwerken van het profiel." - -#: finishaddopenid.php:170 -#: openidlogin.php:95 -msgid "OpenID Login" -msgstr "Aanmelden via OpenID" - -#: finishopenidlogin.php:34 -#: openidlogin.php:30 -msgid "Already logged in." -msgstr "U bent al aangemeld." - -#: finishopenidlogin.php:38 -#: openidlogin.php:37 -#: openidsettings.php:194 -msgid "There was a problem with your session token. Try again, please." -msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw." - -#: finishopenidlogin.php:43 -msgid "You can't register if you don't agree to the license." -msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie." - -#: finishopenidlogin.php:52 -#: openidsettings.php:208 -msgid "Something weird happened." -msgstr "Er is iets vreemds gebeurd." - -#: finishopenidlogin.php:66 -#, php-format -msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one." -msgstr "Dit is de eerste keer dat u aameldt bij %s en uw OpenID moet gekoppeld worden aan uw lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of koppelen met uw bestaande gebruiker als u die al hebt." - -#: finishopenidlogin.php:72 -msgid "OpenID Account Setup" -msgstr "Instellingen OpenID" - -#: finishopenidlogin.php:97 -msgid "Create new account" -msgstr "Nieuwe gebruiker aanmaken" - -#: finishopenidlogin.php:99 -msgid "Create a new user with this nickname." -msgstr "Nieuwe gebruiker met deze naam aanmaken." - -#: finishopenidlogin.php:102 -msgid "New nickname" -msgstr "Nieuwe gebruiker" - -#: finishopenidlogin.php:104 -msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "1-64 kleine letters of getallen; geen leestekens of spaties" - -#: finishopenidlogin.php:114 -msgid "My text and files are available under " -msgstr "Mijn teksten en bestanden zijn beschikbaar onder" - -#: finishopenidlogin.php:117 -msgid " except this private data: password, email address, IM address, phone number." -msgstr "behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer." - -#: finishopenidlogin.php:121 -msgid "Create" -msgstr "Aanmaken" - -#: finishopenidlogin.php:126 -msgid "Connect existing account" -msgstr "Koppelen met bestaande gebruiker" - -#: finishopenidlogin.php:128 -msgid "If you already have an account, login with your username and password to connect it to your OpenID." -msgstr "Als u al een gebruiker hebt, meld u dan aan met uw gebruikersnaam en wachtwoord om de gebruiker te koppelen met uw OpenID." - -#: finishopenidlogin.php:131 -msgid "Existing nickname" -msgstr "Bestaande gebruiker" - -#: finishopenidlogin.php:134 -msgid "Password" -msgstr "Wachtwoord" - -#: finishopenidlogin.php:137 -msgid "Connect" -msgstr "Koppelen" - -#: finishopenidlogin.php:215 -#: finishopenidlogin.php:224 -msgid "Registration not allowed." -msgstr "Registreren is niet mogelijk." - -#: finishopenidlogin.php:231 -msgid "Not a valid invitation code." -msgstr "De uitnodigingscode is niet geldig." - -#: finishopenidlogin.php:241 -msgid "Nickname must have only lowercase letters and numbers and no spaces." -msgstr "De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en geen spaties bevatten." - -#: finishopenidlogin.php:246 -msgid "Nickname not allowed." -msgstr "Deze gebruikersnaam is niet toegestaan." - -#: finishopenidlogin.php:251 -msgid "Nickname already in use. Try another one." -msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere." - -#: finishopenidlogin.php:258 -#: finishopenidlogin.php:338 -msgid "Stored OpenID not found." -msgstr "Het opgeslagen OpenID is niet aangetroffen." - -#: finishopenidlogin.php:267 -msgid "Creating new account for OpenID that already has a user." -msgstr "Bezig met het aanmaken van een gebruiker voor OpenID die al een gebruiker heeft." - -#: finishopenidlogin.php:327 -msgid "Invalid username or password." -msgstr "Ongeldige gebruikersnaam of wachtwoord." - -#: finishopenidlogin.php:345 -msgid "Error connecting user to OpenID." -msgstr "Fout bij het koppelen met OpenID." - -#: openid.php:141 -msgid "Cannot instantiate OpenID consumer object." -msgstr "Het was niet mogelijk een OpenID-object aan te maken." - -#: openid.php:151 -msgid "Not a valid OpenID." -msgstr "Geen geldige OpenID." - -#: openid.php:153 -#, php-format -msgid "OpenID failure: %s" -msgstr "OpenID-fout: %s" - -#: openid.php:180 -#, php-format -msgid "Could not redirect to server: %s" -msgstr "Het was niet mogelijk door te verwijzen naar de server: %s" - -#: openid.php:198 -#, php-format -msgid "Could not create OpenID form: %s" -msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s" - -#: openid.php:214 -msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider." -msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan." - -#: openid.php:246 -msgid "Error saving the profile." -msgstr "Fout bij het opslaan van het profiel." - -#: openid.php:257 -msgid "Error saving the user." -msgstr "Fout bij het opslaan van de gebruiker." - -#: openid.php:277 -msgid "OpenID Auto-Submit" -msgstr "OpenID automatisch opslaan" - -#: openidlogin.php:66 -#, php-format -msgid "For security reasons, please re-login with your [OpenID](%%doc.openid%%) before changing your settings." -msgstr "Om veiligheidsreden moet u opnieuw aanmelden met uw [OpenID](%%doc.openid%%) voordat u uw instellingen kunt wijzigen." - -#: openidlogin.php:70 -#, php-format -msgid "Login with an [OpenID](%%doc.openid%%) account." -msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker." - -#: openidlogin.php:112 -msgid "OpenID login" -msgstr "Aanmelden via OpenID" - -#: openidlogin.php:117 -#: openidsettings.php:107 -msgid "OpenID URL" -msgstr "OpenID-URL" - -#: openidlogin.php:119 -msgid "Your OpenID URL" -msgstr "Uw OpenID-URL" - -#: openidlogin.php:122 -msgid "Remember me" -msgstr "Aanmeldgegevens onthouden" - -#: openidlogin.php:123 -msgid "Automatically login in the future; not for shared computers!" -msgstr "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!" - -#: openidlogin.php:127 -msgid "Login" -msgstr "Aanmelden" - -#: OpenIDPlugin.php:123 -#: OpenIDPlugin.php:135 -msgid "OpenID" -msgstr "OpenID" - -#: OpenIDPlugin.php:124 -msgid "Login or register with OpenID" -msgstr "Aanmelden of registreren met OpenID" - -#: OpenIDPlugin.php:136 -msgid "Add or remove OpenIDs" -msgstr "OpenID's toevoegen of verwijderen" - -#: OpenIDPlugin.php:324 -msgid "Use OpenID to login to the site." -msgstr "Gebruik OpenID om aan te melden bij de site." - -#: openidserver.php:106 -#, php-format -msgid "You are not authorized to use the identity %s." -msgstr "U mag de identiteit %s niet gebruiken." - -#: openidserver.php:126 -msgid "Just an OpenID provider. Nothing to see here, move along..." -msgstr "Gewoon een OpenID-provider. Niets te zien hier..." #: openidsettings.php:59 msgid "OpenID settings" @@ -285,6 +34,11 @@ msgstr "OpenID toevoegen" msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"." msgstr "Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in en klik op \"Toevoegen\"." +#: openidsettings.php:107 +#: openidlogin.php:119 +msgid "OpenID URL" +msgstr "OpenID-URL" + #: openidsettings.php:117 msgid "Add" msgstr "Toevoegen" @@ -302,21 +56,303 @@ msgid "You can remove an OpenID from your account by clicking the button marked msgstr "U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop \"Verwijderen\"." #: openidsettings.php:172 +#: openidsettings.php:213 msgid "Remove" msgstr "Verwijderen" -#: openidsettings.php:228 +#: openidsettings.php:186 +msgid "OpenID Trusted Sites" +msgstr "Vertrouwde OpenID-sites" + +#: openidsettings.php:189 +msgid "The following sites are allowed to access your identity and log you in. You can remove a site from this list to deny it access to your OpenID." +msgstr "De volgende sites hebben toegang tot uw indentiteit en kunnen u aanmelden. U kunt een site verwijderen uit deze lijst zodat deze niet langer toegang heeft tot uw OpenID." + +#: openidsettings.php:231 +#: finishopenidlogin.php:38 +#: openidlogin.php:39 +msgid "There was a problem with your session token. Try again, please." +msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw." + +#: openidsettings.php:247 +#: finishopenidlogin.php:51 +msgid "Something weird happened." +msgstr "Er is iets vreemds gebeurd." + +#: openidsettings.php:271 +msgid "No such OpenID trustroot." +msgstr "Die OpenID trustroot bestaat niet." + +#: openidsettings.php:275 +msgid "Trustroots removed" +msgstr "De trustroots zijn verwijderd" + +#: openidsettings.php:298 msgid "No such OpenID." msgstr "De OpenID bestaat niet." -#: openidsettings.php:233 +#: openidsettings.php:303 msgid "That OpenID does not belong to you." msgstr "Die OpenID is niet van u." -#: openidsettings.php:237 +#: openidsettings.php:307 msgid "OpenID removed." msgstr "OpenID verwijderd." +#: openid.php:137 +msgid "Cannot instantiate OpenID consumer object." +msgstr "Het was niet mogelijk een OpenID-object aan te maken." + +#: openid.php:147 +msgid "Not a valid OpenID." +msgstr "Geen geldige OpenID." + +#: openid.php:149 +#, php-format +msgid "OpenID failure: %s" +msgstr "OpenID-fout: %s" + +#: openid.php:176 +#, php-format +msgid "Could not redirect to server: %s" +msgstr "Het was niet mogelijk door te verwijzen naar de server: %s" + +#: openid.php:194 +#, php-format +msgid "Could not create OpenID form: %s" +msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s" + +#: openid.php:210 +msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider." +msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan." + +#: openid.php:242 +msgid "Error saving the profile." +msgstr "Fout bij het opslaan van het profiel." + +#: openid.php:253 +msgid "Error saving the user." +msgstr "Fout bij het opslaan van de gebruiker." + +#: openid.php:282 +msgid "Unauthorized URL used for OpenID login." +msgstr "Ongeautoriseerde URL gebruikt voor aanmelden via OpenID" + +#: openid.php:302 +#, fuzzy +msgid "OpenID Login Submission" +msgstr "Aanmelden via OpenID" + +#: openid.php:312 +msgid "Requesting authorization from your login provider..." +msgstr "Bezig met het vragen van autorisatie van uw aanmeldprovider..." + +#: openid.php:315 +msgid "If you are not redirected to your login provider in a few seconds, try pushing the button below." +msgstr "Als u binnen een aantal seconden niet wordt doorverwezen naar uw aanmeldprovider, klik dan op de onderstaande knop." + +#. TRANS: Tooltip for main menu option "Login" +#: OpenIDPlugin.php:204 +msgctxt "TOOLTIP" +msgid "Login to the site" +msgstr "Aanmelden bij de site" + +#: OpenIDPlugin.php:207 +#, fuzzy +msgctxt "MENU" +msgid "Login" +msgstr "Aanmelden" + +#. TRANS: Tooltip for main menu option "Help" +#: OpenIDPlugin.php:212 +msgctxt "TOOLTIP" +msgid "Help me!" +msgstr "Help me" + +#: OpenIDPlugin.php:215 +msgctxt "MENU" +msgid "Help" +msgstr "Hulp" + +#. TRANS: Tooltip for main menu option "Search" +#: OpenIDPlugin.php:221 +msgctxt "TOOLTIP" +msgid "Search for people or text" +msgstr "Zoeken naar mensen of tekst" + +#: OpenIDPlugin.php:224 +msgctxt "MENU" +msgid "Search" +msgstr "Zoeken" + +#: OpenIDPlugin.php:283 +#: OpenIDPlugin.php:319 +msgid "OpenID" +msgstr "OpenID" + +#: OpenIDPlugin.php:284 +msgid "Login or register with OpenID" +msgstr "Aanmelden of registreren met OpenID" + +#: OpenIDPlugin.php:320 +msgid "Add or remove OpenIDs" +msgstr "OpenID's toevoegen of verwijderen" + +#: OpenIDPlugin.php:595 +msgid "Use OpenID to login to the site." +msgstr "Gebruik OpenID om aan te melden bij de site." + +#: openidserver.php:106 +#, php-format +msgid "You are not authorized to use the identity %s." +msgstr "U mag de identiteit %s niet gebruiken." + +#: openidserver.php:126 +msgid "Just an OpenID provider. Nothing to see here, move along..." +msgstr "Gewoon een OpenID-provider. Niets te zien hier..." + +#: finishopenidlogin.php:34 +#: openidlogin.php:30 +msgid "Already logged in." +msgstr "U bent al aangemeld." + +#: finishopenidlogin.php:43 +msgid "You can't register if you don't agree to the license." +msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie." + +#: finishopenidlogin.php:65 +#, php-format +msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one." +msgstr "Dit is de eerste keer dat u aameldt bij %s en uw OpenID moet gekoppeld worden aan uw lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of koppelen met uw bestaande gebruiker als u die al hebt." + +#: finishopenidlogin.php:71 +msgid "OpenID Account Setup" +msgstr "Instellingen OpenID" + +#: finishopenidlogin.php:101 +msgid "Create new account" +msgstr "Nieuwe gebruiker aanmaken" + +#: finishopenidlogin.php:103 +msgid "Create a new user with this nickname." +msgstr "Nieuwe gebruiker met deze naam aanmaken." + +#: finishopenidlogin.php:106 +msgid "New nickname" +msgstr "Nieuwe gebruiker" + +#: finishopenidlogin.php:108 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "1-64 kleine letters of getallen; geen leestekens of spaties" + +#: finishopenidlogin.php:130 +msgid "Create" +msgstr "Aanmaken" + +#: finishopenidlogin.php:135 +msgid "Connect existing account" +msgstr "Koppelen met bestaande gebruiker" + +#: finishopenidlogin.php:137 +msgid "If you already have an account, login with your username and password to connect it to your OpenID." +msgstr "Als u al een gebruiker hebt, meld u dan aan met uw gebruikersnaam en wachtwoord om de gebruiker te koppelen met uw OpenID." + +#: finishopenidlogin.php:140 +msgid "Existing nickname" +msgstr "Bestaande gebruiker" + +#: finishopenidlogin.php:143 +msgid "Password" +msgstr "Wachtwoord" + +#: finishopenidlogin.php:146 +msgid "Connect" +msgstr "Koppelen" + +#: finishopenidlogin.php:158 +#: finishaddopenid.php:88 +msgid "OpenID authentication cancelled." +msgstr "De authenticatie via OpenID is afgebroken." + +#: finishopenidlogin.php:162 +#: finishaddopenid.php:92 +#, php-format +msgid "OpenID authentication failed: %s" +msgstr "De authenticatie via OpenID is mislukt: %s" + +#: finishopenidlogin.php:227 +#: finishopenidlogin.php:236 +msgid "Registration not allowed." +msgstr "Registreren is niet mogelijk." + +#: finishopenidlogin.php:243 +msgid "Not a valid invitation code." +msgstr "De uitnodigingscode is niet geldig." + +#: finishopenidlogin.php:253 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en geen spaties bevatten." + +#: finishopenidlogin.php:258 +msgid "Nickname not allowed." +msgstr "Deze gebruikersnaam is niet toegestaan." + +#: finishopenidlogin.php:263 +msgid "Nickname already in use. Try another one." +msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere." + +#: finishopenidlogin.php:270 +#: finishopenidlogin.php:350 +msgid "Stored OpenID not found." +msgstr "Het opgeslagen OpenID is niet aangetroffen." + +#: finishopenidlogin.php:279 +msgid "Creating new account for OpenID that already has a user." +msgstr "Bezig met het aanmaken van een gebruiker voor OpenID die al een gebruiker heeft." + +#: finishopenidlogin.php:339 +msgid "Invalid username or password." +msgstr "Ongeldige gebruikersnaam of wachtwoord." + +#: finishopenidlogin.php:357 +msgid "Error connecting user to OpenID." +msgstr "Fout bij het koppelen met OpenID." + +#: openidlogin.php:68 +#, php-format +msgid "For security reasons, please re-login with your [OpenID](%%doc.openid%%) before changing your settings." +msgstr "Om veiligheidsreden moet u opnieuw aanmelden met uw [OpenID](%%doc.openid%%) voordat u uw instellingen kunt wijzigen." + +#: openidlogin.php:72 +#, php-format +msgid "Login with an [OpenID](%%doc.openid%%) account." +msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker." + +#: openidlogin.php:97 +#: finishaddopenid.php:170 +msgid "OpenID Login" +msgstr "Aanmelden via OpenID" + +#: openidlogin.php:114 +msgid "OpenID login" +msgstr "Aanmelden via OpenID" + +#: openidlogin.php:121 +msgid "Your OpenID URL" +msgstr "Uw OpenID-URL" + +#: openidlogin.php:124 +msgid "Remember me" +msgstr "Aanmeldgegevens onthouden" + +#: openidlogin.php:125 +msgid "Automatically login in the future; not for shared computers!" +msgstr "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!" + +#: openidlogin.php:129 +msgid "Login" +msgstr "Aanmelden" + #: openidtrust.php:51 msgid "OpenID Identity Verification" msgstr "OpenID-identiteitscontrole" @@ -325,16 +361,35 @@ msgstr "OpenID-identiteitscontrole" msgid "This page should only be reached during OpenID processing, not directly." msgstr "Deze pagina hoort alleen bezocht te worden tijdens het verwerken van een OpenID, en niet direct." -#: openidtrust.php:118 +#: openidtrust.php:117 #, php-format msgid "%s has asked to verify your identity. Click Continue to verify your identity and login without creating a new password." msgstr "%s heeft gevraagd uw identiteit te bevestigen. Klik op \"Doorgaan\" om uw indentiteit te controleren en aan te melden zonder een wachtwoord te hoeven invoeren." -#: openidtrust.php:136 +#: openidtrust.php:135 msgid "Continue" msgstr "Doorgaan" -#: openidtrust.php:137 +#: openidtrust.php:136 msgid "Cancel" msgstr "Annuleren" +#: finishaddopenid.php:67 +msgid "Not logged in." +msgstr "Niet aangemeld." + +#: finishaddopenid.php:112 +msgid "You already have this OpenID!" +msgstr "U hebt deze OpenID al!" + +#: finishaddopenid.php:114 +msgid "Someone else already has this OpenID." +msgstr "Iemand anders gebruikt deze OpenID al." + +#: finishaddopenid.php:126 +msgid "Error connecting user." +msgstr "Fout bij het verbinden met de gebruiker." + +#: finishaddopenid.php:131 +msgid "Error updating profile" +msgstr "Fout bij het bijwerken van het profiel." diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot new file mode 100644 index 0000000000..b7107d4c17 --- /dev/null +++ b/plugins/PostDebug/locale/PostDebug.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: PostDebugPlugin.php:58 +msgid "Debugging tool to record request details on POST." +msgstr "" diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot index 8f8434a85d..bc0e814f2c 100644 --- a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot +++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot new file mode 100644 index 0000000000..a888f80e4a --- /dev/null +++ b/plugins/PtitUrl/locale/PtitUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: PtitUrlPlugin.php:67 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot new file mode 100644 index 0000000000..4078cc749d --- /dev/null +++ b/plugins/RSSCloud/locale/RSSCloud.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RSSCloudPlugin.php:260 +msgid "" +"The RSSCloud plugin enables your StatusNet instance to publish real-time " +"updates for profile RSS feeds using the RSSCloud protocol\"." +msgstr "" diff --git a/plugins/Recaptcha/locale/Recaptcha.pot b/plugins/Recaptcha/locale/Recaptcha.pot new file mode 100644 index 0000000000..6611ff604a --- /dev/null +++ b/plugins/Recaptcha/locale/Recaptcha.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RecaptchaPlugin.php:97 +msgid "" +"Uses Recaptcha service to add a " +"captcha to the registration page." +msgstr "" diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot new file mode 100644 index 0000000000..834f5fd4ad --- /dev/null +++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot @@ -0,0 +1,29 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RegisterThrottlePlugin.php:122 RegisterThrottlePlugin.php:161 +msgid "Cannot find IP address." +msgstr "" + +#: RegisterThrottlePlugin.php:167 +msgid "Cannot find user after successful registration." +msgstr "" + +#: RegisterThrottlePlugin.php:200 +msgid "Throttles excessive registration from a single IP." +msgstr "" diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot index 49ac4f6f4d..c8953a1fa3 100644 --- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot +++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-10 10:05-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot new file mode 100644 index 0000000000..6fa18c464c --- /dev/null +++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ReverseUsernameAuthenticationPlugin.php:67 +msgid "" +"The Reverse Username Authentication plugin allows for StatusNet to handle " +"authentication by checking if the provided password is the same as the " +"reverse of the username." +msgstr "" diff --git a/plugins/Sample/locale/Sample.pot b/plugins/Sample/locale/Sample.pot index a52c4ec01c..bd21dd3c4c 100644 --- a/plugins/Sample/locale/Sample.pot +++ b/plugins/Sample/locale/Sample.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,10 +17,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: hello.php:115 SamplePlugin.php:266 +#: User_greeting_count.php:163 +#, php-format +msgid "Could not save new greeting count for %d" +msgstr "" + +#: User_greeting_count.php:176 +#, php-format +msgid "Could not increment greeting count for %d" +msgstr "" + +#: SamplePlugin.php:266 hello.php:115 msgid "Hello" msgstr "" +#: SamplePlugin.php:266 +msgid "A warm greeting" +msgstr "" + +#: SamplePlugin.php:277 +msgid "A sample plugin to show basics of development for new hackers." +msgstr "" + #: hello.php:117 hello.php:141 #, php-format msgid "Hello, %s" @@ -36,21 +54,3 @@ msgid "I have greeted you %d time." msgid_plural "I have greeted you %d times." msgstr[0] "" msgstr[1] "" - -#: SamplePlugin.php:266 -msgid "A warm greeting" -msgstr "" - -#: SamplePlugin.php:277 -msgid "A sample plugin to show basics of development for new hackers." -msgstr "" - -#: User_greeting_count.php:163 -#, php-format -msgid "Could not save new greeting count for %d" -msgstr "" - -#: User_greeting_count.php:176 -#, php-format -msgid "Could not increment greeting count for %d" -msgstr "" diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot new file mode 100644 index 0000000000..e3c241d538 --- /dev/null +++ b/plugins/SimpleUrl/locale/SimpleUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: SimpleUrlPlugin.php:58 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot new file mode 100644 index 0000000000..3b0e3c261b --- /dev/null +++ b/plugins/TabFocus/locale/TabFocus.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: TabFocusPlugin.php:54 +msgid "" +"TabFocus changes the notice form behavior so that, while in the text area, " +"pressing the tab key focuses the \"Send\" button, matching the behavor of " +"Twitter." +msgstr "" diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot new file mode 100644 index 0000000000..10f59a1e86 --- /dev/null +++ b/plugins/TightUrl/locale/TightUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: TightUrlPlugin.php:68 +#, php-format +msgid "Uses %1$s URL-shortener service." +msgstr "" diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot index eff1255799..c7ac8053ca 100644 --- a/plugins/TwitterBridge/locale/TwitterBridge.pot +++ b/plugins/TwitterBridge/locale/TwitterBridge.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,11 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: twitter.php:320 +#: twitter.php:342 msgid "Your Twitter bridge has been disabled." msgstr "" -#: twitter.php:324 +#: twitter.php:346 #, php-format msgid "" "Hi, %1$s. We're sorry to inform you that your link to Twitter has been " @@ -36,6 +36,89 @@ msgid "" "%3$s\n" msgstr "" +#: TwitterBridgePlugin.php:155 TwitterBridgePlugin.php:178 +#: TwitterBridgePlugin.php:291 twitteradminpanel.php:54 +msgid "Twitter" +msgstr "" + +#: TwitterBridgePlugin.php:156 +msgid "Login or register using Twitter" +msgstr "" + +#: TwitterBridgePlugin.php:179 +msgid "Twitter integration options" +msgstr "" + +#: TwitterBridgePlugin.php:292 +msgid "Twitter bridge configuration" +msgstr "" + +#: TwitterBridgePlugin.php:317 +msgid "" +"The Twitter \"bridge\" plugin allows you to integrate your StatusNet " +"instance with Twitter." +msgstr "" + +#: twitteradminpanel.php:65 +msgid "Twitter bridge settings" +msgstr "" + +#: twitteradminpanel.php:148 +msgid "Invalid consumer key. Max length is 255 characters." +msgstr "" + +#: twitteradminpanel.php:154 +msgid "Invalid consumer secret. Max length is 255 characters." +msgstr "" + +#: twitteradminpanel.php:207 +msgid "Twitter application settings" +msgstr "" + +#: twitteradminpanel.php:213 +msgid "Consumer key" +msgstr "" + +#: twitteradminpanel.php:214 +msgid "Consumer key assigned by Twitter" +msgstr "" + +#: twitteradminpanel.php:222 +msgid "Consumer secret" +msgstr "" + +#: twitteradminpanel.php:223 +msgid "Consumer secret assigned by Twitter" +msgstr "" + +#: twitteradminpanel.php:240 +msgid "Integration source" +msgstr "" + +#: twitteradminpanel.php:241 +msgid "Name of your Twitter application" +msgstr "" + +#: twitteradminpanel.php:253 +msgid "Options" +msgstr "" + +#: twitteradminpanel.php:260 +msgid "Enable \"Sign-in with Twitter\"" +msgstr "" + +#: twitteradminpanel.php:262 +msgid "Allow users to login with their Twitter credentials" +msgstr "" + +#: twitteradminpanel.php:268 +msgid "Enable Twitter import" +msgstr "" + +#: twitteradminpanel.php:270 +msgid "Allow users to import their Twitter friends' timelines" +msgstr "" + #: twitterauthorization.php:181 twitterauthorization.php:229 msgid "Couldn't link your Twitter account." msgstr "" @@ -44,20 +127,6 @@ msgstr "" msgid "Couldn't link your Twitter account: oauth_token mismatch." msgstr "" -#: TwitterBridgePlugin.php:114 -msgid "Twitter" -msgstr "" - -#: TwitterBridgePlugin.php:115 -msgid "Twitter integration options" -msgstr "" - -#: TwitterBridgePlugin.php:207 -msgid "" -"The Twitter \"bridge\" plugin allows you to integrate your StatusNet " -"instance with Twitter." -msgstr "" - #: twittersettings.php:59 msgid "Twitter settings" msgstr "" From 081ee9b29c7e4b207633aec0219b5a5b1ef36800 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 3 May 2010 16:49:59 -0700 Subject: [PATCH 076/730] extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as: 1.2.0: • QA release - stable. • Updated minimum dependencies (Net_SMTP, PEAR, PHP) • Doc Bug #15620 Licence change to BSD • Bug #13659 Mail parse error in special condition • Bug #16200 - Security hole allow to read/write Arbitrary File _hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137). • Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772). • Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764). • Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766). PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail: 1.4.2: • Fixing header string quoting in data(). (Bug #17199) 1.4.1: • The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349) • Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012) 1.4.0: • The data() method now accepts either a string or a file resource containing the message data. (Request #16962) 1.3.4: • All Net_Socket write failures are now recognized. (Bug #16831) 1.3.3: • Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail] • We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254) • You can now specify a debug output handler via setDebug(). (Request #16420) 1.3.2: • TLS connection only gets started if no AUTH methods are sent. (Bug #14944) --- extlib/Mail.php | 82 +++++++++++----- extlib/Mail/RFC822.php | 83 +++++++++------- extlib/Mail/mail.php | 63 +++++++++---- extlib/Mail/mock.php | 64 +++++++++---- extlib/Mail/null.php | 64 +++++++++---- extlib/Mail/sendmail.php | 7 +- extlib/Mail/smtp.php | 73 +++++++++++---- extlib/Mail/smtpmx.php | 44 +++++++-- extlib/Net/SMTP.php | 198 ++++++++++++++++++++++++++++++--------- 9 files changed, 481 insertions(+), 197 deletions(-) mode change 100644 => 100755 extlib/Mail.php mode change 100644 => 100755 extlib/Mail/RFC822.php mode change 100644 => 100755 extlib/Mail/mail.php mode change 100644 => 100755 extlib/Mail/mock.php mode change 100644 => 100755 extlib/Mail/null.php mode change 100644 => 100755 extlib/Mail/sendmail.php mode change 100644 => 100755 extlib/Mail/smtp.php mode change 100644 => 100755 extlib/Mail/smtpmx.php diff --git a/extlib/Mail.php b/extlib/Mail.php old mode 100644 new mode 100755 index 3a0c1a9cb8..75132ac2a6 --- a/extlib/Mail.php +++ b/extlib/Mail.php @@ -1,22 +1,47 @@ | -// +----------------------------------------------------------------------+ -// -// $Id: Mail.php,v 1.17 2006/09/15 03:41:18 jon Exp $ +/** + * PEAR's Mail:: interface. + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2002-2007, Richard Heyes + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category Mail + * @package Mail + * @author Chuck Hagenbuch + * @copyright 1997-2010 Chuck Hagenbuch + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: Mail.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ + */ require_once 'PEAR.php'; @@ -26,7 +51,7 @@ require_once 'PEAR.php'; * useful in multiple mailer backends. * * @access public - * @version $Revision: 1.17 $ + * @version $Revision: 294747 $ * @package Mail */ class Mail @@ -82,12 +107,20 @@ class Mail * @return mixed Returns true on success, or a PEAR_Error * containing a descriptive error message on * failure. + * * @access public * @deprecated use Mail_mail::send instead */ function send($recipients, $headers, $body) { - $this->_sanitizeHeaders($headers); + if (!is_array($headers)) { + return PEAR::raiseError('$headers must be an array'); + } + + $result = $this->_sanitizeHeaders($headers); + if (is_a($result, 'PEAR_Error')) { + return $result; + } // if we're passed an array of recipients, implode it. if (is_array($recipients)) { @@ -103,10 +136,9 @@ class Mail } // flatten the headers out. - list(,$text_headers) = Mail::prepareHeaders($headers); + list(, $text_headers) = Mail::prepareHeaders($headers); return mail($recipients, $subject, $body, $text_headers); - } /** @@ -151,9 +183,9 @@ class Mail foreach ($headers as $key => $value) { if (strcasecmp($key, 'From') === 0) { include_once 'Mail/RFC822.php'; - $parser = &new Mail_RFC822(); + $parser = new Mail_RFC822(); $addresses = $parser->parseAddressList($value, 'localhost', false); - if (PEAR::isError($addresses)) { + if (is_a($addresses, 'PEAR_Error')) { return $addresses; } @@ -221,7 +253,7 @@ class Mail $addresses = Mail_RFC822::parseAddressList($recipients, 'localhost', false); // If parseAddressList() returned a PEAR_Error object, just return it. - if (PEAR::isError($addresses)) { + if (is_a($addresses, 'PEAR_Error')) { return $addresses; } diff --git a/extlib/Mail/RFC822.php b/extlib/Mail/RFC822.php old mode 100644 new mode 100755 index 8714df2e29..58d36465cb --- a/extlib/Mail/RFC822.php +++ b/extlib/Mail/RFC822.php @@ -1,37 +1,48 @@ | -// | Chuck Hagenbuch | -// +-----------------------------------------------------------------------+ +/** + * RFC 822 Email address list validation Utility + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2001-2010, Richard Heyes + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category Mail + * @package Mail + * @author Richard Heyes + * @author Chuck Hagenbuch * @author Chuck Hagenbuch - * @version $Revision: 1.24 $ + * @version $Revision: 294749 $ * @license BSD * @package Mail */ @@ -635,8 +646,8 @@ class Mail_RFC822 { $comment = $this->_splitCheck($parts, ')'); $comments[] = $comment; - // +1 is for the trailing ) - $_mailbox = substr($_mailbox, strpos($_mailbox, $comment)+strlen($comment)+1); + // +2 is for the brackets + $_mailbox = substr($_mailbox, strpos($_mailbox, '('.$comment)+strlen($comment)+2); } else { break; } diff --git a/extlib/Mail/mail.php b/extlib/Mail/mail.php old mode 100644 new mode 100755 index b13d695656..a8b4b5dbee --- a/extlib/Mail/mail.php +++ b/extlib/Mail/mail.php @@ -1,27 +1,52 @@ | -// +----------------------------------------------------------------------+ -// -// $Id: mail.php,v 1.20 2007/10/06 17:00:00 chagenbu Exp $ +/** + * internal PHP-mail() implementation of the PEAR Mail:: interface. + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2010 Chuck Hagenbuch + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category Mail + * @package Mail + * @author Chuck Hagenbuch + * @copyright 2010 Chuck Hagenbuch + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: mail.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ + */ /** * internal PHP-mail() implementation of the PEAR Mail:: interface. * @package Mail - * @version $Revision: 1.20 $ + * @version $Revision: 294747 $ */ class Mail_mail extends Mail { diff --git a/extlib/Mail/mock.php b/extlib/Mail/mock.php old mode 100644 new mode 100755 index 971dae6a0e..61570ba408 --- a/extlib/Mail/mock.php +++ b/extlib/Mail/mock.php @@ -1,29 +1,53 @@ | -// +----------------------------------------------------------------------+ -// -// $Id: mock.php,v 1.1 2007/12/08 17:57:54 chagenbu Exp $ -// +/** + * Mock implementation + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2010 Chuck Hagenbuch + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category Mail + * @package Mail + * @author Chuck Hagenbuch + * @copyright 2010 Chuck Hagenbuch + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: mock.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ + */ /** * Mock implementation of the PEAR Mail:: interface for testing. * @access public * @package Mail - * @version $Revision: 1.1 $ + * @version $Revision: 294747 $ */ class Mail_mock extends Mail { diff --git a/extlib/Mail/null.php b/extlib/Mail/null.php old mode 100644 new mode 100755 index 982bfa45b6..f8d58272ee --- a/extlib/Mail/null.php +++ b/extlib/Mail/null.php @@ -1,29 +1,53 @@ | -// +----------------------------------------------------------------------+ -// -// $Id: null.php,v 1.2 2004/04/06 05:19:03 jon Exp $ -// +/** + * Null implementation of the PEAR Mail interface + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2010 Phil Kernick + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category Mail + * @package Mail + * @author Phil Kernick + * @copyright 2010 Phil Kernick + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: null.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ + */ /** * Null implementation of the PEAR Mail:: interface. * @access public * @package Mail - * @version $Revision: 1.2 $ + * @version $Revision: 294747 $ */ class Mail_null extends Mail { diff --git a/extlib/Mail/sendmail.php b/extlib/Mail/sendmail.php old mode 100644 new mode 100755 index cd248e61d2..b056575e99 --- a/extlib/Mail/sendmail.php +++ b/extlib/Mail/sendmail.php @@ -20,7 +20,7 @@ * Sendmail implementation of the PEAR Mail:: interface. * @access public * @package Mail - * @version $Revision: 1.19 $ + * @version $Revision: 294744 $ */ class Mail_sendmail extends Mail { @@ -117,7 +117,7 @@ class Mail_sendmail extends Mail { if (is_a($recipients, 'PEAR_Error')) { return $recipients; } - $recipients = escapeShellCmd(implode(' ', $recipients)); + $recipients = implode(' ', array_map('escapeshellarg', $recipients)); $headerElements = $this->prepareHeaders($headers); if (is_a($headerElements, 'PEAR_Error')) { @@ -141,7 +141,8 @@ class Mail_sendmail extends Mail { return PEAR::raiseError('From address specified with dangerous characters.'); } - $from = escapeShellCmd($from); + $from = escapeshellarg($from); // Security bug #16200 + $mail = @popen($this->sendmail_path . (!empty($this->sendmail_args) ? ' ' . $this->sendmail_args : '') . " -f$from -- $recipients", 'w'); if (!$mail) { return PEAR::raiseError('Failed to open sendmail [' . $this->sendmail_path . '] for execution.'); diff --git a/extlib/Mail/smtp.php b/extlib/Mail/smtp.php old mode 100644 new mode 100755 index baf3a962ba..52ea602086 --- a/extlib/Mail/smtp.php +++ b/extlib/Mail/smtp.php @@ -1,21 +1,48 @@ | -// | Jon Parise | -// +----------------------------------------------------------------------+ +/** + * SMTP implementation of the PEAR Mail interface. Requires the Net_SMTP class. + * + * PHP versions 4 and 5 + * + * LICENSE: + * + * Copyright (c) 2010, Chuck Hagenbuch + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @category HTTP + * @package HTTP_Request + * @author Jon Parise + * @author Chuck Hagenbuch + * @copyright 2010 Chuck Hagenbuch + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: smtp.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ + */ /** Error: Failed to create a Net_SMTP object */ define('PEAR_MAIL_SMTP_ERROR_CREATE', 10000); @@ -42,7 +69,7 @@ define('PEAR_MAIL_SMTP_ERROR_DATA', 10006); * SMTP implementation of the PEAR Mail interface. Requires the Net_SMTP class. * @access public * @package Mail - * @version $Revision: 1.33 $ + * @version $Revision: 294747 $ */ class Mail_smtp extends Mail { @@ -278,6 +305,16 @@ class Mail_smtp extends Mail { /* Send the message's headers and the body as SMTP data. */ $res = $this->_smtp->data($textHeaders . "\r\n\r\n" . $body); + list(,$args) = $this->_smtp->getResponse(); + + if (preg_match("/Ok: queued as (.*)/", $args, $queued)) { + $this->queued_as = $queued[1]; + } + + /* we need the greeting; from it we can extract the authorative name of the mail server we've really connected to. + * ideal if we're connecting to a round-robin of relay servers and need to track which exact one took the email */ + $this->greeting = $this->_smtp->getGreeting(); + if (is_a($res, 'PEAR_Error')) { $error = $this->_error('Failed to send data', $res); $this->_smtp->rset(); diff --git a/extlib/Mail/smtpmx.php b/extlib/Mail/smtpmx.php old mode 100644 new mode 100755 index 9d2dccfb13..f0b6940868 --- a/extlib/Mail/smtpmx.php +++ b/extlib/Mail/smtpmx.php @@ -8,19 +8,43 @@ * * PHP versions 4 and 5 * - * LICENSE: This source file is subject to version 3.0 of the PHP license - * that is available through the world-wide-web at the following URI: - * http://www.php.net/license/3_0.txt. If you did not receive a copy of - * the PHP License and are unable to obtain it through the web, please - * send a note to license@php.net so we can mail you a copy immediately. + * LICENSE: + * + * Copyright (c) 2010, gERD Schaufelberger + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @category Mail * @package Mail_smtpmx * @author gERD Schaufelberger - * @copyright 1997-2005 The PHP Group - * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: smtpmx.php,v 1.2 2007/10/06 17:00:00 chagenbu Exp $ - * @see Mail + * @copyright 2010 gERD Schaufelberger + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id: smtpmx.php 294747 2010-02-08 08:18:33Z clockwerx $ + * @link http://pear.php.net/package/Mail/ */ require_once 'Net/SMTP.php'; @@ -32,7 +56,7 @@ require_once 'Net/SMTP.php'; * @access public * @author gERD Schaufelberger * @package Mail - * @version $Revision: 1.2 $ + * @version $Revision: 294747 $ */ class Mail_smtpmx extends Mail { diff --git a/extlib/Net/SMTP.php b/extlib/Net/SMTP.php index d632258d63..ea4b55e8d2 100644 --- a/extlib/Net/SMTP.php +++ b/extlib/Net/SMTP.php @@ -18,7 +18,7 @@ // | Damian Alejandro Fernandez Sosa | // +----------------------------------------------------------------------+ // -// $Id: SMTP.php,v 1.63 2008/06/10 05:39:12 jon Exp $ +// $Id: SMTP.php 293948 2010-01-24 21:46:00Z jon $ require_once 'PEAR.php'; require_once 'Net/Socket.php'; @@ -91,6 +91,13 @@ class Net_SMTP */ var $_debug = false; + /** + * Debug output handler. + * @var callback + * @access private + */ + var $_debug_handler = null; + /** * The socket resource being used to connect to the SMTP server. * @var resource @@ -112,6 +119,13 @@ class Net_SMTP */ var $_arguments = array(); + /** + * Stores the SMTP server's greeting string. + * @var string + * @access private + */ + var $_greeting = null; + /** * Stores detected features of the SMTP server. * @var array @@ -172,9 +186,30 @@ class Net_SMTP * @access public * @since 1.1.0 */ - function setDebug($debug) + function setDebug($debug, $handler = null) { $this->_debug = $debug; + $this->_debug_handler = $handler; + } + + /** + * Write the given debug text to the current debug output handler. + * + * @param string $message Debug mesage text. + * + * @access private + * @since 1.3.3 + */ + function _debug($message) + { + if ($this->_debug) { + if ($this->_debug_handler) { + call_user_func_array($this->_debug_handler, + array(&$this, $message)); + } else { + echo "DEBUG: $message\n"; + } + } } /** @@ -189,13 +224,12 @@ class Net_SMTP */ function _send($data) { - if ($this->_debug) { - echo "DEBUG: Send: $data\n"; - } + $this->_debug("Send: $data"); - if (PEAR::isError($error = $this->_socket->write($data))) { - return PEAR::raiseError('Failed to write to socket: ' . - $error->getMessage()); + $error = $this->_socket->write($data); + if ($error === false || PEAR::isError($error)) { + $msg = ($error) ? $error->getMessage() : "unknown error"; + return PEAR::raiseError("Failed to write to socket: $msg"); } return true; @@ -262,9 +296,7 @@ class Net_SMTP for ($i = 0; $i <= $this->_pipelined_commands; $i++) { while ($line = $this->_socket->readLine()) { - if ($this->_debug) { - echo "DEBUG: Recv: $line\n"; - } + $this->_debug("Recv: $line"); /* If we receive an empty line, the connection has been closed. */ if (empty($line)) { @@ -319,6 +351,20 @@ class Net_SMTP return array($this->_code, join("\n", $this->_arguments)); } + /** + * Return the SMTP server's greeting string. + * + * @return string A string containing the greeting string, or null if a + * greeting has not been received. + * + * @access public + * @since 1.3.3 + */ + function getGreeting() + { + return $this->_greeting; + } + /** * Attempt to connect to the SMTP server. * @@ -334,6 +380,7 @@ class Net_SMTP */ function connect($timeout = null, $persistent = false) { + $this->_greeting = null; $result = $this->_socket->connect($this->host, $this->port, $persistent, $timeout); if (PEAR::isError($result)) { @@ -344,6 +391,10 @@ class Net_SMTP if (PEAR::isError($error = $this->_parseResponse(220))) { return $error; } + + /* Extract and store a copy of the server's greeting string. */ + list(, $this->_greeting) = $this->getResponse(); + if (PEAR::isError($error = $this->_negotiate())) { return $error; } @@ -452,40 +503,43 @@ class Net_SMTP * @param string The password to authenticate with. * @param string The requested authentication method. If none is * specified, the best supported method will be used. + * @param bool Flag indicating whether or not TLS should be attempted. * * @return mixed Returns a PEAR_Error with an error message on any * kind of failure, or true on success. * @access public * @since 1.0 */ - function auth($uid, $pwd , $method = '') + function auth($uid, $pwd , $method = '', $tls = true) { - if (empty($this->_esmtp['AUTH'])) { - if (version_compare(PHP_VERSION, '5.1.0', '>=')) { - if (!isset($this->_esmtp['STARTTLS'])) { - return PEAR::raiseError('SMTP server does not support authentication'); - } - if (PEAR::isError($result = $this->_put('STARTTLS'))) { - return $result; - } - if (PEAR::isError($result = $this->_parseResponse(220))) { - return $result; - } - if (PEAR::isError($result = $this->_socket->enableCrypto(true, STREAM_CRYPTO_METHOD_TLS_CLIENT))) { - return $result; - } elseif ($result !== true) { - return PEAR::raiseError('STARTTLS failed'); - } - - /* Send EHLO again to recieve the AUTH string from the - * SMTP server. */ - $this->_negotiate(); - if (empty($this->_esmtp['AUTH'])) { - return PEAR::raiseError('SMTP server does not support authentication'); - } - } else { - return PEAR::raiseError('SMTP server does not support authentication'); + /* We can only attempt a TLS connection if one has been requested, + * we're running PHP 5.1.0 or later, have access to the OpenSSL + * extension, are connected to an SMTP server which supports the + * STARTTLS extension, and aren't already connected over a secure + * (SSL) socket connection. */ + if ($tls && version_compare(PHP_VERSION, '5.1.0', '>=') && + extension_loaded('openssl') && isset($this->_esmtp['STARTTLS']) && + strncasecmp($this->host, 'ssl://', 6) !== 0) { + /* Start the TLS connection attempt. */ + if (PEAR::isError($result = $this->_put('STARTTLS'))) { + return $result; } + if (PEAR::isError($result = $this->_parseResponse(220))) { + return $result; + } + if (PEAR::isError($result = $this->_socket->enableCrypto(true, STREAM_CRYPTO_METHOD_TLS_CLIENT))) { + return $result; + } elseif ($result !== true) { + return PEAR::raiseError('STARTTLS failed'); + } + + /* Send EHLO again to recieve the AUTH string from the + * SMTP server. */ + $this->_negotiate(); + } + + if (empty($this->_esmtp['AUTH'])) { + return PEAR::raiseError('SMTP server does not support authentication'); } /* If no method has been specified, get the name of the best @@ -844,30 +898,51 @@ class Net_SMTP /** * Send the DATA command. * - * @param string $data The message body to send. + * @param mixed $data The message data, either as a string or an open + * file resource. + * @param string $headers The message headers. If $headers is provided, + * $data is assumed to contain only body data. * * @return mixed Returns a PEAR_Error with an error message on any * kind of failure, or true on success. * @access public * @since 1.0 */ - function data($data) + function data($data, $headers = null) { + /* Verify that $data is a supported type. */ + if (!is_string($data) && !is_resource($data)) { + return PEAR::raiseError('Expected a string or file resource'); + } + /* RFC 1870, section 3, subsection 3 states "a value of zero * indicates that no fixed maximum message size is in force". * Furthermore, it says that if "the parameter is omitted no * information is conveyed about the server's fixed maximum * message size". */ if (isset($this->_esmtp['SIZE']) && ($this->_esmtp['SIZE'] > 0)) { - if (strlen($data) >= $this->_esmtp['SIZE']) { + /* Start by considering the size of the optional headers string. + * We also account for the addition 4 character "\r\n\r\n" + * separator sequence. */ + $size = (is_null($headers)) ? 0 : strlen($headers) + 4; + + if (is_resource($data)) { + $stat = fstat($data); + if ($stat === false) { + return PEAR::raiseError('Failed to get file size'); + } + $size += $stat['size']; + } else { + $size += strlen($data); + } + + if ($size >= $this->_esmtp['SIZE']) { $this->disconnect(); - return PEAR::raiseError('Message size excedes the server limit'); + return PEAR::raiseError('Message size exceeds server limit'); } } - /* Quote the data based on the SMTP standards. */ - $this->quotedata($data); - + /* Initiate the DATA command. */ if (PEAR::isError($error = $this->_put('DATA'))) { return $error; } @@ -875,9 +950,40 @@ class Net_SMTP return $error; } - if (PEAR::isError($result = $this->_send($data . "\r\n.\r\n"))) { - return $result; + /* If we have a separate headers string, send it first. */ + if (!is_null($headers)) { + $this->quotedata($headers); + if (PEAR::isError($result = $this->_send($headers . "\r\n\r\n"))) { + return $result; + } } + + /* Now we can send the message body data. */ + if (is_resource($data)) { + /* Stream the contents of the file resource out over our socket + * connection, line by line. Each line must be run through the + * quoting routine. */ + while ($line = fgets($data, 1024)) { + $this->quotedata($line); + if (PEAR::isError($result = $this->_send($line))) { + return $result; + } + } + + /* Finally, send the DATA terminator sequence. */ + if (PEAR::isError($result = $this->_send("\r\n.\r\n"))) { + return $result; + } + } else { + /* Just send the entire quoted string followed by the DATA + * terminator. */ + $this->quotedata($data); + if (PEAR::isError($result = $this->_send($data . "\r\n.\r\n"))) { + return $result; + } + } + + /* Verify that the data was successfully received by the server. */ if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) { return $error; } From ecf9dc6d1b5a068b2e5ba23debf2b7bec04d3d2c Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 3 May 2010 21:25:10 -0400 Subject: [PATCH 077/730] use the new maxNoticeLength and maxUrlLength functionality introduced in commit 14adb7cc41e3d5d4e543c1f13f7a60d3cadb5c71 --- .../ClientSideShorten/ClientSideShortenPlugin.php | 4 +++- plugins/ClientSideShorten/shorten.js | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php index ba1f7d3a7c..454bedb084 100644 --- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php +++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php @@ -51,8 +51,10 @@ class ClientSideShortenPlugin extends Plugin } function onEndShowScripts($action){ - $action->inlineScript('var Notice_maxContent = ' . Notice::maxContent()); if (common_logged_in()) { + $user = common_current_user(); + $action->inlineScript('var maxNoticeLength = ' . User_urlshortener_prefs::maxNoticeLength($user)); + $action->inlineScript('var maxUrlLength = ' . User_urlshortener_prefs::maxUrlLength($user)); $action->script('plugins/ClientSideShorten/shorten.js'); } } diff --git a/plugins/ClientSideShorten/shorten.js b/plugins/ClientSideShorten/shorten.js index 856c7f05fd..bdffb81e26 100644 --- a/plugins/ClientSideShorten/shorten.js +++ b/plugins/ClientSideShorten/shorten.js @@ -31,10 +31,21 @@ })(jQuery,'smartkeypress'); + function longestWordInString(string) + { + var words = string.split(/\s/); + var longestWord = 0; + for(var i=0;i longestWord) longestWord = words[i].length; + return longestWord; + } + function shorten() { - $noticeDataText = $('#'+SN.C.S.NoticeDataText); - if(Notice_maxContent > 0 && $noticeDataText.val().length > Notice_maxContent){ + var $noticeDataText = $('#'+SN.C.S.NoticeDataText); + var noticeText = $noticeDataText.val(); + + if(noticeText.length > maxNoticeLength || longestWordInString(noticeText) > maxUrlLength) { var original = $noticeDataText.val(); shortenAjax = $.ajax({ url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten', From 4fe00a3075c10c5b2168ac2b4996a32055a799ee Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 3 May 2010 23:02:25 -0400 Subject: [PATCH 078/730] When handling incoming mail, skip everything after a blank line if we already have content --- lib/mailhandler.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/mailhandler.php b/lib/mailhandler.php index 890f6d5b49..e9ba418399 100644 --- a/lib/mailhandler.php +++ b/lib/mailhandler.php @@ -265,6 +265,10 @@ class MailHandler if (preg_match('/^\s*Begin\s+forward/', $line)) { break; } + // skip everything after a blank line if we already have content + if ($output !== '' && $line === '') { + break; + } $output .= ' ' . $line; } From 2a6b3be4e6785452d5a6b52706f098ceceddadc3 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 4 May 2010 14:19:02 -0400 Subject: [PATCH 079/730] correct config.php.sample documentation of sendfile --- config.php.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.php.sample b/config.php.sample index 20de7ffedf..5481ca539e 100644 --- a/config.php.sample +++ b/config.php.sample @@ -45,7 +45,7 @@ $config['site']['path'] = 'statusnet'; // lighttpd, nginx), you can enable X-Sendfile support for better // performance. Presently, only attachment serving when the site is // in private mode will use X-Sendfile. -// $config['site']['X-Sendfile'] = false; +// $config['site']['use_x_sendfile'] = false; // You may also need to enable X-Sendfile support for your web server and // allow it to access files outside of the web root. For Apache with // mod_xsendfile, you can add these to your .htaccess or server config: From 9d2c3d45bc32f54d325072d67d8426edd0e112f0 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 4 May 2010 12:31:55 -0700 Subject: [PATCH 080/730] Add Emacs Identica-mode to notice sources --- db/notice_source.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/notice_source.sql b/db/notice_source.sql index 50660e9480..f9c5256791 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -12,7 +12,8 @@ VALUES ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()), ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()), ('drupal','Drupal','http://drupal.org/', now()), - ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/ ', now()), + ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/', now()), + ('identica-mode','Emacs Identica-mode','http://nongnu.org/identica-mode/', now()), ('Facebook','Facebook','http://apps.facebook.com/identica/', now()), ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()), ('get2gnow', 'get2gnow', 'http://uberchicgeekchick.com/?projects=get2gnow', now()), From 68eaa2e12ad1cb5793fdf31ed5f1a69a0bac59d9 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 4 May 2010 12:31:55 -0700 Subject: [PATCH 081/730] Add Emacs Identica-mode to notice sources --- db/notice_source.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/notice_source.sql b/db/notice_source.sql index 50660e9480..f9c5256791 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -12,7 +12,8 @@ VALUES ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()), ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()), ('drupal','Drupal','http://drupal.org/', now()), - ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/ ', now()), + ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/', now()), + ('identica-mode','Emacs Identica-mode','http://nongnu.org/identica-mode/', now()), ('Facebook','Facebook','http://apps.facebook.com/identica/', now()), ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()), ('get2gnow', 'get2gnow', 'http://uberchicgeekchick.com/?projects=get2gnow', now()), From f803c1fbfecbe31d30441c695e44b7f62b02cebf Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 4 May 2010 12:31:55 -0700 Subject: [PATCH 082/730] Add Emacs Identica-mode to notice sources --- db/notice_source.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/notice_source.sql b/db/notice_source.sql index 50660e9480..f9c5256791 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -12,7 +12,8 @@ VALUES ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()), ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()), ('drupal','Drupal','http://drupal.org/', now()), - ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/ ', now()), + ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/', now()), + ('identica-mode','Emacs Identica-mode','http://nongnu.org/identica-mode/', now()), ('Facebook','Facebook','http://apps.facebook.com/identica/', now()), ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()), ('get2gnow', 'get2gnow', 'http://uberchicgeekchick.com/?projects=get2gnow', now()), From 5f5d9518bdc5daec5a9250a852777d3015856c78 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 4 May 2010 17:11:43 -0700 Subject: [PATCH 083/730] Avoid spewing giant debug backtrace into exception in certain OStatus subscription failure cases. The code pattern 'new XXXException($e)' to chain exceptions doesn't actually work as intended, as exceptions are actually expecting a string message here. This caused an implicit string conversion from HTTP_Request2_Exception, which is a PEAR_Exception, which defines an absurdly detailed __toString() method including a giant HTML table with a backtrace if you happen to be on a web request. Simply passing $e->getMessage() instead clears this up, as we'll get the nice short message like 'Couldn't connect to tcp://blahblah:80' --- plugins/OStatus/lib/feeddiscovery.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php index 4809f9d35c..4ac2438326 100644 --- a/plugins/OStatus/lib/feeddiscovery.php +++ b/plugins/OStatus/lib/feeddiscovery.php @@ -104,7 +104,7 @@ class FeedDiscovery $response = $client->get($url); } catch (HTTP_Request2_Exception $e) { common_log(LOG_ERR, __METHOD__ . " Failure for $url - " . $e->getMessage()); - throw new FeedSubBadURLException($e); + throw new FeedSubBadURLException($e->getMessage()); } if ($htmlOk) { From bb94b78e8997ba1b66ddde7ad46653bfa6f958e6 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 4 May 2010 18:43:32 -0700 Subject: [PATCH 084/730] Handle timeout more gracefully in background pings Added a 2-second default timeout for XMLRPC/extended pings, configurable as [ping,timeout]. No longer repeating the entire ping section if we had an HTTP error during a submission. For now, dropping the bad item and continuing on with others. (Todo: individual retry and cleaner discards of blacklisted broken-for-now sites.) --- lib/default.php | 3 ++- lib/ping.php | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/default.php b/lib/default.php index fa4ece10ad..ab5f294ded 100644 --- a/lib/default.php +++ b/lib/default.php @@ -188,7 +188,8 @@ $default = 'cache' => array('base' => null), 'ping' => - array('notify' => array()), + array('notify' => array(), + 'timeout' => 2), 'inboxes' => array('enabled' => true), # ignored after 0.9.x 'newuser' => diff --git a/lib/ping.php b/lib/ping.php index 735af9ef13..be2933ae34 100644 --- a/lib/ping.php +++ b/lib/ping.php @@ -45,7 +45,15 @@ function ping_broadcast_notice($notice) { $tags)); $request = HTTPClient::start(); - $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req); + $request->setConfig('connect_timeout', common_config('ping', 'timeout')); + $request->setConfig('timeout', common_config('ping', 'timeout')); + try { + $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req); + } catch (Exception $e) { + common_log(LOG_ERR, + "Exception pinging $notify_url: " . $e->getMessage()); + continue; + } if (!$httpResponse || mb_strlen($httpResponse->getBody()) == 0) { common_log(LOG_WARNING, From 60825ba535763838059797db03cc32cf07276de0 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 5 May 2010 10:51:05 -0700 Subject: [PATCH 085/730] Clean up reference usage warnings in DirectionDetector plugin --- plugins/DirectionDetector/DirectionDetectorPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php index 303e60d5f4..0277e02c56 100644 --- a/plugins/DirectionDetector/DirectionDetectorPlugin.php +++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php @@ -48,7 +48,7 @@ class DirectionDetectorPlugin extends Plugin { * * @param */ - public function onEndShowStatusNetStyles(&$xml){ + public function onEndShowStatusNetStyles($xml){ $xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;width:490px;} .notice .author {float:left}'); } /** @@ -102,7 +102,7 @@ class DirectionDetectorPlugin extends Plugin { * * Returns false if the input string isn't a valid UTF-8 octet sequence. */ - private static function utf8ToUnicode(&$str){ + private static function utf8ToUnicode($str){ $mState = 0; // cached expected number of octets after the current octet // until the beginning of the next UTF8 character sequence $mUcs4 = 0; // cached Unicode character From 8260a88f41bb21fe5e5bd25dea15283a08c2224c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 5 May 2010 11:28:05 -0700 Subject: [PATCH 086/730] Quick fix for DirectionDetector: only apply once; if it's already there in an incoming message (eg via OStatus), don't reapply it. Modified from patch from Everplays --- plugins/DirectionDetector/DirectionDetectorPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php index 0277e02c56..34c511e21d 100644 --- a/plugins/DirectionDetector/DirectionDetectorPlugin.php +++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php @@ -38,7 +38,7 @@ class DirectionDetectorPlugin extends Plugin { * @param object $notice notice is going to be saved */ public function onStartNoticeSave(&$notice){ - if(self::isRTL($notice->content)) + if(!preg_match('//', $notice->rendered) && self::isRTL($notice->content)) $notice->rendered = ''.$notice->rendered.''; return true; } From c2bda7726c05c6c7f5ef4f9519e56f107bc4e1e5 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 5 May 2010 13:11:36 -0700 Subject: [PATCH 087/730] XMPP debugging: log the message source when discarding empty or unrecognized messages. --- lib/xmppmanager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php index cca54db08d..829eaa36cb 100644 --- a/lib/xmppmanager.php +++ b/lib/xmppmanager.php @@ -253,12 +253,12 @@ class XmppManager extends IoManager $from = jabber_normalize_jid($pl['from']); if ($pl['type'] != 'chat') { - $this->log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from."); + $this->log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from: " . $pl['xml']->toString()); return; } if (mb_strlen($pl['body']) == 0) { - $this->log(LOG_WARNING, "Ignoring message with empty body from $from."); + $this->log(LOG_WARNING, "Ignoring message with empty body from $from: " . $pl['xml']->toString()); return; } From b50f300566143837aba3739d62caf679ec19727e Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 5 May 2010 14:46:36 -0700 Subject: [PATCH 088/730] Implement since_id and max_id param handling for /api/favorites --- actions/apitimelinefavorites.php | 10 ++++++++-- actions/favoritesrss.php | 2 +- actions/showfavorites.php | 8 ++++---- classes/Fave.php | 4 ++-- classes/User.php | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index 8cb2e808de..79632447ef 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -185,17 +185,23 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction { $notices = array(); + common_debug("since id = " . $this->since_id . " max id = " . $this->max_id); + if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) { $notice = $this->user->favoriteNotices( + true, ($this->page-1) * $this->count, $this->count, - true + $this->since_id, + $this->max_id ); } else { $notice = $this->user->favoriteNotices( + false, ($this->page-1) * $this->count, $this->count, - false + $this->since_id, + $this->max_id ); } diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php index 62f06e841b..51c92af933 100644 --- a/actions/favoritesrss.php +++ b/actions/favoritesrss.php @@ -89,7 +89,7 @@ class FavoritesrssAction extends Rss10Action function getNotices($limit=0) { $user = $this->user; - $notice = $user->favoriteNotices(0, $limit); + $notice = $user->favoriteNotices(false, 0, $limit); $notices = array(); while ($notice->fetch()) { $notices[] = clone($notice); diff --git a/actions/showfavorites.php b/actions/showfavorites.php index 4d776ef04c..7f3c77ee24 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -121,11 +121,11 @@ class ShowfavoritesAction extends OwnerDesignAction // Show imported/gateway notices as well as local if // the user is looking at his own favorites - $this->notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE, - NOTICES_PER_PAGE + 1, true); + $this->notice = $this->user->favoriteNotices(true, ($this->page-1)*NOTICES_PER_PAGE, + NOTICES_PER_PAGE + 1); } else { - $this->notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE, - NOTICES_PER_PAGE + 1, false); + $this->notice = $this->user->favoriteNotices(false, ($this->page-1)*NOTICES_PER_PAGE, + NOTICES_PER_PAGE + 1); } if (empty($this->notice)) { diff --git a/classes/Fave.php b/classes/Fave.php index 7ca9ade7f0..ed4f56aeef 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -75,13 +75,13 @@ class Fave extends Memcached_DataObject return Memcached_DataObject::pkeyGet('Fave', $kv); } - function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false) + function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false, $since_id=0, $max_id=0) { $ids = Notice::stream(array('Fave', '_streamDirect'), array($user_id, $own), ($own) ? 'fave:ids_by_user_own:'.$user_id : 'fave:ids_by_user:'.$user_id, - $offset, $limit); + $offset, $limit, $since_id, $max_id); return $ids; } diff --git a/classes/User.php b/classes/User.php index 1928a3c62f..2abb7eeb69 100644 --- a/classes/User.php +++ b/classes/User.php @@ -464,9 +464,9 @@ class User extends Memcached_DataObject return $profile->getNotices($offset, $limit, $since_id, $before_id); } - function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE, $own=false) + function favoriteNotices($own=false, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0) { - $ids = Fave::stream($this->id, $offset, $limit, $own); + $ids = Fave::stream($this->id, $offset, $limit, $own, $since_id, $max_id); return Notice::getStreamByIds($ids); } From 94190e77f664c06c76e650fdebd23720fe26bf6e Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 6 May 2010 00:25:25 +0200 Subject: [PATCH 089/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/ca/LC_MESSAGES/statusnet.po | 308 +++++++++++++++-------------- locale/de/LC_MESSAGES/statusnet.po | 12 +- locale/statusnet.pot | 2 +- 3 files changed, 172 insertions(+), 150 deletions(-) diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index b12c03a1ce..1f517b6bde 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:30+0000\n" +"PO-Revision-Date: 2010-05-05 22:19:09+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r65963); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -176,6 +176,8 @@ msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"Podeu provar d'[avisar %1$s](../%2$s) des del seu perfil o [enviar quelcom " +"per reclamar-li l'atenció](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 #, php-format @@ -183,6 +185,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" +"Per què no [registreu un compte](%%%%action.register%%%%) i aviseu %s o " +"envieu un avís a la seva atenció." #. TRANS: H1 text #: actions/all.php:178 @@ -558,11 +562,13 @@ msgid "" "The request token %s has been authorized. Please exchange it for an access " "token." msgstr "" +"S'ha autoritzat el testimoni de sol·licitud %s. Si us plau, canvieu-lo per " +"un testimoni d'accés." #: actions/apioauthauthorize.php:227 #, php-format msgid "The request token %s has been denied and revoked." -msgstr "" +msgstr "S'ha denegat i revocat el testimoni de sol·licitud %s." #. TRANS: Message given submitting a form with an unknown action in e-mail settings. #. TRANS: Message given submitting a form with an unknown action in IM settings. @@ -591,6 +597,9 @@ msgid "" "the ability to %3$s your %4$s account data. You should only " "give access to your %4$s account to third parties you trust." msgstr "" +"L'aplicació %1$s, de %2$s, voldria obtenir " +"l'habilitat de %3$s les dades del vostre compte %4$s. Només " +"hauríeu de donar accés al compte %4$s a terceres parts en què confieu." #. TRANS: Main menu option when logged in for access to user settings #: actions/apioauthauthorize.php:310 lib/action.php:440 @@ -826,6 +835,9 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" +"Esteu segur que voleu blocar l'usuari? Tot seguit, deixarà la vostra " +"subscripció, no us podrà subscriure en el futur, i no en rebreu cap avís de " +"respostes @." #. TRANS: Button label on the user block form. #. TRANS: Button label on the delete application form. @@ -1273,11 +1285,11 @@ msgstr "Cal una pàgina d'inici de l'organització." #: actions/editapplication.php:218 actions/newapplication.php:206 msgid "Callback is too long." -msgstr "" +msgstr "La crida de retorn és massa llarga." #: actions/editapplication.php:225 actions/newapplication.php:215 msgid "Callback URL is not valid." -msgstr "" +msgstr "L'URL de la crida de retorn no és vàlid." #: actions/editapplication.php:258 msgid "Could not update application." @@ -1666,9 +1678,8 @@ msgid "You are not authorized." msgstr "No esteu autoritzat." #: actions/finishremotesubscribe.php:113 -#, fuzzy msgid "Could not convert request token to access token." -msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés." +msgstr "No s'ha pogut convertir el testimoni de sol·licitud a un d'accés." #: actions/finishremotesubscribe.php:118 msgid "Remote service uses unknown version of OMB protocol." @@ -1880,6 +1891,11 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" +"Els grups de %%%%site.name%%%% us permeten trobar-vos i parlar amb gent " +"d'interessos semblants. Després d'unir-vos a un grup, podeu enviar missatges " +"a altres membres emprant la sintaxi «!groupname». No veieu cap grup que us " +"agradi? Proveu de [cercar-ne un](%%%%action.groupsearch%%%%) o [comenceu-ne " +"un de propi!](%%%%action.newgroup%%%%)" #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" @@ -1909,6 +1925,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"Si no podeu trobar el grup que cerqueu, podeu provar de [crear-lo](%%action." +"newgroup%%) també." #: actions/groupsearch.php:85 #, php-format @@ -1916,6 +1934,8 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"Per què no [registreu un compte](%%action.register%%) i proveu de [crear-hi " +"un grup](%%action.newgroup%%)!" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." @@ -2444,6 +2464,8 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" #: actions/noticesearch.php:124 #, php-format @@ -2451,6 +2473,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"Per què no [registreu un compte](%%%%action.register%%%%) i sou el primer " +"[en parlar del tema](%%%%action.newnotice%%%%?status_textarea=%s)!" #: actions/noticesearchrss.php:96 #, php-format @@ -2510,15 +2534,17 @@ msgstr "No sou usuari de l'aplicació." #: actions/oauthconnectionssettings.php:186 #, php-format msgid "Unable to revoke access for app: %s." -msgstr "" +msgstr "No s'ha pogut revocar l'accés de l'aplicació: %s" #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "No heu autoritzat cap aplicació perquè utilitzi el vostre compte." #: actions/oauthconnectionssettings.php:211 msgid "Developers can edit the registration settings for their applications " msgstr "" +"Els desenvolupadors poden editar els paràmetres de registre de llurs " +"aplicacions " #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile." @@ -2539,7 +2565,7 @@ msgstr "El tipus de contingut %s no està permès." #: actions/oembed.php:162 #, php-format msgid "Only %s URLs over plain HTTP please." -msgstr "" +msgstr "Si us plau, només URL %s sobre HTTP pla." #. TRANS: Client error on an API request with an unsupported data format. #: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 @@ -2593,29 +2619,25 @@ msgid "No user ID specified." msgstr "No s'ha especificat cap ID d'usuari." #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "No s'ha especificat perfil." +msgstr "No s'ha especificat cap testimoni d'inici de sessió." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "No id en el perfil sol·licitat." +msgstr "No s'ha sol·licitat cap testimoni d'inici de sessió." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "El contingut de l'avís és invàlid" +msgstr "No s'ha especificat un testimoni d'inici de sessió vàlid." #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "Accedir al lloc" +msgstr "El testimoni d'inici de sessió ha vençut." #: actions/outbox.php:58 -#, fuzzy, php-format +#, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "Safata de sortida per %s" +msgstr "Safata de sortida de %1$s - pàgina %2$d" #: actions/outbox.php:61 #, php-format @@ -2696,31 +2718,31 @@ msgstr "Camins" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." -msgstr "" +msgstr "Camí i paràmetres del servidor d'aquest lloc StatusNet." #: actions/pathsadminpanel.php:157 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s." -msgstr "Aquesta pàgina no està disponible en " +msgstr "No es pot llegir el directori de temes: %s" #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "No es pot escriure al directori de fons: %s" +msgstr "No es pot escriure al directori d'avatars: %s" #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." msgstr "No es pot escriure al directori de fons: %s" #: actions/pathsadminpanel.php:177 -#, fuzzy, php-format +#, php-format msgid "Locales directory not readable: %s." -msgstr "Aquesta pàgina no està disponible en " +msgstr "No es pot llegir el directori de les traduccions: %s" #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." -msgstr "" +msgstr "El servidor SSL no és vàlid. La mida màxima és de 255 caràcters." #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 msgid "Site" @@ -2744,11 +2766,11 @@ msgstr "Camí del lloc" #: actions/pathsadminpanel.php:246 msgid "Path to locales" -msgstr "" +msgstr "El camí a les traduccions" #: actions/pathsadminpanel.php:246 msgid "Directory path to locales" -msgstr "" +msgstr "El camí del directori a les traduccions" #: actions/pathsadminpanel.php:250 msgid "Fancy URLs" @@ -2856,9 +2878,9 @@ msgid "People search" msgstr "Cerca de gent" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "Etiqueta no vàlida per a la gent: %s" +msgstr "No és una etiqueta de gent vàlida: %s" #: actions/peopletag.php:142 #, php-format @@ -2873,6 +2895,8 @@ msgstr "El contingut de l'avís no és vàlid." #, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"La llicència ‘%1$s’ de l'avís no és compatible amb la llicència ‘%2$s’ del " +"lloc." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2916,9 +2940,8 @@ msgid "Describe yourself and your interests in %d chars" msgstr "Descriviu qui sou i els vostres interessos en %d caràcters" #: actions/profilesettings.php:125 actions/register.php:464 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Explica'ns alguna cosa sobre tu " +msgstr "Feu una descripció personal i interessos" #: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" @@ -3073,16 +3096,20 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Això és %%site.name%%, un servei de [micro-blogging](http://en.wikipedia.org/" +"wiki/Micro-blogging) basat en l'eina lliure [StatusNet](http://status.net/). " +"[Uniu-vos-hi ara](%%action.register%%) per a compartir què feu amb els " +"vostres amics, familiars, i companys! ([Més informació](%%doc.help%%))" #: actions/public.php:247 -#, fuzzy, php-format +#, php-format msgid "" "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" "Això és %%site.name%%, un servei de [microblogging](http://ca.wikipedia.org/" -"wiki/Microblogging) " +"wiki/Microblogging) basat en l'eina lliure [StatusNet](http://status.net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" @@ -3108,6 +3135,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Per què no hi [registreu un compte](%%action.register%%) i sou el primer en " +"escriure'n un!" #: actions/publictagcloud.php:134 msgid "Tag cloud" @@ -3272,7 +3301,6 @@ msgid "Invalid username or password." msgstr "Nom d'usuari o contrasenya invàlids." #: actions/register.php:343 -#, fuzzy msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3309,13 +3337,14 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nom llarg, preferiblement el teu nom \"real\"" #: actions/register.php:494 -#, fuzzy, php-format +#, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -"excepte les següents dades privades: contrasenya, adreça de correu " -"electrònic, adreça de missatgeria instantània, número de telèfon." +"El meu text i fitxers es troben disponibles sota %s, excepte pel que fa a " +"les dades privades: contrasenya, adreça de correu electrònic, adreça de " +"missatgeria instantània i número de telèfon." #: actions/register.php:542 #, fuzzy, php-format @@ -3335,7 +3364,8 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Felicitats, %s! I benvingut/da a %%%%site.name%%%%. Des d'aquí, podries...\n" +"Enhorabona, %1$s! Us donem la benvinguda a %%%%site.name%%%%. Des d'aquí, " +"podríeu voler...\n" "\n" "* Anar al teu [teu perfil](%s) i publicar el teu primer missatge.\n" "* Afegir una [direcció Jabber/GTalk](%%%%action.imsettings%%%%) i així poder " @@ -3402,18 +3432,18 @@ msgid "Invalid profile URL (bad format)" msgstr "L'URL del perfil és invàlid (format incorrecte)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." -msgstr "URL de perfil no vàlid (cap document YADIS)." +msgstr "" +"L'URL del perfil no és vàlid (no és un document YADIS o no s'ha definit un " +"XRDS vàlid)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." msgstr "Aquest és un perfil local! Inicieu una sessió per a subscriure-us-hi." #: actions/remotesubscribe.php:183 -#, fuzzy msgid "Couldn’t get a request token." -msgstr "No s'ha pogut obtenir un senyal de petició." +msgstr "No s'ha pogut obtenir un testimoni de sol·licitud." #: actions/repeat.php:57 msgid "Only logged-in users can repeat notices." @@ -3424,9 +3454,8 @@ msgid "No notice specified." msgstr "No s'ha especificat cap avís." #: actions/repeat.php:76 -#, fuzzy msgid "You can't repeat your own notice." -msgstr "No pots registrar-te si no estàs d'acord amb la llicència." +msgstr "No podeu repetir el vostre propi avís." #: actions/repeat.php:90 msgid "You already repeated that notice." @@ -3467,13 +3496,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Feed d'avisos de %s" #: actions/replies.php:199 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"Aquesta és la línia temporal de %s i amics, però ningú hi ha enviat res " -"encara." +"Aquesta és la línia temporal que mostra les respostes a %1$s, però %2$s " +"encara no ha rebut cap avís a la seva atenció." #: actions/replies.php:204 #, php-format @@ -3481,6 +3510,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Podeu animar altres usuaris a una conversa, subscriviu-vos a més gent o " +"[uniu-vos a grups](%%action.groups%%)." #: actions/replies.php:206 #, php-format @@ -3488,6 +3519,8 @@ msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"Podeu provar d'[avisar %1$s](../%2$s) o [enviar quelcom per demanar la seva " +"atenció](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -3495,28 +3528,24 @@ msgid "Replies to %1$s on %2$s!" msgstr "Respostes a %1$s el %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "No podeu silenciar els usuaris d'aquest lloc." +msgstr "No podeu revocar els rols d'usuari en aquest lloc." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Usuari sense perfil coincident" +msgstr "L'usuari no té aquest rol." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" msgstr "StatusNet" #: actions/sandbox.php:65 actions/unsandbox.php:65 -#, fuzzy msgid "You cannot sandbox users on this site." -msgstr "No pots enviar un missatge a aquest usuari." +msgstr "No podeu posar els usuaris en un entorn de prova en aquest lloc." #: actions/sandbox.php:72 -#, fuzzy msgid "User is already sandboxed." -msgstr "Un usuari t'ha bloquejat." +msgstr "L'usuari ja es troba en un entorn de proves." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 @@ -3525,9 +3554,8 @@ msgid "Sessions" msgstr "Sessions" #: actions/sessionsadminpanel.php:65 -#, fuzzy msgid "Session settings for this StatusNet site." -msgstr "Paràmetres de disseny d'aquest lloc StatusNet." +msgstr "Paràmetres de sessió d'aquest lloc StatusNet." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" @@ -3551,9 +3579,8 @@ msgid "Save site settings" msgstr "Desa els paràmetres del lloc" #: actions/showapplication.php:82 -#, fuzzy msgid "You must be logged in to view an application." -msgstr "Has d'haver entrat per a poder marxar d'un grup." +msgstr "Heu d'haver iniciat una sessió per a visualitzar una aplicació." #: actions/showapplication.php:157 msgid "Application profile" @@ -3613,11 +3640,11 @@ msgstr "" #: actions/showapplication.php:273 msgid "Request token URL" -msgstr "" +msgstr "Sol·licita l'URL del testimoni" #: actions/showapplication.php:278 msgid "Access token URL" -msgstr "" +msgstr "Accedeix a l'URL del testimoni" #: actions/showapplication.php:283 msgid "Authorize URL" @@ -3628,6 +3655,8 @@ msgid "" "Note: We support HMAC-SHA1 signatures. We do not support the plaintext " "signature method." msgstr "" +"Nota: Les signatures HMAC-SHA1 són vàlides; però no es permet el mètode de " +"signatures en text net." #: actions/showapplication.php:309 #, fuzzy @@ -3635,9 +3664,9 @@ msgid "Are you sure you want to reset your consumer key and secret?" msgstr "N'estàs segur que vols eliminar aquesta notificació?" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "%s's notes favorites" +msgstr "Avisos preferits de %1$s, pàgina %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3663,6 +3692,9 @@ msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"No heu triat cap avís preferit encara. Feu clic al botó de preferit dels " +"avisos que us agraden per a arxivar-los per a més endavant i fer-los " +"conèixer." #: actions/showfavorites.php:208 #, php-format @@ -3670,6 +3702,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s no ha afegit cap avís als seus preferits encara. Envieu quelcom " +"interessant que pugui afegir-hi." #: actions/showfavorites.php:212 #, php-format @@ -3678,6 +3712,9 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s no ha afegit cap avís als seus preferits encara. Per què no [registreu un " +"compte](%%%%action.register%%%%) i llavors envieu quelcom interessant que " +"pugui afegir-hi." #: actions/showfavorites.php:243 msgid "This is a way to share what you like." @@ -3689,9 +3726,9 @@ msgid "%s group" msgstr "%s grup" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "%s membre/s en el grup, pàgina %d" +msgstr "grup %1$s, pàgina %2$d" #: actions/showgroup.php:227 msgid "Group profile" @@ -3811,36 +3848,35 @@ msgid "%1$s, page %2$d" msgstr "%1$s, pàgina %2$d" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Feed d'avisos del grup %s" +msgstr "Canal d'avisos de %1$s etiquetats amb %2$s (RSS 1.0)" #: actions/showstream.php:129 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "Feed d'avisos de %s" +msgstr "Canal d'avisos de %s (RSS 1.0)" #: actions/showstream.php:136 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "Feed d'avisos de %s" +msgstr "Canal d'avisos de %s (RSS 2.0)" #: actions/showstream.php:143 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (Atom)" -msgstr "Feed d'avisos de %s" +msgstr "Canal d'avisos de %s (Atom)" #: actions/showstream.php:148 -#, fuzzy, php-format +#, php-format msgid "FOAF for %s" -msgstr "Safata de sortida per %s" +msgstr "FOAF de %s" #: actions/showstream.php:200 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" -"Aquesta és la línia temporal de %s i amics, però ningú hi ha enviat res " -"encara." +"Aquesta és la línia temporal de %1$s, però %2$s no hi ha enviat res encara." #: actions/showstream.php:205 msgid "" @@ -3888,18 +3924,16 @@ msgid "User is already silenced." msgstr "L'usuari ja està silenciat." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Paràmetres bàsic d'aquest lloc basat en l'StatusNet." +msgstr "Paràmetres bàsics d'aquest lloc basat en l'StatusNet." #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." msgstr "El nom del lloc ha de tenir una longitud superior a zero." #: actions/siteadminpanel.php:141 -#, fuzzy msgid "You must have a valid contact email address." -msgstr "Heu de tenir una adreça electrònica de contacte vàlida" +msgstr "Heu de tenir una adreça electrònica de contacte vàlida." #: actions/siteadminpanel.php:159 #, php-format @@ -3928,7 +3962,7 @@ msgstr "El nom del vostre lloc, com ara «El microblog de l'empresa»" #: actions/siteadminpanel.php:229 msgid "Brought by" -msgstr "" +msgstr "Funciona gràcies a" #: actions/siteadminpanel.php:230 msgid "Text used for credits link in footer of each page" @@ -3936,11 +3970,11 @@ msgstr "El text que s'utilitza a l'enllaç dels crèdits al peu de cada pàgina" #: actions/siteadminpanel.php:234 msgid "Brought by URL" -msgstr "" +msgstr "URL de «Funciona gràcies a»" #: actions/siteadminpanel.php:235 msgid "URL used for credits link in footer of each page" -msgstr "" +msgstr "L'URL que s'utilitza en els enllaços de crèdits al peu de cada pàgina" #: actions/siteadminpanel.php:239 msgid "Contact email address for your site" @@ -4135,9 +4169,8 @@ msgstr "Aquest és un número de confirmació incorrecte." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "Confirmació cancel·lada." +msgstr "La confirmació d'SMS s'ha cancel·lat." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. @@ -4147,9 +4180,8 @@ msgstr "Aquest no és el teu número de telèfon." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "Número de telèfon per als SMS" +msgstr "S'ha suprimit el número de telèfon de l'SMS." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4248,7 +4280,7 @@ msgstr "No s'ha pogut guardar la subscripció." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "Aquesta acció només accepta sol·licituds POST." #: actions/subscribe.php:107 msgid "No such profile." @@ -4352,19 +4384,19 @@ msgid "Notices tagged with %1$s, page %2$d" msgstr "Usuaris que s'han etiquetat %s - pàgina %d" #: actions/tag.php:87 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Feed d'avisos de %s" +msgstr "Canal d'avisos per a l'etiqueta %s (RSS 1.0)" #: actions/tag.php:93 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed d'avisos de %s" +msgstr "Canal d'avisos per a l'etiqueta %s (RSS 2.0)" #: actions/tag.php:99 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Feed d'avisos de %s" +msgstr "Canal d'avisos per a l'etiqueta %s (Atom)" #: actions/tagother.php:39 #, fuzzy @@ -4427,9 +4459,8 @@ msgid "You haven't blocked that user." msgstr "No heu blocat l'usuari." #: actions/unsandbox.php:72 -#, fuzzy msgid "User is not sandboxed." -msgstr "Un usuari t'ha bloquejat." +msgstr "L'usuari no està a l'entorn de proves." #: actions/unsilence.php:72 msgid "User is not silenced." @@ -4607,22 +4638,22 @@ msgstr "" #: actions/userauthorization.php:329 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "L'URL del perfil «%s» és només per a un usuari local." #: actions/userauthorization.php:345 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "L'URL de l'avatar «%s» no és vàlid." #: actions/userauthorization.php:350 -#, fuzzy, php-format +#, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "No es pot llegir l'URL de l'avatar '%s'" +msgstr "No es pot llegir l'URL de l'avatar «%s»." #: actions/userauthorization.php:355 -#, fuzzy, php-format +#, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "Tipus d'imatge incorrecte per a '%s'" +msgstr "Tipus d'imatge incorrecta per a l'URL de l'avatar «%s»." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4642,9 +4673,9 @@ msgstr "Gaudiu de l'entrepà!" #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. #: actions/usergroups.php:66 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "%s membre/s en el grup, pàgina %d" +msgstr "Grups de %1$s, pàgina %2$d" #: actions/usergroups.php:132 msgid "Search for more groups" @@ -4753,9 +4784,8 @@ msgid "Group leave failed." msgstr "La sortida del grup ha fallat." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "No s'ha pogut actualitzar el grup." +msgstr "No s'ha pogut actualitzar el grup local." #: classes/Login_token.php:76 #, fuzzy, php-format @@ -4813,9 +4843,8 @@ msgid "Problem saving notice." msgstr "Problema en guardar l'avís." #: classes/Notice.php:967 -#, fuzzy msgid "Problem saving group inbox." -msgstr "Problema en guardar l'avís." +msgstr "S'ha produït un problema en desar la safata d'entrada del grup." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. @@ -5203,28 +5232,24 @@ msgstr "No podeu fer canvis al lloc." #. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "Registre no permès." +msgstr "No es permeten canvis a aquell tauler." #. TRANS: Client error message. #: lib/adminpanelaction.php:229 -#, fuzzy msgid "showForm() not implemented." -msgstr "Comanda encara no implementada." +msgstr "El showForm() no està implementat." #. TRANS: Client error message #: lib/adminpanelaction.php:259 -#, fuzzy msgid "saveSettings() not implemented." -msgstr "Comanda encara no implementada." +msgstr "El saveSettings() no està implementat." #. TRANS: Client error message thrown if design settings could not be deleted in #. TRANS: the admin panel Design. #: lib/adminpanelaction.php:284 -#, fuzzy msgid "Unable to delete design setting." -msgstr "No s'ha pogut guardar la teva configuració de Twitter!" +msgstr "No s'ha pogut suprimir el paràmetre de disseny." #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:349 @@ -5275,9 +5300,8 @@ msgstr "Configuració de les sessions" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:397 -#, fuzzy msgid "Edit site notice" -msgstr "Avís del lloc" +msgstr "Edita l'avís del lloc" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:405 @@ -5652,9 +5676,9 @@ msgstr "" "minuts: %s" #: lib/command.php:761 -#, fuzzy, php-format +#, php-format msgid "Unsubscribed %s" -msgstr "Has deixat d'estar subscrit a %s" +msgstr "S'ha dessubscrit %s" #: lib/command.php:778 #, fuzzy @@ -5775,10 +5799,11 @@ msgid "Upload file" msgstr "Puja un fitxer" #: lib/designsettings.php:109 -#, fuzzy msgid "" "You can upload your personal background image. The maximum file size is 2MB." -msgstr "Pots pujar el teu avatar personal." +msgstr "" +"Podeu pujar la vostra imatge de fons personal. La mida màxima del fitxer és " +"2MB." #: lib/designsettings.php:418 msgid "Design defaults restored." @@ -6266,15 +6291,15 @@ msgstr "No s'ha pogut escriure el fitxer al disc." #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "L'extensió ha aturat la càrrega del fitxer." #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota." -msgstr "" +msgstr "El fitxer excedeix la quota de l'usuari." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "No s'ha pogut moure el fitxer al directori de destinació." #: lib/mediafile.php:201 lib/mediafile.php:237 msgid "Could not determine file's MIME type." @@ -6283,16 +6308,16 @@ msgstr "No s'ha pogut determinar el tipus MIME del fitxer." #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr "Proveu d'emprar un altre format %s." #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported file type on this server." -msgstr "" +msgstr "%s no és un tipus de fitxer permès al servidor." #: lib/messageform.php:120 msgid "Send a direct notice" -msgstr "Enviar notificació directa" +msgstr "Envia un avís directe" #: lib/messageform.php:146 msgid "To" @@ -6309,7 +6334,7 @@ msgstr "Envia" #: lib/noticeform.php:160 msgid "Send a notice" -msgstr "Enviar notificació" +msgstr "Envia un avís" #: lib/noticeform.php:173 #, php-format @@ -6542,17 +6567,15 @@ msgstr "Revoca el rol «%s» de l'usuari" #: lib/router.php:704 msgid "No single user defined for single-user mode." -msgstr "" +msgstr "No s'ha definit cap usuari únic per al mode d'usuari únic." #: lib/sandboxform.php:67 -#, fuzzy msgid "Sandbox" -msgstr "Safata d'entrada" +msgstr "Entorn de proves" #: lib/sandboxform.php:78 -#, fuzzy msgid "Sandbox this user" -msgstr "Desbloquejar aquest usuari" +msgstr "Posa l'usuari a l'entorn de proves" #: lib/searchaction.php:120 msgid "Search site" @@ -6646,12 +6669,11 @@ msgstr "Que més publiquen" #: lib/unsandboxform.php:69 msgid "Unsandbox" -msgstr "" +msgstr "Treu de l'entorn de proves" #: lib/unsandboxform.php:80 -#, fuzzy msgid "Unsandbox this user" -msgstr "Desbloquejar aquest usuari" +msgstr "Treu l'usuari de l'entorn de proves" #: lib/unsilenceform.php:67 msgid "Unsilence" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index eda01937ab..828e2d8870 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:36+0000\n" +"PO-Revision-Date: 2010-05-05 22:19:15+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r65963); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -4255,7 +4255,7 @@ msgstr "Verwalten Snapshot-Konfiguration" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." -msgstr "" +msgstr "Der Wert zum Ausführen von Snapshots ist ungültig." #: actions/snapshotadminpanel.php:133 msgid "Snapshot frequency must be a number." @@ -4655,17 +4655,17 @@ msgstr "" #: actions/userauthorization.php:303 #, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "" +msgstr "Eine Listener-URI „%s“ wurde hier nicht gefunden." #: actions/userauthorization.php:308 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "Die URI „%s“ für den Stream ist zu lang." #: actions/userauthorization.php:314 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "Die URI „%s“ für den Stream ist ein lokaler Benutzer." #: actions/userauthorization.php:329 #, php-format diff --git a/locale/statusnet.pot b/locale/statusnet.pot index caa8258f97..dedce0ad9b 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-03 19:17+0000\n" +"POT-Creation-Date: 2010-05-05 22:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From ddc7811a7b412c9c3c4b6bfb9350dd18a62fdf51 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 5 May 2010 16:52:31 -0700 Subject: [PATCH 090/730] Move XMPPHP from core extlibs to Xmpp plugin extlibs --- plugins/Xmpp/XmppPlugin.php | 4 +--- {extlib => plugins/Xmpp/extlib}/XMPPHP/BOSH.php | 0 {extlib => plugins/Xmpp/extlib}/XMPPHP/Exception.php | 0 {extlib => plugins/Xmpp/extlib}/XMPPHP/Log.php | 0 {extlib => plugins/Xmpp/extlib}/XMPPHP/Roster.php | 0 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLObj.php | 0 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLStream.php | 0 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP.php | 0 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP_Old.php | 0 9 files changed, 1 insertion(+), 3 deletions(-) rename {extlib => plugins/Xmpp/extlib}/XMPPHP/BOSH.php (100%) rename {extlib => plugins/Xmpp/extlib}/XMPPHP/Exception.php (100%) rename {extlib => plugins/Xmpp/extlib}/XMPPHP/Log.php (100%) rename {extlib => plugins/Xmpp/extlib}/XMPPHP/Roster.php (100%) rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLObj.php (100%) rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLStream.php (100%) rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP.php (100%) rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP_Old.php (100%) diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php index a2521536bc..9d75e2475d 100644 --- a/plugins/Xmpp/XmppPlugin.php +++ b/plugins/Xmpp/XmppPlugin.php @@ -34,8 +34,6 @@ if (!defined('STATUSNET')) { exit(1); } -set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/XMPPHP'); - /** * Plugin for XMPP * @@ -287,7 +285,7 @@ class XmppPlugin extends ImPlugin switch ($cls) { case 'XMPPHP_XMPP': - require_once 'XMPP.php'; + require_once $dir . '/extlib/XMPPHP/XMPP.php'; return false; case 'Sharing_XMPP': case 'Queued_XMPP': diff --git a/extlib/XMPPHP/BOSH.php b/plugins/Xmpp/extlib/XMPPHP/BOSH.php similarity index 100% rename from extlib/XMPPHP/BOSH.php rename to plugins/Xmpp/extlib/XMPPHP/BOSH.php diff --git a/extlib/XMPPHP/Exception.php b/plugins/Xmpp/extlib/XMPPHP/Exception.php similarity index 100% rename from extlib/XMPPHP/Exception.php rename to plugins/Xmpp/extlib/XMPPHP/Exception.php diff --git a/extlib/XMPPHP/Log.php b/plugins/Xmpp/extlib/XMPPHP/Log.php similarity index 100% rename from extlib/XMPPHP/Log.php rename to plugins/Xmpp/extlib/XMPPHP/Log.php diff --git a/extlib/XMPPHP/Roster.php b/plugins/Xmpp/extlib/XMPPHP/Roster.php similarity index 100% rename from extlib/XMPPHP/Roster.php rename to plugins/Xmpp/extlib/XMPPHP/Roster.php diff --git a/extlib/XMPPHP/XMLObj.php b/plugins/Xmpp/extlib/XMPPHP/XMLObj.php similarity index 100% rename from extlib/XMPPHP/XMLObj.php rename to plugins/Xmpp/extlib/XMPPHP/XMLObj.php diff --git a/extlib/XMPPHP/XMLStream.php b/plugins/Xmpp/extlib/XMPPHP/XMLStream.php similarity index 100% rename from extlib/XMPPHP/XMLStream.php rename to plugins/Xmpp/extlib/XMPPHP/XMLStream.php diff --git a/extlib/XMPPHP/XMPP.php b/plugins/Xmpp/extlib/XMPPHP/XMPP.php similarity index 100% rename from extlib/XMPPHP/XMPP.php rename to plugins/Xmpp/extlib/XMPPHP/XMPP.php diff --git a/extlib/XMPPHP/XMPP_Old.php b/plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php similarity index 100% rename from extlib/XMPPHP/XMPP_Old.php rename to plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php From 3e8af172d636cc7ca3a9e2301b928f6ca79b9eb2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 5 May 2010 17:30:42 -0700 Subject: [PATCH 091/730] Add ?uselang=xx language override option (only valid, locally-enabled languages supported, just as with headers and user settings). Great aid for debugging & translation testing --- lib/util.php | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/lib/util.php b/lib/util.php index e7ea9df613..e15c69f950 100644 --- a/lib/util.php +++ b/lib/util.php @@ -138,23 +138,38 @@ function common_timezone() return common_config('site', 'timezone'); } +function common_valid_language($lang) +{ + if ($lang) { + // Validate -- we don't want to end up with a bogus code + // left over from some old junk. + foreach (common_config('site', 'languages') as $code => $info) { + if ($info['lang'] == $lang) { + return true; + } + } + } + return false; +} + function common_language() { + // Allow ?uselang=xx override, very useful for debugging + // and helping translators check usage and context. + if (isset($_GET['uselang'])) { + $uselang = strval($_GET['uselang']); + if (common_valid_language($uselang)) { + return $uselang; + } + } // If there is a user logged in and they've set a language preference // then return that one... if (_have_config() && common_logged_in()) { $user = common_current_user(); - $user_language = $user->language; - if ($user->language) { - // Validate -- we don't want to end up with a bogus code - // left over from some old junk. - foreach (common_config('site', 'languages') as $code => $info) { - if ($info['lang'] == $user_language) { - return $user_language; - } - } + if (common_valid_language($user->language)) { + return $user->language; } } From 5996d80c0918001f5c69f8d52681fc16aa003297 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 6 May 2010 21:29:04 +0000 Subject: [PATCH 092/730] Ticket #2184: recognize Palm Pre / WebOS browsers for MobileProfile One-line addition of 'webos' to the keywords list. --- plugins/MobileProfile/MobileProfilePlugin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 1c61b4fe52..a3dc4de465 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -138,6 +138,7 @@ class MobileProfilePlugin extends WAP20Plugin 'vodafone', 'wap1', 'wap2', + 'webos', 'windows ce' ); From b547079b280b9fa2f8877aab7ad5cd3761f500b9 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 5 May 2010 22:35:16 -0700 Subject: [PATCH 093/730] Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices --- classes/Notice.php | 17 +++++++++++++++-- lib/atomnoticefeed.php | 9 ++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index c0828674d1..e82a825268 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1172,7 +1172,7 @@ class Notice extends Memcached_DataObject return $groups; } - function asAtomEntry($namespace=false, $source=false, $author=true) + function asAtomEntry($namespace=false, $source=false, $author=true, $cur=null) { $profile = $this->getProfile(); @@ -1185,7 +1185,8 @@ class Notice extends Memcached_DataObject 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/', 'xmlns:media' => 'http://purl.org/syndication/atommedia', 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0', - 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0'); + 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0', + 'xmlns:statusnet' => 'http://status.net/ont/'); } else { $attrs = array(); } @@ -1211,6 +1212,18 @@ class Notice extends Memcached_DataObject $xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE)); $xs->element('updated', null, common_date_w3dtf($this->created)); + + $noticeInfoAttr = array( + 'local_id' => $this->id, // local notice ID (useful to clients for ordering) + 'source' => $this->source // the client name (source attribution) + // @todo source source_link + ); + + if (!empty($cur)) { + $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; + } + + $xs->element('statusnet:notice_info', $noticeInfoAttr, null); } if ($source) { diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php index e4df731fe0..35a45118ce 100644 --- a/lib/atomnoticefeed.php +++ b/lib/atomnoticefeed.php @@ -79,6 +79,11 @@ class AtomNoticeFeed extends Atom10Feed 'ostatus', 'http://ostatus.org/schema/1.0' ); + + $this->addNamespace( + 'statusnet', + 'http://status.net/ont/' + ); } /** @@ -110,7 +115,9 @@ class AtomNoticeFeed extends Atom10Feed $source = $this->showSource(); $author = $this->showAuthor(); - $this->addEntryRaw($notice->asAtomEntry(false, $source, $author)); + $cur = common_current_user(); + + $this->addEntryRaw($notice->asAtomEntry(false, $source, $author, $cur)); } function showSource() From 22fde00defe79a153ed77ddf6a4e63dd7fef6743 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 00:20:10 -0700 Subject: [PATCH 094/730] Refactor and centralize notice source link calculation --- actions/twitapisearchatom.php | 15 ++++++++-- classes/Notice.php | 39 +++++++++++++++++++++++- lib/apiaction.php | 51 ++++++++----------------------- lib/noticelist.php | 56 ++++++++++++++++------------------- 4 files changed, 90 insertions(+), 71 deletions(-) diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 24aa619bd7..3eb54ccc36 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -342,10 +342,21 @@ class TwitapisearchatomAction extends ApiAction 'rel' => 'related', 'href' => $profile->avatarUrl())); - // TODO: Here is where we'd put in a link to an atom feed for threads + // @todo: Here is where we'd put in a link to an atom feed for threads + + $source = null; + + $ns = $notice->getSource(); + if ($ns) { + if (!empty($ns->name) && !empty($ns->url)) { + $source = '' . $ns->name . ''; + } else { + $source = $ns->code; + } + } $this->element("twitter:source", null, - htmlentities($this->sourceLink($notice->source))); + htmlentities($source)); $this->elementStart('author'); diff --git a/classes/Notice.php b/classes/Notice.php index e82a825268..cd27376a4a 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -704,7 +704,7 @@ class Notice extends Memcached_DataObject /** * Is this notice part of an active conversation? - * + * * @return boolean true if other messages exist in the same * conversation, false if this is the only one */ @@ -1812,4 +1812,41 @@ class Notice extends Memcached_DataObject return $result; } + + /** + * Get the source of the notice + * + * @return Notice_source $ns A notice source object. 'code' is the only attribute + * guaranteed to be populated. + */ + function getSource() + { + $ns = new Notice_source(); + if (!empty($this->source)) { + switch ($this->source) { + case 'web': + case 'xmpp': + case 'mail': + case 'omb': + case 'system': + case 'api': + $ns->code = $this->source; + break; + default: + $ns = Notice_source::staticGet($this->source); + if (!$ns) { + $ns = new Notice_source(); + $ns->code = $this->source; + $app = Oauth_application::staticGet('name', $this->source); + if ($app) { + $ns->name = $app->name; + $ns->url = $app->source_url; + } + } + break; + } + } + return $ns; + } + } diff --git a/lib/apiaction.php b/lib/apiaction.php index a3c34a91bf..8c4dc6c262 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -313,7 +313,19 @@ class ApiAction extends Action $twitter_status['created_at'] = $this->dateTwitter($notice->created); $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ? intval($notice->reply_to) : null; - $twitter_status['source'] = $this->sourceLink($notice->source); + + $source = null; + + $ns = $notice->getSource(); + if ($ns) { + if (!empty($ns->name) && !empty($ns->url)) { + $source = '' . $ns->name . ''; + } else { + $source = $ns->code; + } + } + + $twitter_status['source'] = $source; $twitter_status['id'] = intval($notice->id); $replier_profile = null; @@ -1354,43 +1366,6 @@ class ApiAction extends Action } } - function sourceLink($source) - { - $source_name = _($source); - switch ($source) { - case 'web': - case 'xmpp': - case 'mail': - case 'omb': - case 'api': - break; - default: - - $name = null; - $url = null; - - $ns = Notice_source::staticGet($source); - - if ($ns) { - $name = $ns->name; - $url = $ns->url; - } else { - $app = Oauth_application::staticGet('name', $source); - if ($app) { - $name = $app->name; - $url = $app->source_url; - } - } - - if (!empty($name) && !empty($url)) { - $source_name = '' . $name . ''; - } - - break; - } - return $source_name; - } - /** * Returns query argument or default value if not found. Certain * parameters used throughout the API are lightly scrubbed and diff --git a/lib/noticelist.php b/lib/noticelist.php index 5265326b27..c42e4fb600 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -488,48 +488,44 @@ class NoticeListItem extends Widget function showNoticeSource() { - if ($this->notice->source) { + $ns = $this->notice->getSource(); + + if ($ns) { + $source_name = _($ns->code); $this->out->text(' '); $this->out->elementStart('span', 'source'); $this->out->text(_('from')); - $source_name = _($this->notice->source); $this->out->text(' '); - switch ($this->notice->source) { - case 'web': - case 'xmpp': - case 'mail': - case 'omb': - case 'system': - case 'api': - $this->out->element('span', 'device', $source_name); - break; - default: - $name = $source_name; - $url = null; + // if $ns->name and $ns->url are populated we have + // configured a source attr somewhere + if (empty($ns->name) && empty($ns->url)) { + // otherwise it's from normal channel such as web or api + $this->out->element('span', 'device', $source_name); + } else { + $name = null; + $url = null; + $title = null; if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { - $ns = Notice_source::staticGet($this->notice->source); - - if ($ns) { - $name = $ns->name; - $url = $ns->url; - } else { - $app = Oauth_application::staticGet('name', $this->notice->source); - if ($app) { - $name = $app->name; - $url = $app->source_url; - } - } + $name = $source_name; + $url = $ns->url; } Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); if (!empty($name) && !empty($url)) { $this->out->elementStart('span', 'device'); - $this->out->element('a', array('href' => $url, - 'rel' => 'external', - 'title' => $title), - $name); + + $attrs = array( + 'href' => $url, + 'rel' => 'external' + ); + + if (isset($title)) { + $attrs['title'] = $title; + } + + $this->out->element('a', $attrs, $name); $this->out->elementEnd('span'); } else { $this->out->element('span', 'device', $name); From 292ea33dbddeee881474b8f98507213a7d8c159c Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 00:44:56 -0700 Subject: [PATCH 095/730] Add source link attr to statusnet:notice_info element in Atom output for notices --- classes/Notice.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index cd27376a4a..b3cfb28138 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1216,8 +1216,14 @@ class Notice extends Memcached_DataObject $noticeInfoAttr = array( 'local_id' => $this->id, // local notice ID (useful to clients for ordering) 'source' => $this->source // the client name (source attribution) - // @todo source source_link - ); + ); + + $ns = $this->getSource(); + if ($ns) { + if (!empty($ns->url)) { + $noticeInfoAttr['source_link'] = htmlentities($ns->url); + } + } if (!empty($cur)) { $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; From 209fd12cd033c62619c68ac17a4fa70b1e981169 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 00:55:17 -0700 Subject: [PATCH 096/730] HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them --- actions/twitapisearchatom.php | 2 +- lib/apiaction.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 3eb54ccc36..6c740c4902 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -349,7 +349,7 @@ class TwitapisearchatomAction extends ApiAction $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' . $ns->name . ''; } else { $source = $ns->code; } diff --git a/lib/apiaction.php b/lib/apiaction.php index 8c4dc6c262..2608be227a 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -319,13 +319,13 @@ class ApiAction extends Action $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' . $ns->name . ''; } else { $source = $ns->code; } } - $twitter_status['source'] = $source; + $twitter_status['source'] = htmlentities($source); $twitter_status['id'] = intval($notice->id); $replier_profile = null; From ce177400f876a1e48f38ef18635d5ecf486a6867 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 19:52:25 +0000 Subject: [PATCH 097/730] - OStatusPlugin should return true if it doesn't need to handle source attribution - Remove stray break statement from NoticeList --- lib/noticelist.php | 1 - plugins/OStatus/OStatusPlugin.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index c42e4fb600..c7dc9d29d9 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -530,7 +530,6 @@ class NoticeListItem extends Widget } else { $this->out->element('span', 'device', $name); } - break; } $this->out->elementEnd('span'); } diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index f183bc7aea..d3a92755cc 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -452,6 +452,7 @@ class OStatusPlugin extends Plugin return false; } } + return true; } /** From ee8c9d142251566f87ee0780b5788549cc0a0c12 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 20:25:20 +0000 Subject: [PATCH 098/730] Allow OStatusPlugin to set the source attribution title --- lib/noticelist.php | 57 ++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index c7dc9d29d9..432ea78d5b 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -497,40 +497,37 @@ class NoticeListItem extends Widget $this->out->text(_('from')); $this->out->text(' '); + $name = $source_name; + $url = $ns->url; + $title = null; + + if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { + $name = $source_name; + $url = $ns->url; + } + Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); + // if $ns->name and $ns->url are populated we have // configured a source attr somewhere - if (empty($ns->name) && empty($ns->url)) { - // otherwise it's from normal channel such as web or api - $this->out->element('span', 'device', $source_name); + if (!empty($name) && !empty($url)) { + + $this->out->elementStart('span', 'device'); + + $attrs = array( + 'href' => $url, + 'rel' => 'external' + ); + + if (!empty($title)) { + $attrs['title'] = $title; + } + + $this->out->element('a', $attrs, $name); + $this->out->elementEnd('span'); } else { - $name = null; - $url = null; - $title = null; - - if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { - $name = $source_name; - $url = $ns->url; - } - Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); - - if (!empty($name) && !empty($url)) { - $this->out->elementStart('span', 'device'); - - $attrs = array( - 'href' => $url, - 'rel' => 'external' - ); - - if (isset($title)) { - $attrs['title'] = $title; - } - - $this->out->element('a', $attrs, $name); - $this->out->elementEnd('span'); - } else { - $this->out->element('span', 'device', $name); - } + $this->out->element('span', 'device', $name); } + $this->out->elementEnd('span'); } } From 869bc32d0d8cd68d75483e33c62d8ea9f1cc8e2c Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 21:36:13 +0000 Subject: [PATCH 099/730] Remove errant double HTML entity encoding in API source attribution --- actions/twitapisearchatom.php | 9 ++++++--- classes/Notice.php | 2 +- lib/apiaction.php | 8 ++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 6c740c4902..51e8a8881b 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -349,14 +349,17 @@ class TwitapisearchatomAction extends ApiAction $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' + . htmlspecialchars($ns->name) + . ''; } else { $source = $ns->code; } } - $this->element("twitter:source", null, - htmlentities($source)); + $this->element("twitter:source", null, $source); $this->elementStart('author'); diff --git a/classes/Notice.php b/classes/Notice.php index b3cfb28138..875bcaa020 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1221,7 +1221,7 @@ class Notice extends Memcached_DataObject $ns = $this->getSource(); if ($ns) { if (!empty($ns->url)) { - $noticeInfoAttr['source_link'] = htmlentities($ns->url); + $noticeInfoAttr['source_link'] = $ns->url; } } diff --git a/lib/apiaction.php b/lib/apiaction.php index 2608be227a..42aa08ef7d 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -319,13 +319,17 @@ class ApiAction extends Action $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' + . htmlspecialchars($ns->name) + . ''; } else { $source = $ns->code; } } - $twitter_status['source'] = htmlentities($source); + $twitter_status['source'] = $source; $twitter_status['id'] = intval($notice->id); $replier_profile = null; From 79153869505c9bfb41b7e49b757f233dc19530bb Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 7 May 2010 01:28:37 +0000 Subject: [PATCH 100/730] Allow plugins to load their styles for mobile view; fixes bad realtime button layout --- plugins/MobileProfile/MobileProfilePlugin.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index a3dc4de465..6076bbde0b 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -255,6 +255,10 @@ class MobileProfilePlugin extends WAP20Plugin $action->cssLink('plugins/MobileProfile/mp-handheld.css',null,'handheld'); } + // Allow other plugins to load their styles. + Event::handle('EndShowStatusNetStyles', array($action)); + Event::handle('EndShowLaconicaStyles', array($action)); + return false; } From 30328fc1666b9e3a6651c5d8881933debaf5ecc6 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 6 May 2010 23:33:27 -0400 Subject: [PATCH 101/730] Enable ClientSideShorten plugin by default --- lib/default.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/default.php b/lib/default.php index 449d2b3bb4..52a4ec7836 100644 --- a/lib/default.php +++ b/lib/default.php @@ -287,6 +287,7 @@ $default = 'OStatus' => null, 'WikiHashtags' => null, 'RSSCloud' => null, + 'ClientSideShorten' => null, 'OpenID' => null), ), 'pluginlist' => array(), From 4b0458801af03b40fa636849da0a7e96bbd3e860 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 6 May 2010 23:40:07 -0400 Subject: [PATCH 102/730] Ignore PEAR errors with code DB_DATAOBJECT_ERROR_NODATA --- lib/common.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/common.php b/lib/common.php index 2bda88c974..72a1b70751 100644 --- a/lib/common.php +++ b/lib/common.php @@ -132,6 +132,12 @@ require_once INSTALLDIR.'/lib/serverexception.php'; //set PEAR error handling to use regular PHP exceptions function PEAR_ErrorToPEAR_Exception($err) { + //DB_DataObject throws error when an empty set would be returned + //That behavior is weird, and not how the rest of StatusNet works. + //So just ignore those errors. + if ($err->getCode() == DB_DATAOBJECT_ERROR_NODATA) { + return; + } if ($err->getCode()) { throw new PEAR_Exception($err->getMessage(), $err->getCode()); } From b407665b983297078f5361db24c60a7d46e0f4ba Mon Sep 17 00:00:00 2001 From: Zachary Copley Date: Tue, 20 Apr 2010 11:29:13 -0700 Subject: [PATCH 103/730] Initial work on API method for updating a group's profile info --- actions/apigroupprofileupdate.php | 370 ++++++++++++++++++++++++++++++ lib/router.php | 6 + 2 files changed, 376 insertions(+) create mode 100644 actions/apigroupprofileupdate.php diff --git a/actions/apigroupprofileupdate.php b/actions/apigroupprofileupdate.php new file mode 100644 index 0000000000..0d3620c265 --- /dev/null +++ b/actions/apigroupprofileupdate.php @@ -0,0 +1,370 @@ +. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apiauth.php'; + +class ApiValidationException extends Exception { } + +/** + * API analog to the group edit page + * + * @category API + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiGroupProfileUpdateAction extends ApiAuthAction +{ + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + * + */ + + function prepare($args) + { + parent::prepare($args); + + $this->nickname = common_canonical_nickname($this->trimmed('nickname')); + $this->fullname = $this->trimmed('fullname'); + $this->homepage = $this->trimmed('homepage'); + $this->description = $this->trimmed('description'); + $this->location = $this->trimmed('location'); + $this->aliasstring = $this->trimmed('aliases'); + + $this->user = $this->auth_user; + $this->group = $this->getTargetGroup($this->arg('id')); + + return true; + } + + /** + * Handle the request + * + * See which request params have been set, and update the profile + * + * @param array $args $_REQUEST data (unused) + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if ($_SERVER['REQUEST_METHOD'] != 'POST') { + $this->clientError( + _('This method requires a POST.'), + 400, $this->format + ); + return; + } + + if (!in_array($this->format, array('xml', 'json'))) { + $this->clientError( + _('API method not found.'), + 404, + $this->format + ); + return; + } + + if (empty($this->user)) { + $this->clientError(_('No such user.'), 404, $this->format); + return; + } + + if (empty($this->group)) { + $this->clientError(_('Group not found.'), 404, $this->format); + return false; + } + + if (!$this->user->isAdmin($this->group)) { + $this->clientError(_('You must be an admin to edit the group.'), 403); + return false; + } + + $this->group->query('BEGIN'); + + $orig = clone($this->group); + + try { + + if (!empty($this->nickname)) { + if ($this->validateNickname()) { + $this->group->nickname = $this->nickname; + $this->group->mainpage = common_local_url( + 'showgroup', + array('nickname' => $this->nickname) + ); + } + } + + if (!empty($this->fullname)) { + $this->validateFullname(); + $this->group->fullname = $this->fullname; + } + + if (!empty($this->homepage)) { + $this->validateHomepage(); + $this->group->homepage = $this->hompage; + } + + if (!empty($this->description)) { + $this->validateDescription(); + $this->group->description = $this->decription; + } + + if (!empty($this->location)) { + $this->validateLocation(); + $this->group->location = $this->location; + } + + } catch (ApiValidationException $ave) { + $this->clientError( + $ave->getMessage(), + 403, + $this->format + ); + return; + } + + $result = $this->group->update($orig); + + if (!$result) { + common_log_db_error($this->group, 'UPDATE', __FILE__); + $this->serverError(_('Could not update group.')); + } + + $aliases = null; + + try { + + if (!empty($this->aliasstring)) { + $aliases = $this->parseAliases(); + } + + } catch (ApiValidationException $ave) { + $this->clientError( + $ave->getMessage(), + 403, + $this->format + ); + return; + } + + $result = $this->group->setAliases($aliases); + + if (!$result) { + $this->serverError(_('Could not create aliases.')); + } + + if (!empty($this->nickname) && $this->nickname != $orig->nickname) { + common_log(LOG_INFO, "Saving local group info."); + $local = Local_group::staticGet('group_id', $this->group->id); + $local->setNickname($this->nickname); + } + + $this->group->query('COMMIT'); + + switch($this->format) { + case 'xml': + $this->showSingleXmlGroup($this->group); + break; + case 'json': + $this->showSingleJsonGroup($this->group); + break; + default: + $this->clientError(_('API method not found.'), 404, $this->format); + break; + } + } + + function nicknameExists($nickname) + { + $group = Local_group::staticGet('nickname', $nickname); + + if (!empty($group) && + $group->group_id != $this->group->id) { + return true; + } + + $alias = Group_alias::staticGet('alias', $nickname); + + if (!empty($alias) && + $alias->group_id != $this->group->id) { + return true; + } + + return false; + } + + function validateNickname() + { + if (!Validate::string( + $this->nickname, array( + 'min_length' => 1, + 'max_length' => 64, + 'format' => NICKNAME_FMT + ) + ) + ) { + throw new ApiValidationException( + _( + 'Nickname must have only lowercase letters ' . + 'and numbers and no spaces.' + ) + ); + } else if ($this->nicknameExists($this->nickname)) { + throw new ApiValidationException( + _('Nickname already in use. Try another one.') + ); + } else if (!User_group::allowedNickname($this->nickname)) { + throw new ApiValidationException( + _('Not a valid nickname.') + ); + } + } + + function validateHomepage() + { + if (!is_null($this->homepage) + && (strlen($this->homepage) > 0) + && !Validate::uri( + $this->homepage, + array('allowed_schemes' => array('http', 'https') + ) + ) + ) { + throw new ApiValidationException( + _('Homepage is not a valid URL.') + ); + } + } + + function validateFullname() + { + if (!is_null($this->fullname) && mb_strlen($this->fullname) > 255) { + throw new ApiValidationException( + _('Full name is too long (max 255 chars).') + ); + } + } + + function validateDescription() + { + if (User_group::descriptionTooLong($this->description)) { + throw new ApiValidationException( + sprintf( + _('description is too long (max %d chars).'), + User_group::maxDescription() + ) + ); + } + } + + function validateLocation() + { + if (!is_null($this->location) && mb_strlen($this->location) > 255) { + throw new ApiValidationException( + _('Location is too long (max 255 chars).') + ); + } + } + + function validateAliases() + { + $aliases = array_map( + 'common_canonical_nickname', + array_unique( + preg_split('/[\s,]+/', + $this->aliasstring + ) + ) + ); + + if (empty($aliases)) { + $aliases = array(); + } + + if (count($aliases) > common_config('group', 'maxaliases')) { + throw new ApiValidationException( + sprintf( + _('Too many aliases! Maximum %d.'), + common_config('group', 'maxaliases') + ) + ); + } + + foreach ($aliases as $alias) { + if (!Validate::string( + $alias, array( + 'min_length' => 1, + 'max_length' => 64, + 'format' => NICKNAME_FMT) + ) + ) { + throw new ApiValidationException( + sprintf( + _('Invalid alias: "%s"'), + $alias + ) + ); + } + + if ($this->nicknameExists($alias)) { + throw new ApiValidationException( + sprintf( + _('Alias "%s" already in use. Try another one.'), + $alias) + ); + } + + // XXX assumes alphanum nicknames + if (strcmp($alias, $nickname) == 0) { + throw new ApiValidationException( + _('Alias can\'t be the same as nickname.') + ); + } + } + + return $aliases; + } + +} \ No newline at end of file diff --git a/lib/router.php b/lib/router.php index a040abb832..faa26c8610 100644 --- a/lib/router.php +++ b/lib/router.php @@ -650,6 +650,12 @@ class Router $m->connect('api/statusnet/groups/create.:format', array('action' => 'ApiGroupCreate', 'format' => '(xml|json)')); + + $m->connect('api/statusnet/groups/update/:id.:format', + array('action' => 'ApiGroupProfileUpdate', + 'id' => '[a-zA-Z0-9]+', + 'format' => '(xml|json)')); + // Tags $m->connect('api/statusnet/tags/timeline/:tag.:format', array('action' => 'ApiTimelineTag', From 06a63b0404aa96efc1118563482c11567b048961 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 7 May 2010 00:52:54 -0700 Subject: [PATCH 104/730] Finish api/statusnet/groups/update --- actions/apigroupprofileupdate.php | 19 ++++++++----------- lib/apiaction.php | 2 ++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/actions/apigroupprofileupdate.php b/actions/apigroupprofileupdate.php index 0d3620c265..6ac4b5a4b5 100644 --- a/actions/apigroupprofileupdate.php +++ b/actions/apigroupprofileupdate.php @@ -33,8 +33,6 @@ if (!defined('STATUSNET')) { require_once INSTALLDIR . '/lib/apiauth.php'; -class ApiValidationException extends Exception { } - /** * API analog to the group edit page * @@ -62,6 +60,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction parent::prepare($args); $this->nickname = common_canonical_nickname($this->trimmed('nickname')); + $this->fullname = $this->trimmed('fullname'); $this->homepage = $this->trimmed('homepage'); $this->description = $this->trimmed('description'); @@ -172,12 +171,12 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction $this->serverError(_('Could not update group.')); } - $aliases = null; + $aliases = array(); try { - if (!empty($this->aliasstring)) { - $aliases = $this->parseAliases(); + if (!empty($this->aliasstring)) { + $aliases = $this->validateAliases(); } } catch (ApiValidationException $ave) { @@ -195,7 +194,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction $this->serverError(_('Could not create aliases.')); } - if (!empty($this->nickname) && $this->nickname != $orig->nickname) { + if (!empty($this->nickname) && ($this->nickname != $orig->nickname)) { common_log(LOG_INFO, "Saving local group info."); $local = Local_group::staticGet('group_id', $this->group->id); $local->setNickname($this->nickname); @@ -260,6 +259,8 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction _('Not a valid nickname.') ); } + + return true; } function validateHomepage() @@ -319,10 +320,6 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction ) ); - if (empty($aliases)) { - $aliases = array(); - } - if (count($aliases) > common_config('group', 'maxaliases')) { throw new ApiValidationException( sprintf( @@ -357,7 +354,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction } // XXX assumes alphanum nicknames - if (strcmp($alias, $nickname) == 0) { + if (strcmp($alias, $this->nickname) == 0) { throw new ApiValidationException( _('Alias can\'t be the same as nickname.') ); diff --git a/lib/apiaction.php b/lib/apiaction.php index 42aa08ef7d..d35391d4ea 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -97,6 +97,8 @@ if (!defined('STATUSNET')) { exit(1); } +class ApiValidationException extends Exception { } + /** * Contains most of the Twitter-compatible API output functions. * From 3c9686e80f50f24f302abf5dd27b74a44fa4ae56 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 7 May 2010 16:32:24 -0700 Subject: [PATCH 105/730] Fix for repeats from the API having null source attribution --- actions/apidirectmessagenew.php | 8 -------- actions/apistatusesretweet.php | 2 +- actions/apistatusesupdate.php | 12 ------------ lib/apiaction.php | 9 +++++++++ lib/apiauth.php | 3 +-- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index b9ac92d77b..65d065648f 100644 --- a/actions/apidirectmessagenew.php +++ b/actions/apidirectmessagenew.php @@ -52,7 +52,6 @@ require_once INSTALLDIR . '/lib/apiauth.php'; class ApiDirectMessageNewAction extends ApiAuthAction { - var $source = null; var $other = null; var $content = null; @@ -76,13 +75,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction return; } - $this->source = $this->trimmed('source'); // Not supported by Twitter. - - $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api'); - if (empty($this->source) || in_array($this->source, $reserved_sources)) { - $source = 'api'; - } - $this->content = $this->trimmed('text'); $this->user = $this->auth_user; diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index 128c881e25..9aa3374854 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -79,7 +79,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->user = $this->auth_user; - if ($this->user->id == $notice->profile_id) { + if ($this->user->id == $this->original->profile_id) { $this->clientError(_('Cannot repeat your own notice.'), 400, $this->format); return false; diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index 5f3a447c23..a0a81f3368 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -155,8 +155,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction var $lat = null; var $lon = null; - static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api'); - /** * Take arguments for running * @@ -171,19 +169,9 @@ class ApiStatusesUpdateAction extends ApiAuthAction parent::prepare($args); $this->status = $this->trimmed('status'); - $this->source = $this->trimmed('source'); $this->lat = $this->trimmed('lat'); $this->lon = $this->trimmed('long'); - // try to set the source attr from OAuth app - if (empty($this->source)) { - $this->source = $this->oauth_source; - } - - if (empty($this->source) || in_array($this->source, self::$reserved_sources)) { - $this->source = 'api'; - } - $this->in_reply_to_status_id = intval($this->trimmed('in_reply_to_status_id')); diff --git a/lib/apiaction.php b/lib/apiaction.php index 42aa08ef7d..80a8a08d10 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -124,9 +124,12 @@ class ApiAction extends Action var $count = null; var $max_id = null; var $since_id = null; + var $source = null; var $access = self::READ_ONLY; // read (default) or read-write + static $reserved_sources = array('web', 'omb', 'ostatus', 'mail', 'xmpp', 'api'); + /** * Initialization. * @@ -150,6 +153,12 @@ class ApiAction extends Action header('X-StatusNet-Warning: since parameter is disabled; use since_id'); } + $this->source = $this->trimmed('source'); + + if (empty($this->source) || in_array($this->source, self::$reserved_sources)) { + $this->source = 'api'; + } + return true; } diff --git a/lib/apiauth.php b/lib/apiauth.php index 8c39988889..9c68e27713 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -72,7 +72,6 @@ class ApiAuthAction extends ApiAction { var $auth_user_nickname = null; var $auth_user_password = null; - var $oauth_source = null; /** * Take arguments for running, looks for an OAuth request, @@ -181,7 +180,7 @@ class ApiAuthAction extends ApiAction // set the source attr - $this->oauth_source = $app->name; + $this->source = $app->name; $appUser = Oauth_application_user::staticGet('token', $access_token); From fba140f4e0246a244664f0c0fb2361b027508d35 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 7 May 2010 16:32:24 -0700 Subject: [PATCH 106/730] Fix for repeats from the API having null source attribution --- actions/apidirectmessagenew.php | 8 -------- actions/apistatusesretweet.php | 2 +- actions/apistatusesupdate.php | 12 ------------ lib/apiaction.php | 9 +++++++++ lib/apiauth.php | 3 +-- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index b9ac92d77b..65d065648f 100644 --- a/actions/apidirectmessagenew.php +++ b/actions/apidirectmessagenew.php @@ -52,7 +52,6 @@ require_once INSTALLDIR . '/lib/apiauth.php'; class ApiDirectMessageNewAction extends ApiAuthAction { - var $source = null; var $other = null; var $content = null; @@ -76,13 +75,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction return; } - $this->source = $this->trimmed('source'); // Not supported by Twitter. - - $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api'); - if (empty($this->source) || in_array($this->source, $reserved_sources)) { - $source = 'api'; - } - $this->content = $this->trimmed('text'); $this->user = $this->auth_user; diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index 128c881e25..9aa3374854 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -79,7 +79,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->user = $this->auth_user; - if ($this->user->id == $notice->profile_id) { + if ($this->user->id == $this->original->profile_id) { $this->clientError(_('Cannot repeat your own notice.'), 400, $this->format); return false; diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index d4ef6b550d..e3e579b0de 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -64,8 +64,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction var $lat = null; var $lon = null; - static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api'); - /** * Take arguments for running * @@ -80,19 +78,9 @@ class ApiStatusesUpdateAction extends ApiAuthAction parent::prepare($args); $this->status = $this->trimmed('status'); - $this->source = $this->trimmed('source'); $this->lat = $this->trimmed('lat'); $this->lon = $this->trimmed('long'); - // try to set the source attr from OAuth app - if (empty($this->source)) { - $this->source = $this->oauth_source; - } - - if (empty($this->source) || in_array($this->source, self::$reserved_sources)) { - $this->source = 'api'; - } - $this->in_reply_to_status_id = intval($this->trimmed('in_reply_to_status_id')); diff --git a/lib/apiaction.php b/lib/apiaction.php index 59dc47c23b..f87b046114 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -63,9 +63,12 @@ class ApiAction extends Action var $count = null; var $max_id = null; var $since_id = null; + var $source = null; var $access = self::READ_ONLY; // read (default) or read-write + static $reserved_sources = array('web', 'omb', 'ostatus', 'mail', 'xmpp', 'api'); + /** * Initialization. * @@ -89,6 +92,12 @@ class ApiAction extends Action header('X-StatusNet-Warning: since parameter is disabled; use since_id'); } + $this->source = $this->trimmed('source'); + + if (empty($this->source) || in_array($this->source, self::$reserved_sources)) { + $this->source = 'api'; + } + return true; } diff --git a/lib/apiauth.php b/lib/apiauth.php index e78de618ee..95acbbd7bd 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -54,7 +54,6 @@ class ApiAuthAction extends ApiAction { var $auth_user_nickname = null; var $auth_user_password = null; - var $oauth_source = null; /** * Take arguments for running, looks for an OAuth request, @@ -162,7 +161,7 @@ class ApiAuthAction extends ApiAction // set the source attr - $this->oauth_source = $app->name; + $this->source = $app->name; $appUser = Oauth_application_user::staticGet('token', $access_token); From da18701394ef717cd68dad11f5a830719ad675e6 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 7 May 2010 16:32:24 -0700 Subject: [PATCH 107/730] Fix for repeats from the API having null source attribution --- actions/apidirectmessagenew.php | 8 -------- actions/apistatusesretweet.php | 2 +- actions/apistatusesupdate.php | 12 ------------ lib/apiaction.php | 9 +++++++++ lib/apiauth.php | 3 +-- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index b9ac92d77b..65d065648f 100644 --- a/actions/apidirectmessagenew.php +++ b/actions/apidirectmessagenew.php @@ -52,7 +52,6 @@ require_once INSTALLDIR . '/lib/apiauth.php'; class ApiDirectMessageNewAction extends ApiAuthAction { - var $source = null; var $other = null; var $content = null; @@ -76,13 +75,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction return; } - $this->source = $this->trimmed('source'); // Not supported by Twitter. - - $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api'); - if (empty($this->source) || in_array($this->source, $reserved_sources)) { - $source = 'api'; - } - $this->content = $this->trimmed('text'); $this->user = $this->auth_user; diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index 128c881e25..9aa3374854 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -79,7 +79,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->user = $this->auth_user; - if ($this->user->id == $notice->profile_id) { + if ($this->user->id == $this->original->profile_id) { $this->clientError(_('Cannot repeat your own notice.'), 400, $this->format); return false; diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index 5f3a447c23..a0a81f3368 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -155,8 +155,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction var $lat = null; var $lon = null; - static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api'); - /** * Take arguments for running * @@ -171,19 +169,9 @@ class ApiStatusesUpdateAction extends ApiAuthAction parent::prepare($args); $this->status = $this->trimmed('status'); - $this->source = $this->trimmed('source'); $this->lat = $this->trimmed('lat'); $this->lon = $this->trimmed('long'); - // try to set the source attr from OAuth app - if (empty($this->source)) { - $this->source = $this->oauth_source; - } - - if (empty($this->source) || in_array($this->source, self::$reserved_sources)) { - $this->source = 'api'; - } - $this->in_reply_to_status_id = intval($this->trimmed('in_reply_to_status_id')); diff --git a/lib/apiaction.php b/lib/apiaction.php index d35391d4ea..e481a1ef29 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -126,9 +126,12 @@ class ApiAction extends Action var $count = null; var $max_id = null; var $since_id = null; + var $source = null; var $access = self::READ_ONLY; // read (default) or read-write + static $reserved_sources = array('web', 'omb', 'ostatus', 'mail', 'xmpp', 'api'); + /** * Initialization. * @@ -152,6 +155,12 @@ class ApiAction extends Action header('X-StatusNet-Warning: since parameter is disabled; use since_id'); } + $this->source = $this->trimmed('source'); + + if (empty($this->source) || in_array($this->source, self::$reserved_sources)) { + $this->source = 'api'; + } + return true; } diff --git a/lib/apiauth.php b/lib/apiauth.php index 8c39988889..9c68e27713 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -72,7 +72,6 @@ class ApiAuthAction extends ApiAction { var $auth_user_nickname = null; var $auth_user_password = null; - var $oauth_source = null; /** * Take arguments for running, looks for an OAuth request, @@ -181,7 +180,7 @@ class ApiAuthAction extends ApiAction // set the source attr - $this->oauth_source = $app->name; + $this->source = $app->name; $appUser = Oauth_application_user::staticGet('token', $access_token); From bbefcc104eb0863e6ffdfd7701b7b7249ce30da6 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 9 May 2010 00:36:52 +0200 Subject: [PATCH 108/730] Tweaks for DirectionDetector: * remove trailin whitespace * update use of capital letters * fix a few typos in comments * add translator documentation --- .../DirectionDetectorPlugin.php | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php index 34c511e21d..b1362b166f 100644 --- a/plugins/DirectionDetector/DirectionDetectorPlugin.php +++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php @@ -1,5 +1,4 @@ element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;width:490px;} .notice .author {float:left}'); @@ -54,7 +53,7 @@ class DirectionDetectorPlugin extends Plugin { /** * checks that passed string is a RTL language or not * - * @param string $str string to be checked + * @param string $str String to be checked */ public static function isRTL($str){ self::getClearText($str); @@ -62,15 +61,15 @@ class DirectionDetectorPlugin extends Plugin { $cc = $cc[0]; else return false; - if($cc>=1536 && $cc<=1791) // arabic, persian, urdu, kurdish, ... + if($cc>=1536 && $cc<=1791) // Arabic, Persian, Urdu, Kurdish, ... return true; - if($cc>=65136 && $cc<=65279) // arabic peresent 2 + if($cc>=65136 && $cc<=65279) // Arabic peresent 2 return true; - if($cc>=64336 && $cc<=65023) // arabic peresent 1 + if($cc>=64336 && $cc<=65023) // Arabic peresent 1 return true; - if($cc>=1424 && $cc<=1535) // hebrew + if($cc>=1424 && $cc<=1535) // Hebrew return true; - if($cc>=64256 && $cc<=64335) // hebrew peresent + if($cc>=64256 && $cc<=64335) // Hebrew peresent return true; if($cc>=1792 && $cc<=1871) // Syriac return true; @@ -84,7 +83,7 @@ class DirectionDetectorPlugin extends Plugin { } /** - * clears text from replys, tags, groups, reteets & whitespaces + * clears text from replies, tags, groups, repeats & whitespaces * * @param string &$str string to be cleared */ @@ -95,9 +94,9 @@ class DirectionDetectorPlugin extends Plugin { } /** - * Takes an UTF-8 string and returns an array of ints representing the - * Unicode characters. Astral planes are supported ie. the ints in the - * output can be > 0xFFFF. O$ccurrances of the BOM are ignored. Surrogates + * Takes a UTF-8 string and returns an array of ints representing the + * Unicode characters. Astral planes are supported i.e. the ints in the + * output can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates * are not allowed. ### modified ### returns first character code * * Returns false if the input string isn't a valid UTF-8 octet sequence. @@ -200,7 +199,7 @@ class DirectionDetectorPlugin extends Plugin { } } else { /* ((0xC0 & (*in) != 0x80) && (mState != 0)) - * + * * Incomplete multi-octet sequence. */ return false; @@ -217,8 +216,9 @@ class DirectionDetectorPlugin extends Plugin { $versions[] = array( 'name' => 'Direction detector', 'version' => DIRECTIONDETECTORPLUGIN_VERSION, - 'author' => 'behrooz shabani', - 'rawdescription' => _m('shows notices with right-to-left content in correct direction.') + 'author' => 'Behrooz Shabani', + // TRANS: Direction detector plugin description. + 'rawdescription' => _m('Shows notices with right-to-left content in correct direction.') ); return true; } From f430480ddd87abbba3bf6e24f00c095420d33514 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 9 May 2010 00:37:47 +0200 Subject: [PATCH 109/730] Update pot and add Dutch translation --- .../locale/DirectionDetector.pot | 6 ++--- .../nl/LC_MESSAGES/DirectionDetector.po | 22 +++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot index ebeda2dc49..44bbcca4dd 100644 --- a/plugins/DirectionDetector/locale/DirectionDetector.pot +++ b/plugins/DirectionDetector/locale/DirectionDetector.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"POT-Creation-Date: 2010-05-08 22:32+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: DirectionDetectorPlugin.php:221 -msgid "shows notices with right-to-left content in correct direction." +#: DirectionDetectorPlugin.php:222 +msgid "Shows notices with right-to-left content in correct direction." msgstr "" diff --git a/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po new file mode 100644 index 0000000000..e8dae6ea85 --- /dev/null +++ b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po @@ -0,0 +1,22 @@ +# Translation of StatusNet plugin DirectionDetector to Dutch +# +# Author@translatewiki.net: Siebrand +# -- +# This file is distributed under the same license as the StatusNet package. +# +msgid "" +msgstr "" +"Project-Id-Version: StatusNet\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-05-08 22:32+0000\n" +"PO-Revision-Date: 2010-05-08 23:32+0100\n" +"Last-Translator: Siebrand Mazeland \n" +"Language-Team: Dutch\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: DirectionDetectorPlugin.php:222 +msgid "Geeft mededelingen met rechts-naar-linksinhoud weer in de juiste richting." +msgstr "" From 7ce231c7c1f6514bbf4562245290ee49b217afe9 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 9 May 2010 19:17:51 +0200 Subject: [PATCH 110/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/ca/LC_MESSAGES/statusnet.po | 630 ++++++++++++++++---------- locale/en_GB/LC_MESSAGES/statusnet.po | 76 ++-- locale/es/LC_MESSAGES/statusnet.po | 58 +-- locale/pt_BR/LC_MESSAGES/statusnet.po | 137 +++--- locale/statusnet.pot | 52 +-- 5 files changed, 551 insertions(+), 402 deletions(-) diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 1f517b6bde..ecbd190df6 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-05 22:19:09+0000\n" +"POT-Creation-Date: 2010-05-09 17:09+0000\n" +"PO-Revision-Date: 2010-05-09 17:10:00+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65963); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66119); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -99,10 +99,10 @@ msgstr "No existeix la pàgina." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -115,7 +115,7 @@ msgstr "No existeix la pàgina." #: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59 #: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." -msgstr "No existeix aquest usuari." +msgstr "No existeix l'usuari." #. TRANS: Page title. %1$s is user nickname, %2$d is page number #: actions/all.php:86 @@ -231,12 +231,12 @@ msgstr "No s'ha trobat el mètode API!" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Aquest mètode requereix POST." @@ -268,7 +268,7 @@ msgstr "No s'ha pogut desar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -301,11 +301,11 @@ msgstr "No podeu bloquejar-vos a vosaltres mateixos!" #: actions/apiblockcreate.php:126 msgid "Block user failed." -msgstr "Ha fallat el bloqueig d'usuari." +msgstr "Ha fallat el blocatge de l'usuari." #: actions/apiblockdestroy.php:114 msgid "Unblock user failed." -msgstr "Ha fallat el desbloqueig d'usuari." +msgstr "Ha fallat el desblocatge de l'usuari." #: actions/apidirectmessage.php:89 #, php-format @@ -327,20 +327,20 @@ msgstr "Missatges directes a %s" msgid "All the direct messages sent to %s" msgstr "Tots els missatges directes enviats a %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "No hi ha text al missatge!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "És massa llarg. La mida màxima del missatge és %d caràcters." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." -msgstr "No has escrit cap usuari receptor." +msgstr "No s'ha trobat l'usuari destinatari." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "No es pot enviar missatges directes a usuaris que no siguin els vostres " @@ -349,7 +349,7 @@ msgstr "" #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." -msgstr "No s'ha trobat cap estatus amb aquesta ID." +msgstr "No s'ha trobat cap estat amb aquest ID." #: actions/apifavoritecreate.php:119 msgid "This status is already a favorite." @@ -357,7 +357,7 @@ msgstr "Aquest estat ja és un preferit." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." -msgstr "No es pot crear favorit." +msgstr "No es pot crear el preferit." #: actions/apifavoritedestroy.php:122 msgid "That status is not a favorite." @@ -369,25 +369,24 @@ msgstr "No s'ha pogut suprimir el preferit." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." -msgstr "No pots subscriure't a aquest usuari: L'usuari no existeix." +msgstr "No s'ha pogut seguir l'usuari: l'usuari no existeix." #: actions/apifriendshipscreate.php:118 #, php-format msgid "Could not follow user: %s is already on your list." -msgstr "" -"No pots subscriure't de nou a aquest usuari: %s ja està a la teva llista." +msgstr "No s'ha pogut seguir l'usuari: %s ja està a la vostra llista." #: actions/apifriendshipsdestroy.php:109 msgid "Could not unfollow user: User not found." -msgstr "No pots subscriure't a aquest usuari: l'usuari no existeix." +msgstr "No es pot deixar de seguir l'usuari: no s'ha trobat l'usuari." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself." -msgstr "No podeu deixar de seguir-vos a vosaltres mateixos." +msgstr "No podeu deixar de seguir-vos a un mateix." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." -msgstr "Dos ids d'usuari o screen_names has de ser substituïts." +msgstr "Cal proporcionar dos ids d'usuari o screen_names." #: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." @@ -428,7 +427,7 @@ msgstr "La pàgina personal no és un URL vàlid." #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:220 msgid "Full name is too long (max 255 chars)." -msgstr "El teu nom és massa llarg (màx. 255 caràcters)." +msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)." #: actions/apigroupcreate.php:215 actions/editapplication.php:190 #: actions/newapplication.php:172 @@ -638,7 +637,7 @@ msgstr "Aquest mètode requereix POST o DELETE." #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." -msgstr "No pots eliminar l'estatus d'un altre usuari." +msgstr "No podeu suprimir l'estat d'un altre usuari." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 #: actions/deletenotice.php:52 actions/shownotice.php:92 @@ -661,17 +660,17 @@ msgstr "S'ha suprimit l'estat." msgid "No status with that ID found." msgstr "No s'ha trobat cap estatus amb la ID trobada." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Massa llarg. La longitud màxima és de %d caràcters." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "No s'ha trobat." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt." @@ -747,7 +746,7 @@ msgstr "Cap mida." #: actions/avatarbynickname.php:69 msgid "Invalid size." -msgstr "Mida invàlida." +msgstr "La mida no és vàlida." #. TRANS: Link description in user account settings menu. #: actions/avatarsettings.php:67 actions/showgroup.php:230 @@ -783,7 +782,7 @@ msgid "Preview" msgstr "Vista prèvia" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Suprimeix" @@ -827,7 +826,7 @@ msgstr "Ja heu blocat l'usuari." #: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 msgid "Block user" -msgstr "Usuari bloquejat." +msgstr "Bloca l'usuari" #: actions/block.php:130 msgid "" @@ -872,11 +871,11 @@ msgstr "Sí" #. TRANS: Submit button title for 'Yes' when blocking a user. #: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" -msgstr "Bloquejar aquest usuari" +msgstr "Bloca aquest usuari" #: actions/block.php:179 msgid "Failed to save block information." -msgstr "Error al guardar la informació del block." +msgstr "No s'ha pogut desar la informació del bloc." #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62 @@ -922,7 +921,7 @@ msgstr "Desbloca l'usuari" #: actions/bookmarklet.php:51 #, php-format msgid "Post to %s" -msgstr "Publicar a %s" +msgstr "Envia a %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -934,7 +933,7 @@ msgstr "Codi de confirmació no trobat. " #: actions/confirmaddress.php:85 msgid "That confirmation code is not for you!" -msgstr "Aquest codi de confirmació no és per a tu!" +msgstr "Aquest codi de confirmació no és vostre!" #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. #: actions/confirmaddress.php:91 @@ -966,7 +965,7 @@ msgstr "No s'ha pogut actualitzar l'usuari." #: actions/confirmaddress.php:128 actions/emailsettings.php:433 #: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." -msgstr "No s'ha pogut eliminar la confirmació de correu electrònic." +msgstr "No s'ha pogut suprimir la confirmació de correu electrònic." #: actions/confirmaddress.php:146 msgid "Confirm address" @@ -975,7 +974,7 @@ msgstr "Confirmeu l'adreça de correu electrònic" #: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." -msgstr "L'adreça \"%s\" ha estat confirmada per al teu compte." +msgstr "L'adreça «%s» ha estat confirmada per al vostre compte." #: actions/conversation.php:99 msgid "Conversation" @@ -1003,11 +1002,11 @@ msgstr "No sou el propietari d'aquesta aplicació." #: actions/newapplication.php:110 actions/showapplication.php:118 #: lib/action.php:1253 msgid "There was a problem with your session token." -msgstr "Ha ocorregut algun problema amb la teva sessió." +msgstr "S'ha produït un problema amb el testimoni de la vostra sessió." #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 msgid "Delete application" -msgstr "Esborra aplicació" +msgstr "Suprimeix l'aplicació" #: actions/deleteapplication.php:149 msgid "" @@ -1027,7 +1026,7 @@ msgstr "No suprimeixis l'aplicació" #. TRANS: Submit button title for 'Yes' when deleting an application. #: actions/deleteapplication.php:164 msgid "Delete this application" -msgstr "Elimina aquesta aplicació" +msgstr "Suprimeix aquesta aplicació" #. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 @@ -1042,33 +1041,33 @@ msgstr "No heu iniciat una sessió." #: actions/deletenotice.php:71 msgid "Can't delete this notice." -msgstr "No es pot esborrar la notificació." +msgstr "No es pot suprimir l'avís." #: actions/deletenotice.php:103 msgid "" "You are about to permanently delete a notice. Once this is done, it cannot " "be undone." msgstr "" -"Estàs a punt d'eliminar permanentment un avís. Una vegada fet, no es podrà " +"Esteu a punt de suprimir permanentment un avís. Una vegada fet, no es podrà " "desfer." #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" -msgstr "Eliminar nota." +msgstr "Suprimeix l'avís" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" -msgstr "N'estàs segur que vols eliminar aquesta notificació?" +msgstr "Esteu segur que voleu suprimir aquest avís?" #. TRANS: Submit button title for 'No' when deleting a notice. #: actions/deletenotice.php:151 msgid "Do not delete this notice" -msgstr "No elimineu aquest avís" +msgstr "No suprimeixis aquest avís" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" -msgstr "Eliminar aquesta nota" +msgstr "Suprimeix aquest avís" #: actions/deleteuser.php:67 msgid "You cannot delete users." @@ -1076,7 +1075,7 @@ msgstr "No podeu suprimir els usuaris." #: actions/deleteuser.php:74 msgid "You can only delete local users." -msgstr "Només podeu eliminar usuaris locals." +msgstr "Només podeu suprimir usuaris locals." #: actions/deleteuser.php:110 actions/deleteuser.php:133 msgid "Delete user" @@ -1219,7 +1218,7 @@ msgstr "Desa el disseny" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" -msgstr "Aquesta notificació no és un favorit!" +msgstr "Aquesta avís no és un preferit!" #: actions/disfavor.php:94 msgid "Add to favorites" @@ -1298,11 +1297,11 @@ msgstr "No s'ha pogut actualitzar l'aplicació." #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" -msgstr "Editar el grup %s" +msgstr "Edita el grup %s" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." -msgstr "Has d'haver entrat per crear un grup." +msgstr "Heu d'haver iniciat una sessió per a crear un grup." #: actions/editgroup.php:107 actions/editgroup.php:172 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109 @@ -1345,7 +1344,7 @@ msgstr "Paràmetres del correu electrònic" #: actions/emailsettings.php:76 #, php-format msgid "Manage how you get email from %%site.name%%." -msgstr "Gestionar com reps correus de %%site.name%%." +msgstr "Gestioneu com rebeu correu de %%site.name%%." #. TRANS: Form legend for e-mail settings form. #. TRANS: Field label for e-mail address input in e-mail settings form. @@ -1419,7 +1418,7 @@ msgstr "" #. TRANS: Instructions for incoming SMS e-mail address input form. #: actions/emailsettings.php:164 actions/smssettings.php:186 msgid "Make a new email address for posting to; cancels the old one." -msgstr "Posar un nou correu electrònic per publicar; cancel·lar l'antic." +msgstr "Estableix una nova adreça electrònica d'enviament; cancel·la l'antiga." #. TRANS: Button label for adding an e-mail address to send notices from. #. TRANS: Button label for adding an SMS e-mail address to send notices from. @@ -1444,7 +1443,7 @@ msgstr "" #: actions/emailsettings.php:186 msgid "Send me email when someone adds my notice as a favorite." msgstr "" -"Envia'm un correu electrònic quan algú afegeixi una nota meva com a favorit." +"Envia'm un correu electrònic quan algú afegeixi un avís meu com a preferit." #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:193 @@ -1572,11 +1571,11 @@ msgstr "Nou correu electrònic entrant afegit." #: actions/favor.php:79 msgid "This notice is already a favorite!" -msgstr "Aquesta nota ja és favorita." +msgstr "Aquest avís ja és un preferit." #: actions/favor.php:92 lib/disfavorform.php:140 msgid "Disfavor favorite" -msgstr "Desfavoritar favorit" +msgstr "Fes que deixi de ser preferit" #: actions/favorited.php:65 lib/popularnoticesection.php:91 #: lib/publicgroupnav.php:93 @@ -1619,7 +1618,7 @@ msgstr "" #: lib/personalgroupnav.php:115 #, php-format msgid "%s's favorite notices" -msgstr "%s's notes favorites" +msgstr "Avisos preferits de %s" #: actions/favoritesrss.php:115 #, php-format @@ -1667,7 +1666,7 @@ msgstr "L'usuari que s'escolta no existeix." #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" -msgstr "Pots utilitzar la subscripció local!" +msgstr "Podeu utilitzar la subscripció local!" #: actions/finishremotesubscribe.php:99 msgid "That user has blocked you from subscribing." @@ -1963,8 +1962,8 @@ msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -"Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de Jabber/" -"GTalk. Configura la teva adreça i opcions a sota." +"Podeu enviar i rebre avisos a través de [missatges instantanis](%%doc.im%%) " +"de Jabber/GTalk. Configureu la vostra adreça i opcions a continuació." #. TRANS: Message given in the IM settings if XMPP is not enabled on the site. #: actions/imsettings.php:94 @@ -2132,11 +2131,11 @@ msgstr "Correu electrònic invàlid: %s" #: actions/invite.php:110 msgid "Invitation(s) sent" -msgstr "Invitació(ons) enviada(des)" +msgstr "Invitacions envidades" #: actions/invite.php:112 msgid "Invite new users" -msgstr "Invitar nous usuaris" +msgstr "Convida nous usuaris" #: actions/invite.php:128 msgid "You are already subscribed to these users:" @@ -2176,11 +2175,11 @@ msgstr "" #: actions/invite.php:187 msgid "Email addresses" -msgstr "Direcció de correu electrònic" +msgstr "Adreces de correu electrònic" #: actions/invite.php:189 msgid "Addresses of friends to invite (one per line)" -msgstr "Direccions d'amic per convidar (una per línia)" +msgstr "Adreces d'amics per convidar (una per línia)" #: actions/invite.php:192 msgid "Personal message" @@ -2262,7 +2261,7 @@ msgstr "" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." -msgstr "Has d'haver entrat per participar en un grup." +msgstr "Heu d'haver iniciat una sessió per a unir-vos a un grup." #: actions/joingroup.php:88 actions/leavegroup.php:88 msgid "No nickname or ID." @@ -2277,7 +2276,7 @@ msgstr "%1$s s'ha unit al grup %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." -msgstr "Has d'haver entrat per a poder marxar d'un grup." +msgstr "Heu d'haver iniciat una sessió per a deixar un grup." #: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." @@ -2319,7 +2318,7 @@ msgstr "Recorda'm" #: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" -"Iniciar sessió automàticament en el futur; no utilitzar en ordinadors " +"Inicia la sessió automàticament en el futur; no ho activeu en ordinadors " "compartits!" #: actions/login.php:247 @@ -2331,8 +2330,8 @@ msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -"Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i " -"contrasenya abans de canviar la teva configuració." +"Per raons de seguretat, torneu a escriure el vostre nom d'usuari i " +"contrasenya abans de canviar la vostra configuració." #: actions/login.php:270 msgid "Login with your username and password." @@ -2568,8 +2567,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Si us plau, només URL %s sobre HTTP pla." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -2587,7 +2586,7 @@ msgstr "Altres paràmetres" #: actions/othersettings.php:71 msgid "Manage various other options." -msgstr "Gestionar altres vàries opcions." +msgstr "Gestiona altres opcions diferents." #: actions/othersettings.php:108 msgid " (free service)" @@ -2652,11 +2651,11 @@ msgstr "" #: actions/passwordsettings.php:58 msgid "Change password" -msgstr "Canviar contrasenya" +msgstr "Canvia la contrasenya" #: actions/passwordsettings.php:69 msgid "Change your password." -msgstr "Canviar contrasenya" +msgstr "Canvieu la vostra contrasenya" #: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" @@ -2701,11 +2700,11 @@ msgstr "Contrasenya antiga incorrecta" #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." -msgstr "Error en guardar usuari; invàlid." +msgstr "S'ha produït un error en desar l'usuari; no és vàlid." #: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." -msgstr "No es pot guardar la nova contrasenya." +msgstr "No es pot desar la nova contrasenya." #: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." @@ -2906,8 +2905,8 @@ msgstr "Configuració del perfil" msgid "" "You can update your personal profile info here so people know more about you." msgstr "" -"Pots actualitzar la informació del teu perfil personal per a que la gent " -"sàpiga més sobre tu." +"Podeu actualitzar la informació del vostre perfil personal perquè la gent us " +"pugui conèixer millor." #: actions/profilesettings.php:99 msgid "Profile information" @@ -3026,11 +3025,11 @@ msgstr "No s'han pogut desar les preferències d'ubicació." #: actions/profilesettings.php:375 msgid "Couldn't save profile." -msgstr "No s'ha pogut guardar el perfil." +msgstr "No s'ha pogut desar el perfil." #: actions/profilesettings.php:383 msgid "Couldn't save tags." -msgstr "No s'han pogut guardar les etiquetes." +msgstr "No s'han pogut desar les etiquetes." #. TRANS: Message after successful saving of administrative settings. #: actions/profilesettings.php:391 lib/adminpanelaction.php:141 @@ -3124,6 +3123,8 @@ msgstr "Aquestes són les etiquetes recents més populars a %s " #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." msgstr "" +"Ningú ha enviat encara cap avís amb una [etiqueta de coixinet (#)](%%doc.tags" +"%%)." #: actions/publictagcloud.php:72 msgid "Be the first to post one!" @@ -3198,15 +3199,15 @@ msgstr "" #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" -msgstr "Recuperar" +msgstr "Recupera" #: actions/recoverpassword.php:208 msgid "Reset password" -msgstr "Restablir contrasenya" +msgstr "Reinicialitza la contrasenya" #: actions/recoverpassword.php:209 msgid "Recover password" -msgstr "Recuperar contrasenya" +msgstr "Recupera la contrasenya" #: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" @@ -3347,7 +3348,7 @@ msgstr "" "missatgeria instantània i número de telèfon." #: actions/register.php:542 -#, fuzzy, php-format +#, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" @@ -3364,19 +3365,20 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Enhorabona, %1$s! Us donem la benvinguda a %%%%site.name%%%%. Des d'aquí, " -"podríeu voler...\n" +"Enhorabona, %1$s! Us donem la benvinguda a %%%%site.name%%%%. A partir " +"d'ara, podríeu voler...\n" "\n" -"* Anar al teu [teu perfil](%s) i publicar el teu primer missatge.\n" -"* Afegir una [direcció Jabber/GTalk](%%%%action.imsettings%%%%) i així poder " -"publicar les notificacions a través de missatgeria instantània.\n" -"* [Buscar gent](%%%%action.peoplesearch%%%%) que puguis conèixer o que " -"comparteixi els teus interessos. \n" -"* Actualitzar les [preferències del teu perfil](%%%%action.profilesettings%%%" -"%) per explicar als demés més sobre tu. * Llegir els [documents de la xarxa]" -"(%%%%doc.help%%%%) per conèixer les característiques del nostre servei. \n" +"* Anar al [vostre perfil](%2%s) i enviar el vostre primer missatge.\n" +"* Afegir una [adreça de Jabber/GTalk](%%%%action.imsettings%%%%) i així " +"poder enviar avisos a través de missatgeria instantània.\n" +"* [Cercar gent](%%%%action.peoplesearch%%%%) que pugueu conèixer o que " +"comparteixi els vostres interessos. \n" +"* Actualitzar les [preferències del vostre perfil](%%%%action.profilesettings" +"%%%%) per a incloure-hi informació personal. \n" +"* Consultar els [documents de la xarxa](%%%%doc.help%%%%) per tal de " +"conèixer les característiques del servei. \n" "\n" -"Gràcies per registrar-te i esperem que gaudeixis d'aquest servei." +"Gràcies per registrar-vos-hi i esperem que en gaudiu." #: actions/register.php:566 msgid "" @@ -3461,7 +3463,7 @@ msgstr "No podeu repetir el vostre propi avís." msgid "You already repeated that notice." msgstr "Ja havíeu repetit l'avís." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Repetit" @@ -3493,7 +3495,7 @@ msgstr "Canal de respostes de %s (RSS 2.0)" #: actions/replies.php:159 #, php-format msgid "Replies feed for %s (Atom)" -msgstr "Feed d'avisos de %s" +msgstr "Canal de respostes de %s (Atom)" #: actions/replies.php:199 #, php-format @@ -3519,7 +3521,7 @@ msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Podeu provar d'[avisar %1$s](../%2$s) o [enviar quelcom per demanar la seva " +"Podeu provar d'[avisar %1$s](../%2$s) o [enviar quelcom per reclamar la seva " "atenció](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 @@ -3624,7 +3626,7 @@ msgstr "Accions d'aplicació" #: actions/showapplication.php:236 msgid "Reset key & secret" -msgstr "" +msgstr "Reinicialitza la clau i la secreta" #: actions/showapplication.php:261 msgid "Application info" @@ -3632,11 +3634,11 @@ msgstr "Informació de l'aplicació" #: actions/showapplication.php:263 msgid "Consumer key" -msgstr "" +msgstr "Clau del consumidor" #: actions/showapplication.php:268 msgid "Consumer secret" -msgstr "" +msgstr "Secreta del consumidor" #: actions/showapplication.php:273 msgid "Request token URL" @@ -3659,9 +3661,9 @@ msgstr "" "signatures en text net." #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "N'estàs segur que vols eliminar aquesta notificació?" +msgstr "" +"Esteu segur que voleu reinicialitzar la clau del consumidor i la secreta?" #: actions/showfavorites.php:79 #, php-format @@ -3799,9 +3801,15 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]" +"(http://ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure " +"[StatusNet](http://status.net/). Els seus membres comparteixen missatges " +"curts sobre llur vida i interessos. [Uniu-vos-hi ara](%%%%action.register%%%" +"%) per a formar part del grup i molt més! ([Més informació...](%%%%doc.help%%" +"%%))" #: actions/showgroup.php:469 -#, fuzzy, php-format +#, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " @@ -3809,7 +3817,9 @@ msgid "" "their life and interests. " msgstr "" "**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]" -"(http://ca.wikipedia.org/wiki/Microblogging)" +"(http://ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure " +"[StatusNet](http://status.net/). Els seus membre comparteixen missatges " +"curts sobre llur vida i interessos. " #: actions/showgroup.php:497 msgid "Admins" @@ -3883,6 +3893,8 @@ msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"Heu vist res interessant recentment? No heu enviat cap avís encara, ara " +"podria ser un bon moment per començar :)" #: actions/showstream.php:207 #, php-format @@ -3890,6 +3902,8 @@ msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" +"Podeu provar d'avisar %1$s o [enviar quelcom per reclamar la seva atenció](%%" +"%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:243 #, php-format @@ -3899,16 +3913,23 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://" +"ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure [StatusNet]" +"(http://status.net/). Els seus membres comparteixen missatges curts sobre " +"llur vida i interessos. [Uniu-vos-hi ara](%%%%action.register%%%%) per poder " +"seguir els avisos de **%s** i molt més! ([Més informació...](%%%%doc.help%%%" +"%))" #: actions/showstream.php:248 -#, fuzzy, php-format +#, php-format msgid "" "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" "**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://" -"ca.wikipedia.org/wiki/Microblogging) " +"ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure [StatusNet]" +"(http://status.net/). " #: actions/showstream.php:305 #, php-format @@ -4153,14 +4174,13 @@ msgstr "Aquest número de telèfon pertany a un altre usuari." #. TRANS: Message given saving valid SMS phone number that is to be confirmed. #: actions/smssettings.php:384 -#, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -"S'ha enviat un codi de confirmació al número de telèfon has afegit. Revisa " -"la teva safata d'entrada (i la carpeta de spam!) per veure aquest codi i les " -"instruccions per utilitzar-lo." +"S'ha enviat un codi de confirmació al número de telèfon que heu afegit. " +"Comproveu el codi i instruccions del vostre telèfon per saber com fer-lo " +"servir." #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. #: actions/smssettings.php:413 @@ -4217,25 +4237,24 @@ msgid "Snapshots" msgstr "Instantànies" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Canvia la configuració del lloc" +msgstr "Gestiona la configuració de les instantànies" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." -msgstr "" +msgstr "El valor d'execució d'instantànies no és vàlid." #: actions/snapshotadminpanel.php:133 msgid "Snapshot frequency must be a number." -msgstr "" +msgstr "La freqüència de les instantànies ha de ser un nombre." #: actions/snapshotadminpanel.php:144 msgid "Invalid snapshot report URL." -msgstr "" +msgstr "L'URL d'informe d'instantànies no és vàlid." #: actions/snapshotadminpanel.php:200 msgid "Randomly during web hit" -msgstr "" +msgstr "A l'atzar durant les sol·licituds web" #: actions/snapshotadminpanel.php:201 msgid "In a scheduled job" @@ -4247,7 +4266,7 @@ msgstr "Instantànies de dades" #: actions/snapshotadminpanel.php:208 msgid "When to send statistical data to status.net servers" -msgstr "" +msgstr "Quan enviar dades estadístiques als servidors de l'status.net" #: actions/snapshotadminpanel.php:217 msgid "Frequency" @@ -4255,20 +4274,19 @@ msgstr "Freqüència" #: actions/snapshotadminpanel.php:218 msgid "Snapshots will be sent once every N web hits" -msgstr "" +msgstr "Les instantànies s'enviaran una vegada cada N sol·licituds web" #: actions/snapshotadminpanel.php:226 msgid "Report URL" -msgstr "" +msgstr "Informa de l'URL" #: actions/snapshotadminpanel.php:227 msgid "Snapshots will be sent to this URL" msgstr "Les instantànies s'enviaran a aquest URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Desa els paràmetres del lloc" +msgstr "Desa els paràmetres de les instantànies" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." @@ -4287,9 +4305,8 @@ msgid "No such profile." msgstr "No existeix el perfil." #: actions/subscribe.php:117 -#, fuzzy msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "No estàs subscrit a aquest perfil." +msgstr "No podeu subscriure-us a un perfil remot OMB 0.1 amb aquesta acció." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4364,6 +4381,12 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"No esteu escoltant els avisos de ningú ara mateix, proveu de subscriure-us a " +"gent que coneixeu. Proveu de [cercar gent](%%action.peoplesearch%%), trobar " +"membres de grups en què esteu interessats i en els nostres [usuaris " +"destacats](%%action.featured%%). Si sou un [usuari del Twitter](%%action." +"twittersettings%%), podeu subscriure-us automàticament a gent que ja seguiu " +"allà." #: actions/subscriptions.php:128 actions/subscriptions.php:132 #, php-format @@ -4379,9 +4402,9 @@ msgid "SMS" msgstr "SMS" #: actions/tag.php:69 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "Usuaris que s'han etiquetat %s - pàgina %d" +msgstr "Avisos etiquetats amb %1$s, pàgina %2$d" #: actions/tag.php:87 #, php-format @@ -4399,9 +4422,8 @@ msgid "Notice feed for tag %s (Atom)" msgstr "Canal d'avisos per a l'etiqueta %s (Atom)" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." -msgstr "No argument de la id." +msgstr "No hi ha cap argument ID." #: actions/tagother.php:65 #, php-format @@ -4433,8 +4455,8 @@ msgstr "" msgid "" "You can only tag people you are subscribed to or who are subscribed to you." msgstr "" -"Només pots etiquetar gent a la que estiguis subscrit o que s'hagin subscrit " -"a tu." +"Només podeu etiquetar gent a la qual estigueu subscrit o que us hagin " +"subscrit." #: actions/tagother.php:200 msgid "Could not save tags." @@ -4443,7 +4465,7 @@ msgstr "No s'han pogut guardar les etiquetes." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -"Utilitza aquest formulari per afegir etiquetes als teus subscriptors i " +"Utilitzeu aquest formulari per afegir etiquetes als vostres subscriptors i " "subscripcions." #: actions/tagrss.php:35 @@ -4467,9 +4489,8 @@ msgid "User is not silenced." msgstr "L'usuari no està silenciat." #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile ID in request." -msgstr "No id en el perfil sol·licitat." +msgstr "No hi ha cap identificador del perfil en la sol·licitud." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4480,6 +4501,8 @@ msgstr "No subscrit" msgid "" "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"La llicència del flux de qui escolteu, «%1$s», no és compatible amb la " +"llicència del lloc, «%2$s»." #. TRANS: User admin panel title #: actions/useradminpanel.php:59 @@ -4556,15 +4579,14 @@ msgid "Authorize subscription" msgstr "Autoritzar subscripció" #: actions/userauthorization.php:110 -#, fuzzy msgid "" "Please check these details to make sure that you want to subscribe to this " "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " "click “Reject”." msgstr "" -"Si us plau, revisa aquestes dades per a estar segur que desitges " -"subscriure't als avisos d'aquest usuari. Si no has demanat subscriure't als " -"avisos de ningú, clica \"Cancel·lar\"." +"Si us plau, reviseu aquests detalls per assegurar-vos que voleu subscriure-" +"us als avisos d'aquest usuari. Si no heu demanat subscriure-us als avisos de " +"ningú, feu clic a «Rebutja»." #: actions/userauthorization.php:196 actions/version.php:165 msgid "License" @@ -4577,7 +4599,7 @@ msgstr "Accepta" #: actions/userauthorization.php:218 lib/subscribeform.php:115 #: lib/subscribeform.php:139 msgid "Subscribe to this user" -msgstr "Subscriure's a aquest usuari" +msgstr "Subscriu-me a aquest usuari" #: actions/userauthorization.php:219 msgid "Reject" @@ -4589,51 +4611,50 @@ msgstr "Rebutja la subscripció" #: actions/userauthorization.php:232 msgid "No authorization request!" -msgstr "Cap petició d'autorització!" +msgstr "No és una sol·licitud d'autorització!" #: actions/userauthorization.php:254 msgid "Subscription authorized" msgstr "Subscripció autoritzada" #: actions/userauthorization.php:256 -#, fuzzy msgid "" "The subscription has been authorized, but no callback URL was passed. Check " "with the site’s instructions for details on how to authorize the " "subscription. Your subscription token is:" msgstr "" -"S'ha autoritzat la subscripció, però no s'ha enviat un URL de retorn. " -"Llegeix de nou les instruccions per a saber com autoritzar la subscripció. " -"El teu identificador de subscripció és:" +"S'ha autoritzat la subscripció, però no s'ha enviat cap URL de la crida de " +"retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de " +"com autoritzar la subscripció. El vostre testimoni de subscripció és:" #: actions/userauthorization.php:266 msgid "Subscription rejected" msgstr "Subscripció rebutjada" #: actions/userauthorization.php:268 -#, fuzzy msgid "" "The subscription has been rejected, but no callback URL was passed. Check " "with the site’s instructions for details on how to fully reject the " "subscription." msgstr "" -"S'ha rebutjat la subscripció, però no s'ha enviat un URL de retorn. Llegeix " -"de nou les instruccions per a saber com rebutjar la subscripció completament." +"S'ha rebutjat la subscripció, però no s'ha enviat cap URL de la crida de " +"retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de " +"com rebutjar la subscripció completament." #: actions/userauthorization.php:303 #, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "" +msgstr "No s'hi ha trobat l'URI de qui us escolta, «%s»." #: actions/userauthorization.php:308 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "L'URI de qui escolteu, «%s», és massa llarga." #: actions/userauthorization.php:314 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "L'URI de qui escolteu, «%s», és un usuari local." #: actions/userauthorization.php:329 #, php-format @@ -4689,7 +4710,7 @@ msgstr "%s no és membre de cap grup." #: actions/usergroups.php:164 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." -msgstr "" +msgstr "Proveu de [cercar grups](%%action.groupsearch%%) i unir-vos-hi." #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom group notice feed. @@ -4713,6 +4734,8 @@ msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" +"El lloc funciona gràcies a %1$s versió %2$s. Copyright 2008-2010 StatusNet, " +"Inc. i col·laboradors." #: actions/version.php:161 msgid "Contributors" @@ -4725,6 +4748,10 @@ msgid "" "Software Foundation, either version 3 of the License, or (at your option) " "any later version. " msgstr "" +"L'StatusNet és programari lliure; podeu redistribuir-lo i/o modificar-lo " +"d'acord amb els termes de la llicència GNU Affero General Public License tal " +"i com la publica la Free Software Foundation; tant per a la versió 3 de la " +"llicència, com (a la vostra discreció) per a una versió posterior. " #: actions/version.php:174 msgid "" @@ -4733,6 +4760,10 @@ msgid "" "FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " "for more details. " msgstr "" +"Aquest programa es distribueix amb la voluntat que sigui útil, perquè sense " +"cap mena de garantia; sense tampoc cap garantia implícita respecte a la seva " +"comercialització o idoneïtat per a cap propòsit en particular. Consulteu la " +"llicència GNU Affero General Public License per a més detalls. " #: actions/version.php:180 #, php-format @@ -4740,6 +4771,8 @@ msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" +"Hauríeu d'haver rebut una còpia de la llicència GNU Affero General Public " +"License juntament amb el programa. Si no és així, consulteu %s." #: actions/version.php:189 msgid "Plugins" @@ -4760,16 +4793,20 @@ msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"Cap fitxer pot ser major de %d bytes i el fitxer que heu enviat era de %d " +"bytes. Proveu de pujar una versió de mida menor." #: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" +"Un fitxer d'aquesta mida excediria la vostra quota d'usuari de %d bytes." #: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +"Un fitxer d'aquesta mida excediria la vostra quota mensual de %d bytes." #: classes/Group_member.php:41 msgid "Group join failed." @@ -4788,9 +4825,9 @@ msgid "Could not update local group." msgstr "No s'ha pogut actualitzar el grup local." #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "No s'han pogut crear els àlies." +msgstr "No s'ha pogut crear un testimoni d'inici de sessió per a %s" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4806,9 +4843,11 @@ msgstr "No s'ha pogut inserir el missatge amb la nova URI." #. TRANS: Server exception. %s are the error details. #: classes/Notice.php:176 -#, fuzzy, php-format +#, php-format msgid "Database error inserting hashtag: %s" -msgstr "Hashtag de l'error de la base de dades:%s" +msgstr "" +"S'ha produït un error de la base de dades en inserir una etiqueta de " +"coixinet (%): %s" #: classes/Notice.php:245 msgid "Problem saving notice. Too long." @@ -4826,13 +4865,12 @@ msgstr "" "minuts." #: classes/Notice.php:260 -#, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -"Masses notificacions massa ràpid; pren un respir i publica de nou en uns " -"minuts." +"Massa missatges duplicats en massa poc temps; preneu un respir i torneu a " +"enviar en uns minuts." #: classes/Notice.php:266 msgid "You are banned from posting notices on this site." @@ -4848,7 +4886,7 @@ msgstr "S'ha produït un problema en desar la safata d'entrada del grup." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4866,22 +4904,20 @@ msgid "User has blocked you." msgstr "Un usuari t'ha bloquejat." #: classes/Subscription.php:167 -#, fuzzy msgid "Not subscribed!" -msgstr "No estàs subscrit!" +msgstr "No hi esteu subscrit!" #: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." -msgstr "No s'ha pogut eliminar l'autosubscripció." +msgstr "No s'ha pogut suprimir l'autosubscripció." #: classes/Subscription.php:200 -#, fuzzy msgid "Couldn't delete subscription OMB token." -msgstr "No s'ha pogut eliminar la subscripció." +msgstr "No s'ha pogut suprimir el testimoni OMB de la subscripció." #: classes/Subscription.php:211 msgid "Couldn't delete subscription." -msgstr "No s'ha pogut eliminar la subscripció." +msgstr "No s'ha pogut suprimir la subscripció." #: classes/User.php:363 #, php-format @@ -4893,18 +4929,16 @@ msgid "Could not create group." msgstr "No s'ha pogut crear el grup." #: classes/User_group.php:489 -#, fuzzy msgid "Could not set group URI." -msgstr "No s'ha pogut establir la pertinença d'aquest grup." +msgstr "No es pot definir l'URI del grup." #: classes/User_group.php:510 msgid "Could not set group membership." msgstr "No s'ha pogut establir la pertinença d'aquest grup." #: classes/User_group.php:524 -#, fuzzy msgid "Could not save local group info." -msgstr "No s'ha pogut guardar la subscripció." +msgstr "No s'ha pogut desar la informació del grup local." #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:109 @@ -5107,7 +5141,7 @@ msgstr "Preguntes més freqüents" #. TRANS: Secondary navigation menu option leading to Terms of Service. #: lib/action.php:769 msgid "TOS" -msgstr "" +msgstr "Termes del servei" #. TRANS: Secondary navigation menu option leading to privacy policy. #: lib/action.php:773 @@ -5135,7 +5169,7 @@ msgstr "Llicència del programari StatusNet" #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. #: lib/action.php:817 -#, fuzzy, php-format +#, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." @@ -5171,7 +5205,7 @@ msgstr "Llicència de contingut del lloc" #: lib/action.php:847 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "El contingut i les dades de %1$s són privades i confidencials." #. TRANS: Content license displayed when license is set to 'allrightsreserved'. #. TRANS: %1$s is the copyright owner. @@ -5179,17 +5213,22 @@ msgstr "" #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" +"El contingut i les dades són copyright de %1$s. Tots els drets reservats." #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. #: lib/action.php:858 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"El contingut i les dades són copyright dels col·laboradors. Tots els drets " +"reservats." #. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. #: lib/action.php:871 #, php-format msgid "All %1$s content and data are available under the %2$s license." msgstr "" +"Tot el contingut i les dades de %1$s es troben disponibles sota una " +"llicència %2$s." #. TRANS: DT element for pagination (previous/next, etc.). #: lib/action.php:1182 @@ -5212,18 +5251,20 @@ msgstr "Anteriors" #: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" +"S'esperava un element del canal arrel, però se n'ha obtingut tot un document " +"XML sencer." #: lib/activityutils.php:208 msgid "Can't handle remote content yet." -msgstr "" +msgstr "No es pot gestionar el contingut remot encara." #: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." -msgstr "" +msgstr "No es pot gestionar el contingut XML incrustat encara." #: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." -msgstr "" +msgstr "No es pot gestionar el contingut Base64 incrustat encara." #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 @@ -5305,14 +5346,15 @@ msgstr "Edita l'avís del lloc" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:405 -#, fuzzy msgid "Snapshots configuration" -msgstr "Configuració dels camins" +msgstr "Configuració de les instantànies" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" +"El recurs API requereix accés de lectura i d'escriptura, però només en teniu " +"de lectura." #. TRANS: Form legend. #: lib/applicationeditform.php:137 @@ -5348,18 +5390,17 @@ msgstr "URL d'origen" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:233 msgid "Organization responsible for this application" -msgstr "" +msgstr "Organització responsable de l'aplicació" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:242 -#, fuzzy msgid "URL for the homepage of the organization" -msgstr "URL del teu web, blog del grup u tema" +msgstr "L'URL de la pàgina d'inici de l'organització" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:251 msgid "URL to redirect to after authentication" -msgstr "" +msgstr "URL on redirigir-hi després de l'autenticació." #. TRANS: Radio button label for application type #: lib/applicationeditform.php:278 @@ -5400,12 +5441,12 @@ msgstr "Cancel·la" #. TRANS: Application access type #: lib/applicationlist.php:136 msgid "read-write" -msgstr "lectura i escriptura" +msgstr "de lectura i d'escriptura" #. TRANS: Application access type #: lib/applicationlist.php:138 msgid "read-only" -msgstr "només lectura" +msgstr "només de lectura" #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) #: lib/applicationlist.php:144 @@ -5447,9 +5488,8 @@ msgid "Password changing failed" msgstr "El canvi de contrasenya ha fallat" #: lib/authenticationplugin.php:235 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Contrasenya canviada." +msgstr "No es permet el canvi de contrasenya" #: lib/channel.php:157 lib/channel.php:177 msgid "Command results" @@ -5464,9 +5504,8 @@ msgid "Command failed" msgstr "Comanda fallida" #: lib/command.php:83 lib/command.php:105 -#, fuzzy msgid "Notice with that id does not exist" -msgstr "No hi ha cap perfil amb aquesta id." +msgstr "No existeix cap avís amb aquest identificador." #: lib/command.php:99 lib/command.php:596 msgid "User has no last notice" @@ -5475,16 +5514,16 @@ msgstr "L'usuari no té última nota" #. TRANS: Message given requesting a profile for a non-existing user. #. TRANS: %s is the nickname of the user for which the profile could not be found. #: lib/command.php:127 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" -msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat" +msgstr "No s'ha pogut trobar un usuari amb el sobrenom %s" #. TRANS: Message given getting a non-existing user. #. TRANS: %s is the nickname of the user that could not be found. #: lib/command.php:147 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat" +msgstr "No s'ha pogut trobar a un usuari local amb el sobrenom %s" #: lib/command.php:180 msgid "Sorry, this command is not yet implemented." @@ -5492,7 +5531,7 @@ msgstr "Perdona, aquesta comanda no està implementada." #: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "No té massa sentit avisar-se a un mateix!" #. TRANS: Message given having nudged another user. #. TRANS: %s is the nickname of the user that was nudged. @@ -5514,7 +5553,7 @@ msgstr "" #: lib/command.php:302 msgid "Notice marked as fave." -msgstr "Nota marcada com a favorita." +msgstr "L'avís està marcat com a preferit." #: lib/command.php:323 msgid "You are already a member of that group" @@ -5558,7 +5597,7 @@ msgstr "Pàgina web: %s" #: lib/command.php:430 #, php-format msgid "About: %s" -msgstr "Sobre tu: %s" +msgstr "Informació personal: %s" #: lib/command.php:457 #, php-format @@ -5582,11 +5621,11 @@ msgstr "" #: lib/command.php:492 #, php-format msgid "Direct message to %s sent" -msgstr "Missatge directe per a %s enviat" +msgstr "Missatge directe a %s enviat" #: lib/command.php:494 msgid "Error sending direct message." -msgstr "Error al enviar el missatge directe." +msgstr "S'ha produït un error en enviar el missatge directe." #: lib/command.php:514 msgid "Cannot repeat your own notice" @@ -5608,9 +5647,9 @@ msgid "Error repeating notice." msgstr "S'ha produït un error en repetir l'avís." #: lib/command.php:562 -#, fuzzy, php-format +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" +msgstr "L'avís és massa llarg - el màxim és %d caràcters, i n'heu enviat %d" #: lib/command.php:571 #, php-format @@ -5623,12 +5662,11 @@ msgstr "S'ha produït un error en desar l'avís." #: lib/command.php:620 msgid "Specify the name of the user to subscribe to" -msgstr "Especifica el nom de l'usuari a que vols subscriure't" +msgstr "Especifiqueu el nom de l'usuari al qual voleu subscriure-us" #: lib/command.php:628 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "No estàs subscrit a aquest perfil." +msgstr "No es pot subscriure a perfils de OMB amb ordres." #: lib/command.php:634 #, php-format @@ -5637,7 +5675,7 @@ msgstr "Subscrit a %s" #: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" -msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit" +msgstr "Especifiqueu el nom de l'usuari de qui voleu deixar d'estar subscrit" #: lib/command.php:664 #, php-format @@ -5681,9 +5719,8 @@ msgid "Unsubscribed %s" msgstr "S'ha dessubscrit %s" #: lib/command.php:778 -#, fuzzy msgid "You are not subscribed to anyone." -msgstr "No estàs subscrit a aquest perfil." +msgstr "No esteu subscrit a ningú." #: lib/command.php:780 msgid "You are subscribed to this person:" @@ -5692,9 +5729,8 @@ msgstr[0] "Ja estàs subscrit a aquests usuaris:" msgstr[1] "Ja estàs subscrit a aquests usuaris:" #: lib/command.php:800 -#, fuzzy msgid "No one is subscribed to you." -msgstr "No pots subscriure a un altre a tu mateix." +msgstr "Ningú no us ha subscrit." #: lib/command.php:802 msgid "This person is subscribed to you:" @@ -5753,6 +5789,44 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Ordres:\n" +"on - activeu els avisos\n" +"off - desactiveu els avisos\n" +"help - mostra aquesta ajuda\n" +"follow - se subscriu a l'usuari\n" +"groups - llista els grups on us heu unit\n" +"subscriptions - llista la gent que seguiu\n" +"subscribers - llista la gent que us segueix\n" +"leave - dessubscriu de l'usuari\n" +"d - missatge directe a l'usuari\n" +"get - s'obté el darrer avís de l'usuari\n" +"whois - s'obté la informació del perfil de l'usuari\n" +"lose - es força l'usuari a deixar de seguir-vos\n" +"fav - afegeix el darrer avís de l'usuari com a «preferit»\n" +"fav # - afegeix l'avís amb l'id donat com a «preferit»\n" +"repeat # - repeteix l'avís amb l'id donat\n" +"repeat - repeteix el darrer avís de l'usari\n" +"reply # - respon l'avís amb l'id donat\n" +"reply - respon el darrer avís de l'usuari\n" +"join - s'uneix al grup\n" +"login - s'obté un enllaç per iniciar una sessió des de la interfície web\n" +"drop - es deixa el grup\n" +"stats - s'obté el vostre estat\n" +"stop - el mateix que «off»\n" +"quit - el mateix que «off»\n" +"sub - el mateix que «follow»\n" +"unsub - el mateix que «leave»\n" +"last - el mateix que «get»\n" +"on - no s'ha implementat encara.\n" +"off - no s'ha implementat encara.\n" +"nudge - es recorda a l'usuari que actualitzi.\n" +"invite - no s'ha implementat encara.\n" +"track - no s'ha implementat encara.\n" +"untrack - no s'ha implementat encara.\n" +"track off - no s'ha implementat encara.\n" +"untrack all - no s'ha implementat encara.\n" +"tracks - no s'ha implementat encara.\n" +"tracking - no s'ha implementat encara.\n" #: lib/common.php:135 msgid "No configuration file found. " @@ -5811,11 +5885,11 @@ msgstr "S'han restaurat els paràmetres de disseny per defecte." #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" -msgstr "Deixar de tenir favorita aquesta notificació" +msgstr "Deixa de tenir com a preferit aquest avís" #: lib/favorform.php:114 lib/favorform.php:140 msgid "Favor this notice" -msgstr "Fer favorita aquesta notificació" +msgstr "Fes preferit aquest avís" #: lib/favorform.php:140 msgid "Favor" @@ -5859,7 +5933,7 @@ msgstr "Etiqueta" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" -msgstr "Elegeix una etiqueta para reduir la llista" +msgstr "Trieu una etiqueta per a escurçar la llista" #: lib/galleryaction.php:143 msgid "Go" @@ -5887,12 +5961,12 @@ msgstr "Descriviu el grup o el tema en %d caràcters" msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" msgstr "" -"Localització del grup, si n'hi ha, com \"Ciutat, Estat (o Regió), País\"" +"Ubicació del grup, si s'hi adiu cap, com ara «ciutat, comarca (o illa), país»" #: lib/groupeditform.php:187 #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" -msgstr "" +msgstr "Sobrenoms addicionals del grup, separats per coma o espai, màx. %d" #: lib/groupnav.php:85 msgid "Group" @@ -5910,7 +5984,7 @@ msgstr "%susuaris blocats" #: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" -msgstr "Editar propietats del grup %s" +msgstr "Edita les propietats del grup %s" #: lib/groupnav.php:113 msgid "Logo" @@ -5997,7 +6071,7 @@ msgstr "Inici de sessió" #: lib/leaveform.php:114 msgid "Leave" -msgstr "Abandonar" +msgstr "Deixa" #: lib/logingroupnav.php:80 msgid "Login with a username and password" @@ -6005,7 +6079,7 @@ msgstr "Accedir amb el nom d'usuari i contrasenya" #: lib/logingroupnav.php:86 msgid "Sign up for a new account" -msgstr "Crear nou compte" +msgstr "Registreu-vos-hi per a un compte nou" #. TRANS: Subject for address confirmation email #: lib/mail.php:174 @@ -6029,6 +6103,19 @@ msgid "" "Thanks for your time, \n" "%s\n" msgstr "" +"Hola, %s.\n" +"\n" +"Algú ha introduït aquesta adreça electrònica a %s.\n" +"\n" +"Si sou qui ho ha fet i voleu confirmar-hi la vostra entrada, feu servir " +"l'URL a continuació:\n" +"\n" +"\t%s\n" +"\n" +"Si nou, simplement ignoreu el missatge.\n" +"\n" +"Gràcies pel vostre temps, \n" +"%s\n" #. TRANS: Subject of new-subscriber notification e-mail #: lib/mail.php:243 @@ -6038,7 +6125,7 @@ msgstr "%1$s ara està escoltant els teus avisos a %2$s." #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:249 -#, fuzzy, php-format +#, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" "\n" @@ -6051,12 +6138,16 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" -"%1$s ara està escoltant els teus avisos a %2$s.\n" +"%1$s ara està escoltant els vostres avisos a %2$s.\n" "\n" -"\t%3$s\n" +"%3$s\n" "\n" +"%4$s%5$s%6$s\n" "Atentament,\n" -"%4$s.\n" +"%7$s.\n" +"\n" +"----\n" +"Canvieu la vostra adreça electrònica o les opcions de notificació a %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail #: lib/mail.php:269 @@ -6131,6 +6222,16 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) què tal us trobeu is us convida a enviar algunes notícies.\n" +"\n" +"Esperem sentir-vos aviat :)\n" +"\n" +"%3$s\n" +"\n" +"No responeu aquest missatge; no els hi arribarà.\n" +"\n" +"Ben cordialment,\n" +"%4$s\n" #. TRANS: Subject for direct-message notification email #: lib/mail.php:530 @@ -6157,6 +6258,20 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) us ha enviat un missatge privat:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Podeu respondre llurs missatges a continuació:\n" +"\n" +"%4$s\n" +"\n" +"No responeu aquest missatge; no els hi arribarà.\n" +"\n" +"Ben cordialment,\n" +"%5$s\n" #. TRANS: Subject for favorite notification email #: lib/mail.php:583 @@ -6185,6 +6300,22 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) acaba d'afegir el vostre avís de %2$s com a preferit.\n" +"\n" +"L'URL del vostre avís és:\n" +"\n" +"%3$s\n" +"\n" +"El text del vostre avís és:\n" +"\n" +"%4$s\n" +"\n" +"Podeu veure la llista dels preferits de %1$s a continuació:\n" +"\n" +"%5$s\n" +"\n" +"Atentament,\n" +"%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. #: lib/mail.php:645 @@ -6194,11 +6325,14 @@ msgid "" "\n" "\t%s" msgstr "" +"La conversa sencera pot llegir-se a continuació:\n" +"\n" +"%s" #: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) us ha enviat un avís a la vostra atenció" #. TRANS: Body of @-reply notification e-mail. #: lib/mail.php:654 @@ -6227,6 +6361,29 @@ msgid "" "\n" "P.S. You can turn off these email notifications here: %8$s\n" msgstr "" +"1$s (@%9$s) acaba d'enviar un avís un avís a la vostra atenció (una resposta " +"amb @) a %2$s.\n" +"\n" +"L'avís és a continuació:\n" +"\n" +"\t%3$s\n" +"\n" +"Hi diu:\n" +"\n" +"\t%4$s\n" +"\n" +"%5$s Podeu respondre'l a continuació:\n" +"\n" +"\t%6$s\n" +"\n" +"Teniu la llista de les respostes amb @ a continuació:\n" +"\n" +"%7$s\n" +"\n" +"Atentament,\n" +"%2$s\n" +"\n" +"P.S. Podeu desactivar les notificacions per correu aquí: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6237,8 +6394,11 @@ msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" +"No teniu missatges privats. Podeu enviar un missatge per a animar altres " +"usuaris en la conversa. La gent pot enviar-vos missatges només per als " +"vostres ulls." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "de" @@ -6266,20 +6426,26 @@ msgstr "Tipus de missatge no permès: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" +"S'ha produït un error a la base de dades mentre es desava el vostre fitxer. " +"Torneu-ho a provar." #: lib/mediafile.php:142 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." msgstr "" +"El fitxer pujat excedeix la mida de la directiva upload_max_filesize del php." +"ini." #: lib/mediafile.php:147 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"El fitxer pujat excedeix la mida de la directiva MAX_FILE_SIZE especificada " +"en el formulari HTML." #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "El fitxer pujat només s'ha pujat parcialment." #: lib/mediafile.php:159 msgid "Missing a temporary folder." @@ -6362,7 +6528,7 @@ msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" -"Ho sentim, la obtenció de la vostra ubicació geogràfic està trigant més de " +"Ho sentim, la obtenció de la vostra ubicació geogràfica està trigant més de " "l'esperat; torneu-ho a provar més tard" #. TRANS: Used in coordinates as abbreviation of north @@ -6394,23 +6560,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "a" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "en context" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Repetit per" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "respondre a aquesta nota" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Respon" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Avís repetit" @@ -6652,12 +6818,12 @@ msgstr "Convidar amics i companys perquè participin a %s" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 msgid "People Tagcloud as self-tagged" -msgstr "" +msgstr "Núvol d'etiquetes personals (etiquetes pròpies)" #: lib/subscriberspeopletagcloudsection.php:48 #: lib/subscriptionspeopletagcloudsection.php:48 msgid "People Tagcloud as tagged" -msgstr "" +msgstr "Núvol d'etiquetes personals" #: lib/tagcloudsection.php:56 msgid "None" @@ -6689,7 +6855,7 @@ msgstr "Deixar d'estar subscrit des d'aquest usuari" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" -msgstr "Cancel·lar subscripció" +msgstr "Cancel·la la subscripció" #: lib/usernoprofileexception.php:58 #, php-format @@ -6718,7 +6884,7 @@ msgstr "Edita" #: lib/userprofile.php:287 msgid "Send a direct message to this user" -msgstr "Enviar un missatge directe a aquest usuari" +msgstr "Envia un missatge directe a aquest usuari" #: lib/userprofile.php:288 msgid "Message" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 38caf74c60..e89d7e602e 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:42+0000\n" +"POT-Creation-Date: 2010-05-09 17:09+0000\n" +"PO-Revision-Date: 2010-05-09 17:10:17+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66119); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -96,10 +96,10 @@ msgstr "No such page." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -227,12 +227,12 @@ msgstr "API method not found." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "This method requires a POST." @@ -266,7 +266,7 @@ msgstr "Couldn't save profile." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -325,20 +325,20 @@ msgstr "Direct messages to %s" msgid "All the direct messages sent to %s" msgstr "All the direct messages sent to %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "No message text!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "That's too long. Max message size is %d chars." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Recipient user not found." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "Can't send direct messages to users who aren't your friend." @@ -652,17 +652,17 @@ msgstr "Status deleted." msgid "No status with that ID found." msgstr "No status with that ID found." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "That's too long. Max notice size is %d chars." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Not found." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Max notice size is %d chars, including attachment URL." @@ -773,7 +773,7 @@ msgid "Preview" msgstr "Preview" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Delete" @@ -1054,7 +1054,7 @@ msgid "Do not delete this notice" msgstr "Do not delete this notice" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Delete this notice" @@ -1686,7 +1686,7 @@ msgstr "Invalid role." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "This role is reserved and cannot be set." #: actions/grantrole.php:75 msgid "You cannot grant user roles on this site." @@ -2303,21 +2303,19 @@ msgstr "" "changing your settings." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Login with a username and password" +msgstr "Login with your username and password." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" -"Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account." +"Don't have a username yet? [Register](%%action.register%%) a new account." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." -msgstr "" +msgstr "Only and admin can make another user an admin." #: actions/makeadmin.php:96 #, php-format @@ -2480,16 +2478,16 @@ msgstr "OAuth applications" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "Applications you have registered" #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "You have not registered any applications yet." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" -msgstr "" +msgstr "Connected applications" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." @@ -2534,8 +2532,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -3404,7 +3402,7 @@ msgstr "You can't repeat your own notice." msgid "You already repeated that notice." msgstr "You already repeated that notice." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Repeated" @@ -4779,7 +4777,7 @@ msgstr "Problem saving group inbox." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5237,7 +5235,7 @@ msgid "Snapshots configuration" msgstr "Snapshots configuration" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5700,7 +5698,7 @@ msgstr "Connections" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "Authorised connected applications" #: lib/dberroraction.php:60 msgid "Database error" @@ -6153,7 +6151,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "from" @@ -6307,23 +6305,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "in context" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Repeated by" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Reply to this notice" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Reply" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Notice repeated" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 7147c728f9..c9335e99c2 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:46+0000\n" +"POT-Creation-Date: 2010-05-09 17:09+0000\n" +"PO-Revision-Date: 2010-05-09 17:10:20+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66119); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -100,10 +100,10 @@ msgstr "No existe tal página." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -232,12 +232,12 @@ msgstr "Método de API no encontrado." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Este método requiere un POST." @@ -269,7 +269,7 @@ msgstr "No se pudo guardar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -328,20 +328,20 @@ msgstr "Mensajes directos a %s" msgid "All the direct messages sent to %s" msgstr "Todos los mensajes directos enviados a %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "¡Sin texto de mensaje!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "No se encuentra usuario receptor." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo." @@ -660,17 +660,17 @@ msgstr "Status borrado." msgid "No status with that ID found." msgstr "No hay estado para ese ID" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "La entrada es muy larga. El tamaño máximo es de %d caracteres." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "No encontrado." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -783,7 +783,7 @@ msgid "Preview" msgstr "Vista previa" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Borrar" @@ -1065,7 +1065,7 @@ msgid "Do not delete this notice" msgstr "No eliminar este mensaje" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Borrar este aviso" @@ -2567,8 +2567,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Solamente %s URLs sobre HTTP simples por favor." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -3467,7 +3467,7 @@ msgstr "No puedes repetir tus propios mensajes." msgid "You already repeated that notice." msgstr "Ya has repetido este mensaje." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Repetido" @@ -4883,7 +4883,7 @@ msgstr "Hubo un problema al guarda la bandeja de entrada del grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5053,7 +5053,7 @@ msgstr "Cerrar sesión en el sitio" #: lib/action.php:467 msgctxt "MENU" msgid "Logout" -msgstr "Cerrar Sesión" +msgstr "Cerrar sesión" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:472 @@ -5348,7 +5348,7 @@ msgid "Snapshots configuration" msgstr "Configuración de instantáneas" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API requiere acceso de lectura y escritura, pero sólo tienes acceso de " @@ -6402,7 +6402,7 @@ msgstr "" "otros usuarios partícipes de la conversación. La gente puede enviarte " "mensajes que sólo puedas leer tú." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "desde" @@ -6563,23 +6563,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "en" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "en contexto" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Repetido por" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Responder este aviso." -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Aviso repetido" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 1409dc6146..eb56ca7b95 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:56+0000\n" +"POT-Creation-Date: 2010-05-09 17:09+0000\n" +"PO-Revision-Date: 2010-05-09 17:11:23+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66119); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -98,10 +98,10 @@ msgstr "Esta página não existe." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -231,12 +231,12 @@ msgstr "O método da API não foi encontrado!" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -268,7 +268,7 @@ msgstr "Não foi possível salvar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -327,20 +327,20 @@ msgstr "Mensagens diretas para %s" msgid "All the direct messages sent to %s" msgstr "Todas as mensagens diretas enviadas para %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Nenhuma mensagem de texto!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Isso é muito extenso. O tamanho máximo das mensagens é %d caracteres." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "O usuário destinatário não foi encontrado." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Não é possível enviar mensagens diretas para usuários que não sejam seus " @@ -662,17 +662,17 @@ msgstr "A mensagem foi excluída." msgid "No status with that ID found." msgstr "Não foi encontrada nenhuma mensagem com esse ID." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Está muito extenso. O tamanho máximo é de %s caracteres." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Não encontrado." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "O tamanho máximo da mensagem é de %s caracteres" @@ -784,7 +784,7 @@ msgid "Preview" msgstr "Visualização" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Excluir" @@ -1066,7 +1066,7 @@ msgid "Do not delete this notice" msgstr "Não excluir esta mensagem." #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Excluir esta mensagem" @@ -2552,9 +2552,8 @@ msgstr "" "aplicações " #: actions/oembed.php:79 actions/shownotice.php:100 -#, fuzzy msgid "Notice has no profile." -msgstr "A mensagem não está associada a nenhum perfil" +msgstr "A mensagem não está associada a nenhum perfil." #: actions/oembed.php:86 actions/shownotice.php:175 #, php-format @@ -2563,19 +2562,19 @@ msgstr "Mensagem de %1$s no %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') #: actions/oembed.php:158 -#, fuzzy, php-format +#, php-format msgid "Content type %s not supported." -msgstr "tipo de conteúdo " +msgstr "O tipo de conteúdo %s não é suportado." #. TRANS: Error message displaying attachments. %s is the site's base URL. #: actions/oembed.php:162 #, php-format msgid "Only %s URLs over plain HTTP please." -msgstr "" +msgstr "Por favor, somente URLs %s sobre HTTP puro." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Não é um formato de dados suportado." @@ -2726,24 +2725,24 @@ msgid "Path and server settings for this StatusNet site." msgstr "Configurações dos caminhos e do servidor para este site StatusNet." #: actions/pathsadminpanel.php:157 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s." -msgstr "Sem permissão de leitura no diretório de temas: %s" +msgstr "Sem permissão de leitura no diretório de temas: %s." #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "Sem permissão de escrita no diretório de avatares: %s" +msgstr "Sem permissão de escrita no diretório de avatares: %s." #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." -msgstr "Sem permissão de escrita no diretório de imagens de fundo: %s" +msgstr "Sem permissão de escrita no diretório de imagens de fundo: %s." #: actions/pathsadminpanel.php:177 -#, fuzzy, php-format +#, php-format msgid "Locales directory not readable: %s." -msgstr "Sem permissão de leitura no diretório de locales: %s" +msgstr "Sem permissão de leitura no diretório de locales: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2884,9 +2883,9 @@ msgid "People search" msgstr "Procurar pessoas" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "Não é uma etiqueta de pessoa válida: %s" +msgstr "Não é uma etiqueta de pessoa válida: %s." #: actions/peopletag.php:142 #, php-format @@ -2894,9 +2893,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "O conteúdo da mensagem é inválido" +msgstr "O conteúdo da mensagem é inválido." #: actions/postnotice.php:101 #, php-format @@ -3042,9 +3040,9 @@ msgid "Settings saved." msgstr "As configurações foram salvas." #: actions/public.php:83 -#, fuzzy, php-format +#, php-format msgid "Beyond the page limit (%s)." -msgstr "Além do limite da página (%s)" +msgstr "Além do limite da página (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3309,7 +3307,6 @@ msgid "Invalid username or password." msgstr "Nome de usuário e/ou senha inválido(s)" #: actions/register.php:343 -#, fuzzy msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3345,12 +3342,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, de preferência seu nome \"real\"" #: actions/register.php:494 -#, fuzzy, php-format +#, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -" exceto estes dados particulares: senha, endereço de e-mail, endereço de MI " +"Meus textos e arquivos estão disponíveis sob a %s, exceto estes dados " +"particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo " "e número de telefone." #: actions/register.php:542 @@ -3468,7 +3466,7 @@ msgstr "Você não pode repetir sua própria mensagem." msgid "You already repeated that notice." msgstr "Você já repetiu essa mensagem." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Repetida" @@ -3971,7 +3969,6 @@ msgid "Minimum text limit is 0 (unlimited)." msgstr "O valor mínimo para o limite de texto é 0 (sem limites)." #: actions/siteadminpanel.php:171 -#, fuzzy msgid "Dupe limit must be one or more seconds." msgstr "O limite de duplicatas deve ser de um ou mais segundos." @@ -4064,7 +4061,6 @@ msgid "Unable to save site notice." msgstr "Não foi possível salvar os avisos do site." #: actions/sitenoticeadminpanel.php:113 -#, fuzzy msgid "Max length for the site-wide notice is 255 chars." msgstr "O tamanho máximo para os avisos é de 255 caracteres." @@ -4099,9 +4095,8 @@ msgstr "SMS não está disponível." #. TRANS: Form legend for SMS settings form. #: actions/smssettings.php:111 -#, fuzzy msgid "SMS address" -msgstr "Endereço do MI" +msgstr "Endereço de SMS" #. TRANS: Form guide in SMS settings form. #: actions/smssettings.php:120 @@ -4125,7 +4120,6 @@ msgstr "Informe o código que você recebeu no seu telefone." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" msgstr "Confirmar" @@ -4142,9 +4136,8 @@ msgstr "Número de telefone, sem pontuação ou espaços, com código de área" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Preferências" +msgstr "Preferências do SMS" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4157,9 +4150,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "As preferências foram salvas." +msgstr "As preferências do SMS foram salvas." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4197,9 +4189,8 @@ msgstr "Isso é um número de confirmação errado." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 -#, fuzzy msgid "SMS confirmation cancelled." -msgstr "A confirmação foi cancelada." +msgstr "A confirmação do SMS foi cancelada." #. TRANS: Message given trying to remove an SMS phone number that is not #. TRANS: registered for the active user. @@ -4209,9 +4200,8 @@ msgstr "Esse não é seu número de telefone." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 -#, fuzzy msgid "The SMS phone number was removed." -msgstr "Telefone para SMS" +msgstr "O número de telefone para SMS foi removido." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4262,9 +4252,8 @@ msgid "Invalid snapshot report URL." msgstr "A URL para o envio das estatísticas é inválida." #: actions/snapshotadminpanel.php:200 -#, fuzzy msgid "Randomly during web hit" -msgstr "Aleatoriamente durante o funcionamento" +msgstr "Aleatoriamente durante as visitas ao site" #: actions/snapshotadminpanel.php:201 msgid "In a scheduled job" @@ -4497,9 +4486,8 @@ msgid "User is not silenced." msgstr "O usuário não está silenciado." #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile ID in request." -msgstr "Nenhuma ID de perfil na requisição." +msgstr "A requisição não possui nenhuma ID de perfil." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -4852,7 +4840,7 @@ msgstr "Não foi possível atualizar a mensagem com a nova URI." #. TRANS: Server exception. %s are the error details. #: classes/Notice.php:176 -#, fuzzy, php-format +#, php-format msgid "Database error inserting hashtag: %s" msgstr "Erro no banco de dados durante a inserção da hashtag: %s" @@ -4893,7 +4881,7 @@ msgstr "Problema no salvamento das mensagens recebidas do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5176,7 +5164,7 @@ msgstr "Licença do software StatusNet" #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. #: lib/action.php:817 -#, fuzzy, php-format +#, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." @@ -5232,7 +5220,7 @@ msgstr "" #: lib/action.php:871 #, php-format msgid "All %1$s content and data are available under the %2$s license." -msgstr "" +msgstr "Todo o conteúdo e dados de %1$s estão disponíveis sob a licença %2$s." #. TRANS: DT element for pagination (previous/next, etc.). #: lib/action.php:1182 @@ -5354,7 +5342,7 @@ msgid "Snapshots configuration" msgstr "Configurações das estatísticas" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Os recursos de API exigem acesso de leitura e escrita, mas você possui " @@ -5444,25 +5432,22 @@ msgstr "Cancelar" #. TRANS: Application access type #: lib/applicationlist.php:136 -#, fuzzy msgid "read-write" -msgstr "Leitura e escrita" +msgstr "leitura e escrita" #. TRANS: Application access type #: lib/applicationlist.php:138 -#, fuzzy msgid "read-only" -msgstr "Somente leitura" +msgstr "somente leitura" #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) #: lib/applicationlist.php:144 #, php-format msgid "Approved %1$s - \"%2$s\" access." -msgstr "" +msgstr "Aprovado em %1$s - acesso \"%2$s\"." #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" msgstr "Revogar" @@ -6382,7 +6367,7 @@ msgstr "" "privadas para envolver outras pessoas em uma conversa. Você também pode " "receber mensagens privadas." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "de" @@ -6544,23 +6529,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "em" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "no contexto" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Responder a esta mensagem" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Mensagem repetida" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index dedce0ad9b..529533870c 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-05 22:18+0000\n" +"POT-Creation-Date: 2010-05-09 17:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -92,10 +92,10 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -216,12 +216,12 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "" @@ -251,7 +251,7 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -308,20 +308,20 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "" -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "" -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" @@ -630,17 +630,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "" -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -751,7 +751,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "" @@ -1024,7 +1024,7 @@ msgid "Do not delete this notice" msgstr "" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "" @@ -2426,8 +2426,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "" @@ -3259,7 +3259,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "" -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "" @@ -4575,7 +4575,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5027,7 +5027,7 @@ msgid "Snapshots configuration" msgstr "" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5923,7 +5923,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "" @@ -6077,23 +6077,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "" From 45392bef3382cd0bad30ebcd343d1cdd21e16f08 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 11 May 2010 12:16:13 -0700 Subject: [PATCH 111/730] Installer tweak for Windows: normalize line endings to platform standard in generated config.php Added a comment that the writable directory checks are insufficient to catch ACL problems on Windows; need a better check for that. --- lib/installer.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/installer.php b/lib/installer.php index 589a19a66e..58ffbfef7e 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -128,6 +128,7 @@ abstract class Installer $pass = false; } + // @fixme this check seems to be insufficient with Windows ACLs if (!is_writable(INSTALLDIR)) { $this->warning(sprintf('Cannot write config file to: %s

', INSTALLDIR), sprintf('On your server, try this command: chmod a+w %s', INSTALLDIR)); @@ -409,6 +410,10 @@ abstract class Installer "\$config['db']['database'] = '{$this->db['database']}';\n\n". ($this->db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":''). "\$config['db']['type'] = '{$this->db['type']}';\n\n"; + + // Normalize line endings for Windows servers + $cfg = str_replace("\n", PHP_EOL, $cfg); + // write configuration file out to install directory $res = file_put_contents(INSTALLDIR.'/config.php', $cfg); From 3d00cfd47fe5458a531df1b78b1833eb17321393 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 11 May 2010 12:22:14 -0700 Subject: [PATCH 112/730] Windows server fix: Use platform EOL in debug log file --- lib/util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index c0013bb3da..efede1d4be 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1365,7 +1365,7 @@ function common_log_line($priority, $msg) { static $syslog_priorities = array('LOG_EMERG', 'LOG_ALERT', 'LOG_CRIT', 'LOG_ERR', 'LOG_WARNING', 'LOG_NOTICE', 'LOG_INFO', 'LOG_DEBUG'); - return date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . "\n"; + return date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . PHP_EOL; } function common_request_id() From 5d0593ec342f76aa8062584a92108a66328ff41e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 12 May 2010 11:09:37 -0700 Subject: [PATCH 113/730] Fix keys() / keyTypes() mixup in SamplePlugin --- plugins/Sample/User_greeting_count.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/plugins/Sample/User_greeting_count.php b/plugins/Sample/User_greeting_count.php index d9a59770d3..fc0cbd28ff 100644 --- a/plugins/Sample/User_greeting_count.php +++ b/plugins/Sample/User_greeting_count.php @@ -94,29 +94,34 @@ class User_greeting_count extends Memcached_DataObject /** * return key definitions for DB_DataObject * - * DB_DataObject needs to know about keys that the table has; this function - * defines them. + * DB_DataObject needs to know about keys that the table has, since it + * won't appear in StatusNet's own keys list. In most cases, this will + * simply reference your keyTypes() function. * - * @return array key definitions + * @return array list of key field names */ function keys() { - return array('user_id' => 'K'); + return array_keys($this->keyTypes()); } /** * return key definitions for Memcached_DataObject * * Our caching system uses the same key definitions, but uses a different - * method to get them. + * method to get them. This key information is used to store and clear + * cached data, so be sure to list any key that will be used for static + * lookups. * - * @return array key definitions + * @return array associative array of key definitions, field name to type: + * 'K' for primary key: for compound keys, add an entry for each component; + * 'U' for unique keys: compound keys are not well supported here. */ function keyTypes() { - return $this->keys(); + return array('user_id' => 'K'); } /** From df034f0a1e96acc2f495fc2c9e024cd79a0e8a49 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 12 May 2010 15:08:01 -0700 Subject: [PATCH 114/730] Need to always emit statusnet:notice_info so it's available in profile feeds --- classes/Notice.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 875bcaa020..7c3b5b5191 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1212,24 +1212,6 @@ class Notice extends Memcached_DataObject $xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE)); $xs->element('updated', null, common_date_w3dtf($this->created)); - - $noticeInfoAttr = array( - 'local_id' => $this->id, // local notice ID (useful to clients for ordering) - 'source' => $this->source // the client name (source attribution) - ); - - $ns = $this->getSource(); - if ($ns) { - if (!empty($ns->url)) { - $noticeInfoAttr['source_link'] = $ns->url; - } - } - - if (!empty($cur)) { - $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; - } - - $xs->element('statusnet:notice_info', $noticeInfoAttr, null); } if ($source) { @@ -1252,6 +1234,24 @@ class Notice extends Memcached_DataObject $xs->element('published', null, common_date_w3dtf($this->created)); $xs->element('updated', null, common_date_w3dtf($this->created)); + $noticeInfoAttr = array( + 'local_id' => $this->id, // local notice ID (useful to clients for ordering) + 'source' => $this->source // the client name (source attribution) + ); + + $ns = $this->getSource(); + if ($ns) { + if (!empty($ns->url)) { + $noticeInfoAttr['source_link'] = $ns->url; + } + } + + if (!empty($cur)) { + $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; + } + + $xs->element('statusnet:notice_info', $noticeInfoAttr, null); + if ($this->reply_to) { $reply_notice = Notice::staticGet('id', $this->reply_to); if (!empty($reply_notice)) { From 2f8480a779f3495eb64d6c9a94d6153225783e4d Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 13 May 2010 23:17:48 +0200 Subject: [PATCH 115/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/af/LC_MESSAGES/statusnet.po | 54 +++---- locale/ar/LC_MESSAGES/statusnet.po | 54 +++---- locale/arz/LC_MESSAGES/statusnet.po | 54 +++---- locale/bg/LC_MESSAGES/statusnet.po | 54 +++---- locale/br/LC_MESSAGES/statusnet.po | 54 +++---- locale/ca/LC_MESSAGES/statusnet.po | 204 +++++++++++++------------- locale/cs/LC_MESSAGES/statusnet.po | 54 +++---- locale/de/LC_MESSAGES/statusnet.po | 54 +++---- locale/el/LC_MESSAGES/statusnet.po | 54 +++---- locale/en_GB/LC_MESSAGES/statusnet.po | 4 +- locale/es/LC_MESSAGES/statusnet.po | 4 +- locale/fa/LC_MESSAGES/statusnet.po | 54 +++---- locale/fi/LC_MESSAGES/statusnet.po | 54 +++---- locale/fr/LC_MESSAGES/statusnet.po | 54 +++---- locale/ga/LC_MESSAGES/statusnet.po | 54 +++---- locale/gl/LC_MESSAGES/statusnet.po | 54 +++---- locale/he/LC_MESSAGES/statusnet.po | 54 +++---- locale/hsb/LC_MESSAGES/statusnet.po | 54 +++---- locale/ia/LC_MESSAGES/statusnet.po | 54 +++---- locale/is/LC_MESSAGES/statusnet.po | 54 +++---- locale/it/LC_MESSAGES/statusnet.po | 54 +++---- locale/ja/LC_MESSAGES/statusnet.po | 54 +++---- locale/ko/LC_MESSAGES/statusnet.po | 54 +++---- locale/mk/LC_MESSAGES/statusnet.po | 54 +++---- locale/nb/LC_MESSAGES/statusnet.po | 57 +++---- locale/nl/LC_MESSAGES/statusnet.po | 54 +++---- locale/nn/LC_MESSAGES/statusnet.po | 54 +++---- locale/pl/LC_MESSAGES/statusnet.po | 54 +++---- locale/pt/LC_MESSAGES/statusnet.po | 54 +++---- locale/pt_BR/LC_MESSAGES/statusnet.po | 4 +- locale/ru/LC_MESSAGES/statusnet.po | 54 +++---- locale/statusnet.pot | 2 +- locale/sv/LC_MESSAGES/statusnet.po | 54 +++---- locale/te/LC_MESSAGES/statusnet.po | 102 +++++++------ locale/tr/LC_MESSAGES/statusnet.po | 54 +++---- locale/uk/LC_MESSAGES/statusnet.po | 54 +++---- locale/vi/LC_MESSAGES/statusnet.po | 54 +++---- locale/zh_CN/LC_MESSAGES/statusnet.po | 54 +++---- locale/zh_TW/LC_MESSAGES/statusnet.po | 54 +++---- 39 files changed, 1050 insertions(+), 1055 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index b6ca4a23eb..d6119b23f5 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:08+0000\n" +"PO-Revision-Date: 2010-05-13 20:50:32+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -95,10 +95,10 @@ msgstr "Hierdie bladsy bestaan nie" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -221,12 +221,12 @@ msgstr "Die API-funksie is nie gevind nie." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Hierdie metode benodig 'n POST." @@ -256,7 +256,7 @@ msgstr "Kon nie die profiel stoor nie." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -313,20 +313,20 @@ msgstr "Direkte boodskappe aan %s" msgid "All the direct messages sent to %s" msgstr "Alle direkte boodskappe gestuur aan %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Die boodskap bevat geen inhoud nie!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Dit is te lank. Die maksimum boodskaplengte is %d karakters." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Die ontvanger kon gevind word nie." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "U kan nie direkte boodskappe aan gebruikers wat nie op u viendelys is stuur " @@ -643,17 +643,17 @@ msgstr "Die status is verwyder." msgid "No status with that ID found." msgstr "Geen status met die ID gevind nie." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Nie gevind nie." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -764,7 +764,7 @@ msgid "Preview" msgstr "Voorskou" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Skrap" @@ -1039,7 +1039,7 @@ msgid "Do not delete this notice" msgstr "Moenie hierdie kennisgewing verwyder nie" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Verwyder hierdie kennisgewing" @@ -2459,8 +2459,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "" @@ -3293,7 +3293,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "" -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Herhalend" @@ -4616,7 +4616,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5068,7 +5068,7 @@ msgid "Snapshots configuration" msgstr "" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5969,7 +5969,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "van" @@ -6123,23 +6123,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "op" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "in konteks" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Herhaal deur" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Antwoord" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 44a1607dad..277190ef85 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:11+0000\n" +"PO-Revision-Date: 2010-05-13 20:50:36+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -96,10 +96,10 @@ msgstr "لا صفحة كهذه." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -220,12 +220,12 @@ msgstr "لم يتم العثور على وسيلة API." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقة POST." @@ -255,7 +255,7 @@ msgstr "لم يمكن حفظ الملف." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -312,20 +312,20 @@ msgstr "رسالة مباشرة %s" msgid "All the direct messages sent to %s" msgstr "كل الرسائل المباشرة التي أرسلت إلى %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "لا نص في الرسالة!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "" -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "لم يُعثر على المستخدم المستلم." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" @@ -637,17 +637,17 @@ msgstr "حُذِفت الحالة." msgid "No status with that ID found." msgstr "لا حالة وُجدت بهذه الهوية." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "لم يوجد." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -758,7 +758,7 @@ msgid "Preview" msgstr "معاينة" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "احذف" @@ -1031,7 +1031,7 @@ msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -2449,8 +2449,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -3291,7 +3291,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية." msgid "You already repeated that notice." msgstr "أنت كررت هذه الملاحظة بالفعل." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "مكرر" @@ -4635,7 +4635,7 @@ msgstr "مشكلة أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" @@ -5097,7 +5097,7 @@ msgid "Snapshots configuration" msgstr "ضبط المسارات" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6069,7 +6069,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "من" @@ -6223,23 +6223,23 @@ msgstr "" msgid "at" msgstr "في" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "في السياق" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "مكرر بواسطة" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "رُد" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "الإشعار مكرر" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 30763d3e02..53ec108d6a 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:20+0000\n" +"PO-Revision-Date: 2010-05-13 20:50:39+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -103,10 +103,10 @@ msgstr "لا صفحه كهذه" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -227,12 +227,12 @@ msgstr "الـ API method مش موجوده." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقه POST." @@ -262,7 +262,7 @@ msgstr "لم يمكن حفظ الملف." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -319,20 +319,20 @@ msgstr "رساله مباشره %s" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "لا نص فى الرسالة!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "" -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "لم يُعثر على المستخدم المستلم." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" @@ -645,17 +645,17 @@ msgstr "حُذِفت الحاله." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "لم يوجد." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -766,7 +766,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "احذف" @@ -1047,7 +1047,7 @@ msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -2473,8 +2473,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr " مش نظام بيانات مدعوم." @@ -3313,7 +3313,7 @@ msgstr "ما ينفعش تكرر الملاحظه بتاعتك." msgid "You already repeated that notice." msgstr "انت عيدت الملاحظه دى فعلا." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "مكرر" @@ -4658,7 +4658,7 @@ msgstr "مشكله أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" @@ -5142,7 +5142,7 @@ msgid "Snapshots configuration" msgstr "ضبط المسارات" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6054,7 +6054,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "من" @@ -6209,23 +6209,23 @@ msgstr "" msgid "at" msgstr "في" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "فى السياق" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "متكرر من" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "رُد" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "الإشعار مكرر" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 650bfdc93f..43afebb729 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:24+0000\n" +"PO-Revision-Date: 2010-05-13 20:50:43+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -97,10 +97,10 @@ msgstr "Няма такака страница." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -221,12 +221,12 @@ msgstr "Не е открит методът в API." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Този метод изисква заявка POST." @@ -256,7 +256,7 @@ msgstr "Грешка при запазване на профила." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -315,20 +315,20 @@ msgstr "Преки съобщения до %s" msgid "All the direct messages sent to %s" msgstr "Всички преки съобщения, изпратени до %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Липсва текст на съобщението" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Твърде дълго. Може да е най-много %d знака." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Получателят не е открит" -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Не може да изпращате преки съобщения до хора, които не са в списъка ви с " @@ -646,17 +646,17 @@ msgstr "Бележката е изтрита." msgid "No status with that ID found." msgstr "Не е открита бележка с такъв идентификатор." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Твърде дълга бележка. Трябва да е най-много 140 знака." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Не е открито." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -770,7 +770,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Изтриване" @@ -1044,7 +1044,7 @@ msgid "Do not delete this notice" msgstr "Да не се изтрива бележката" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Изтриване на бележката" @@ -2558,8 +2558,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -3432,7 +3432,7 @@ msgstr "Не можете да повтаряте собствена бележ msgid "You already repeated that notice." msgstr "Вече сте повторили тази бележка." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Повторено" @@ -4816,7 +4816,7 @@ msgstr "Проблем при записване на бележката." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5298,7 +5298,7 @@ msgid "Snapshots configuration" msgstr "Настройка на пътищата" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6226,7 +6226,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "от" @@ -6382,23 +6382,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "в контекст" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Повторено от" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Отговаряне на тази бележка" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Отговор" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Бележката е повторена." diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 2ab02917ba..b207e4a5fe 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:27+0000\n" +"PO-Revision-Date: 2010-05-13 20:50:46+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -95,10 +95,10 @@ msgstr "N'eus ket eus ar bajenn-se." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -219,12 +219,12 @@ msgstr "N'eo ket bet kavet an hentenn API !" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Ezhomm en deus an argerzh-mañ eus ur POST." @@ -254,7 +254,7 @@ msgstr "Diposubl eo enrollañ ar profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -311,20 +311,20 @@ msgstr "Kemennadennoù war-eeun kaset da %s" msgid "All the direct messages sent to %s" msgstr "An holl gemennadennoù war-eeun kaset da %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Kemenadenn hep testenn !" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Re hir eo ! Ment hirañ ar gemenadenn a zo a %d arouezenn." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "N'eo ket bet kavet ar resever." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Ne c'helloc'h ket kas kemennadennoù personel d'an implijerien n'int ket ho " @@ -636,17 +636,17 @@ msgstr "Statud diverket." msgid "No status with that ID found." msgstr "N'eo ket bet kavet a statud evit an ID-mañ" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "N'eo ket bet kavet." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -757,7 +757,7 @@ msgid "Preview" msgstr "Rakwelet" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Diverkañ" @@ -1031,7 +1031,7 @@ msgid "Do not delete this notice" msgstr "Arabat dilemel an ali-mañ" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Dilemel an ali-mañ" @@ -2450,8 +2450,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "" @@ -3308,7 +3308,7 @@ msgstr "Ne c'helloc'h ket adkemer ho ali deoc'h." msgid "You already repeated that notice." msgstr "Adkemeret o peus dija an ali-mañ." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Adlavaret" @@ -4636,7 +4636,7 @@ msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5089,7 +5089,7 @@ msgid "Snapshots configuration" msgstr "Kefluniadur ar primoù" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5995,7 +5995,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "eus" @@ -6149,23 +6149,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "e" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "en amdro" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Adkemeret gant" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Respont d'an ali-mañ" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Respont" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Ali adkemeret" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index ecbd190df6..f41cef30cf 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-09 17:10:00+0000\n" +"PO-Revision-Date: 2010-05-13 20:50:56+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66119); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -157,7 +157,7 @@ msgstr "Canal dels amics de %s (Atom)" msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -"Aquesta és la línia temporal de %s i amics, però ningú hi ha enviat res " +"Aquesta és la línia temporal de %s i amics, però ningú hi ha publicat res " "encara." #: actions/all.php:139 @@ -167,7 +167,7 @@ msgid "" "something yourself." msgstr "" "Proveu de subscriure més gent, [uniu-vos a un grup](%%action.groups%%) o " -"envieu quelcom personal." +"publiqueu quelcom personal." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" #: actions/all.php:142 @@ -176,8 +176,9 @@ msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Podeu provar d'[avisar %1$s](../%2$s) des del seu perfil o [enviar quelcom " -"per reclamar-li l'atenció](%%%%action.newnotice%%%%?status_textarea=%3$s)." +"Podeu provar d'[avisar %1$s](../%2$s) des del seu perfil o [publiqueu " +"quelcom per reclamar-li l'atenció](%%%%action.newnotice%%%%?status_textarea=%" +"3$s)." #: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 #, php-format @@ -186,7 +187,7 @@ msgid "" "post a notice to his or her attention." msgstr "" "Per què no [registreu un compte](%%%%action.register%%%%) i aviseu %s o " -"envieu un avís a la seva atenció." +"publiqueu un avís a la seva atenció." #. TRANS: H1 text #: actions/all.php:178 @@ -365,7 +366,7 @@ msgstr "L'estat no és un preferit." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." -msgstr "No s'ha pogut suprimir el preferit." +msgstr "No s'ha pogut eliminar el preferit." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." @@ -489,7 +490,7 @@ msgstr "No sou un membre del grup." #: actions/apigroupleave.php:124 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "No s'ha pogut suprimir l'usuari %1$s del grup %2$s." +msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s." #. TRANS: %s is a user name #: actions/apigrouplist.php:97 @@ -637,7 +638,7 @@ msgstr "Aquest mètode requereix POST o DELETE." #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." -msgstr "No podeu suprimir l'estat d'un altre usuari." +msgstr "No podeu eliminar l'estat d'un altre usuari." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 #: actions/deletenotice.php:52 actions/shownotice.php:92 @@ -697,7 +698,7 @@ msgstr "%1$s / Actualitzacions que mencionen %2$s" #: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." -msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s." +msgstr "%1$s actualitzacions que responen a avisos de %2$s / %3$s." #: actions/apitimelinepublic.php:196 actions/publicrss.php:103 #, php-format @@ -707,12 +708,12 @@ msgstr "%s línia temporal pública" #: actions/apitimelinepublic.php:201 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" -msgstr "%s notificacions de tots!" +msgstr "%s actualitzacions de tothom!" #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" -msgstr "Repetida a %s" +msgstr "Repetit a %s" #: actions/apitimelineretweetsofme.php:114 #, php-format @@ -784,7 +785,7 @@ msgstr "Vista prèvia" #: actions/avatarsettings.php:149 actions/showapplication.php:252 #: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" -msgstr "Suprimeix" +msgstr "Elimina" #: actions/avatarsettings.php:166 actions/grouplogo.php:236 msgid "Upload" @@ -834,9 +835,9 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" -"Esteu segur que voleu blocar l'usuari? Tot seguit, deixarà la vostra " -"subscripció, no us podrà subscriure en el futur, i no en rebreu cap avís de " -"respostes @." +"Esteu segur que voleu blocar l'usuari? Tot seguit, se'n cancel·larà la " +"vostra subscripció, no us podrà subscriure en el futur, i no en rebreu cap " +"avís de respostes @." #. TRANS: Button label on the user block form. #. TRANS: Button label on the delete application form. @@ -921,7 +922,7 @@ msgstr "Desbloca l'usuari" #: actions/bookmarklet.php:51 #, php-format msgid "Post to %s" -msgstr "Envia a %s" +msgstr "Publica a %s" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -965,7 +966,7 @@ msgstr "No s'ha pogut actualitzar l'usuari." #: actions/confirmaddress.php:128 actions/emailsettings.php:433 #: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." -msgstr "No s'ha pogut suprimir la confirmació de correu electrònic." +msgstr "No s'ha pogut eliminar la confirmació de correu electrònic." #: actions/confirmaddress.php:146 msgid "Confirm address" @@ -987,7 +988,7 @@ msgstr "Avisos" #: actions/deleteapplication.php:63 msgid "You must be logged in to delete an application." -msgstr "Heu d'haver iniciat una sessió per a suprimir una aplicació." +msgstr "Heu d'haver iniciat una sessió per eliminar una aplicació." #: actions/deleteapplication.php:71 msgid "Application not found." @@ -1006,7 +1007,7 @@ msgstr "S'ha produït un problema amb el testimoni de la vostra sessió." #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 msgid "Delete application" -msgstr "Suprimeix l'aplicació" +msgstr "Elimina l'aplicació" #: actions/deleteapplication.php:149 msgid "" @@ -1014,19 +1015,19 @@ msgid "" "about the application from the database, including all existing user " "connections." msgstr "" -"Esteu segur que voler suprimir l'aplicació? Això netejarà totes les dades de " +"Esteu segur que voler eliminar l'aplicació? Això netejarà totes les dades de " "l'aplicació de la base de dades, incloent-hi totes les connexions d'usuari " "existents." #. TRANS: Submit button title for 'No' when deleting an application. #: actions/deleteapplication.php:158 msgid "Do not delete this application" -msgstr "No suprimeixis l'aplicació" +msgstr "No eliminis l'aplicació" #. TRANS: Submit button title for 'Yes' when deleting an application. #: actions/deleteapplication.php:164 msgid "Delete this application" -msgstr "Suprimeix aquesta aplicació" +msgstr "Elimina aquesta aplicació" #. TRANS: Client error message thrown when trying to access the admin panel while not logged in. #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 @@ -1041,58 +1042,58 @@ msgstr "No heu iniciat una sessió." #: actions/deletenotice.php:71 msgid "Can't delete this notice." -msgstr "No es pot suprimir l'avís." +msgstr "No es pot eliminar l'avís." #: actions/deletenotice.php:103 msgid "" "You are about to permanently delete a notice. Once this is done, it cannot " "be undone." msgstr "" -"Esteu a punt de suprimir permanentment un avís. Una vegada fet, no es podrà " +"Esteu a punt d'eliminar permanentment un avís. Una vegada fet, no es podrà " "desfer." #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" -msgstr "Suprimeix l'avís" +msgstr "Elimina l'avís" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" -msgstr "Esteu segur que voleu suprimir aquest avís?" +msgstr "Esteu segur que voleu eliminar aquest avís?" #. TRANS: Submit button title for 'No' when deleting a notice. #: actions/deletenotice.php:151 msgid "Do not delete this notice" -msgstr "No suprimeixis aquest avís" +msgstr "No eliminis aquest avís" #. TRANS: Submit button title for 'Yes' when deleting a notice. #: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" -msgstr "Suprimeix aquest avís" +msgstr "Elimina aquest avís" #: actions/deleteuser.php:67 msgid "You cannot delete users." -msgstr "No podeu suprimir els usuaris." +msgstr "No podeu eliminar els usuaris." #: actions/deleteuser.php:74 msgid "You can only delete local users." -msgstr "Només podeu suprimir usuaris locals." +msgstr "Només podeu eliminar usuaris locals." #: actions/deleteuser.php:110 actions/deleteuser.php:133 msgid "Delete user" -msgstr "Suprimeix l'usuari" +msgstr "Elimina l'usuari" #: actions/deleteuser.php:136 msgid "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." msgstr "" -"Esteu segur que voleu suprimir l'usuari? S'esborraran totes les dades de " +"Esteu segur que voleu eliminar l'usuari? S'esborraran totes les dades de " "l'usuari de la base de dades, sense cap còpia de seguretat." #. TRANS: Submit button title for 'Yes' when deleting a user. #: actions/deleteuser.php:163 lib/deleteuserform.php:77 msgid "Delete this user" -msgstr "Suprimeix l'usuari" +msgstr "Elimina l'usuari" #. TRANS: Message used as title for design settings for the site. #. TRANS: Link description in user account settings menu. @@ -1244,7 +1245,7 @@ msgstr "No hi ha tal aplicació." #: actions/editapplication.php:161 msgid "Use this form to edit your application." -msgstr "Utilitza el formulari per a editar la vostra aplicació." +msgstr "Utilitza el formulari per editar la vostra aplicació." #: actions/editapplication.php:177 actions/newapplication.php:159 msgid "Name is required." @@ -1301,12 +1302,12 @@ msgstr "Edita el grup %s" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." -msgstr "Heu d'haver iniciat una sessió per a crear un grup." +msgstr "Heu d'haver iniciat una sessió per crear un grup." #: actions/editgroup.php:107 actions/editgroup.php:172 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109 msgid "You must be an admin to edit the group." -msgstr "Heu de ser administrador per a editar el grup." +msgstr "Heu de ser administrador per editar el grup." #: actions/editgroup.php:158 msgid "Use this form to edit the group." @@ -1367,7 +1368,7 @@ msgstr "Adreça electrònica confirmada actualment." #: actions/smssettings.php:180 msgctxt "BUTTON" msgid "Remove" -msgstr "Suprimeix" +msgstr "Elimina" #: actions/emailsettings.php:122 msgid "" @@ -1411,8 +1412,7 @@ msgstr "Correu electrònic entrant" #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings. #: actions/emailsettings.php:155 actions/smssettings.php:178 msgid "Send email to this address to post new notices." -msgstr "" -"Envia correu electrònic a aquesta adreça per publicar noves notificacions." +msgstr "Envia correu electrònic a aquesta adreça per publicar nous avisos." #. TRANS: Instructions for incoming e-mail address input form. #. TRANS: Instructions for incoming SMS e-mail address input form. @@ -1435,9 +1435,7 @@ msgstr "Preferències del correu electrònic" #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:180 msgid "Send me notices of new subscriptions through email." -msgstr "" -"Envia'm notificacions quan algú nou se'm subscrigui, al meu correu " -"electrònic." +msgstr "Envia'm avisos per correu electrònic quan algú nou se'm subscrigui." #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:186 @@ -1463,7 +1461,7 @@ msgstr "Permetre que els amics em reclamin i m'enviïn un correu electrònic." #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:212 msgid "I want to post notices by email." -msgstr "Vull publicar notificacions per correu electrònic." +msgstr "Vull publicar avisos amb el correu electrònic." #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:219 @@ -1525,7 +1523,7 @@ msgstr "" #: actions/emailsettings.php:419 actions/imsettings.php:383 #: actions/smssettings.php:408 msgid "No pending confirmation to cancel." -msgstr "Cap confirmació pendent per a cancel·lar." +msgstr "Cap confirmació pendent per cancel·lar." #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address. #: actions/emailsettings.php:424 @@ -1580,16 +1578,16 @@ msgstr "Fes que deixi de ser preferit" #: actions/favorited.php:65 lib/popularnoticesection.php:91 #: lib/publicgroupnav.php:93 msgid "Popular notices" -msgstr "Notificacions populars" +msgstr "Avisos populars" #: actions/favorited.php:67 #, php-format msgid "Popular notices, page %d" -msgstr "Notificacions populars, pàgina %d" +msgstr "Avisos populars, pàgina %d" #: actions/favorited.php:79 msgid "The most popular notices on the site right now." -msgstr "Les notificacions més populars en aquest lloc ara mateix." +msgstr "Els avisos més populars en aquest lloc ara mateix." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." @@ -1946,7 +1944,7 @@ msgstr "L'usuari no està blocat del grup." #: actions/groupunblock.php:128 actions/unblock.php:86 msgid "Error removing the block." -msgstr "S'ha produït un error en suprimir el bloc." +msgstr "S'ha produït un error en eliminar el bloc." #. TRANS: Title for instance messaging settings. #: actions/imsettings.php:60 @@ -2070,7 +2068,7 @@ msgid "" "s for sending messages to you." msgstr "" "S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que " -"has afegit. Has d'acceptar que %s et pugui enviar missatges." +"heu afegit. Heu d'acceptar que %s us pugui enviar missatges." #. TRANS: Message given canceling IM address confirmation for the wrong IM address. #: actions/imsettings.php:388 @@ -2080,7 +2078,7 @@ msgstr "Aquesta adreça de missatgeria instantània és incorrecta." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 msgid "Couldn't delete IM confirmation." -msgstr "No s'ha pogut suprimir la confirmació de MI." +msgstr "No s'ha pogut eliminar la confirmació de MI." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 @@ -2096,17 +2094,17 @@ msgstr "Aquest no és el teu Jabber ID." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 msgid "The IM address was removed." -msgstr "S'ha suprimit l'adreça de MI." +msgstr "S'ha eliminat l'adreça de MI." #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Safata d'entrada per a %1$s - pàgina %2$d" +msgstr "Safata d'entrada de %1$s - pàgina %2$d" #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" -msgstr "Safata d'entrada per %s" +msgstr "Safata d'entrada de %s" #: actions/inbox.php:115 msgid "This is your inbox, which lists your incoming private messages." @@ -2122,7 +2120,7 @@ msgstr "S'han inhabilitat les invitacions." #, php-format msgid "You must be logged in to invite other users to use %s." msgstr "" -"Heu d'haver iniciat una sessió per a convidar altres usuaris a utilitzar %s" +"Heu d'haver iniciat una sessió per convidar altres usuaris a utilitzar %s" #: actions/invite.php:72 #, php-format @@ -2261,7 +2259,7 @@ msgstr "" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." -msgstr "Heu d'haver iniciat una sessió per a unir-vos a un grup." +msgstr "Heu d'haver iniciat una sessió per unir-vos a un grup." #: actions/joingroup.php:88 actions/leavegroup.php:88 msgid "No nickname or ID." @@ -2276,7 +2274,7 @@ msgstr "%1$s s'ha unit al grup %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." -msgstr "Heu d'haver iniciat una sessió per a deixar un grup." +msgstr "Heu d'haver iniciat una sessió per deixar un grup." #: actions/leavegroup.php:100 lib/command.php:373 msgid "You are not a member of that group." @@ -2374,7 +2372,7 @@ msgstr "Nova Aplicació" #: actions/newapplication.php:64 msgid "You must be logged in to register an application." -msgstr "Heu d'haver iniciat una sessió per a registrar-hi una aplicació." +msgstr "Heu d'haver iniciat una sessió per registrar-hi una aplicació." #: actions/newapplication.php:143 msgid "Use this form to register a new application." @@ -2437,7 +2435,7 @@ msgstr "Nou avís" #: actions/newnotice.php:217 msgid "Notice posted" -msgstr "Notificació publicada" +msgstr "S'ha publicat l'avís" #: actions/noticesearch.php:68 #, php-format @@ -2503,7 +2501,7 @@ msgstr "Reclamació enviada!" #: actions/oauthappssettings.php:59 msgid "You must be logged in to list your applications." -msgstr "Heu d'haver iniciat una sessió per a llistar les vostres aplicacions." +msgstr "Heu d'haver iniciat una sessió per llistar les vostres aplicacions." #: actions/oauthappssettings.php:74 msgid "OAuth applications" @@ -2578,7 +2576,7 @@ msgstr "Cerca de gent" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "Cerca de notificacions" +msgstr "Cerca d'avisos" #: actions/othersettings.php:60 msgid "Other settings" @@ -2971,31 +2969,31 @@ msgstr "Etiquetes" msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -"Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat " -"por espais" +"Etiquetes pròpies (lletres, nombres, -, ., i _), per comes o separades amb " +"espais" #: actions/profilesettings.php:151 msgid "Language" -msgstr "Idioma" +msgstr "Llengua" #: actions/profilesettings.php:152 msgid "Preferred language" -msgstr "Preferència d'idioma" +msgstr "Llengua preferida" #: actions/profilesettings.php:161 msgid "Timezone" -msgstr "Franja horària" +msgstr "Fus horari" #: actions/profilesettings.php:162 msgid "What timezone are you normally in?" -msgstr "Quina franja horària seria normal ser?" +msgstr "En quin fus horari us trobeu normalment?" #: actions/profilesettings.php:167 msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -"Automàticament subscriure's a qualsevol que ho estigui a tu mateix (ideal " -"per no-humans)" +"Subscripció automàtica a qualsevol qui em tingui subscrit (ideal per no-" +"humans)" #: actions/profilesettings.php:228 actions/register.php:223 #, php-format @@ -3097,8 +3095,8 @@ msgid "" msgstr "" "Això és %%site.name%%, un servei de [micro-blogging](http://en.wikipedia.org/" "wiki/Micro-blogging) basat en l'eina lliure [StatusNet](http://status.net/). " -"[Uniu-vos-hi ara](%%action.register%%) per a compartir què feu amb els " -"vostres amics, familiars, i companys! ([Més informació](%%doc.help%%))" +"[Uniu-vos-hi ara](%%action.register%%) per compartir què feu amb els vostres " +"amics, familiars, i companys! ([Més informació](%%doc.help%%))" #: actions/public.php:247 #, php-format @@ -3235,7 +3233,7 @@ msgstr "No hi ha cap usuari amb aquesta direcció o usuari." #: actions/recoverpassword.php:299 msgid "No registered email address for that user." -msgstr "Cap adreça de correu electrònic registrada per aquest usuari." +msgstr "No hi ha cap adreça de correu electrònic registrada d'aquest usuari." #: actions/recoverpassword.php:313 msgid "Error saving address confirmation." @@ -3246,7 +3244,7 @@ msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -"S'han enviat instruccions per a recuperar la teva contrasenya a l'adreça de " +"S'han enviat instruccions per recuperar la vostra contrasenya a l'adreça de " "correu electrònic registrada." #: actions/recoverpassword.php:357 @@ -3331,7 +3329,7 @@ msgstr "Correu electrònic" #: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" -"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes" +"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya" #: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" @@ -3374,7 +3372,7 @@ msgstr "" "* [Cercar gent](%%%%action.peoplesearch%%%%) que pugueu conèixer o que " "comparteixi els vostres interessos. \n" "* Actualitzar les [preferències del vostre perfil](%%%%action.profilesettings" -"%%%%) per a incloure-hi informació personal. \n" +"%%%%) per incloure-hi informació personal. \n" "* Consultar els [documents de la xarxa](%%%%doc.help%%%%) per tal de " "conèixer les característiques del servei. \n" "\n" @@ -3395,10 +3393,10 @@ msgid "" "register%%) a new account. If you already have an account on a [compatible " "microblogging site](%%doc.openmublog%%), enter your profile URL below." msgstr "" -"Per a subscriure't, pots [iniciar una sessió](%%action.login%%), o " -"[registrar](%%action.register%%) un nou compte. Si ja tens un en un [servei " -"de microblogging compatible](%%doc.openmublog%%), escriu l'URL del teu " -"perfil a sota." +"Per subscriure-us, podeu [iniciar una sessió](%%action.login%%), o " +"[registrar-hi](%%action.register%%) un nou compte. Si ja en teniu un en un " +"[servei de microblogging compatible](%%doc.openmublog%%), escriviu l'URL del " +"vostre perfil a continuació." #: actions/remotesubscribe.php:112 msgid "Remote subscribe" @@ -3441,7 +3439,7 @@ msgstr "" #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "Aquest és un perfil local! Inicieu una sessió per a subscriure-us-hi." +msgstr "Aquest és un perfil local! Inicieu una sessió per subscriure-us-hi." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." @@ -3582,7 +3580,7 @@ msgstr "Desa els paràmetres del lloc" #: actions/showapplication.php:82 msgid "You must be logged in to view an application." -msgstr "Heu d'haver iniciat una sessió per a visualitzar una aplicació." +msgstr "Heu d'haver iniciat una sessió per visualitzar una aplicació." #: actions/showapplication.php:157 msgid "Application profile" @@ -3695,8 +3693,7 @@ msgid "" "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" "No heu triat cap avís preferit encara. Feu clic al botó de preferit dels " -"avisos que us agraden per a arxivar-los per a més endavant i fer-los " -"conèixer." +"avisos que us agraden per arxivar-los per a més endavant i fer-los conèixer." #: actions/showfavorites.php:208 #, php-format @@ -3805,8 +3802,8 @@ msgstr "" "(http://ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure " "[StatusNet](http://status.net/). Els seus membres comparteixen missatges " "curts sobre llur vida i interessos. [Uniu-vos-hi ara](%%%%action.register%%%" -"%) per a formar part del grup i molt més! ([Més informació...](%%%%doc.help%%" -"%%))" +"%) per formar part del grup i molt més! ([Més informació...](%%%%doc.help%%%" +"%))" #: actions/showgroup.php:469 #, php-format @@ -4051,7 +4048,7 @@ msgstr "Avís del lloc" #: actions/sitenoticeadminpanel.php:67 msgid "Edit site-wide message" -msgstr "Edita el missatge per a tot el lloc" +msgstr "Edita el missatge de tot el lloc" #: actions/sitenoticeadminpanel.php:103 msgid "Unable to save site notice." @@ -4059,15 +4056,15 @@ msgstr "No s'ha pogut desar l'avís del lloc." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars." -msgstr "La mida màxima per a als avisos per a tot el lloc és de 255 caràcters." +msgstr "La mida màxima per als avisos de tot el lloc és de 255 caràcters." #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" -msgstr "Text de l'avís per al lloc" +msgstr "Text de l'avís del lloc" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "Text d'avís per a tot el lloc (màxim 255 caràcters, es permet l'HTML)" +msgstr "Text d'avís de tot el lloc (màxim 255 caràcters, es permet l'HTML)" #: actions/sitenoticeadminpanel.php:198 msgid "Save site notice" @@ -4105,7 +4102,7 @@ msgstr "Número de telèfon actualment confirmat i activat per SMS." #. TRANS: Form guide in IM settings form. #: actions/smssettings.php:133 msgid "Awaiting confirmation on this phone number." -msgstr "Esperant confirmació per aquest número de telèfon." +msgstr "S'està esperant la confirmació d'aquest número de telèfon." #. TRANS: Field label for SMS address input in SMS settings form. #: actions/smssettings.php:142 @@ -4221,14 +4218,14 @@ msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -"Capacitat per al teu telèfon mòbil. Si vostè coneix una companyia que " -"accepti SMS a través del correu electrònic, però no està a la llista, " -"envia'ns un correu electrònic per fer-nos-ho saber %s." +"Capacitat per al vostre telèfon mòbil. Si coneixeu una companyia que accepti " +"SMS a través del correu electrònic, però no es troba a la llista, envieu-nos " +"un missatge de correu per fer-nos-ho saber %s." #. TRANS: Message given saving SMS phone number confirmation code without having provided one. #: actions/smssettings.php:548 msgid "No code entered" -msgstr "No hi ha cap codi entrat" +msgstr "No s'ha introduït cap codi" #. TRANS: Menu item for site administration #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196 @@ -4409,17 +4406,17 @@ msgstr "Avisos etiquetats amb %1$s, pàgina %2$d" #: actions/tag.php:87 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Canal d'avisos per a l'etiqueta %s (RSS 1.0)" +msgstr "Canal d'avisos de l'etiqueta %s (RSS 1.0)" #: actions/tag.php:93 #, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Canal d'avisos per a l'etiqueta %s (RSS 2.0)" +msgstr "Canal d'avisos de l'etiqueta %s (RSS 2.0)" #: actions/tag.php:99 #, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Canal d'avisos per a l'etiqueta %s (Atom)" +msgstr "Canal d'avisos de l'etiqueta %s (Atom)" #: actions/tagother.php:39 msgid "No ID argument." @@ -4448,8 +4445,8 @@ msgid "" "Tags for this user (letters, numbers, -, ., and _), comma- or space- " "separated" msgstr "" -"Etiquetes per aquest usuari (lletres, números,, -, ., i _), comes o separat " -"per espais" +"Etiquetes d'aquest usuari (lletres, nombres,, -, ., i _), comes o separades " +"amb espais" #: actions/tagother.php:193 msgid "" @@ -4855,14 +4852,13 @@ msgstr "S'ha produït un problema en desar l'avís. És massa llarg." #: classes/Notice.php:249 msgid "Problem saving notice. Unknown user." -msgstr "Problema al guardar la notificació. Usuari desconegut." +msgstr "S'ha produït un problema en desar l'avís. Usuari desconegut." #: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -"Masses notificacions massa ràpid; pren un respir i publica de nou en uns " -"minuts." +"Massa avisos massa ràpid; pren un respir i publica de nou en uns minuts." #: classes/Notice.php:260 msgid "" @@ -4874,7 +4870,7 @@ msgstr "" #: classes/Notice.php:266 msgid "You are banned from posting notices on this site." -msgstr "Ha estat bandejat de publicar notificacions en aquest lloc." +msgstr "Ha estat bandejat de publicar avisos en aquest lloc." #: classes/Notice.php:332 classes/Notice.php:358 msgid "Problem saving notice." diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 2180ad6cec..a6fbcfe7bb 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:33+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:00+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -103,10 +103,10 @@ msgstr "Žádné takové oznámení." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -229,12 +229,12 @@ msgstr "Potvrzující kód nebyl nalezen" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "" @@ -266,7 +266,7 @@ msgstr "Nelze uložit profil" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -325,20 +325,20 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, fuzzy, php-format msgid "That's too long. Max message size is %d chars." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "" -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" @@ -664,18 +664,18 @@ msgstr "Obrázek nahrán" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "Žádný požadavek nebyl nalezen!" -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -790,7 +790,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Odstranit" @@ -1081,7 +1081,7 @@ msgid "Do not delete this notice" msgstr "Žádné takové oznámení." #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Odstranit toto oznámení" @@ -2575,8 +2575,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "" @@ -3453,7 +3453,7 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." msgid "You already repeated that notice." msgstr "Již jste přihlášen" -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "Vytvořit" @@ -4846,7 +4846,7 @@ msgstr "Problém při ukládání sdělení" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5341,7 +5341,7 @@ msgid "Snapshots configuration" msgstr "Potvrzení emailové adresy" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6277,7 +6277,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 #, fuzzy msgid "from" msgstr " od " @@ -6438,26 +6438,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 #, fuzzy msgid "in context" msgstr "Žádný obsah!" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "Vytvořit" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 #, fuzzy msgid "Reply" msgstr "odpověď" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "Sdělení" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 828e2d8870..199f0d683c 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-05 22:19:15+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:03+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65963); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -102,10 +102,10 @@ msgstr "Seite nicht vorhanden" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -236,12 +236,12 @@ msgstr "API-Methode nicht gefunden." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Diese Methode benötigt ein POST." @@ -273,7 +273,7 @@ msgstr "Konnte Profil nicht speichern." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -332,21 +332,21 @@ msgstr "Direkte Nachricht an %s" msgid "All the direct messages sent to %s" msgstr "Alle an %s gesendeten direkten Nachrichten" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Fehlender Nachrichtentext!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "" "Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Empfänger nicht gefunden." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen " @@ -665,18 +665,18 @@ msgstr "Status gelöscht." msgid "No status with that ID found." msgstr "Keine Nachricht mit dieser ID gefunden." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Nicht gefunden." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -790,7 +790,7 @@ msgid "Preview" msgstr "Vorschau" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Löschen" @@ -1071,7 +1071,7 @@ msgid "Do not delete this notice" msgstr "Diese Nachricht nicht löschen" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Nachricht löschen" @@ -2581,8 +2581,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Bitte nur %s URLs über einfaches HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -3477,7 +3477,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen." msgid "You already repeated that notice." msgstr "Nachricht bereits wiederholt" -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Wiederholt" @@ -4897,7 +4897,7 @@ msgstr "Problem bei Speichern der Nachricht." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5359,7 +5359,7 @@ msgid "Snapshots configuration" msgstr "Snapshot Konfiguration" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte." @@ -6405,7 +6405,7 @@ msgstr "" "schicken, um sie in eine Konversation zu verwickeln. Andere Leute können Dir " "Nachrichten schicken, die nur Du sehen kannst." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "von" @@ -6567,23 +6567,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "in" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "im Zusammenhang" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Wiederholt von" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Auf diese Nachricht antworten" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Antworten" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Nachricht wiederholt" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index a75fef345b..e7ba67b548 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:39+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:07+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -98,10 +98,10 @@ msgstr "Δεν υπάρχει τέτοια σελίδα" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -227,12 +227,12 @@ msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "" @@ -264,7 +264,7 @@ msgstr "Απέτυχε η αποθήκευση του προφίλ." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -322,20 +322,20 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "" -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "" -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" @@ -655,17 +655,17 @@ msgstr "Η κατάσταση διεγράφη." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "" -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -776,7 +776,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Διαγραφή" @@ -1064,7 +1064,7 @@ msgid "Do not delete this notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "" @@ -2531,8 +2531,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "" @@ -3411,7 +3411,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "Δημιουργία" @@ -4769,7 +4769,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5251,7 +5251,7 @@ msgid "Snapshots configuration" msgstr "Επιβεβαίωση διεύθυνσης email" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6161,7 +6161,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "από" @@ -6318,23 +6318,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Επαναλαμβάνεται από" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "Ρυθμίσεις OpenID" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index e89d7e602e..e9fd5bdd33 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-09 17:10:17+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:11+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66119); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index c9335e99c2..69d670e546 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -15,11 +15,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-09 17:10:20+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:14+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66119); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 77e38b3a80..e41e075ca8 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:52+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:21+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -99,10 +99,10 @@ msgstr "چنین صفحه‌ای وجود ندارد" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -229,12 +229,12 @@ msgstr "رابط مورد نظر پیدا نشد." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "برای استفاده از این روش باید اطلاعات را به صورت پست بفرستید" @@ -265,7 +265,7 @@ msgstr "نمی‌توان شناس‌نامه را ذخیره کرد." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -323,20 +323,20 @@ msgstr "پیام‌های مستقیم به %s" msgid "All the direct messages sent to %s" msgstr "تمام پیام‌های مستقیم فرستاده‌شده به %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "هیچ پیام متنی وجود ندارد!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "این بسیار طولانی است. بیشینهٔ اندازهٔ پیام %d حرف است." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "کاربر گیرنده یافت نشد." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "نمی‌توان پیام مستقیم را به کاربرانی که دوست شما نیستند، فرستاد." @@ -650,17 +650,17 @@ msgstr "وضعیت حذف شد." msgid "No status with that ID found." msgstr "هیچ وضعیتی با آن شناسه یافت نشد." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "خیلی طولانی است. حداکثر طول مجاز پیام %d حرف است." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "یافت نشد." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "حداکثر طول پیام %d حرف است که شامل ضمیمه نیز می‌باشد" @@ -773,7 +773,7 @@ msgid "Preview" msgstr "پیش‌نمایش" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "حذف" @@ -1065,7 +1065,7 @@ msgid "Do not delete this notice" msgstr "این پیام را پاک نکن" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "این پیام را پاک کن" @@ -2554,8 +2554,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست." @@ -3408,7 +3408,7 @@ msgstr "شما نمی توانید آگهی خودتان را تکرار کنی msgid "You already repeated that notice." msgstr "شما قبلا آن آگهی را تکرار کردید." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "" @@ -4775,7 +4775,7 @@ msgstr "مشکل در ذخیره کردن آگهی." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5254,7 +5254,7 @@ msgid "Snapshots configuration" msgstr "پیکره بندی اصلی سایت" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6167,7 +6167,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "از" @@ -6326,23 +6326,23 @@ msgstr "" msgid "at" msgstr "در" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "در زمینه" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "تکرار از" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "به این آگهی جواب دهید" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "جواب دادن" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "آگهی تکرار شد" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index a09c1415df..663e6ad348 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:49+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:17+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -105,10 +105,10 @@ msgstr "Sivua ei ole." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -236,12 +236,12 @@ msgstr "API-metodia ei löytynyt!" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Tämä metodi edellyttää POST sanoman." @@ -273,7 +273,7 @@ msgstr "Ei voitu tallentaa profiilia." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -333,20 +333,20 @@ msgstr "Suorat viestit käyttäjälle %s" msgid "All the direct messages sent to %s" msgstr "Kaikki suorat viestit käyttäjälle %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Viestissä ei ole tekstiä!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Vastaanottajaa ei löytynyt." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri." @@ -674,17 +674,17 @@ msgstr "Päivitys poistettu." msgid "No status with that ID found." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Ei löytynyt." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." @@ -797,7 +797,7 @@ msgid "Preview" msgstr "Esikatselu" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Poista" @@ -1084,7 +1084,7 @@ msgid "Do not delete this notice" msgstr "Älä poista tätä päivitystä" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Poista tämä päivitys" @@ -2622,8 +2622,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -3530,7 +3530,7 @@ msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja." msgid "You already repeated that notice." msgstr "Sinä olet jo estänyt tämän käyttäjän." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "Luotu" @@ -4949,7 +4949,7 @@ msgstr "Ongelma päivityksen tallentamisessa." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5447,7 +5447,7 @@ msgid "Snapshots configuration" msgstr "SMS vahvistus" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6390,7 +6390,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 #, fuzzy msgid "from" msgstr " lähteestä " @@ -6550,25 +6550,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 #, fuzzy msgid "in context" msgstr "Ei sisältöä!" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "Luotu" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Vastaa tähän päivitykseen" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Vastaus" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "Päivitys on poistettu." diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index cf3f5d3b5b..639def20d4 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:17:56+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:27+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -101,10 +101,10 @@ msgstr "Page non trouvée." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -234,12 +234,12 @@ msgstr "Méthode API non trouvée !" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Ce processus requiert un POST." @@ -271,7 +271,7 @@ msgstr "Impossible d’enregistrer le profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -330,20 +330,20 @@ msgstr "Messages directs envoyés à %s" msgid "All the direct messages sent to %s" msgstr "Tous les messages directs envoyés à %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Message sans texte !" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "C’est trop long ! La taille maximale du message est de %d caractères." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Destinataire non trouvé." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits " @@ -668,17 +668,17 @@ msgstr "Statut supprimé." msgid "No status with that ID found." msgstr "Aucun statut trouvé avec cet identifiant." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Non trouvé." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -793,7 +793,7 @@ msgid "Preview" msgstr "Aperçu" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Supprimer" @@ -1074,7 +1074,7 @@ msgid "Do not delete this notice" msgstr "Ne pas supprimer cet avis" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Supprimer cet avis" @@ -2587,8 +2587,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -3484,7 +3484,7 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis." msgid "You already repeated that notice." msgstr "Vous avez déjà repris cet avis." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Repris" @@ -4913,7 +4913,7 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5375,7 +5375,7 @@ msgid "Snapshots configuration" msgstr "Configuration des instantanés" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "La ressource de l’API a besoin de l’accès en lecture et en écriture, mais " @@ -6436,7 +6436,7 @@ msgstr "" "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent " "vous envoyer des messages destinés à vous seul(e)." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "de" @@ -6596,23 +6596,23 @@ msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s" msgid "at" msgstr "chez" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "dans le contexte" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Repris par" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Répondre à cet avis" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Répondre" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Avis repris" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 6fd5580455..bf1273bd71 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:04+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:30+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -104,10 +104,10 @@ msgstr "Non existe a etiqueta." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -230,12 +230,12 @@ msgstr "Método da API non atopado" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Este método require un POST." @@ -267,7 +267,7 @@ msgstr "Non se puido gardar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -327,21 +327,21 @@ msgstr "Mensaxes directas para %s" msgid "All the direct messages sent to %s" msgstr "Tódalas mensaxes directas enviadas a %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Non hai mensaxes de texto!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, fuzzy, php-format msgid "That's too long. Max message size is %d chars." msgstr "" "Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Usuario destinatario non atopado." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo." @@ -669,18 +669,18 @@ msgstr "Avatar actualizado." msgid "No status with that ID found." msgstr "Non existe ningún estado con esa ID atopada." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Non atopado" -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -795,7 +795,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 #, fuzzy msgid "Delete" msgstr "eliminar" @@ -1095,7 +1095,7 @@ msgid "Do not delete this notice" msgstr "Non se pode eliminar este chíos." #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 #, fuzzy msgid "Delete this notice" msgstr "Eliminar chío" @@ -2651,8 +2651,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -3569,7 +3569,7 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza." msgid "You already repeated that notice." msgstr "Xa bloqueaches a este usuario." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "Crear" @@ -5004,7 +5004,7 @@ msgstr "Aconteceu un erro ó gardar o chío." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5506,7 +5506,7 @@ msgid "Snapshots configuration" msgstr "Confirmación de SMS" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6539,7 +6539,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 #, fuzzy msgid "from" msgstr " dende " @@ -6702,27 +6702,27 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 #, fuzzy msgid "in context" msgstr "Sen contido!" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "Crear" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 #, fuzzy msgid "Reply to this notice" msgstr "Non se pode eliminar este chíos." -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 #, fuzzy msgid "Reply" msgstr "contestar" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "Chío publicado" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index 0b59b9adb8..b54d10ac9e 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:08+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:34+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -95,10 +95,10 @@ msgstr "Esa páxina non existe." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -227,12 +227,12 @@ msgstr "Non se atopou o método da API." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Este método require un POST." @@ -264,7 +264,7 @@ msgstr "Non se puido gardar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -323,21 +323,21 @@ msgstr "Mensaxes directas a %s" msgid "All the direct messages sent to %s" msgstr "Todas as mensaxes directas enviadas a %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "A mensaxe non ten texto!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "" "Iso é longo de máis. A lonxitude máxima das mensaxes é de %d caracteres." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Non se atopou o destinatario." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Non pode enviar mensaxes directas a usuarios que non sexan amigos seus." @@ -656,17 +656,17 @@ msgstr "Borrouse o estado." msgid "No status with that ID found." msgstr "Non se atopou ningún estado con esa ID." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Iso é longo de máis. A nota non pode exceder os %d caracteres." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Non se atopou." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -781,7 +781,7 @@ msgid "Preview" msgstr "Vista previa" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Borrar" @@ -1062,7 +1062,7 @@ msgid "Do not delete this notice" msgstr "Non borrar esta nota" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Borrar esta nota" @@ -2563,8 +2563,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Só %s enderezos URL sobre HTTP simple." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Non se soporta ese formato de datos." @@ -3463,7 +3463,7 @@ msgstr "Non pode repetir a súa propia nota." msgid "You already repeated that notice." msgstr "Xa repetiu esa nota." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Repetida" @@ -4880,7 +4880,7 @@ msgstr "Houbo un problema ao gardar a caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "♻ @%1$s %2$s" @@ -5343,7 +5343,7 @@ msgid "Snapshots configuration" msgstr "Configuración das instantáneas" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "O recurso API precisa permisos de lectura e escritura, pero só dispón de " @@ -6394,7 +6394,7 @@ msgstr "" "Non ten mensaxes privadas. Pode enviar mensaxes privadas para conversar con " "outros usuarios. A xente pode enviarlle mensaxes para que só as lea vostede." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "de" @@ -6553,23 +6553,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "en" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "no contexto" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Responder a esta nota" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Repetiuse a nota" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 2c9927ebfe..29f21cbc00 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:12+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:37+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -101,10 +101,10 @@ msgstr "אין הודעה כזו." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -227,12 +227,12 @@ msgstr "קוד האישור לא נמצא." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "" @@ -264,7 +264,7 @@ msgstr "שמירת הפרופיל נכשלה." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -323,20 +323,20 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, fuzzy, php-format msgid "That's too long. Max message size is %d chars." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "" -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" @@ -661,18 +661,18 @@ msgstr "התמונה עודכנה." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "לא נמצא" -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -787,7 +787,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 #, fuzzy msgid "Delete" msgstr "מחק" @@ -1081,7 +1081,7 @@ msgid "Do not delete this notice" msgstr "אין הודעה כזו." #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "" @@ -2583,8 +2583,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "" @@ -3457,7 +3457,7 @@ msgstr "לא ניתן להירשם ללא הסכמה לרשיון" msgid "You already repeated that notice." msgstr "כבר נכנסת למערכת!" -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "צור" @@ -4849,7 +4849,7 @@ msgstr "בעיה בשמירת ההודעה." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5343,7 +5343,7 @@ msgid "Snapshots configuration" msgstr "הרשמות" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6278,7 +6278,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "" @@ -6439,26 +6439,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 #, fuzzy msgid "in context" msgstr "אין תוכן!" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "צור" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 #, fuzzy msgid "Reply" msgstr "הגב" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "הודעות" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index a5126d75ad..22e57db041 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:15+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:43+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -96,10 +96,10 @@ msgstr "Strona njeeksistuje." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -220,12 +220,12 @@ msgstr "API-metoda njenamakana." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Tuta metoda wužaduje sej POST." @@ -255,7 +255,7 @@ msgstr "Profil njeje so składować dał." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -312,20 +312,20 @@ msgstr "Direktne powěsće do %s" msgid "All the direct messages sent to %s" msgstr "Wšě do %s pósłane direktne powěsće" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Žadyn powěsćowy tekst!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Přijimowar njenamakany." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" @@ -634,17 +634,17 @@ msgstr "Status zničeny." msgid "No status with that ID found." msgstr "Žadyn status z tym ID namakany." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Njenamakany." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -756,7 +756,7 @@ msgid "Preview" msgstr "Přehlad" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Zničić" @@ -1029,7 +1029,7 @@ msgid "Do not delete this notice" msgstr "Tutu zdźělenku njewušmórnyć" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Tutu zdźělenku wušmórnyć" @@ -2438,8 +2438,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -3273,7 +3273,7 @@ msgstr "Njemóžeš swójsku zdźělenku wospjetować." msgid "You already repeated that notice." msgstr "Sy tutu zdźělenku hižo wospjetował." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Wospjetowany" @@ -4589,7 +4589,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5041,7 +5041,7 @@ msgid "Snapshots configuration" msgstr "Konfiguracija wobrazowkowych fotow" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5943,7 +5943,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "wot" @@ -6097,23 +6097,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Wospjetowany wot" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Na tutu zdźělenku wotmołwić" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Wotmołwić" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Zdźělenka wospjetowana" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 1b05490b9e..c235d78c23 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:18+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:46+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -94,10 +94,10 @@ msgstr "Pagina non existe." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -226,12 +226,12 @@ msgstr "Methodo API non trovate." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Iste methodo require un POST." @@ -263,7 +263,7 @@ msgstr "Non poteva salveguardar le profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -322,20 +322,20 @@ msgstr "Messages directe a %s" msgid "All the direct messages sent to %s" msgstr "Tote le messages directe inviate a %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Message sin texto!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Isto es troppo longe. Le maximo es %d characteres." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Usator destinatario non trovate." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "Non pote inviar messages directe a usatores que non es tu amicos." @@ -652,18 +652,18 @@ msgstr "Stato delite." msgid "No status with that ID found." msgstr "Nulle stato trovate con iste ID." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Isto es troppo longe. Le longitude maximal del notas es %d characteres." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Non trovate." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -778,7 +778,7 @@ msgid "Preview" msgstr "Previsualisation" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Deler" @@ -1059,7 +1059,7 @@ msgid "Do not delete this notice" msgstr "Non deler iste nota" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Deler iste nota" @@ -2557,8 +2557,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Solmente le URLs %s es permittite super HTTP simple." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Formato de datos non supportate." @@ -3445,7 +3445,7 @@ msgstr "Tu non pote repeter tu proprie nota." msgid "You already repeated that notice." msgstr "Tu ha ja repetite iste nota." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Repetite" @@ -4857,7 +4857,7 @@ msgstr "Problema salveguardar le cassa de entrata del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5317,7 +5317,7 @@ msgid "Snapshots configuration" msgstr "Configuration del instantaneos" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Le ressource de API require accesso pro lectura e scriptura, ma tu ha " @@ -6366,7 +6366,7 @@ msgstr "" "altere usatores in conversation. Altere personas pote inviar te messages que " "solmente tu pote leger." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "de" @@ -6526,23 +6526,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "a" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "in contexto" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Repetite per" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Responder a iste nota" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Nota repetite" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 2b2f19f5d6..35d508d9fa 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:21+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:50+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -104,10 +104,10 @@ msgstr "Ekkert þannig merki." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -229,12 +229,12 @@ msgstr "Aðferð í forritsskilum fannst ekki!" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Þessi aðferð krefst POST." @@ -266,7 +266,7 @@ msgstr "Gat ekki vistað persónulega síðu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -325,20 +325,20 @@ msgstr "Bein skilaboð til %s" msgid "All the direct messages sent to %s" msgstr "Öll bein skilaboð til %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Enginn texti í skilaboðum!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, fuzzy, php-format msgid "That's too long. Max message size is %d chars." msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Móttakandi fannst ekki." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir." @@ -662,17 +662,17 @@ msgstr "" msgid "No status with that ID found." msgstr "Engin staða með þessu kenni fannst." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Fannst ekki." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -785,7 +785,7 @@ msgid "Preview" msgstr "Forsýn" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Eyða" @@ -1072,7 +1072,7 @@ msgid "Do not delete this notice" msgstr "" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Eyða þessu babli" @@ -2603,8 +2603,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -3503,7 +3503,7 @@ msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið." msgid "You already repeated that notice." msgstr "Þú hefur nú þegar lokað á þennan notanda." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "Í sviðsljósinu" @@ -4899,7 +4899,7 @@ msgstr "Vandamál komu upp við að vista babl." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5396,7 +5396,7 @@ msgid "Snapshots configuration" msgstr "SMS staðfesting" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6325,7 +6325,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 #, fuzzy msgid "from" msgstr "frá" @@ -6485,24 +6485,24 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "Í sviðsljósinu" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Svara þessu babli" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Svara" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "Babl sent inn" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 6b6351f89b..d6b01201a5 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:25+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:54+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -97,10 +97,10 @@ msgstr "Pagina inesistente." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -230,12 +230,12 @@ msgstr "Metodo delle API non trovato." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Questo metodo richiede POST." @@ -267,7 +267,7 @@ msgstr "Impossibile salvare il profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -326,20 +326,20 @@ msgstr "Messaggi diretti a %s" msgid "All the direct messages sent to %s" msgstr "Tutti i messaggi diretti inviati a %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Nessun testo nel messaggio!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Troppo lungo. La dimensione massima di un messaggio è di %d caratteri." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Destinatario non trovato." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "Non puoi inviare messaggi diretti a utenti che non sono tuoi amici." @@ -656,17 +656,17 @@ msgstr "Messaggio eliminato." msgid "No status with that ID found." msgstr "Nessuno stato trovato con quel ID." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Troppo lungo. Lunghezza massima %d caratteri." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Non trovato." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -779,7 +779,7 @@ msgid "Preview" msgstr "Anteprima" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Elimina" @@ -1059,7 +1059,7 @@ msgid "Do not delete this notice" msgstr "Non eliminare il messaggio" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Elimina questo messaggio" @@ -2555,8 +2555,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Solo URL %s attraverso HTTP semplice." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -3445,7 +3445,7 @@ msgstr "Non puoi ripetere i tuoi stessi messaggi." msgid "You already repeated that notice." msgstr "Hai già ripetuto quel messaggio." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Ripetuti" @@ -4857,7 +4857,7 @@ msgstr "Problema nel salvare la casella della posta del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5319,7 +5319,7 @@ msgid "Snapshots configuration" msgstr "Configurazione snapshot" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo " @@ -6373,7 +6373,7 @@ msgstr "" "iniziare una conversazione con altri utenti. Altre persone possono mandare " "messaggi riservati solamente a te." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "via" @@ -6532,23 +6532,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "presso" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "in una discussione" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Ripetuto da" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Rispondi a questo messaggio" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Rispondi" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Messaggio ripetuto" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index d3943819ab..58e507dfd4 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:28+0000\n" +"PO-Revision-Date: 2010-05-13 20:51:57+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -99,10 +99,10 @@ msgstr "そのようなページはありません。" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -229,12 +229,12 @@ msgstr "API メソッドが見つかりません。" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "このメソッドには POST が必要です。" @@ -267,7 +267,7 @@ msgstr "プロフィールを保存できませんでした。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -326,20 +326,20 @@ msgstr "%s へのダイレクトメッセージ" msgid "All the direct messages sent to %s" msgstr "%s へ送った全てのダイレクトメッセージ" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "メッセージの本文がありません！" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "長すぎます。メッセージは最大 %d 字までです。" -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "受け取り手のユーザが見つかりません。" -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "友人でないユーザにダイレクトメッセージを送ることはできません。" @@ -654,17 +654,17 @@ msgstr "ステータスを削除しました。" msgid "No status with that ID found." msgstr "そのＩＤでのステータスはありません。" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "長すぎます。つぶやきは最大 140 字までです。" -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "見つかりません。" -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "つぶやきは URL を含めて最大 %d 字までです。" @@ -775,7 +775,7 @@ msgid "Preview" msgstr "プレビュー" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "削除" @@ -1060,7 +1060,7 @@ msgid "Do not delete this notice" msgstr "このつぶやきを削除できません。" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "このつぶやきを削除" @@ -2576,8 +2576,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "サポートされていないデータ形式。" @@ -3463,7 +3463,7 @@ msgstr "自分のつぶやきは繰り返せません。" msgid "You already repeated that notice." msgstr "すでにそのつぶやきを繰り返しています。" -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "繰り返された" @@ -4890,7 +4890,7 @@ msgstr "グループ受信箱を保存する際に問題が発生しました。 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5371,7 +5371,7 @@ msgid "Snapshots configuration" msgstr "パス設定" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って" @@ -6354,7 +6354,7 @@ msgstr "" "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの" "メッセージを送ることができます。" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "from" @@ -6521,23 +6521,23 @@ msgstr "" msgid "at" msgstr "at" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "このつぶやきへ返信" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "返信" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "つぶやきを繰り返しました" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 835611a9fd..8c20d9370a 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:31+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:00+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -94,10 +94,10 @@ msgstr "해당하는 페이지 없음" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -220,12 +220,12 @@ msgstr "API 메서드 발견 안 됨." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "이 메서드는 POST를 요구합니다." @@ -255,7 +255,7 @@ msgstr "프로필을 저장 할 수 없습니다." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -314,20 +314,20 @@ msgstr "%s에게 직접 메시지" msgid "All the direct messages sent to %s" msgstr "%s에게 모든 직접 메시지" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "메시지 내용이 없습니다!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "너무 깁니다. 최대 메시지 길이는 %d 자까지입니다." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "받는 사용자가 없습니다." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다." @@ -644,17 +644,17 @@ msgstr "삭제된 소식입니다." msgid "No status with that ID found." msgstr "발견된 ID의 상태가 없습니다." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "너무 깁니다. 통지의 최대 길이는 %d 글자 입니다." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "찾을 수가 없습니다." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "소식의 최대 길이는 첨부 URL을 포함하여 %d 글자입니다." @@ -766,7 +766,7 @@ msgid "Preview" msgstr "미리보기" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "삭제" @@ -1054,7 +1054,7 @@ msgid "Do not delete this notice" msgstr "이 통지를 지울 수 없습니다." #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "이 게시글 삭제하기" @@ -2572,8 +2572,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -3467,7 +3467,7 @@ msgstr "자신의 글은 재전송할 수 없습니다." msgid "You already repeated that notice." msgstr "당신은 이미 이 사용자를 차단하고 있습니다." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "재전송됨" @@ -4871,7 +4871,7 @@ msgstr "통지를 저장하는데 문제가 발생했습니다." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5367,7 +5367,7 @@ msgid "Snapshots configuration" msgstr "SMS 인증" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6293,7 +6293,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 #, fuzzy msgid "from" msgstr "다음에서:" @@ -6453,25 +6453,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 #, fuzzy msgid "in context" msgstr "내용이 없습니다!" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "생성" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "이 게시글에 대해 답장하기" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "답장하기" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "게시글이 등록되었습니다." diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 215f5089cd..2647c9aac7 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:38+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:17+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -97,10 +97,10 @@ msgstr "Нема таква страница." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -230,12 +230,12 @@ msgstr "API методот не е пронајден." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Овој метод бара POST." @@ -267,7 +267,7 @@ msgstr "Не може да се зачува профил." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -326,20 +326,20 @@ msgstr "Директни пораки до %s" msgid "All the direct messages sent to %s" msgstr "Сите директни пораки испратени до %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Нема текст за пораката!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Ова е предолго. Максималната должина изнесува %d знаци." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Примачот не е пронајден." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Неможете да испраќате директни пораки на корисници што не ви се пријатели." @@ -656,17 +656,17 @@ msgstr "Статусот е избришан." msgid "No status with that ID found." msgstr "Нема пронајдено статус со тој ID." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ова е предолго. Максималната дозволена должина изнесува %d знаци." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Не е пронајдено." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -781,7 +781,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Бриши" @@ -1063,7 +1063,7 @@ msgid "Do not delete this notice" msgstr "Не ја бриши оваа забелешка" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Бриши ја оваа забелешка" @@ -2565,8 +2565,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Ве молиме користете само %s URL-адреси врз прост HTTP-код." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Ова не е поддржан формат на податотека." @@ -3459,7 +3459,7 @@ msgstr "Не можете да повторувате сопствена заб msgid "You already repeated that notice." msgstr "Веќе ја имате повторено таа забелешка." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Повторено" @@ -4878,7 +4878,7 @@ msgstr "Проблем при зачувувањето на групното п #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5340,7 +5340,7 @@ msgid "Snapshots configuration" msgstr "Поставки за снимки" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-ресурсот бара да може и да чита и да запишува, а вие можете само да " @@ -6391,7 +6391,7 @@ msgstr "" "впуштите во разговор со други корисници. Луѓето можат да ви испраќаат пораки " "што ќе можете да ги видите само Вие." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "од" @@ -6553,23 +6553,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "во" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "во контекст" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Повторено од" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Одговори на забелешкава" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Одговор" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Забелешката е повторена" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index c36addf558..8cfe078f75 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:41+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:20+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -95,10 +95,10 @@ msgstr "Ingen slik side." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -227,12 +227,12 @@ msgstr "API-metode ikke funnet!" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Denne metoden krever en POST." @@ -264,7 +264,7 @@ msgstr "Klarte ikke å lagre profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -324,20 +324,20 @@ msgstr "Direktemeldinger til %s" msgid "All the direct messages sent to %s" msgstr "Alle direktemeldinger sendt til %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Ingen meldingstekst!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Dette er for langt. Meldingen kan bare være %d tegn lang." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Fant ikke mottakeren." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "Kan ikke sende direktemeldinger til brukere du ikke er venn med." @@ -649,17 +649,17 @@ msgstr "Status slettet." msgid "No status with that ID found." msgstr "Ingen status med den ID-en funnet." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt. Maks notisstørrelse er %d tegn." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Ikke funnet." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL." @@ -770,7 +770,7 @@ msgid "Preview" msgstr "Forhåndsvis" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Slett" @@ -1051,7 +1051,7 @@ msgid "Do not delete this notice" msgstr "Ikke slett denne notisen" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -2531,8 +2531,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Bare %s-nettadresser over vanlig HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Ikke et støttet dataformat." @@ -3418,7 +3418,7 @@ msgstr "Du kan ikke gjenta din egen notis." msgid "You already repeated that notice." msgstr "Du har allerede gjentatt den notisen." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Gjentatt" @@ -4792,7 +4792,7 @@ msgstr "Problem ved lagring av gruppeinnboks." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5250,7 +5250,7 @@ msgid "Snapshots configuration" msgstr "" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6185,6 +6185,9 @@ msgid "" "\n" "\t%s" msgstr "" +"Hele samtalen kan leses her:\n" +"\n" +"%s" #: lib/mail.php:651 #, php-format @@ -6255,7 +6258,7 @@ msgstr "" "engasjere andre brukere i en samtale. Personer kan sende deg meldinger som " "bare du kan se." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "fra" @@ -6411,23 +6414,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "på" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Repetert av" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Svar" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Notis repetert" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index f42b339413..26a2d0b31c 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:47+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:27+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -96,10 +96,10 @@ msgstr "Deze pagina bestaat niet." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -229,12 +229,12 @@ msgstr "De API-functie is niet aangetroffen." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Deze methode vereist een POST." @@ -266,7 +266,7 @@ msgstr "Het was niet mogelijk het profiel op te slaan." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -325,20 +325,20 @@ msgstr "Privéberichten aan %s" msgid "All the direct messages sent to %s" msgstr "Alle privéberichten aan %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Het bericht is leeg!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Dat is te lang. De maximale berichtlengte is %d tekens." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "De ontvanger is niet aangetroffen." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "U kunt geen privéberichten sturen aan gebruikers die niet op uw " @@ -666,17 +666,17 @@ msgstr "De status is verwijderd." msgid "No status with that ID found." msgstr "Er is geen status gevonden met dit ID." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "De mededeling is te lang. Gebruik maximaal %d tekens." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Niet aangetroffen." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -790,7 +790,7 @@ msgid "Preview" msgstr "Voorvertoning" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Verwijderen" @@ -1072,7 +1072,7 @@ msgid "Do not delete this notice" msgstr "Deze mededeling niet verwijderen" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Deze mededeling verwijderen" @@ -2587,8 +2587,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Alleen URL's voor %s via normale HTTP alstublieft." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -3484,7 +3484,7 @@ msgstr "U kunt uw eigen mededeling niet herhalen." msgid "You already repeated that notice." msgstr "U hent die mededeling al herhaald." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Herhaald" @@ -4920,7 +4920,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5383,7 +5383,7 @@ msgid "Snapshots configuration" msgstr "Snapshotinstellingen" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen " @@ -6443,7 +6443,7 @@ msgstr "" "U hebt geen privéberichten. U kunt privéberichten verzenden aan andere " "gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "van" @@ -6605,23 +6605,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "op" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "in context" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Herhaald door" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Op deze mededeling antwoorden" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Antwoorden" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Mededeling herhaald" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index ddff427729..ffe8ad5611 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:44+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:24+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -103,10 +103,10 @@ msgstr "Dette emneord finst ikkje." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -229,12 +229,12 @@ msgstr "Fann ikkje API-metode." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Dette krev ein POST." @@ -266,7 +266,7 @@ msgstr "Kan ikkje lagra profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -326,20 +326,20 @@ msgstr "Direkte meldingar til %s" msgid "All the direct messages sent to %s" msgstr "Alle direkte meldingar sendt til %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Inga meldingstekst!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, fuzzy, php-format msgid "That's too long. Max message size is %d chars." msgstr "Det er for langt. Ein notis kan berre være 140 teikn." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Kunne ikkje finne mottakar." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med." @@ -665,17 +665,17 @@ msgstr "Lasta opp brukarbilete." msgid "No status with that ID found." msgstr "Fann ingen status med den ID-en." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Finst ikkje." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -789,7 +789,7 @@ msgid "Preview" msgstr "Forhandsvis" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Slett" @@ -1082,7 +1082,7 @@ msgid "Do not delete this notice" msgstr "Kan ikkje sletta notisen." #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -2625,8 +2625,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -3527,7 +3527,7 @@ msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen." msgid "You already repeated that notice." msgstr "Du har allereie blokkert denne brukaren." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "Lag" @@ -4938,7 +4938,7 @@ msgstr "Eit problem oppstod ved lagring av notis." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5436,7 +5436,7 @@ msgid "Snapshots configuration" msgstr "SMS bekreftelse" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6371,7 +6371,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 #, fuzzy msgid "from" msgstr " frå " @@ -6531,25 +6531,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 #, fuzzy msgid "in context" msgstr "Ingen innhald." -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "Lag" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Svar" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "Melding lagra" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index c816475e19..7288244c68 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:50+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:30+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -100,10 +100,10 @@ msgstr "Nie ma takiej strony." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -233,12 +233,12 @@ msgstr "Nie odnaleziono metody API." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Ta metoda wymaga POST." @@ -269,7 +269,7 @@ msgstr "Nie można zapisać profilu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -328,20 +328,20 @@ msgstr "Bezpośrednia wiadomość do użytkownika %s" msgid "All the direct messages sent to %s" msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Brak tekstu wiadomości." -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Nie odnaleziono odbiorcy." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są " @@ -657,17 +657,17 @@ msgstr "Usunięto stan." msgid "No status with that ID found." msgstr "Nie odnaleziono stanów z tym identyfikatorem." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Nie odnaleziono." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika." @@ -778,7 +778,7 @@ msgid "Preview" msgstr "Podgląd" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Usuń" @@ -1058,7 +1058,7 @@ msgid "Do not delete this notice" msgstr "Nie usuwaj tego wpisu" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Usuń ten wpis" @@ -2546,8 +2546,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -3434,7 +3434,7 @@ msgstr "Nie można powtórzyć własnego wpisu." msgid "You already repeated that notice." msgstr "Już powtórzono ten wpis." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Powtórzono" @@ -4851,7 +4851,7 @@ msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5314,7 +5314,7 @@ msgid "Snapshots configuration" msgstr "Konfiguracja migawek" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko " @@ -6369,7 +6369,7 @@ msgstr "" "rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla " "twoich oczu." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "z" @@ -6526,23 +6526,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "w" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "w rozmowie" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Powtórzone przez" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Odpowiedz na ten wpis" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Odpowiedz" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Powtórzono wpis" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 2d65717674..f580b61076 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:53+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:36+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -96,10 +96,10 @@ msgstr "Página não foi encontrada." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -227,12 +227,12 @@ msgstr "Método da API não encontrado." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -263,7 +263,7 @@ msgstr "Não foi possível gravar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -322,20 +322,20 @@ msgstr "Mensagens directas para %s" msgid "All the direct messages sent to %s" msgstr "Todas as mensagens directas enviadas para %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Mensagem não tem texto!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Demasiado longo. Tamanho máx. das mensagens é %d caracteres." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Destinatário não encontrado." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Não pode enviar mensagens directas a utilizadores que não sejam amigos." @@ -649,17 +649,17 @@ msgstr "Estado apagado." msgid "No status with that ID found." msgstr "Não foi encontrado um estado com esse ID." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Não encontrado." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo." @@ -770,7 +770,7 @@ msgid "Preview" msgstr "Antevisão" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Apagar" @@ -1051,7 +1051,7 @@ msgid "Do not delete this notice" msgstr "Não apagar esta nota" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Apagar esta nota" @@ -2546,8 +2546,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Só URLs %s sobre HTTP simples, por favor." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -3437,7 +3437,7 @@ msgstr "Não pode repetir a sua própria nota." msgid "You already repeated that notice." msgstr "Já repetiu essa nota." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Repetida" @@ -4849,7 +4849,7 @@ msgstr "Problema na gravação da caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5314,7 +5314,7 @@ msgid "Snapshots configuration" msgstr "Configuração dos instântaneos" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura." @@ -6359,7 +6359,7 @@ msgstr "" "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que " "só você terá acesso." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "de" @@ -6519,23 +6519,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "coords." -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "no contexto" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Responder a esta nota" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Nota repetida" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index eb56ca7b95..5bfc411d10 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-09 17:11:23+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:39+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66119); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 054ed2bc2a..4fd2bbd228 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:18:59+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:43+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -100,10 +100,10 @@ msgstr "Нет такой страницы." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -231,12 +231,12 @@ msgstr "Метод API не найден." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Этот метод требует POST." @@ -268,7 +268,7 @@ msgstr "Не удаётся сохранить профиль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -327,20 +327,20 @@ msgstr "Прямые сообщения для %s" msgid "All the direct messages sent to %s" msgstr "Все прямые сообщения посланные для %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Отсутствует текст сообщения!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Слишком длинно. Максимальная длина сообщения — %d знаков." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Получатель не найден." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Не удаётся посылать прямые сообщения пользователям, которые не являются " @@ -661,17 +661,17 @@ msgstr "Статус удалён." msgid "No status with that ID found." msgstr "Не найдено статуса с таким ID." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Слишком длинная запись. Максимальная длина — %d знаков." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Не найдено." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Максимальная длина записи — %d символов, включая URL вложения." @@ -783,7 +783,7 @@ msgid "Preview" msgstr "Просмотр" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Удалить" @@ -1064,7 +1064,7 @@ msgid "Do not delete this notice" msgstr "Не удалять эту запись" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Удалить эту запись" @@ -2567,8 +2567,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Только %s URL в простом HTTP, пожалуйста." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -3451,7 +3451,7 @@ msgstr "Вы не можете повторить собственную зап msgid "You already repeated that notice." msgstr "Вы уже повторили эту запись." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Повторено" @@ -4869,7 +4869,7 @@ msgstr "Проблемы с сохранением входящих сообще #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5330,7 +5330,7 @@ msgid "Snapshots configuration" msgstr "Конфигурация снимков" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API ресурса требует доступ для чтения и записи, но у вас есть только доступ " @@ -6381,7 +6381,7 @@ msgstr "" "вовлечения других пользователей в разговор. Сообщения, получаемые от других " "людей, видите только вы." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "от " @@ -6540,23 +6540,23 @@ msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s" msgid "at" msgstr "на" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "в контексте" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Повторено" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Ответить на эту запись" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Ответить" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Запись повторена" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 529533870c..8ecee1b8e7 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-09 17:09+0000\n" +"POT-Creation-Date: 2010-05-13 20:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index e50bf1a328..cb75b31422 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:19:02+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:46+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -96,10 +96,10 @@ msgstr "Ingen sådan sida" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -227,12 +227,12 @@ msgstr "API-metod hittades inte." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Denna metod kräver en POST." @@ -262,7 +262,7 @@ msgstr "Kunde inte spara profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -321,20 +321,20 @@ msgstr "Direktmeddelande till %s" msgid "All the direct messages sent to %s" msgstr "Alla direktmeddelanden skickade till %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Ingen meddelandetext!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Detta är för långt. Maximal meddelandestorlek är %d tecken." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Mottagare hittades inte." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän." @@ -647,17 +647,17 @@ msgstr "Status borttagen." msgid "No status with that ID found." msgstr "Ingen status med det ID:t hittades." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det är för långt. Maximal notisstorlek är %d tecken." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Hittades inte." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga." @@ -769,7 +769,7 @@ msgid "Preview" msgstr "Förhandsgranska" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Ta bort" @@ -1051,7 +1051,7 @@ msgid "Do not delete this notice" msgstr "Ta inte bort denna notis" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Ta bort denna notis" @@ -2545,8 +2545,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "Endast %s-webbadresser över vanlig HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -3435,7 +3435,7 @@ msgstr "Du kan inte upprepa din egna notis." msgid "You already repeated that notice." msgstr "Du har redan upprepat denna notis." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Upprepad" @@ -4846,7 +4846,7 @@ msgstr "Problem med att spara gruppinkorg." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5304,7 +5304,7 @@ msgid "Snapshots configuration" msgstr "Konfiguration av ögonblicksbilder" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet." @@ -6347,7 +6347,7 @@ msgstr "" "engagera andra användare i konversationen. Folk kan skicka meddelanden till " "dig som bara du ser." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "från" @@ -6507,23 +6507,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "på" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "i sammanhang" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Upprepad av" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Svara på denna notis" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Svara" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Notis upprepad" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 7084c9114a..e93b96c267 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-03 19:19:06+0000\n" +"PO-Revision-Date: 2010-05-13 20:52:55+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -95,10 +95,10 @@ msgstr "అటువంటి పేజీ లేదు." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -220,12 +220,12 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "" @@ -257,7 +257,7 @@ msgstr "ప్రొఫైలుని భద్రపరచలేకున్ #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -315,20 +315,20 @@ msgstr "%s కి నేరు సందేశాలు" msgid "All the direct messages sent to %s" msgstr "%sకి పంపిన అన్ని నేరు సందేశాలు" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "సందేశపు పాఠ్యం లేదు!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం %d అక్షరాలు." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "అందుకోవాల్సిన వాడుకరి కనబడలేదు." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "మీ స్నేహితులు కాని వాడుకరులకి నేరు సందేశాలు పంపించలేరు." @@ -642,17 +642,17 @@ msgstr "స్థితిని తొలగించాం." msgid "No status with that ID found." msgstr "ఆ IDతో ఏ నోటీసు కనబడలేదు." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "అది చాలా పొడవుంది. గరిష్ఠ నోటీసు పరిమాణం %d అక్షరాలు." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "కనబడలేదు." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షరాలు, జోడింపు URLని కలుపుకుని." @@ -765,7 +765,7 @@ msgid "Preview" msgstr "మునుజూపు" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "తొలగించు" @@ -1044,7 +1044,7 @@ msgid "Do not delete this notice" msgstr "ఈ నోటీసుని తొలగించకు" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "ఈ నోటీసుని తొలగించు" @@ -2350,7 +2350,7 @@ msgstr "విషయం లేదు!" #: actions/newmessage.php:158 msgid "No recipient specified." -msgstr "" +msgstr "ఎవరికి పంపించాలో పేర్కొనలేదు." #: actions/newmessage.php:164 lib/command.php:484 msgid "" @@ -2460,7 +2460,7 @@ msgstr "సంధానిత ఉపకరణాలు" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." -msgstr "" +msgstr "మీ ఖాతాని ప్రాపించడానికి మీరు ఈ క్రింది ఉపకరణాలకి అనుమతినిచ్చారు." #: actions/oauthconnectionssettings.php:175 msgid "You are not a user of that application." @@ -2502,8 +2502,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "" @@ -3256,11 +3256,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది" #: actions/register.php:494 -#, fuzzy, php-format +#, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." -msgstr " ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, మరియు ఫోన్ నంబర్." +msgstr "" +"నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM " +"చిరునామా, మరియు ఫోన్ నంబర్." #: actions/register.php:542 #, php-format @@ -3314,7 +3316,7 @@ msgstr "" #: actions/remotesubscribe.php:112 msgid "Remote subscribe" -msgstr "" +msgstr "సుదూర చందా" #: actions/remotesubscribe.php:124 #, fuzzy @@ -3327,7 +3329,7 @@ msgstr "వాడుకరి పేరు" #: actions/remotesubscribe.php:130 msgid "Nickname of the user you want to follow" -msgstr "" +msgstr "మీరు అనుసరించాలనుకుంటున్న వాడుకరి యొక్క ముద్దుపేరు" #: actions/remotesubscribe.php:133 msgid "Profile URL" @@ -3375,7 +3377,7 @@ msgstr "మీ నోటీసుని మీరే పునరావృతి msgid "You already repeated that notice." msgstr "మీరు ఇప్పటికే ఆ నోటీసుని పునరావృతించారు." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "సృష్టితం" @@ -3594,9 +3596,9 @@ msgid "Feed for favorites of %s (RSS 1.0)" msgstr "%s యొక్క మిత్రుల ఫీడు" #: actions/showfavorites.php:178 -#, fuzzy, php-format +#, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "%s యొక్క మిత్రుల ఫీడు" +msgstr "%s యొక్క ఇష్టాంశాల ఫీడు (RSS 2.0)" #: actions/showfavorites.php:185 #, php-format @@ -4698,19 +4700,17 @@ msgid "Database error inserting hashtag: %s" msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు" #: classes/Notice.php:245 -#, fuzzy msgid "Problem saving notice. Too long." -msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." +msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు. చాలా పొడవుగా ఉంది." #: classes/Notice.php:249 -#, fuzzy msgid "Problem saving notice. Unknown user." -msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." +msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు. గుర్తుతెలియని వాడుకరి." #: classes/Notice.php:254 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." -msgstr "" +msgstr "చాలా ఎక్కువ నోటీసులు అంత వేగంగా; కాస్త ఊపిరి తీసుకుని మళ్ళీ కొన్ని నిమిషాల తర్వాత వ్రాయండి." #: classes/Notice.php:260 msgid "" @@ -4733,7 +4733,7 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4842,7 +4842,7 @@ msgstr "శీర్షికలేని పేజీ" #. TRANS: DT element for primary navigation menu. String is hidden in default CSS. #: lib/action.php:426 msgid "Primary site navigation" -msgstr "" +msgstr "ప్రాధమిక సైటు మార్గదర్శిని" #. TRANS: Tooltip for main menu option "Personal" #: lib/action.php:432 @@ -4858,7 +4858,6 @@ msgstr "వ్యక్తిగత" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:437 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి" @@ -4975,9 +4974,8 @@ msgstr "పేజీ గమనిక" #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. #: lib/action.php:752 -#, fuzzy msgid "Secondary site navigation" -msgstr "చందాలు" +msgstr "ద్వితీయ సైటు మార్గదర్శిని" #. TRANS: Secondary navigation menu option leading to help on StatusNet. #: lib/action.php:758 @@ -5025,13 +5023,13 @@ msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైస #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. #: lib/action.php:817 -#, fuzzy, php-format +#, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." msgstr "" "**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు " -"అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. " +"అందిస్తున్న సూక్ష్మ బ్లాగింగు సేవ." #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. #: lib/action.php:820 @@ -5205,7 +5203,7 @@ msgid "Snapshots configuration" msgstr "SMS నిర్ధారణ" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5362,9 +5360,8 @@ msgid "Command failed" msgstr "ఆదేశం విఫలమైంది" #: lib/command.php:83 lib/command.php:105 -#, fuzzy msgid "Notice with that id does not exist" -msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు." +msgstr "ఆ గుర్తింపుతో ఏ నోటీసు లేదు" #: lib/command.php:99 lib/command.php:596 #, fuzzy @@ -5413,7 +5410,7 @@ msgstr "" #: lib/command.php:302 msgid "Notice marked as fave." -msgstr "" +msgstr "నోటీసుని ఇష్టాంశంగా గుర్తించాం." #: lib/command.php:323 msgid "You are already a member of that group" @@ -5429,9 +5426,9 @@ msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్ #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "వాడుకరి %1$sని %2$s గుంపు నుండి తొలగించలేకపోయాం." +msgstr "వాడుకరి %1$sని %2$s గుంపు నుండి తొలగించలేకపోయాం" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -6205,7 +6202,7 @@ msgstr "" "మీకు అంతరంగిక సందేశాలు లేవు. ఇతర వాడుకరులతో సంభాషణకై మీరు వారికి అంతరంగిక సందేశాలు " "పంపించవచ్చు. మీ కంటికి మాత్రమే కనబడేలా వారు మీకు సందేశాలు పంపవచ్చు." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "నుండి" @@ -6363,27 +6360,26 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "సందర్భంలో" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "సృష్టితం" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "ఈ నోటీసుపై స్పందించండి" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "స్పందించండి" -#: lib/noticelist.php:674 -#, fuzzy +#: lib/noticelist.php:666 msgid "Notice repeated" -msgstr "నోటీసుని తొలగించాం." +msgstr "నోటీసుని పునరావృతించారు" #: lib/nudgeform.php:116 msgid "Nudge this user" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 28869e63fb..568980585e 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:19:10+0000\n" +"PO-Revision-Date: 2010-05-13 20:53:01+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -103,10 +103,10 @@ msgstr "Böyle bir durum mesajı yok." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -229,12 +229,12 @@ msgstr "Onay kodu bulunamadı." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "" @@ -266,7 +266,7 @@ msgstr "Profil kaydedilemedi." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -325,21 +325,21 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, fuzzy, php-format msgid "That's too long. Max message size is %d chars." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "" -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" @@ -666,19 +666,19 @@ msgstr "Avatar güncellendi." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "İstek bulunamadı!" -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -793,7 +793,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "" @@ -1085,7 +1085,7 @@ msgid "Do not delete this notice" msgstr "Böyle bir durum mesajı yok." #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "" @@ -2587,8 +2587,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "" @@ -3466,7 +3466,7 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." msgid "You already repeated that notice." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "Yarat" @@ -4852,7 +4852,7 @@ msgstr "Durum mesajını kaydederken hata oluştu." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5347,7 +5347,7 @@ msgid "Snapshots configuration" msgstr "Eposta adresi onayı" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6284,7 +6284,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "" @@ -6444,26 +6444,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 #, fuzzy msgid "in context" msgstr "İçerik yok!" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "Yarat" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 #, fuzzy msgid "Reply" msgstr "cevapla" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "Durum mesajları" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 349e2da72e..0893e4b6dd 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:19:13+0000\n" +"PO-Revision-Date: 2010-05-13 20:53:07+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -100,10 +100,10 @@ msgstr "Немає такої сторінки." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -230,12 +230,12 @@ msgstr "API метод не знайдено." #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Цей метод потребує POST." @@ -266,7 +266,7 @@ msgstr "Не вдалося зберегти профіль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -325,20 +325,20 @@ msgstr "Пряме повідомлення до %s" msgid "All the direct messages sent to %s" msgstr "Всі прямі повідомлення надіслані до %s" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "Повідомлення без тексту!" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "Надто довго. Максимальний розмір %d знаків." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "Отримувача не знайдено." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Не можна надіслати пряме повідомлення користувачеві, який не є Вашим другом." @@ -657,17 +657,17 @@ msgstr "Статус видалено." msgid "No status with that ID found." msgstr "Не знайдено жодних статусів з таким ID." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Надто довго. Максимальний розмір допису — %d знаків." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 msgid "Not found." msgstr "Не знайдено." -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -780,7 +780,7 @@ msgid "Preview" msgstr "Перегляд" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "Видалити" @@ -1059,7 +1059,7 @@ msgid "Do not delete this notice" msgstr "Не видаляти цей допис" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "Видалити допис" @@ -2555,8 +2555,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "URL-адреса %s лише в простому HTTP, будь ласка." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -3443,7 +3443,7 @@ msgstr "Ви не можете повторювати свої власні до msgid "You already repeated that notice." msgstr "Ви вже повторили цей допис." -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 msgid "Repeated" msgstr "Повторено" @@ -4854,7 +4854,7 @@ msgstr "Проблема при збереженні вхідних дописі #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5313,7 +5313,7 @@ msgid "Snapshots configuration" msgstr "Конфігурація знімків" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-ресурс вимагає дозвіл типу «читання-запис», але у вас є лише доступ для " @@ -6363,7 +6363,7 @@ msgstr "" "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите " "лише Ви." -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "від" @@ -6522,23 +6522,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgid "at" msgstr "в" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 msgid "in context" msgstr "в контексті" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 msgid "Repeated by" msgstr "Повторено" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "Відповісти на цей допис" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Відповісти" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 msgid "Notice repeated" msgstr "Допис повторили" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 5c22fbad66..94d77bdb94 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:19:17+0000\n" +"PO-Revision-Date: 2010-05-13 20:53:11+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -102,10 +102,10 @@ msgstr "Không có tin nhắn nào." #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -228,12 +228,12 @@ msgstr "Phương thức API không tìm thấy!" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "Phương thức này yêu cầu là POST." @@ -265,7 +265,7 @@ msgstr "Không thể lưu hồ sơ cá nhân." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -325,22 +325,22 @@ msgstr "Tin nhắn riêng" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 #, fuzzy msgid "No message text!" msgstr "Không có tin nhắn nào." -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, fuzzy, php-format msgid "That's too long. Max message size is %d chars." msgstr "Quá dài. Tối đa là 140 ký tự." -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 #, fuzzy msgid "Recipient user not found." msgstr "Không tìm thấy user." -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" @@ -668,18 +668,18 @@ msgstr "Hình đại diện đã được cập nhật." msgid "No status with that ID found." msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Quá dài. Tối đa là 140 ký tự." -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "Không tìm thấy" -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -795,7 +795,7 @@ msgid "Preview" msgstr "Xem trước" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 #, fuzzy msgid "Delete" msgstr "Xóa tin nhắn" @@ -1091,7 +1091,7 @@ msgid "Do not delete this notice" msgstr "Không thể xóa tin nhắn này." #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 #, fuzzy msgid "Delete this notice" msgstr "Xóa tin nhắn" @@ -2677,8 +2677,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -3586,7 +3586,7 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các điều kho msgid "You already repeated that notice." msgstr "Bạn đã theo những người này:" -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "Tạo" @@ -5006,7 +5006,7 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" @@ -5508,7 +5508,7 @@ msgid "Snapshots configuration" msgstr "Xác nhận SMS" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6507,7 +6507,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 #, fuzzy msgid "from" msgstr " từ " @@ -6671,26 +6671,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 #, fuzzy msgid "in context" msgstr "Không có nội dung!" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "Tạo" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 #, fuzzy msgid "Reply to this notice" msgstr "Trả lời tin nhắn này" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "Trả lời" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "Tin đã gửi" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 71d3293f41..2b204d0317 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:19:20+0000\n" +"PO-Revision-Date: 2010-05-13 20:53:21+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -105,10 +105,10 @@ msgstr "没有该页面" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -230,12 +230,12 @@ msgstr "API 方法未实现！" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "此方法接受POST请求。" @@ -267,7 +267,7 @@ msgstr "无法保存个人信息。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -327,20 +327,20 @@ msgstr "发给 %s 的直接消息" msgid "All the direct messages sent to %s" msgstr "发给 %s 的直接消息" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "消息没有正文！" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, fuzzy, php-format msgid "That's too long. Max message size is %d chars." msgstr "超出长度限制。不能超过 140 个字符。" -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "未找到收件人。" -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "无法向并非好友的用户发送直接消息。" @@ -666,18 +666,18 @@ msgstr "头像已更新。" msgid "No status with that ID found." msgstr "没有找到此ID的信息。" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "超出长度限制。不能超过 140 个字符。" -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "未找到" -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -791,7 +791,7 @@ msgid "Preview" msgstr "预览" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 #, fuzzy msgid "Delete" msgstr "删除" @@ -1089,7 +1089,7 @@ msgid "Do not delete this notice" msgstr "无法删除通告。" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 #, fuzzy msgid "Delete this notice" msgstr "删除通告" @@ -2629,8 +2629,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -3522,7 +3522,7 @@ msgstr "您必须同意此授权方可注册。" msgid "You already repeated that notice." msgstr "您已成功阻止该用户：" -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "创建" @@ -4935,7 +4935,7 @@ msgstr "保存通告时出错。" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5440,7 +5440,7 @@ msgid "Snapshots configuration" msgstr "SMS短信确认" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6384,7 +6384,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 #, fuzzy msgid "from" msgstr " 从 " @@ -6547,27 +6547,27 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 #, fuzzy msgid "in context" msgstr "没有内容！" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "创建" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 #, fuzzy msgid "Reply to this notice" msgstr "无法删除通告。" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 #, fuzzy msgid "Reply" msgstr "回复" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "消息已发布。" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index b7aca62bc3..127220dbd2 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-03 19:19:23+0000\n" +"PO-Revision-Date: 2010-05-13 20:53:34+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -99,10 +99,10 @@ msgstr "無此通知" #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 @@ -225,12 +225,12 @@ msgstr "確認碼遺失" #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 -#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 msgid "This method requires a POST." msgstr "" @@ -262,7 +262,7 @@ msgstr "無法儲存個人資料" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -321,20 +321,20 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessagenew.php:126 +#: actions/apidirectmessagenew.php:118 msgid "No message text!" msgstr "" -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." msgstr "" -#: actions/apidirectmessagenew.php:146 +#: actions/apidirectmessagenew.php:138 msgid "Recipient user not found." msgstr "" -#: actions/apidirectmessagenew.php:150 +#: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" @@ -657,18 +657,18 @@ msgstr "更新個人圖像" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:252 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "目前無請求" -#: actions/apistatusesupdate.php:316 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -781,7 +781,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:656 +#: lib/deleteuserform.php:66 lib/noticelist.php:648 msgid "Delete" msgstr "" @@ -1071,7 +1071,7 @@ msgid "Do not delete this notice" msgstr "無此通知" #. TRANS: Submit button title for 'Yes' when deleting a notice. -#: actions/deletenotice.php:158 lib/noticelist.php:656 +#: actions/deletenotice.php:158 lib/noticelist.php:648 msgid "Delete this notice" msgstr "" @@ -2537,8 +2537,8 @@ msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131 -#: lib/apiaction.php:1160 lib/apiaction.php:1277 +#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 +#: lib/apiaction.php:1185 lib/apiaction.php:1302 msgid "Not a supported data format." msgstr "" @@ -3393,7 +3393,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "無此使用者" -#: actions/repeat.php:114 lib/noticelist.php:675 +#: actions/repeat.php:114 lib/noticelist.php:667 #, fuzzy msgid "Repeated" msgstr "新增" @@ -4760,7 +4760,7 @@ msgstr "儲存使用者發生錯誤" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1533 +#: classes/Notice.php:1552 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5248,7 +5248,7 @@ msgid "Snapshots configuration" msgstr "確認信箱" #. TRANS: Client error 401. -#: lib/apiauth.php:113 +#: lib/apiauth.php:112 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -6168,7 +6168,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:494 +#: lib/mailbox.php:227 lib/noticelist.php:497 msgid "from" msgstr "" @@ -6327,25 +6327,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:567 +#: lib/noticelist.php:559 #, fuzzy msgid "in context" msgstr "無內容" -#: lib/noticelist.php:602 +#: lib/noticelist.php:594 #, fuzzy msgid "Repeated by" msgstr "新增" -#: lib/noticelist.php:629 +#: lib/noticelist.php:621 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:630 +#: lib/noticelist.php:622 msgid "Reply" msgstr "" -#: lib/noticelist.php:674 +#: lib/noticelist.php:666 #, fuzzy msgid "Notice repeated" msgstr "更新個人圖像" From 2e808fdc82adc862be12118332d27a36a19123ca Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 13 May 2010 16:47:58 -0700 Subject: [PATCH 116/730] More direct text for registration licensing/tos checkbox for private and all-rights-reserved sites. --- actions/register.php | 48 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/actions/register.php b/actions/register.php index da8d0a0bbc..7fdbb4ded6 100644 --- a/actions/register.php +++ b/actions/register.php @@ -491,6 +491,45 @@ class RegisterAction extends Action $this->elementStart('li'); $this->element('input', $attrs); $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license')); + $this->raw($this->licenseCheckbox()); + $this->elementEnd('label'); + $this->elementEnd('li'); + } + $this->elementEnd('ul'); + $this->submit('submit', _('Register')); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + } + + function licenseCheckbox() + { + $out = ''; + switch (common_config('license', 'type')) { + case 'private': + // TRANS: Copyright checkbox label in registration dialog, for private sites. + $out .= htmlspecialchars(sprintf( + _('I understand that content and data of %1$s are private and confidential.'), + common_config('site', 'name'))); + // fall through + case 'allrightsreserved': + if ($out != '') { + $out .= ' '; + } + if (common_config('license', 'owner')) { + // TRANS: Copyright checkbox label in registration dialog, for all rights reserved with a specified copyright owner. + $out .= htmlspecialchars(sprintf( + _('My text and files are copyright by %1$s.'), + common_config('license', 'owner'))); + } else { + // TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. + $out .= htmlspecialchars(_('My text and files remain under my own copyright.')); + } + // TRANS: Copyright checkbox label in registration dialog, for all rights reserved. + $out .= ' ' . _('All rights reserved.'); + break; + case 'cc': // fall through + default: + // TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. $message = _('My text and files are available under %s ' . 'except this private data: password, ' . 'email address, IM address, and phone number.'); @@ -499,14 +538,9 @@ class RegisterAction extends Action '">' . htmlspecialchars(common_config('license', 'title')) . ''; - $this->raw(sprintf(htmlspecialchars($message), $link)); - $this->elementEnd('label'); - $this->elementEnd('li'); + $out .= sprintf(htmlspecialchars($message), $link); } - $this->elementEnd('ul'); - $this->submit('submit', _('Register')); - $this->elementEnd('fieldset'); - $this->elementEnd('form'); + return $out; } /** From 275002d88a758d47e15b2f6d97873c243a500451 Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 14 May 2010 16:41:29 -0400 Subject: [PATCH 117/730] allow hyphens in subdomains for webfinger addresses --- plugins/OStatus/OStatusPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index f183bc7aea..5167842ca9 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -257,7 +257,7 @@ class OStatusPlugin extends Plugin $matches = array(); // Webfinger matches: @user@example.com - if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!', + if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!', $text, $wmatches, PREG_OFFSET_CAPTURE)) { From 1999b836c0681c44171d849028fb2d5d0c3d01b8 Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 14 May 2010 16:43:21 -0400 Subject: [PATCH 118/730] accept either salmon endpoint (until they're unified in the spec) --- plugins/OStatus/lib/discoveryhints.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php index 80cfbbf15e..ca54a0f5f5 100644 --- a/plugins/OStatus/lib/discoveryhints.php +++ b/plugins/OStatus/lib/discoveryhints.php @@ -30,6 +30,7 @@ class DiscoveryHints { case Discovery::PROFILEPAGE: $hints['profileurl'] = $link['href']; break; + case Salmon::NS_MENTIONS: case Salmon::NS_REPLIES: $hints['salmon'] = $link['href']; break; From 599942f58a839a7d6d7ff92e31873f3d61faf326 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 14:56:40 +1200 Subject: [PATCH 119/730] sorted enums and auto_increments on postgres. Still needs inline indexes on table creation --- lib/pgsqlschema.php | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 715065d774..7594edc8e3 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -41,6 +41,7 @@ if (!defined('STATUSNET')) { * @category Database * @package StatusNet * @author Evan Prodromou + * @author Brenda Wallace * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -79,7 +80,6 @@ class PgsqlSchema extends Schema $row = array(); while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) { -// var_dump($row); $cd = new ColumnDef(); $cd->name = $row['field']; @@ -155,7 +155,6 @@ class PgsqlSchema extends Schema } $sql .= $this->_columnSql($cd); - switch ($cd->key) { case 'UNI': $uniques[] = $cd->name; @@ -188,7 +187,7 @@ class PgsqlSchema extends Schema $res = $this->conn->query($sql); if (PEAR::isError($res)) { - throw new Exception($res->getMessage()); + throw new Exception($res->getMessage(). ' SQL was '. $sql); } return true; @@ -223,7 +222,7 @@ class PgsqlSchema extends Schema */ private function _columnTypeTranslation($type) { $map = array( - 'datetime' => 'timestamp' + 'datetime' => 'timestamp', ); if(!empty($map[$type])) { return $map[$type]; @@ -397,16 +396,17 @@ class PgsqlSchema extends Schema $todrop = array_diff($cur, $new); $same = array_intersect($new, $cur); $tomod = array(); - foreach ($same as $m) { $curCol = $this->_byName($td->columns, $m); $newCol = $this->_byName($columns, $m); + if (!$newCol->equals($curCol)) { - $tomod[] = $newCol->name; + // BIG GIANT TODO! + // stop it detecting different types and trying to modify on every page request +// $tomod[] = $newCol->name; } } - if (count($toadd) + count($todrop) + count($tomod) == 0) { // nothing to do return true; @@ -434,7 +434,7 @@ class PgsqlSchema extends Schema } $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase); - + echo "

$sql

"; $res = $this->conn->query($sql); if (PEAR::isError($res)) { @@ -496,12 +496,21 @@ class PgsqlSchema extends Schema * * @return string correct SQL for that column */ - private function _columnSql($cd) { $sql = "{$cd->name} "; $type = $this->_columnTypeTranslation($cd->type); + //handle those mysql enum fields that postgres doesn't support + if (preg_match('!^enum!', $type)) { + $allowed_values = preg_replace('!^enum!', '', $type); + $sql .= " text check ({$cd->name} in $allowed_values)"; + return $sql; + } + if (!empty($cd->auto_increment)) { + $type = 'serial'; + } + if (!empty($cd->size)) { $sql .= "{$type}({$cd->size}) "; } else { @@ -513,10 +522,6 @@ class PgsqlSchema extends Schema } else { $sql .= ($cd->nullable) ? "null " : "not null "; } - - if (!empty($cd->auto_increment)) { - $sql .= " auto_increment "; - } if (!empty($cd->extra)) { $sql .= "{$cd->extra} "; From 7cf250ff188bac16400b688dd309d189ef99fde8 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:08:22 +1200 Subject: [PATCH 120/730] removed sneaky debug echo that shouldn't be there --- lib/pgsqlschema.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 7594edc8e3..12f24cfbe1 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -434,7 +434,6 @@ class PgsqlSchema extends Schema } $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase); - echo "

$sql

"; $res = $this->conn->query($sql); if (PEAR::isError($res)) { From 191752138a26087648dc665595fb9ca566306637 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:14:11 +1200 Subject: [PATCH 121/730] indexes now working in postgres schemas --- lib/pgsqlschema.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 12f24cfbe1..24b847a986 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -172,18 +172,16 @@ class PgsqlSchema extends Schema $sql .= ",\n primary key (" . implode(',', $primary) . ")"; } - - - foreach ($indices as $i) { - $sql .= ",\nindex {$name}_{$i}_idx ($i)"; - } - $sql .= "); "; foreach ($uniques as $u) { $sql .= "\n CREATE index {$name}_{$u}_idx ON {$name} ($u); "; } + + foreach ($indices as $i) { + $sql .= "CREATE index {$name}_{$i}_idx on {$name} ($i)"; + } $res = $this->conn->query($sql); if (PEAR::isError($res)) { From a467c0ebbab22a220972e458de0652e523bc12d7 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:31:54 +1200 Subject: [PATCH 122/730] caitalise the sql keywords --- lib/pgsqlschema.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 24b847a986..16639ff1b0 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -169,7 +169,7 @@ class PgsqlSchema extends Schema } if (count($primary) > 0) { // it really should be... - $sql .= ",\n primary key (" . implode(',', $primary) . ")"; + $sql .= ",\n PRIMARY KEY (" . implode(',', $primary) . ")"; } $sql .= "); "; @@ -180,7 +180,7 @@ class PgsqlSchema extends Schema } foreach ($indices as $i) { - $sql .= "CREATE index {$name}_{$i}_idx on {$name} ($i)"; + $sql .= "CREATE index {$name}_{$i}_idx ON {$name} ($i)"; } $res = $this->conn->query($sql); From 7bd6b62461551f26fa5571b72b260d4e92c9bfd5 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:32:22 +1200 Subject: [PATCH 123/730] comment out the extra bit, cos there's always mysql-only stuff in therre. this isn't a very good idea --- lib/pgsqlschema.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 16639ff1b0..583d01e0a7 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -520,9 +520,9 @@ class PgsqlSchema extends Schema $sql .= ($cd->nullable) ? "null " : "not null "; } - if (!empty($cd->extra)) { - $sql .= "{$cd->extra} "; - } +// if (!empty($cd->extra)) { +// $sql .= "{$cd->extra} "; +// } return $sql; } From 9bb18541df68b5a921d366c8cfb578887178b694 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:33:55 +1200 Subject: [PATCH 124/730] added missing field to the group by. this makes postgres happy --- lib/popularnoticesection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php index 296ddbbb50..f70a972efe 100644 --- a/lib/popularnoticesection.php +++ b/lib/popularnoticesection.php @@ -72,7 +72,7 @@ class PopularNoticeSection extends NoticeSection $qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' . 'notice.rendered,notice.url,notice.created,notice.modified,' . 'notice.reply_to,notice.is_local,notice.source,notice.conversation, ' . - 'notice.lat,notice.lon,location_id,location_ns' . + 'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of' . ' ORDER BY weight DESC'; $offset = 0; From 57f570c8e73bc03f6b6cf5d3d00f27321c0dc7de Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 16 May 2010 17:45:48 +0200 Subject: [PATCH 125/730] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/af/LC_MESSAGES/statusnet.po | 36 ++++-- locale/ar/LC_MESSAGES/statusnet.po | 36 ++++-- locale/arz/LC_MESSAGES/statusnet.po | 36 ++++-- locale/bg/LC_MESSAGES/statusnet.po | 36 ++++-- locale/br/LC_MESSAGES/statusnet.po | 51 ++++++--- locale/ca/LC_MESSAGES/statusnet.po | 155 +++++++++++++++----------- locale/cs/LC_MESSAGES/statusnet.po | 36 ++++-- locale/de/LC_MESSAGES/statusnet.po | 36 ++++-- locale/el/LC_MESSAGES/statusnet.po | 36 ++++-- locale/en_GB/LC_MESSAGES/statusnet.po | 90 +++++++++++++-- locale/es/LC_MESSAGES/statusnet.po | 36 ++++-- locale/fa/LC_MESSAGES/statusnet.po | 36 ++++-- locale/fi/LC_MESSAGES/statusnet.po | 36 ++++-- locale/fr/LC_MESSAGES/statusnet.po | 36 ++++-- locale/ga/LC_MESSAGES/statusnet.po | 36 ++++-- locale/gl/LC_MESSAGES/statusnet.po | 36 ++++-- locale/he/LC_MESSAGES/statusnet.po | 36 ++++-- locale/hsb/LC_MESSAGES/statusnet.po | 36 ++++-- locale/ia/LC_MESSAGES/statusnet.po | 36 ++++-- locale/is/LC_MESSAGES/statusnet.po | 36 ++++-- locale/it/LC_MESSAGES/statusnet.po | 36 ++++-- locale/ja/LC_MESSAGES/statusnet.po | 36 ++++-- locale/ko/LC_MESSAGES/statusnet.po | 36 ++++-- locale/mk/LC_MESSAGES/statusnet.po | 36 ++++-- locale/nb/LC_MESSAGES/statusnet.po | 36 ++++-- locale/nl/LC_MESSAGES/statusnet.po | 36 ++++-- locale/nn/LC_MESSAGES/statusnet.po | 36 ++++-- locale/pl/LC_MESSAGES/statusnet.po | 36 ++++-- locale/pt/LC_MESSAGES/statusnet.po | 36 ++++-- locale/pt_BR/LC_MESSAGES/statusnet.po | 36 ++++-- locale/ru/LC_MESSAGES/statusnet.po | 36 ++++-- locale/statusnet.pot | 32 +++++- locale/sv/LC_MESSAGES/statusnet.po | 36 ++++-- locale/te/LC_MESSAGES/statusnet.po | 36 ++++-- locale/tr/LC_MESSAGES/statusnet.po | 36 ++++-- locale/uk/LC_MESSAGES/statusnet.po | 36 ++++-- locale/vi/LC_MESSAGES/statusnet.po | 36 ++++-- locale/zh_CN/LC_MESSAGES/statusnet.po | 36 ++++-- locale/zh_TW/LC_MESSAGES/statusnet.po | 36 ++++-- 39 files changed, 1246 insertions(+), 342 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index d6119b23f5..b9f82c0f8b 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:32+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:16+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -3140,7 +3140,7 @@ msgstr "" msgid "Registration successful" msgstr "Die registrasie is voltooi" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registreer" @@ -3192,14 +3192,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3218,7 +3240,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 277190ef85..24253a9705 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:36+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:19+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -3138,7 +3138,7 @@ msgstr "عذرا، رمز دعوة غير صالح." msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -3190,14 +3190,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3216,7 +3238,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 53ec108d6a..12f575846f 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:39+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:22+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -3160,7 +3160,7 @@ msgstr "عذرا، رمز دعوه غير صالح." msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -3212,14 +3212,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3238,7 +3260,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 43afebb729..10f4fc66e2 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:43+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:25+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -3255,7 +3255,7 @@ msgstr "Грешка в кода за потвърждение." msgid "Registration successful" msgstr "Записването е успешно." -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистриране" @@ -3309,14 +3309,36 @@ msgstr "Използва се само за промени, обяви или в msgid "Longer name, preferably your \"real\" name" msgstr "По-дълго име, за предпочитане \"истинското\" ви име." -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3349,7 +3371,7 @@ msgstr "" "Благодарим, че се включихте в сайта и дано ползването на услугата ви носи " "само приятни мигове!" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index b207e4a5fe..0c64a7aa0c 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:46+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:28+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -3151,7 +3151,7 @@ msgstr "Digarezit, kod pedadenn direizh." msgid "Registration successful" msgstr "Krouet eo bet ar gont." -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Krouiñ ur gont" @@ -3205,14 +3205,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3231,7 +3253,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5951,11 +5973,14 @@ msgid "" "\n" "\t%s" msgstr "" +"Ar gaozeadenn klok a c'hell bezañ lennet amañ :\n" +"\n" +"%s" #: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) en deus kaset deoc'h ur c'hemenn" #. TRANS: Body of @-reply notification e-mail. #: lib/mail.php:654 @@ -6065,7 +6090,7 @@ msgstr "" #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr "Klaskit implijout ur furmad %s all." #: lib/mediafile.php:275 #, php-format @@ -6183,11 +6208,11 @@ msgstr "Kas ur blinkadenn d'an implijer-mañ" #: lib/oauthstore.php:283 msgid "Error inserting new profile" -msgstr "" +msgstr "Ur fazi 'zo bet en ur ensoc'hañ ar profil nevez" #: lib/oauthstore.php:291 msgid "Error inserting avatar" -msgstr "" +msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar" #: lib/oauthstore.php:306 msgid "Error updating remote profile" @@ -6289,7 +6314,7 @@ msgstr "Strolladoù implijerien" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" -msgstr "" +msgstr "Merkoù nevez" #: lib/publicgroupnav.php:88 msgid "Featured" @@ -6559,7 +6584,7 @@ msgstr "n'eo ket %s ul liv reizh !" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "" +msgstr "N'eo ket %s ul liv reizh ! Implijit 3 pe 6 arouezenn heksdekvedennel." #: lib/xmppmanager.php:403 #, php-format diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index f41cef30cf..d2bb7867a1 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -1,7 +1,6 @@ # Translation of StatusNet to Catalan # # Author@translatewiki.net: Aleator -# Author@translatewiki.net: McDutchie # Author@translatewiki.net: Paucabot # Author@translatewiki.net: Toniher # -- @@ -11,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:56+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:32+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -451,7 +450,7 @@ msgstr "Hi ha massa àlies! Màxim %d." #: actions/apigroupcreate.php:266 #, php-format msgid "Invalid alias: \"%s\"." -msgstr "L'àlies no és vàlid: \"%s\"." +msgstr "L'àlies no és vàlid: «%s»." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -655,7 +654,7 @@ msgstr "Avís duplicat." #: actions/apistatusesshow.php:138 msgid "Status deleted." -msgstr "S'ha suprimit l'estat." +msgstr "S'ha eliminat l'estat." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." @@ -819,7 +818,7 @@ msgstr "Error en actualitzar avatar." #: actions/avatarsettings.php:397 msgid "Avatar deleted." -msgstr "S'ha suprimit l'avatar." +msgstr "S'ha eliminat l'avatar." #: actions/block.php:69 msgid "You already blocked that user." @@ -1228,7 +1227,7 @@ msgstr "Afegeix als preferits" #: actions/doc.php:158 #, php-format msgid "No such document \"%s\"" -msgstr "No existeix el document \"%s\"" +msgstr "No existeix el document «%s»" #: actions/editapplication.php:54 msgid "Edit Application" @@ -1544,7 +1543,7 @@ msgstr "Aquest no és el teu correu electrònic" #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 msgid "The email address was removed." -msgstr "S'ha suprimit l'adreça de correu electrònic." +msgstr "S'ha eliminat l'adreça de correu electrònic." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1750,8 +1749,8 @@ msgid "" "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"Esteu segur que voleu blocar l'usuari «%1$s» del grup «%2$s»? Se suprimiran " -"del grup, i no podran enviar-hi res ni subscriure-s'hi en el futur." +"Esteu segur que voleu blocar l'usuari «%1$s» del grup «%2$s»? S'eliminarà del " +"grup, i no podrà enviar-hi res ni subscriure-s'hi en el futur." #. TRANS: Submit button title for 'No' when blocking a user from a group. #: actions/groupblock.php:182 @@ -1998,9 +1997,9 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Adreça Jabber o GTalk, per exemple \"NomUsuari@example.org\". Primer, " -"assegura't d'afegir a %s a la teva llista d'amics en el teu client de " -"missatgeria instantània o a GTalk." +"Adreça Jabber o GTalk, per exemple «NomUsuari@example.org». Primer, assegureu-" +"vos d'afegir %s a la vostra llista d'amics en el vostre client de " +"missatgeria instantània o al GTalk." #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 @@ -2953,7 +2952,7 @@ msgstr "Ubicació" #: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\"" +msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" @@ -3011,7 +3010,7 @@ msgstr "L'idioma és massa llarg (màx 50 caràcters)." #: actions/profilesettings.php:253 actions/tagother.php:178 #, php-format msgid "Invalid tag: \"%s\"" -msgstr "Etiqueta no vàlida: \"%s\"" +msgstr "L'etiqueta no és vàlida: «%s»" #: actions/profilesettings.php:306 msgid "Couldn't update user for autosubscribe." @@ -3279,7 +3278,7 @@ msgstr "El codi d'invitació no és vàlid." msgid "Registration successful" msgstr "Registre satisfactori" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registre" @@ -3333,9 +3332,31 @@ msgstr "" #: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" -msgstr "Nom llarg, preferiblement el teu nom \"real\"" +msgstr "Nom llarg, preferiblement el vostre nom «real»" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "El contingut i les dades de %1$s són privades i confidencials." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3345,7 +3366,7 @@ msgstr "" "les dades privades: contrasenya, adreça de correu electrònic, adreça de " "missatgeria instantània i número de telèfon." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3378,7 +3399,7 @@ msgstr "" "\n" "Gràcies per registrar-vos-hi i esperem que en gaudiu." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3842,7 +3863,7 @@ msgstr "Missatge de %1$s a %2$s" #: actions/shownotice.php:90 msgid "Notice deleted." -msgstr "S'ha suprimit l'avís." +msgstr "S'ha eliminat l'avís." #: actions/showstream.php:73 #, php-format @@ -4198,7 +4219,7 @@ msgstr "Aquest no és el teu número de telèfon." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 msgid "The SMS phone number was removed." -msgstr "S'ha suprimit el número de telèfon de l'SMS." +msgstr "S'ha eliminat el número de telèfon de l'SMS." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4905,15 +4926,15 @@ msgstr "No hi esteu subscrit!" #: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." -msgstr "No s'ha pogut suprimir l'autosubscripció." +msgstr "No s'ha pogut eliminar l'autosubscripció." #: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "No s'ha pogut suprimir el testimoni OMB de la subscripció." +msgstr "No s'ha pogut eliminar el testimoni OMB de la subscripció." #: classes/Subscription.php:211 msgid "Couldn't delete subscription." -msgstr "No s'ha pogut suprimir la subscripció." +msgstr "No s'ha pogut eliminar la subscripció." #: classes/User.php:363 #, php-format @@ -5112,7 +5133,7 @@ msgstr "Vistes locals" #. TRANS: DT element for page notice. String is hidden in default CSS. #: lib/action.php:649 msgid "Page notice" -msgstr "Notificació pàgina" +msgstr "Avís de pàgina" #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. #: lib/action.php:752 @@ -5286,7 +5307,7 @@ msgstr "El saveSettings() no està implementat." #. TRANS: the admin panel Design. #: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." -msgstr "No s'ha pogut suprimir el paràmetre de disseny." +msgstr "No s'ha pogut eliminar el paràmetre de disseny." #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:349 @@ -5567,7 +5588,7 @@ msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s." #: lib/command.php:385 #, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "No s'ha pogut suprimir l'usuari %1$s del grup %2$s." +msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s." #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -5671,12 +5692,12 @@ msgstr "Subscrit a %s" #: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" -msgstr "Especifiqueu el nom de l'usuari de qui voleu deixar d'estar subscrit" +msgstr "Especifiqueu el nom de l'usuari de qui voleu cancel·lar la subscripció" #: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" -msgstr "Has deixat d'estar subscrit a %s" +msgstr "Heu cancel·lat la subscripció a %s" #: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." @@ -5684,19 +5705,19 @@ msgstr "Comanda encara no implementada." #: lib/command.php:685 msgid "Notification off." -msgstr "Notificacions off." +msgstr "Avisos desactivats." #: lib/command.php:687 msgid "Can't turn off notification." -msgstr "No es poden posar en off les notificacions." +msgstr "No es poden desactivar els avisos." #: lib/command.php:708 msgid "Notification on." -msgstr "Notificacions on." +msgstr "Avisos activitats." #: lib/command.php:710 msgid "Can't turn on notification." -msgstr "No es poden posar en on les notificacions." +msgstr "No es poden activar els avisos." #: lib/command.php:723 msgid "Login command is disabled" @@ -5712,7 +5733,7 @@ msgstr "" #: lib/command.php:761 #, php-format msgid "Unsubscribed %s" -msgstr "S'ha dessubscrit %s" +msgstr "S'ha cancel·lat la subscripció de %s" #: lib/command.php:778 msgid "You are not subscribed to anyone." @@ -5793,7 +5814,7 @@ msgstr "" "groups - llista els grups on us heu unit\n" "subscriptions - llista la gent que seguiu\n" "subscribers - llista la gent que us segueix\n" -"leave - dessubscriu de l'usuari\n" +"leave - cancel·la la subscripció de l'usuari\n" "d - missatge directe a l'usuari\n" "get - s'obté el darrer avís de l'usuari\n" "whois - s'obté la informació del perfil de l'usuari\n" @@ -5834,7 +5855,7 @@ msgstr "S'han cercat fitxers de configuracions en els llocs següents: " #: lib/common.php:138 msgid "You may wish to run the installer to fix this." -msgstr "Podeu voler executar l'instal·lador per a corregir-ho." +msgstr "Podeu voler executar l'instal·lador per corregir-ho." #: lib/common.php:139 msgid "Go to the installer." @@ -5842,11 +5863,11 @@ msgstr "Vés a l'instal·lador." #: lib/connectsettingsaction.php:110 msgid "IM" -msgstr "Missatgeria Instantània" +msgstr "MI" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "Actualitzacions per Missatgeria Instantània" +msgstr "Actualitzacions per missatgeria instantània (MI)" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" @@ -5929,7 +5950,7 @@ msgstr "Etiqueta" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" -msgstr "Trieu una etiqueta per a escurçar la llista" +msgstr "Trieu una etiqueta per escurçar la llista" #: lib/galleryaction.php:143 msgid "Go" @@ -5942,16 +5963,16 @@ msgstr "Atorga a l'usuari el rol «%s»" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" -msgstr "URL del teu web, blog del grup u tema" +msgstr "URL del teu web, blog del grup o de la temàtica" #: lib/groupeditform.php:168 msgid "Describe the group or topic" -msgstr "Descriviu el grup o el tema" +msgstr "Descriviu el grup o la temàtica" #: lib/groupeditform.php:170 #, php-format msgid "Describe the group or topic in %d characters" -msgstr "Descriviu el grup o el tema en %d caràcters" +msgstr "Descriviu el grup o la temàtica en %d caràcters" #: lib/groupeditform.php:179 msgid "" @@ -5962,7 +5983,7 @@ msgstr "" #: lib/groupeditform.php:187 #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" -msgstr "Sobrenoms addicionals del grup, separats per coma o espai, màx. %d" +msgstr "Sobrenoms addicionals del grup, separats amb comes o espais, màx. %d" #: lib/groupnav.php:85 msgid "Group" @@ -5975,7 +5996,7 @@ msgstr "Blocat" #: lib/groupnav.php:102 #, php-format msgid "%s blocked users" -msgstr "%susuaris blocats" +msgstr "%s usuaris blocats" #: lib/groupnav.php:108 #, php-format @@ -5989,7 +6010,7 @@ msgstr "Logo" #: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" -msgstr "Afegir o editar logo %s" +msgstr "Afegeix o edita el logo %s" #: lib/groupnav.php:120 #, php-format @@ -6007,7 +6028,7 @@ msgstr "Grups amb més entrades" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "Etiquetes en les notificacions del grup %s" +msgstr "Etiquetes en els avisos del grup %s" #. TRANS: Client exception 406 #: lib/htmloutputter.php:104 @@ -6037,7 +6058,7 @@ msgstr "No és una imatge o és un fitxer corrupte." #: lib/imagefile.php:122 msgid "Lost our file." -msgstr "Hem perdut el nostre arxiu." +msgstr "Hem perdut el nostre fitxer." #: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" @@ -6075,7 +6096,7 @@ msgstr "Accedir amb el nom d'usuari i contrasenya" #: lib/logingroupnav.php:86 msgid "Sign up for a new account" -msgstr "Registreu-vos-hi per a un compte nou" +msgstr "Registreu-vos-hi si voleu un compte nou" #. TRANS: Subject for address confirmation email #: lib/mail.php:174 @@ -6143,7 +6164,7 @@ msgstr "" "%7$s.\n" "\n" "----\n" -"Canvieu la vostra adreça electrònica o les opcions de notificació a %8$s\n" +"Canvieu la vostra adreça electrònica o les opcions d'avís a %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail #: lib/mail.php:269 @@ -6170,13 +6191,13 @@ msgid "" "Faithfully yours,\n" "%4$s" msgstr "" -"Tens una nova direcció per publicar a %1$s.\n" +"Teniu una nova adreça per publicar a %1$s.\n" "\n" -"Envia un correu electrònic a %2$s per publicar un nou missatge.\n" +"Envieu un correu electrònic a %2$s per publicar un nou missatge.\n" "\n" "Més instruccions per al correu electrònic a %3$s.\n" "\n" -"Sincerament teus,\n" +"Atentament,\n" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages @@ -6218,7 +6239,7 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" -"%1$s (%2$s) què tal us trobeu is us convida a enviar algunes notícies.\n" +"%1$s (%2$s) què tal us trobeu is us convida a publicar algunes notícies.\n" "\n" "Esperem sentir-vos aviat :)\n" "\n" @@ -6379,7 +6400,7 @@ msgstr "" "Atentament,\n" "%2$s\n" "\n" -"P.S. Podeu desactivar les notificacions per correu aquí: %8$s\n" +"P.S. Podeu desactivar els avisos per correu aquí: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6390,7 +6411,7 @@ msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" -"No teniu missatges privats. Podeu enviar un missatge per a animar altres " +"No teniu missatges privats. Podeu enviar un missatge per animar altres " "usuaris en la conversa. La gent pot enviar-vos missatges només per als " "vostres ulls." @@ -6643,7 +6664,7 @@ msgstr "Els teus missatges enviats" #: lib/personaltagcloudsection.php:56 #, php-format msgid "Tags in %s's notices" -msgstr "Etiquetes en les notificacions de %s's" +msgstr "Etiquetes en els avisos de %s" #: lib/plugin.php:115 msgid "Unknown" @@ -6761,15 +6782,15 @@ msgstr "Gent" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "Trobar gent en aquest lloc" +msgstr "Cerca gent en aquest lloc" #: lib/searchgroupnav.php:83 msgid "Find content of notices" -msgstr "Trobar contingut de les notes" +msgstr "Cerca el contingut dels avisos" #: lib/searchgroupnav.php:85 msgid "Find groups on this site" -msgstr "Trobar un grup en aquest lloc" +msgstr "Cerca grups en aquest lloc" #: lib/section.php:89 msgid "Untitled section" @@ -6777,7 +6798,7 @@ msgstr "Secció sense títol" #: lib/section.php:106 msgid "More..." -msgstr "Més…" +msgstr "Més..." #: lib/silenceform.php:67 msgid "Silence" @@ -6795,7 +6816,7 @@ msgstr "Persones %s subscrites a" #: lib/subgroupnav.php:91 #, php-format msgid "People subscribed to %s" -msgstr "Persones subscrites a %s" +msgstr "Gent subscrita a %s" #: lib/subgroupnav.php:99 #, php-format @@ -6809,7 +6830,7 @@ msgstr "Convida" #: lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "Convidar amics i companys perquè participin a %s" +msgstr "Convida amics i companys perquè participin a %s" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -6827,7 +6848,7 @@ msgstr "Cap" #: lib/topposterssection.php:74 msgid "Top posters" -msgstr "Que més publiquen" +msgstr "Qui més publica" #: lib/unsandboxform.php:69 msgid "Unsandbox" @@ -6847,7 +6868,7 @@ msgstr "Dessilencia l'usuari" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" -msgstr "Deixar d'estar subscrit des d'aquest usuari" +msgstr "Cancel·la la subscripció d'aquest usuari" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" @@ -6868,7 +6889,7 @@ msgstr "Accions de l'usuari" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "S'està suprimint l'usuari..." +msgstr "S'està eliminant l'usuari..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index a6fbcfe7bb..81489316b9 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:00+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:35+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -3289,7 +3289,7 @@ msgstr "Chyba v ověřovacím kódu" msgid "Registration successful" msgstr "Registrace úspěšná" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrovat" @@ -3341,7 +3341,29 @@ msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla." msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3350,7 +3372,7 @@ msgstr "" " až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní " "číslo." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3369,7 +3391,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 199f0d683c..b221c99baa 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:03+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:38+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -3294,7 +3294,7 @@ msgstr "Entschuldigung, ungültiger Bestätigungscode." msgid "Registration successful" msgstr "Registrierung erfolgreich" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrieren" @@ -3353,7 +3353,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Längerer Name, bevorzugt dein „echter“ Name" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Inhalte und Daten von %1$s sind privat und vertraulich." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3362,7 +3384,7 @@ msgstr "" "Abgesehen von folgenden Daten: Passwort, Email Adresse, IM Adresse und " "Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3395,7 +3417,7 @@ msgstr "" "\n" "Danke für deine Anmeldung, wir hoffen das dir der Service gefällt." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index e7ba67b548..4e8f62afe4 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:07+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:41+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -3235,7 +3235,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -3287,7 +3287,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3296,7 +3318,7 @@ msgstr "" "εκτός από τα εξής προσωπικά δεδομένα: κωδικός πρόσβασης, διεύθυνση email, " "διεύθυνση IM, τηλεφωνικό νούμερο." -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3330,7 +3352,7 @@ msgstr "" "Ευχαριστούμε που εγγράφηκες και ευχόμαστε να περάσεις καλά με την υπηρεσία " "μας." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index e9fd5bdd33..03e7a669ff 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:11+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:44+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -1908,6 +1908,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"If you can't find the group you're looking for, you can [create it](%%action." +"newgroup%%) yourself." #: actions/groupsearch.php:85 #, php-format @@ -1915,10 +1917,12 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"Why not [register an account](%%action.register%%) and [create the group](%%" +"action.newgroup%%) yourself!" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Only an admin can unblock group members." #: actions/groupunblock.php:95 msgid "User is not blocked from group." @@ -3228,7 +3232,7 @@ msgstr "Sorry, invalid invitation code." msgid "Registration successful" msgstr "Registration successful" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Register" @@ -3280,7 +3284,29 @@ msgstr "Used only for updates, announcements, and password recovery" msgid "Longer name, preferably your \"real\" name" msgstr "Longer name, preferably your \"real\" name" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3289,7 +3315,7 @@ msgstr "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3322,7 +3348,7 @@ msgstr "" "\n" "Thanks for signing up and we hope you enjoy using this service." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -4251,6 +4277,8 @@ msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" msgstr "" +"You have no subscribers. Try subscribing to people you know and they might " +"return the favour" #: actions/subscribers.php:110 #, php-format @@ -5115,7 +5143,7 @@ msgstr "" #: lib/action.php:871 #, php-format msgid "All %1$s content and data are available under the %2$s license." -msgstr "" +msgstr "All %1$s content and data are available under the %2$s licence." #. TRANS: DT element for pagination (previous/next, etc.). #: lib/action.php:1182 @@ -5663,6 +5691,44 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Commands:\n" +"on - turn on notifications\n" +"off - turn off notifications\n" +"help - show this help\n" +"follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" +"leave - unsubscribe from user\n" +"d - direct message to user\n" +"get - get last notice from user\n" +"whois - get profile info on user\n" +"lose - force user to stop following you\n" +"fav - add user's last notice as a 'fave'\n" +"fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" +"reply # - reply to notice with a given id\n" +"reply - reply to the last notice from user\n" +"join - join group\n" +"login - Get a link to login to the web interface\n" +"drop - leave group\n" +"stats - get your stats\n" +"stop - same as 'off'\n" +"quit - same as 'off'\n" +"sub - same as 'follow'\n" +"unsub - same as 'leave'\n" +"last - same as 'get'\n" +"on - not yet implemented.\n" +"off - not yet implemented.\n" +"nudge - remind a user to update.\n" +"invite - not yet implemented.\n" +"track - not yet implemented.\n" +"untrack - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" #: lib/common.php:135 msgid "No configuration file found. " @@ -6625,7 +6691,7 @@ msgstr "Edit profile settings" #: lib/userprofile.php:264 msgid "Edit" -msgstr "" +msgstr "Edit" #: lib/userprofile.php:287 msgid "Send a direct message to this user" @@ -6637,7 +6703,7 @@ msgstr "Message" #: lib/userprofile.php:326 msgid "Moderate" -msgstr "" +msgstr "Moderate" #: lib/userprofile.php:364 msgid "User role" @@ -6651,7 +6717,7 @@ msgstr "Administrator" #: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "" +msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1083 diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 69d670e546..268cb5c5d2 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:14+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:47+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -3284,7 +3284,7 @@ msgstr "El código de invitación no es válido." msgid "Registration successful" msgstr "Registro exitoso." -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrarse" @@ -3341,7 +3341,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Nombre más largo, preferiblemente tu nombre \"real\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "El contenido y datos de %1$s son privados y confidenciales." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3351,7 +3373,7 @@ msgstr "" "información privada: contraseña, dirección de correo electrónico, dirección " "de mensajería instantánea y número de teléfono." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3384,7 +3406,7 @@ msgstr "" "\n" "¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index e41e075ca8..c4a039c318 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:21+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:56+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -3251,7 +3251,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است." msgid "Registration successful" msgstr "ثبت نام با موفقیت انجام شد." -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "ثبت نام" @@ -3303,7 +3303,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "نام بلند تر، به طور بهتر نام واقعیتان" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3312,7 +3334,7 @@ msgstr "" "به استثنای این داده ی محرمانه : کلمه ی عبور، آدرس ایمیل، آدرس IM، و شماره " "تلفن." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3331,7 +3353,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 663e6ad348..48a25ce224 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:17+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:53+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -3343,7 +3343,7 @@ msgstr "Virheellinen kutsukoodin." msgid "Registration successful" msgstr "Rekisteröityminen onnistui" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Rekisteröidy" @@ -3399,7 +3399,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Pitempi nimi, mieluiten oikea nimesi" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3408,7 +3430,7 @@ msgstr "" "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, " "puhelinnumero." -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3441,7 +3463,7 @@ msgstr "" "\n" "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 639def20d4..f5e2e9a91c 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:27+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:00+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -3301,7 +3301,7 @@ msgstr "Désolé, code d’invitation invalide." msgid "Registration successful" msgstr "Compte créé avec succès" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Créer un compte" @@ -3358,7 +3358,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Nom plus long, votre \"vrai\" nom de préférence" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Le contenu et les données de %1$s sont privés et confidentiels." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3368,7 +3390,7 @@ msgstr "" "données personnelles : mot de passe, adresse électronique, adresse de " "messagerie instantanée, numéro de téléphone." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3402,7 +3424,7 @@ msgstr "" "Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre " "service." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index bf1273bd71..64a4d3e3bf 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:30+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:04+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -3380,7 +3380,7 @@ msgstr "Acounteceu un erro co código de confirmación." msgid "Registration successful" msgstr "Xa estas rexistrado!!" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrar" @@ -3439,7 +3439,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Nome máis longo, preferiblemente o teu nome \"real\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3448,7 +3470,7 @@ msgstr "" " agás esta informción privada: contrasinal, dirección de correo electrónico, " "dirección IM, número de teléfono." -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3480,7 +3502,7 @@ msgstr "" "\n" "Grazas por rexistrarte e esperamos que laretexes moito." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index b54d10ac9e..6639ecf5a2 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:34+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:10+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -3281,7 +3281,7 @@ msgstr "O código da invitación é incorrecto." msgid "Registration successful" msgstr "Rexistrouse correctamente" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrarse" @@ -3338,7 +3338,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Nome longo, preferiblemente o seu nome \"real\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "O contido e os datos de %1$s son privados e confidenciais." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3348,7 +3370,7 @@ msgstr "" "datos privados: contrasinais, enderezos de correo electrónico e mensaxería " "instantánea e números de teléfono." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3380,7 +3402,7 @@ msgstr "" "\n" "Grazas por rexistrarse. Esperamos que goce deste servizo." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 29f21cbc00..486fc32858 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:37+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:14+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -3295,7 +3295,7 @@ msgstr "שגיאה באישור הקוד." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "הירשם" @@ -3347,14 +3347,36 @@ msgstr "לשימוש רק במקרים של עידכונים, הודעות מע msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3373,7 +3395,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 22e57db041..8600eaf7da 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:43+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:17+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -3120,7 +3120,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod." msgid "Registration successful" msgstr "Registrowanje wuspěšne" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrować" @@ -3172,14 +3172,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3198,7 +3220,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index c235d78c23..18617e5c55 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:46+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:20+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -3264,7 +3264,7 @@ msgstr "Pardono, le codice de invitation es invalide." msgid "Registration successful" msgstr "Registration succedite" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Crear conto" @@ -3320,7 +3320,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Le contento e datos de %1$s es private e confidential." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3330,7 +3352,7 @@ msgstr "" "contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de " "telephono." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3362,7 +3384,7 @@ msgstr "" "\n" "Gratias pro inscriber te, e nos spera que iste servicio te place." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 35d508d9fa..b3ced814dd 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:50+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:24+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -3319,7 +3319,7 @@ msgstr "" msgid "Registration successful" msgstr "Nýskráning tókst" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Nýskrá" @@ -3373,14 +3373,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3413,7 +3435,7 @@ msgstr "" "\n" "Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index d6b01201a5..ed159ea92b 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:54+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:28+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -3262,7 +3262,7 @@ msgstr "Codice di invito non valido." msgid "Registration successful" msgstr "Registrazione riuscita" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrati" @@ -3318,7 +3318,29 @@ msgstr "Usata solo per aggiornamenti, annunci e recupero password" msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, preferibilmente il tuo \"vero\" nome" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "I contenuti e i dati di %1$s sono privati e confidenziali." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3328,7 +3350,7 @@ msgstr "" "dati personali: password, indirizzo email, indirizzo messaggistica " "istantanea e numero di telefono." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3362,7 +3384,7 @@ msgstr "" "Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo " "servizio." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 58e507dfd4..36b8105244 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:57+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:31+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -3283,7 +3283,7 @@ msgstr "すみません、不正な招待コード。" msgid "Registration successful" msgstr "登録成功" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "登録" @@ -3339,14 +3339,36 @@ msgstr "更新、アナウンス、パスワードリカバリーでのみ使用 msgid "Longer name, preferably your \"real\" name" msgstr "長い名前" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3379,7 +3401,7 @@ msgstr "" "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん" "で使ってくれることを願っています。" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 8c20d9370a..bd688f7563 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:00+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:35+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -3286,7 +3286,7 @@ msgstr "확인 코드 오류" msgid "Registration successful" msgstr "회원 가입이 성공적입니다." -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "회원가입" @@ -3340,14 +3340,36 @@ msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요." msgid "Longer name, preferably your \"real\" name" msgstr "더욱 긴 이름을 요구합니다." -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호" -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3380,7 +3402,7 @@ msgstr "" "\n" "다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 2647c9aac7..2f4fca4712 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:17+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:38+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -3277,7 +3277,7 @@ msgstr "Жалиме, неважечки код за поканата." msgid "Registration successful" msgstr "Регистрацијата е успешна" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрирај се" @@ -3333,7 +3333,29 @@ msgstr "Се користи само за подновувања, објави msgid "Longer name, preferably your \"real\" name" msgstr "Подолго име, по можност Вашето вистинско име и презиме" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Содржината и податоците на %1$s се лични и доверливи." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3342,7 +3364,7 @@ msgstr "" "Мојот текст и податотеки се достапни под %s, освен следниве приватни " "податоци: лозинка, е-пошта, IM-адреса и телефонски број." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3376,7 +3398,7 @@ msgstr "" "Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа " "служба." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 8cfe078f75..5e5539e576 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:20+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:41+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -3237,7 +3237,7 @@ msgstr "Beklager, ugyldig invitasjonskode." msgid "Registration successful" msgstr "Registrering vellykket" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrer" @@ -3292,7 +3292,29 @@ msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting" msgid "Longer name, preferably your \"real\" name" msgstr "Lengre navn, helst ditt \"ekte\" navn" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3301,7 +3323,7 @@ msgstr "" "Mine tekster og filer er tilgjengelig under %s med unntak av disse private " "dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3334,7 +3356,7 @@ msgstr "" "\n" "Takk for at du registrerte deg og vi håper du kommer til å like tjenesten." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 26a2d0b31c..2fb17c45fe 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:27+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:48+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -3303,7 +3303,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig." msgid "Registration successful" msgstr "De registratie is voltooid" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registreren" @@ -3357,7 +3357,29 @@ msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel" msgid "Longer name, preferably your \"real\" name" msgstr "Een langere naam, mogelijk uw echte naam" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3367,7 +3389,7 @@ msgstr "" "behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, " "telefoonnummer." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3401,7 +3423,7 @@ msgstr "" "Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u " "ervan verwacht." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index ffe8ad5611..f1437b8aa0 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:24+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:45+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -3342,7 +3342,7 @@ msgstr "Feil med stadfestingskode." msgid "Registration successful" msgstr "Registreringa gikk bra" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrér" @@ -3397,7 +3397,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3406,7 +3428,7 @@ msgstr "" " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og " "telefonnummer." -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3438,7 +3460,7 @@ msgstr "" "\n" "Takk for at du blei med, og vi håpar du vil lika tenesta!" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 7288244c68..a6082d4f10 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:30+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:51+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -3253,7 +3253,7 @@ msgstr "Nieprawidłowy kod zaproszenia." msgid "Registration successful" msgstr "Rejestracja powiodła się" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Zarejestruj się" @@ -3309,7 +3309,29 @@ msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła" msgid "Longer name, preferably your \"real\" name" msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Treść i dane %1$s są prywatne i poufne." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3318,7 +3340,7 @@ msgstr "" "Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi " "danymi: hasło, adres e-mail, adres komunikatora i numer telefonu." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3351,7 +3373,7 @@ msgstr "" "Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi " "sprawi ci przyjemność." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index f580b61076..f1368936a2 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:36+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:55+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -3256,7 +3256,7 @@ msgstr "Desculpe, código de convite inválido." msgid "Registration successful" msgstr "Registo efectuado" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registar" @@ -3311,7 +3311,29 @@ msgstr "Usado apenas para actualizações, anúncios e recuperação da senha" msgid "Longer name, preferably your \"real\" name" msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "O conteúdo e dados do site %1$s são privados e confidenciais." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3321,7 +3343,7 @@ msgstr "" "estes dados privados: senha, endereço de correio electrónico, endereço de " "mensageiro instantâneo, número de telefone." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3354,7 +3376,7 @@ msgstr "" "\n" "Obrigado por se ter registado e esperamos que se divirta usando este serviço." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 5bfc411d10..a464b0cae1 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:39+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:58+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -3286,7 +3286,7 @@ msgstr "Desculpe, mas o código do convite é inválido." msgid "Registration successful" msgstr "Registro realizado com sucesso" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrar-se" @@ -3341,7 +3341,29 @@ msgstr "Usado apenas para atualizações, anúncios e recuperações de senha" msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, de preferência seu nome \"real\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "O conteúdo e os dados de %1$s são privados e confidenciais." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3351,7 +3373,7 @@ msgstr "" "particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo " "e número de telefone." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3384,7 +3406,7 @@ msgstr "" "\n" "Obrigado por se registrar e esperamos que você aproveite o serviço." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 4fd2bbd228..249d59d655 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:43+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:01+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -3271,7 +3271,7 @@ msgstr "Извините, неверный пригласительный код msgid "Registration successful" msgstr "Регистрация успешна!" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрация" @@ -3329,7 +3329,29 @@ msgstr "Нужна только для обновлений, осведомле msgid "Longer name, preferably your \"real\" name" msgstr "Полное имя, предпочтительно Ваше настоящее имя" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Содержание и данные %1$s являются личными и конфиденциальными." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3338,7 +3360,7 @@ msgstr "" "Мои тексты и файлы доступны на условиях %s, за исключением следующей личной " "информации: пароля, почтового адреса, номера мессенджера и номера телефона." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3372,7 +3394,7 @@ msgstr "" "Спасибо за то, что присоединились к нам, надеемся, что вы получите " "удовольствие от использования данного сервиса!" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 8ecee1b8e7..da42f33dd5 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-13 20:50+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3106,7 +3106,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -3158,14 +3158,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3184,7 +3206,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index cb75b31422..0cd352cbc1 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:46+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:05+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -3252,7 +3252,7 @@ msgstr "Tyvärr, ogiltig inbjudningskod." msgid "Registration successful" msgstr "Registreringen genomförd" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrera" @@ -3310,7 +3310,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Innehåll och data av %1$s är privat och konfidensiell." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3319,7 +3341,7 @@ msgstr "" "Mina texter och filer är tillgängliga under %s med undantag av den här " "privata datan: lösenord, e-postadress, IM-adress, telefonnummer." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3352,7 +3374,7 @@ msgstr "" "Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda " "denna tjänst." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index e93b96c267..c205085d35 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:55+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:08+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -3203,7 +3203,7 @@ msgstr "క్షమించండి, తప్పు ఆహ్వాన స msgid "Registration successful" msgstr "నమోదు విజయవంతం" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "నమోదు" @@ -3255,7 +3255,29 @@ msgstr "తాజా విశేషాలు, ప్రకటనలు, మర msgid "Longer name, preferably your \"real\" name" msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3264,7 +3286,7 @@ msgstr "" "నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM " "చిరునామా, మరియు ఫోన్ నంబర్." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3295,7 +3317,7 @@ msgstr "" "\n" "నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 568980585e..54d1a00d7f 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:53:01+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:12+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -3305,7 +3305,7 @@ msgstr "Onay kodu hatası." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Kayıt" @@ -3358,7 +3358,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3367,7 +3389,7 @@ msgstr "" "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon " "numarası." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3386,7 +3408,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 0893e4b6dd..ce85953d62 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:53:07+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:15+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -3264,7 +3264,7 @@ msgstr "Даруйте, помилка у коді запрошення." msgid "Registration successful" msgstr "Реєстрація успішна" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Реєстрація" @@ -3320,7 +3320,29 @@ msgstr "Використовується лише для оновлень, ог msgid "Longer name, preferably your \"real\" name" msgstr "Повне ім’я, звісно ж Ваше справжнє ім’я :)" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Зміст і дані %1$s є приватними і конфіденційними." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3329,7 +3351,7 @@ msgstr "" "Мої тексти і файли доступні під %s, окрім цих приватних даних: пароль, " "електронна адреса, адреса IM, телефонний номер." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3362,7 +3384,7 @@ msgstr "" "Дякуємо, що зареєструвались у нас, і, сподіваємось, Вам сподобається наш " "сервіс." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 94d77bdb94..de5d64dc13 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:53:11+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:18+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -3406,7 +3406,7 @@ msgstr "Lỗi xảy ra với mã xác nhận." msgid "Registration successful" msgstr "Đăng ký thành công" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Đăng ký" @@ -3461,14 +3461,36 @@ msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật kh msgid "Longer name, preferably your \"real\" name" msgstr "Họ tên đầy đủ của bạn, tốt nhất là tên thật của bạn." -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại" -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3499,7 +3521,7 @@ msgstr "" "\n" "Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 2b204d0317..771e303de5 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:53:21+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:21+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -3346,7 +3346,7 @@ msgstr "验证码出错。" msgid "Registration successful" msgstr "注册成功。" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "注册" @@ -3398,14 +3398,36 @@ msgstr "只用于更新、通告或密码恢复" msgid "Longer name, preferably your \"real\" name" msgstr "长名字，最好是“实名”" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。" -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3436,7 +3458,7 @@ msgstr "" "\n" "感谢您的注册，希望您喜欢这个服务。" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 127220dbd2..43e6effc8d 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:53:34+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:24+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -3237,7 +3237,7 @@ msgstr "確認碼發生錯誤" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -3289,14 +3289,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "不包含這些個人資料：密碼、電子信箱、線上即時通信箱、電話號碼" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3315,7 +3337,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" From a968cc69994588e475218975a6fcceb90b9826f8 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 17 May 2010 13:47:27 +1200 Subject: [PATCH 126/730] updated database for postgres --- db/statusnet_pg.sql | 73 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 8 deletions(-) diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 998cc71e94..9f97566a99 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -8,6 +8,10 @@ create table profile ( homepage varchar(255) /* comment 'identifying URL' */, bio varchar(140) /* comment 'descriptive biography' */, location varchar(255) /* comment 'physical location' */, + lat decimal(10,7) /* comment 'latitude'*/ , + lon decimal(10,7) /* comment 'longitude'*/ , + location_id integer /* comment 'location id if possible'*/ , + location_ns integer /* comment 'namespace for location'*/ , created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, modified timestamp /* comment 'date this record was modified' */, @@ -132,6 +136,7 @@ create table notice ( is_local integer default 0 /* comment 'notice was generated by a user' */, source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */, conversation integer /*id of root notice in this conversation' */ references notice (id), + location varchar(255) /* comment 'physical location' */, lat decimal(10,7) /* comment 'latitude'*/ , lon decimal(10,7) /* comment 'longitude'*/ , location_id integer /* comment 'location id if possible'*/ , @@ -213,17 +218,33 @@ create table nonce ( primary key (consumer_key, ts, nonce) ); -/* One-to-many relationship of user to openid_url */ - -create table user_openid ( - canonical varchar(255) primary key /* comment 'Canonical true URL' */, - display varchar(255) not null unique /* comment 'URL for viewing, may be different from canonical' */, - user_id integer not null /* comment 'user owning this URL' */ references "user" (id) , +create sequence oauth_application_seq; +create table oauth_application ( + id bigint default nextval('oauth_application_seq') primary key /* comment 'unique identifier' */, + owner integer not null /* comment 'owner of the application' */ references profile (id), + consumer_key varchar(255) not null /* comment 'application consumer key' */ references consumer (consumer_key), + name varchar(255) unique not null /* comment 'name of the application' */, + description varchar(255) /* comment 'description of the application' */, + icon varchar(255) not null /* comment 'application icon' */, + source_url varchar(255) /* comment 'application homepage - used for source link' */, + organization varchar(255) /* comment 'name of the organization running the application' */, + homepage varchar(255) /* comment 'homepage for the organization' */, + callback_url varchar(255) /* comment 'url to redirect to after authentication' */, + "type" integer default 0 /* comment 'type of app, 1 = browser, 2 = desktop' */, + access_type integer default 0 /* comment 'default access type, bit 1 = read, bit 2 = write' */, created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, modified timestamp /* comment 'date this record was modified' */ - ); -create index user_openid_user_id_idx on user_openid using btree(user_id); + +create table oauth_application_user ( + profile_id integer not null /* 'user of the application' */ references profile (id), + application_id integer not null /* 'id of the application' */ references oauth_application (id), + access_type integer default 0 /* 'access type, bit 1 = read, bit 2 = write' */, + token varchar(255) /* 'request or access token' */, + created timestamp not null default CURRENT_TIMESTAMP /* 'date this record was created' */, + modified timestamp /* 'date this record was modified' */, + primary key (profile_id, application_id) +); /* These are used by JanRain OpenID library */ @@ -589,3 +610,39 @@ create table login_token ( primary key (user_id) ); +create table user_location_prefs ( + user_id integer not null /* comment 'user who has the preference' */ references "user" (id), + share_location integer default 1 /* comment 'Whether to share location data' */, + created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */, + modified timestamp /* comment 'date this record was modified' */, + + primary key (user_id) +); + +create table inbox ( + + user_id integer not null /* comment 'user receiving the notice' */ references "user" (id), + notice_ids bytea /* comment 'packed list of notice ids' */, + + primary key (user_id) + +); + +create sequence conversation_seq; +create table conversation ( + id bigint default nextval('conversation_seq') primary key /* comment 'unique identifier' */, + uri varchar(225) unique /* comment 'URI of the conversation' */, + created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */, + modified timestamp /* comment 'date this record was modified' */ +); + +create table local_group ( + + group_id integer primary key /* comment 'group represented' */ references user_group (id), + nickname varchar(64) unique /* comment 'group represented' */, + + created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */, + modified timestamp /* comment 'date this record was modified' */ + +); + From 6f19830c9a1f7f73e6a3b09e78f22f65eb1779c4 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 17 May 2010 13:50:37 +1200 Subject: [PATCH 127/730] fix the column modify on stuff for postgres. change serial to bigserial --- lib/pgsqlschema.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 583d01e0a7..272f7eff68 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -143,6 +143,7 @@ class PgsqlSchema extends Schema $uniques = array(); $primary = array(); $indices = array(); + $onupdate = array(); $sql = "CREATE TABLE $name (\n"; @@ -321,7 +322,7 @@ class PgsqlSchema extends Schema public function modifyColumn($table, $columndef) { - $sql = "ALTER TABLE $table MODIFY COLUMN " . + $sql = "ALTER TABLE $table ALTER COLUMN TYPE " . $this->_columnSql($columndef); $res = $this->conn->query($sql); @@ -428,7 +429,9 @@ class PgsqlSchema extends Schema foreach ($tomod as $columnName) { $cd = $this->_byName($columns, $columnName); - $phrase[] = 'MODIFY COLUMN ' . $this->_columnSql($cd); + /* brute force */ + $phrase[] = 'DROP COLUMN ' . $columnName; + $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd); } $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase); @@ -505,7 +508,7 @@ class PgsqlSchema extends Schema return $sql; } if (!empty($cd->auto_increment)) { - $type = 'serial'; + $type = "bigserial"; // FIXME: creates the wrong name for the sequence for some internal sequence-lookup function, so better fix this to do the real 'create sequence' dance. } if (!empty($cd->size)) { From 48dc899acb9a0ac87140353092dab1f5e67753d8 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:56:43 +1200 Subject: [PATCH 128/730] added notice.location to group by --- lib/popularnoticesection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php index f70a972efe..3f02417901 100644 --- a/lib/popularnoticesection.php +++ b/lib/popularnoticesection.php @@ -72,7 +72,7 @@ class PopularNoticeSection extends NoticeSection $qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' . 'notice.rendered,notice.url,notice.created,notice.modified,' . 'notice.reply_to,notice.is_local,notice.source,notice.conversation, ' . - 'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of' . + 'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of,notice.location' . ' ORDER BY weight DESC'; $offset = 0; From e36df2921260a8970c81f2d729b121816be188e5 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 17 May 2010 19:37:47 +0000 Subject: [PATCH 129/730] Patch from g0: fix for conversation links in Realtime updates Previously was using the reply-to URL, which didn't match with other displays. Now sends to the right conversation page. --- plugins/Realtime/README | 1 - plugins/Realtime/RealtimePlugin.php | 40 ++++++++++++++++++++--------- plugins/Realtime/realtimeupdate.js | 4 +-- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/plugins/Realtime/README b/plugins/Realtime/README index 524382696b..99c79cfab5 100644 --- a/plugins/Realtime/README +++ b/plugins/Realtime/README @@ -1,6 +1,5 @@ == TODO == * i18n -* Change in context URL to conversation (try not to construct the URL in JS) * Update mark behaviour (on notice send) * Pause, Send a notice ~ should not update counter * Pause ~ retain up to 50-100 most recent notices diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index b559d80c60..fa1b5e3e1b 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -250,14 +250,7 @@ class RealtimePlugin extends Plugin $arr['url'] = $notice->bestUrl(); $arr['html'] = htmlspecialchars($notice->rendered); $arr['source'] = htmlspecialchars($arr['source']); - - if (!empty($notice->reply_to)) { - $reply_to = Notice::staticGet('id', $notice->reply_to); - if (!empty($reply_to)) { - $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); - } - $reply_to = null; - } + $arr['conversation_url'] = $this->getConversationUrl($notice); $profile = $notice->getProfile(); $arr['user']['profile_url'] = $profile->profileurl; @@ -272,10 +265,7 @@ class RealtimePlugin extends Plugin $arr['retweeted_status']['source'] = htmlspecialchars($original->source); $originalProfile = $original->getProfile(); $arr['retweeted_status']['user']['profile_url'] = $originalProfile->profileurl; - if (!empty($original->reply_to)) { - $originalReply = Notice::staticGet('id', $original->reply_to); - $arr['retweeted_status']['in_reply_to_status_url'] = $originalReply->bestUrl(); - } + $arr['retweeted_status']['conversation_url'] = $this->getConversationUrl($original); } $original = null; } @@ -303,6 +293,32 @@ class RealtimePlugin extends Plugin return $tags; } + function getConversationUrl($notice) + { + $convurl = null; + + if ($notice->hasConversation()) { + $conv = Conversation::staticGet( + 'id', + $notice->conversation + ); + $convurl = $conv->uri; + + if(empty($convurl)) { + $msg = sprintf( + "Couldn't find Conversation ID %d to make 'in context'" + . "link for Notice ID %d", + $notice->conversation, + $notice->id + ); + + common_log(LOG_WARNING, $msg); + } + } + + return $convurl; + } + function _getScripts() { return array('plugins/Realtime/realtimeupdate.js'); diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 2e5851ae53..25dc12d584 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -149,8 +149,8 @@ RealtimeUpdate = { "from "+ ""+source+""+ // may have a link ""; - if (data['in_reply_to_status_id']) { - ni = ni+" in context"; + if (data['conversation_url']) { + ni = ni+" in context"; } if (repeat) { From b77878f46729d48588fb32b8a54ae13f3752c558 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 17 May 2010 19:47:44 +0000 Subject: [PATCH 130/730] Include notice fragment on 'in context' links in Realtime plugin family. --- plugins/Realtime/RealtimePlugin.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index fa1b5e3e1b..352afcf785 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -313,6 +313,8 @@ class RealtimePlugin extends Plugin ); common_log(LOG_WARNING, $msg); + } else { + $convurl .= '#notice-' . $notice->id; } } From 6da59fab58b3f517a9e48204faa4f29ceabc4ba9 Mon Sep 17 00:00:00 2001 From: James Walker Date: Tue, 18 May 2010 10:09:16 -0400 Subject: [PATCH 131/730] invalid mbox_sha1sum in the case where users don't have an email address (reported by pedantic-web.org) --- actions/foaf.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/actions/foaf.php b/actions/foaf.php index 9cb65a8856..2f054de0c9 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -95,7 +95,9 @@ class FoafAction extends Action // Would be nice to tell if they were a Person or not (e.g. a #person usertag?) $this->elementStart('Agent', array('rdf:about' => $this->user->uri)); - $this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email)); + if ($this->user->email) { + $this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email)); + } if ($this->profile->fullname) { $this->element('name', null, $this->profile->fullname); } From 7c828ae5f8ab20f0daa8a1482fadce9b3e858975 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 18 May 2010 10:39:56 -0700 Subject: [PATCH 132/730] OpenID access control options: trusted provider URL, Launchpad team restrictions. Added an admin panel for setting these and OpenID-only mode, off by default. To enable the admin panel: $config['admin']['panels'][] = 'openid'; Or to set them manually: $config['openid']['trusted_provider'] = 'https://login.ubuntu.net/'; $config['openid']['required_team'] = 'my-project-cabal'; $config['site']['openidonly'] = true; OpenID-only mode can still be set from addPlugin() parameters as well for backwards compatibility. Note: if it's set there, that value will override the setting from the database or config.php. Note that team restrictions are only really meaningful if a trusted provider is set; otherwise, any OpenID server could report back that users are members of the given team. Restrictions are checked only at OpenID authentication time and will not kick off people currently with a session open; existing remembered logins may also survive these changes. Using code for Launchpad team support provided by Canonical under AGPLv3, pulled from r27 of WordPress teams integration plugin: https://code.edge.launchpad.net/~canonical-isd-hackers/wordpress-teams-integration/trunk --- plugins/OpenID/OpenIDPlugin.php | 67 +++++- plugins/OpenID/extlib/README | 6 + plugins/OpenID/extlib/teams-extension.php | 175 ++++++++++++++ plugins/OpenID/finishaddopenid.php | 6 + plugins/OpenID/finishopenidlogin.php | 6 + plugins/OpenID/openid.php | 36 +++ plugins/OpenID/openidadminpanel.php | 270 ++++++++++++++++++++++ plugins/OpenID/openidlogin.php | 22 +- plugins/OpenID/openidsettings.php | 70 +++--- 9 files changed, 611 insertions(+), 47 deletions(-) create mode 100644 plugins/OpenID/extlib/README create mode 100644 plugins/OpenID/extlib/teams-extension.php create mode 100644 plugins/OpenID/openidadminpanel.php diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 270e2c624b..9eac9f6fcd 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -20,7 +20,7 @@ * @category Plugin * @package StatusNet * @author Evan Prodromou - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -45,7 +45,19 @@ if (!defined('STATUSNET')) { class OpenIDPlugin extends Plugin { - public $openidOnly = false; + // Plugin parameter: set true to disallow non-OpenID logins + // If set, overrides the setting in database or $config['site']['openidonly'] + public $openidOnly = null; + + function initialize() + { + parent::initialize(); + if ($this->openidOnly !== null) { + global $config; + $config['site']['openidonly'] = (bool)$this->openidOnly; + } + + } /** * Add OpenID-related paths to the router table @@ -67,6 +79,7 @@ class OpenIDPlugin extends Plugin $m->connect('index.php?action=finishaddopenid', array('action' => 'finishaddopenid')); $m->connect('main/openidserver', array('action' => 'openidserver')); + $m->connect('admin/openid', array('action' => 'openidadminpanel')); return true; } @@ -84,7 +97,7 @@ class OpenIDPlugin extends Plugin function onStartConnectPath(&$path, &$defaults, &$rules, &$result) { - if ($this->openidOnly) { + if (common_config('site', 'openidonly')) { static $block = array('main/login', 'main/register', 'main/recoverpassword', @@ -108,7 +121,7 @@ class OpenIDPlugin extends Plugin function onArgsInitialize($args) { - if ($this->openidOnly) { + if (common_config('site', 'openidonly')) { if (array_key_exists('action', $args)) { $action = trim($args['action']); if (in_array($action, array('login', 'register'))) { @@ -199,7 +212,7 @@ class OpenIDPlugin extends Plugin function onStartPrimaryNav($action) { - if ($this->openidOnly && !common_logged_in()) { + if (common_config('site', 'openidonly') && !common_logged_in()) { // TRANS: Tooltip for main menu option "Login" $tooltip = _m('TOOLTIP', 'Login to the site'); // TRANS: Main menu option when not logged in to log in @@ -241,7 +254,7 @@ class OpenIDPlugin extends Plugin function onStartLoginGroupNav(&$action) { - if ($this->openidOnly) { + if (common_config('site', 'openidonly')) { $this->showOpenIDLoginTab($action); // Even though we replace this code, we // DON'T run the End* hook, to keep others from @@ -297,7 +310,7 @@ class OpenIDPlugin extends Plugin */ function onStartAccountSettingsPasswordMenuItem($menu, &$unused) { - if ($this->openidOnly) { + if (common_config('site', 'openidonly')) { return false; } return true; @@ -345,13 +358,19 @@ class OpenIDPlugin extends Plugin case 'OpenidsettingsAction': case 'OpenidserverAction': case 'OpenidtrustAction': - require_once INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; + case 'OpenidadminpanelAction': + require_once dirname(__FILE__) . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; return false; case 'User_openid': - require_once INSTALLDIR.'/plugins/OpenID/User_openid.php'; + require_once dirname(__FILE__) . '/User_openid.php'; return false; case 'User_openid_trustroot': - require_once INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php'; + require_once dirname(__FILE__) . '/User_openid_trustroot.php'; + return false; + case 'Auth_OpenID_TeamsExtension': + case 'Auth_OpenID_TeamsRequest': + case 'Auth_OpenID_TeamsResponse': + require_once dirname(__FILE__) . '/extlib/teams-extension.php'; return false; default: return true; @@ -442,7 +461,7 @@ class OpenIDPlugin extends Plugin function onRedirectToLogin($action, $user) { - if ($this->openidOnly || (!empty($user) && User_openid::hasOpenID($user->id))) { + if (common_config('site', 'openid_only') || (!empty($user) && User_openid::hasOpenID($user->id))) { common_redirect(common_local_url('openidlogin'), 303); return false; } @@ -577,6 +596,32 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Add an OpenID tab to the admin panel + * + * @param Widget $nav Admin panel nav + * + * @return boolean hook value + */ + + function onEndAdminPanelNav($nav) + { + if (AdminPanelAction::canAdmin('openid')) { + + $action_name = $nav->action->trimmed('action'); + + $nav->out->menuItem( + common_local_url('openidadminpanel'), + _m('OpenID'), + _m('OpenID configuration'), + $action_name == 'openidadminpanel', + 'nav_openid_admin_panel' + ); + } + + return true; + } + /** * Add our version information to output * diff --git a/plugins/OpenID/extlib/README b/plugins/OpenID/extlib/README new file mode 100644 index 0000000000..1fe80d79b6 --- /dev/null +++ b/plugins/OpenID/extlib/README @@ -0,0 +1,6 @@ +team-extension.php + Support for Launchpad's OpenID Teams extension + Maintainer: Canonical + Source: https://code.edge.launchpad.net/wordpress-teams-integration + r27 2010-04-27 + License: AGPLv3 diff --git a/plugins/OpenID/extlib/teams-extension.php b/plugins/OpenID/extlib/teams-extension.php new file mode 100644 index 0000000000..451f2fb194 --- /dev/null +++ b/plugins/OpenID/extlib/teams-extension.php @@ -0,0 +1,175 @@ +. + */ + +/** + * Provides an example OpenID extension to query user team/group membership + * + * This code is based on code supplied with the openid library for simple + * registration data. + */ + +/** + * Require the Message implementation. + */ +require_once 'Auth/OpenID/Message.php'; +require_once 'Auth/OpenID/Extension.php'; + +/** + * The team/group extension base class + */ +class Auth_OpenID_TeamsExtension extends Auth_OpenID_Extension { + var $ns_uri = 'http://ns.launchpad.net/2007/openid-teams'; + var $ns_alias = 'lp'; + var $request_field = 'query_membership'; + var $response_field = 'is_member'; + + /** + * Get the string arguments that should be added to an OpenID + * message for this extension. + */ + function getExtensionArgs() { + $args = array(); + + if ($this->_teams) { + $args[$this->request_field] = implode(',', $this->_teams); + } + + return $args; + } + + /** + * Add the arguments from this extension to the provided message. + * + * Returns the message with the extension arguments added. + */ + function toMessage(&$message) { + if ($message->namespaces->addAlias($this->ns_uri, $this->ns_alias) === null) { + if ($message->namespaces->getAlias($this->ns_uri) != $this->ns_alias) { + return null; + } + } + + $message->updateArgs($this->ns_uri, $this->getExtensionArgs()); + return $message; + } + + /** + * Extract the team/group namespace URI from the given OpenID message. + * Handles OpenID 1 and 2. + * + * $message: The OpenID message from which to parse team/group data. + * This may be a request or response message. + * + * Returns the sreg namespace URI for the supplied message. + * + * @access private + */ + function _getExtensionNS(&$message) { + $alias = null; + $found_ns_uri = null; + + // See if there exists an alias for the namespace + $alias = $message->namespaces->getAlias($this->ns_uri); + + if ($alias !== null) { + $found_ns_uri = $this->ns_uri; + } + + if ($alias === null) { + // There is no alias for this extension, so try to add one. + $found_ns_uri = Auth_OpenID_TYPE_1_0; + + if ($message->namespaces->addAlias($this->ns_uri, $this->ns_alias) === null) { + // An alias for the string 'lp' already exists, but + // it's defined for something other than team/group membership + return null; + } + } + + return $found_ns_uri; + } +} + +/** + * The team/group extension request class + */ +class Auth_OpenID_TeamsRequest extends Auth_OpenID_TeamsExtension { + function __init($teams) { + if (!is_array($teams)) { + if (!empty($teams)) { + $teams = explode(',', $teams); + } else { + $teams = Array(); + } + } + + $this->_teams = $teams; + } + + function Auth_OpenID_TeamsRequest($teams) { + $this->__init($teams); + } +} + +/** + * The team/group extension response class + */ +class Auth_OpenID_TeamsResponse extends Auth_OpenID_TeamsExtension { + var $_teams = array(); + + function __init(&$resp, $signed_only=true) { + $this->ns_uri = $this->_getExtensionNS($resp->message); + + if ($signed_only) { + $args = $resp->getSignedNS($this->ns_uri); + } else { + $args = $resp->message->getArgs($this->ns_uri); + } + + if ($args === null) { + return null; + } + + // An OpenID 2.0 response will handle the namespaces + if (in_array($this->response_field, array_keys($args)) && !empty($args[$this->response_field])) { + $this->_teams = explode(',', $args[$this->response_field]); + } + + // Piggybacking on a 1.x request, however, won't so the field name will + // be different + elseif (in_array($this->ns_alias.'.'.$this->response_field, array_keys($args)) && !empty($args[$this->ns_alias.'.'.$this->response_field])) { + $this->_teams = explode(',', $args[$this->ns_alias.'.'.$this->response_field]); + } + } + + function Auth_OpenID_TeamsResponse(&$resp, $signed_only=true) { + $this->__init($resp, $signed_only); + } + + /** + * Get the array of teams the user is a member of + * + * @return array + */ + function getTeams() { + return $this->_teams; + } +} + +?> diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php index 991e6584ee..df1763a52c 100644 --- a/plugins/OpenID/finishaddopenid.php +++ b/plugins/OpenID/finishaddopenid.php @@ -103,6 +103,12 @@ class FinishaddopenidAction extends Action $sreg = $sreg_resp->contents(); } + // Launchpad teams extension + if (!oid_check_teams($response)) { + $this->message(_m('OpenID authentication aborted: you are not allowed to login to this site.')); + return; + } + $cur = common_current_user(); $other = oid_get_user($canonical); diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index 32b092a0bd..57723ff97f 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -177,6 +177,12 @@ class FinishopenidloginAction extends Action $sreg = $sreg_resp->contents(); } + // Launchpad teams extension + if (!oid_check_teams($response)) { + $this->message(_m('OpenID authentication aborted: you are not allowed to login to this site.')); + return; + } + $user = oid_get_user($canonical); if ($user) { diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 4ec336e1c3..5ee9343d28 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -164,6 +164,15 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $auth_request->addExtension($sreg_request); } + $requiredTeam = common_config('openid', 'required_team'); + if ($requiredTeam) { + // LaunchPad OpenID extension + $team_request = new Auth_OpenID_TeamsRequest(array($requiredTeam)); + if ($team_request) { + $auth_request->addExtension($team_request); + } + } + $trust_root = common_root_url(true); $process_url = common_local_url($returnto); @@ -286,6 +295,33 @@ function oid_assert_allowed($url) return; } +/** + * Check the teams available in the given OpenID response + * Using Launchpad's OpenID teams extension + * + * @return boolean whether this user is acceptable + */ +function oid_check_teams($response) +{ + $requiredTeam = common_config('openid', 'required_team'); + if ($requiredTeam) { + $team_resp = new Auth_OpenID_TeamsResponse($response); + if ($team_resp) { + $teams = $team_resp->getTeams(); + } else { + $teams = array(); + } + + $match = in_array($requiredTeam, $teams); + $is = $match ? 'is' : 'is not'; + common_log(LOG_DEBUG, "Remote user $is in required team $requiredTeam: [" . implode(', ', $teams) . "]"); + + return $match; + } + + return true; +} + class AutosubmitAction extends Action { var $form_html = null; diff --git a/plugins/OpenID/openidadminpanel.php b/plugins/OpenID/openidadminpanel.php new file mode 100644 index 0000000000..0633063662 --- /dev/null +++ b/plugins/OpenID/openidadminpanel.php @@ -0,0 +1,270 @@ +. + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Administer global OpenID settings + * + * @category Admin + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class OpenidadminpanelAction extends AdminPanelAction +{ + /** + * Returns the page title + * + * @return string page title + */ + + function title() + { + return _m('OpenID'); + } + + /** + * Instructions for using this form. + * + * @return string instructions + */ + + function getInstructions() + { + return _m('OpenID settings'); + } + + /** + * Show the OpenID admin panel form + * + * @return void + */ + + function showForm() + { + $form = new OpenIDAdminPanelForm($this); + $form->show(); + return; + } + + /** + * Save settings from the form + * + * @return void + */ + + function saveSettings() + { + static $settings = array( + 'openid' => array('trusted_provider', 'required_team') + ); + + static $booleans = array( + 'site' => array('openidonly') + ); + + $values = array(); + + foreach ($settings as $section => $parts) { + foreach ($parts as $setting) { + $values[$section][$setting] + = $this->trimmed($setting); + } + } + + foreach ($booleans as $section => $parts) { + foreach ($parts as $setting) { + $values[$section][$setting] + = ($this->boolean($setting)) ? 1 : 0; + } + } + + // This throws an exception on validation errors + + $this->validate($values); + + // assert(all values are valid); + + $config = new Config(); + + $config->query('BEGIN'); + + foreach ($settings as $section => $parts) { + foreach ($parts as $setting) { + Config::save($section, $setting, $values[$section][$setting]); + } + } + + foreach ($booleans as $section => $parts) { + foreach ($parts as $setting) { + Config::save($section, $setting, $values[$section][$setting]); + } + } + + $config->query('COMMIT'); + + return; + } + + function validate(&$values) + { + // Validate consumer key and secret (can't be too long) + + if (mb_strlen($values['openid']['trusted_provider']) > 255) { + $this->clientError( + _m("Invalid provider URL. Max length is 255 characters.") + ); + } + + if (mb_strlen($values['openid']['required_team']) > 255) { + $this->clientError( + _m("Invalid team name. Max length is 255 characters.") + ); + } + } +} + +class OpenIDAdminPanelForm extends AdminForm +{ + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return 'openidadminpanel'; + } + + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_settings'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url('openidadminpanel'); + } + + /** + * Data elements of the form + * + * @return void + * + * @todo Some of the options could prevent users from logging in again. + * Make sure that the acting administrator has a valid OpenID matching, + * or more carefully warn folks. + */ + + function formData() + { + $this->out->elementStart( + 'fieldset', + array('id' => 'settings_openid') + ); + $this->out->element('legend', null, _m('Trusted provider')); + $this->out->element('p', 'form_guide', + _m('By default, users are allowed to authenticate with any OpenID provider. ' . + 'If you are using your own OpenID service for shared sign-in, ' . + 'you can restrict access to only your own users here.')); + $this->out->elementStart('ul', 'form_data'); + + $this->li(); + $this->input( + 'trusted_provider', + _m('Provider URL'), + _m('All OpenID logins will be sent to this URL; other providers may not be used.'), + 'openid' + ); + $this->unli(); + + $this->li(); + $this->input( + 'required_team', + _m('Required team'), + _m('Only allow logins from users in the given team (Launchpad extension).'), + 'openid' + ); + $this->unli(); + + $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); + + $this->out->elementStart( + 'fieldset', + array('id' => 'settings_openid-options') + ); + $this->out->element('legend', null, _m('Options')); + + $this->out->elementStart('ul', 'form_data'); + + $this->li(); + + $this->out->checkbox( + 'openidonly', _m('Enable OpenID-only mode'), + (bool) $this->value('openidonly', 'site'), + _m('Require all users to login via OpenID. WARNING: disables password authentication for all users!'), + 'true' + ); + $this->unli(); + + $this->out->elementEnd('ul'); + + $this->out->elementEnd('fieldset'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', _('Save'), 'submit', null, _m('Save OpenID settings')); + } +} diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php index 2a743672cf..8c559c9346 100644 --- a/plugins/OpenID/openidlogin.php +++ b/plugins/OpenID/openidlogin.php @@ -29,7 +29,12 @@ class OpenidloginAction extends Action if (common_is_real_login()) { $this->clientError(_m('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $openid_url = $this->trimmed('openid_url'); + $provider = common_config('openid', 'trusted_provider'); + if ($provider) { + $openid_url = $provider; + } else { + $openid_url = $this->trimmed('openid_url'); + } oid_assert_allowed($openid_url); @@ -116,9 +121,18 @@ class OpenidloginAction extends Action $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('openid_url', _m('OpenID URL'), - $this->openid_url, - _m('Your OpenID URL')); + $provider = common_config('openid', 'trusted_provider'); + if ($provider) { + $this->element('label', array(), _m('OpenID provider')); + $this->element('span', array(), $provider); + $this->element('p', 'form_guide', + _m('You will be sent to the provider\'s site for authentication.')); + $this->hidden('openid_url', $provider); + } else { + $this->input('openid_url', _m('OpenID URL'), + $this->openid_url, + _m('Your OpenID URL')); + } $this->elementEnd('li'); $this->elementStart('li', array('id' => 'settings_rememberme')); $this->checkbox('rememberme', _m('Remember me'), false, diff --git a/plugins/OpenID/openidsettings.php b/plugins/OpenID/openidsettings.php index 16142cf48c..505e7d0ee3 100644 --- a/plugins/OpenID/openidsettings.php +++ b/plugins/OpenID/openidsettings.php @@ -90,34 +90,36 @@ class OpenidsettingsAction extends AccountSettingsAction { $user = common_current_user(); - $this->elementStart('form', array('method' => 'post', - 'id' => 'form_settings_openid_add', - 'class' => 'form_settings', - 'action' => - common_local_url('openidsettings'))); - $this->elementStart('fieldset', array('id' => 'settings_openid_add')); - $this->element('legend', null, _m('Add OpenID')); - $this->hidden('token', common_session_token()); - $this->element('p', 'form_guide', - _m('If you want to add an OpenID to your account, ' . - 'enter it in the box below and click "Add".')); - $this->elementStart('ul', 'form_data'); - $this->elementStart('li'); - $this->element('label', array('for' => 'openid_url'), - _m('OpenID URL')); - $this->element('input', array('name' => 'openid_url', - 'type' => 'text', - 'id' => 'openid_url')); - $this->elementEnd('li'); - $this->elementEnd('ul'); - $this->element('input', array('type' => 'submit', - 'id' => 'settings_openid_add_action-submit', - 'name' => 'add', - 'class' => 'submit', - 'value' => _m('Add'))); - $this->elementEnd('fieldset'); - $this->elementEnd('form'); - + if (!common_config('openid', 'trusted_provider')) { + $this->elementStart('form', array('method' => 'post', + 'id' => 'form_settings_openid_add', + 'class' => 'form_settings', + 'action' => + common_local_url('openidsettings'))); + $this->elementStart('fieldset', array('id' => 'settings_openid_add')); + + $this->element('legend', null, _m('Add OpenID')); + $this->hidden('token', common_session_token()); + $this->element('p', 'form_guide', + _m('If you want to add an OpenID to your account, ' . + 'enter it in the box below and click "Add".')); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); + $this->element('label', array('for' => 'openid_url'), + _m('OpenID URL')); + $this->element('input', array('name' => 'openid_url', + 'type' => 'text', + 'id' => 'openid_url')); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->element('input', array('type' => 'submit', + 'id' => 'settings_openid_add_action-submit', + 'name' => 'add', + 'class' => 'submit', + 'value' => _m('Add'))); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + } $oid = new User_openid(); $oid->user_id = $user->id; @@ -234,10 +236,14 @@ class OpenidsettingsAction extends AccountSettingsAction } if ($this->arg('add')) { - $result = oid_authenticate($this->trimmed('openid_url'), - 'finishaddopenid'); - if (is_string($result)) { // error message - $this->showForm($result); + if (common_config('openid', 'trusted_provider')) { + $this->showForm(_m("Can't add new providers.")); + } else { + $result = oid_authenticate($this->trimmed('openid_url'), + 'finishaddopenid'); + if (is_string($result)) { // error message + $this->showForm($result); + } } } else if ($this->arg('remove')) { $this->removeOpenid(); From 813bbc912d73910943b966d1be80f27c3ff3584a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 18 May 2010 13:44:23 -0700 Subject: [PATCH 133/730] typo fix in en_GB localization (also updated @ translatewiki) --- locale/en_GB/LC_MESSAGES/statusnet.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 38caf74c60..bb3c577b6d 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -4889,7 +4889,7 @@ msgstr "Primary site navigation" #: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" -msgstr "ersonal profile and friends timeline" +msgstr "Personal profile and friends timeline" #. TRANS: Main menu option when logged in for access to personal profile and friends timeline #: lib/action.php:435 From 14a76926a225dec3d29aeffa13ab7ece74f708e5 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 18 May 2010 21:52:17 +0000 Subject: [PATCH 134/730] Redirect non-SSL hits to login & register actions to SSL if 'always' or 'sometimes' SSL modes are kicked in. The forms would already submit to SSL, but people are happier if they start on a secure page! Note: this really should be done for sensitive/all URLs in index.php, but it seems a bit awkward to reconstruct the SSL version of the link atm. Cleanup todo! --- actions/login.php | 22 ++++++++++++++++++++++ actions/register.php | 7 +++++++ 2 files changed, 29 insertions(+) diff --git a/actions/login.php b/actions/login.php index dc6352368a..d3e4312f71 100644 --- a/actions/login.php +++ b/actions/login.php @@ -62,6 +62,28 @@ class LoginAction extends Action return false; } + /** + * Prepare page to run + * + * + * @param $args + * @return string title + */ + + function prepare($args) + { + parent::prepare($args); + + // @todo this check should really be in index.php for all sensitive actions + $ssl = common_config('site', 'ssl'); + if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) { + common_redirect(common_local_url('login')); + // exit + } + + return true; + } + /** * Handle input, produce output * diff --git a/actions/register.php b/actions/register.php index 7fdbb4ded6..2fc7ef9219 100644 --- a/actions/register.php +++ b/actions/register.php @@ -74,6 +74,13 @@ class RegisterAction extends Action parent::prepare($args); $this->code = $this->trimmed('code'); + // @todo this check should really be in index.php for all sensitive actions + $ssl = common_config('site', 'ssl'); + if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) { + common_redirect(common_local_url('register')); + // exit + } + if (empty($this->code)) { common_ensure_session(); if (array_key_exists('invitecode', $_SESSION)) { From d9fddff5395e77287c4de0796fd072b3073f1eb9 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 5 May 2010 22:35:16 -0700 Subject: [PATCH 135/730] Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices --- classes/Notice.php | 17 +++++++++++++++-- lib/atomnoticefeed.php | 9 ++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 0b1b2e402d..9a9172cbab 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1171,7 +1171,7 @@ class Notice extends Memcached_DataObject return $groups; } - function asAtomEntry($namespace=false, $source=false, $author=true) + function asAtomEntry($namespace=false, $source=false, $author=true, $cur=null) { $profile = $this->getProfile(); @@ -1184,7 +1184,8 @@ class Notice extends Memcached_DataObject 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/', 'xmlns:media' => 'http://purl.org/syndication/atommedia', 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0', - 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0'); + 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0', + 'xmlns:statusnet' => 'http://status.net/ont/'); } else { $attrs = array(); } @@ -1210,6 +1211,18 @@ class Notice extends Memcached_DataObject $xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE)); $xs->element('updated', null, common_date_w3dtf($this->created)); + + $noticeInfoAttr = array( + 'local_id' => $this->id, // local notice ID (useful to clients for ordering) + 'source' => $this->source // the client name (source attribution) + // @todo source source_link + ); + + if (!empty($cur)) { + $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; + } + + $xs->element('statusnet:notice_info', $noticeInfoAttr, null); } if ($source) { diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php index e4df731fe0..35a45118ce 100644 --- a/lib/atomnoticefeed.php +++ b/lib/atomnoticefeed.php @@ -79,6 +79,11 @@ class AtomNoticeFeed extends Atom10Feed 'ostatus', 'http://ostatus.org/schema/1.0' ); + + $this->addNamespace( + 'statusnet', + 'http://status.net/ont/' + ); } /** @@ -110,7 +115,9 @@ class AtomNoticeFeed extends Atom10Feed $source = $this->showSource(); $author = $this->showAuthor(); - $this->addEntryRaw($notice->asAtomEntry(false, $source, $author)); + $cur = common_current_user(); + + $this->addEntryRaw($notice->asAtomEntry(false, $source, $author, $cur)); } function showSource() From c78f67aa7367acab5f9156ecf8963e2d5243e400 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 00:20:10 -0700 Subject: [PATCH 136/730] Refactor and centralize notice source link calculation --- actions/twitapisearchatom.php | 15 ++++++++-- classes/Notice.php | 39 +++++++++++++++++++++++- lib/apiaction.php | 51 ++++++++----------------------- lib/noticelist.php | 56 ++++++++++++++++------------------- 4 files changed, 90 insertions(+), 71 deletions(-) diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 24aa619bd7..3eb54ccc36 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -342,10 +342,21 @@ class TwitapisearchatomAction extends ApiAction 'rel' => 'related', 'href' => $profile->avatarUrl())); - // TODO: Here is where we'd put in a link to an atom feed for threads + // @todo: Here is where we'd put in a link to an atom feed for threads + + $source = null; + + $ns = $notice->getSource(); + if ($ns) { + if (!empty($ns->name) && !empty($ns->url)) { + $source = '' . $ns->name . ''; + } else { + $source = $ns->code; + } + } $this->element("twitter:source", null, - htmlentities($this->sourceLink($notice->source))); + htmlentities($source)); $this->elementStart('author'); diff --git a/classes/Notice.php b/classes/Notice.php index 9a9172cbab..2c2c87d560 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -703,7 +703,7 @@ class Notice extends Memcached_DataObject /** * Is this notice part of an active conversation? - * + * * @return boolean true if other messages exist in the same * conversation, false if this is the only one */ @@ -1809,4 +1809,41 @@ class Notice extends Memcached_DataObject return $result; } + + /** + * Get the source of the notice + * + * @return Notice_source $ns A notice source object. 'code' is the only attribute + * guaranteed to be populated. + */ + function getSource() + { + $ns = new Notice_source(); + if (!empty($this->source)) { + switch ($this->source) { + case 'web': + case 'xmpp': + case 'mail': + case 'omb': + case 'system': + case 'api': + $ns->code = $this->source; + break; + default: + $ns = Notice_source::staticGet($this->source); + if (!$ns) { + $ns = new Notice_source(); + $ns->code = $this->source; + $app = Oauth_application::staticGet('name', $this->source); + if ($app) { + $ns->name = $app->name; + $ns->url = $app->source_url; + } + } + break; + } + } + return $ns; + } + } diff --git a/lib/apiaction.php b/lib/apiaction.php index f87b046114..7a6a5549b2 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -260,7 +260,19 @@ class ApiAction extends Action $twitter_status['created_at'] = $this->dateTwitter($notice->created); $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ? intval($notice->reply_to) : null; - $twitter_status['source'] = $this->sourceLink($notice->source); + + $source = null; + + $ns = $notice->getSource(); + if ($ns) { + if (!empty($ns->name) && !empty($ns->url)) { + $source = '' . $ns->name . ''; + } else { + $source = $ns->code; + } + } + + $twitter_status['source'] = $source; $twitter_status['id'] = intval($notice->id); $replier_profile = null; @@ -1298,43 +1310,6 @@ class ApiAction extends Action } } - function sourceLink($source) - { - $source_name = _($source); - switch ($source) { - case 'web': - case 'xmpp': - case 'mail': - case 'omb': - case 'api': - break; - default: - - $name = null; - $url = null; - - $ns = Notice_source::staticGet($source); - - if ($ns) { - $name = $ns->name; - $url = $ns->url; - } else { - $app = Oauth_application::staticGet('name', $source); - if ($app) { - $name = $app->name; - $url = $app->source_url; - } - } - - if (!empty($name) && !empty($url)) { - $source_name = '' . $name . ''; - } - - break; - } - return $source_name; - } - /** * Returns query argument or default value if not found. Certain * parameters used throughout the API are lightly scrubbed and diff --git a/lib/noticelist.php b/lib/noticelist.php index 4f997a3286..e0d8bf560c 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -480,48 +480,44 @@ class NoticeListItem extends Widget function showNoticeSource() { - if ($this->notice->source) { + $ns = $this->notice->getSource(); + + if ($ns) { + $source_name = _($ns->code); $this->out->text(' '); $this->out->elementStart('span', 'source'); $this->out->text(_('from')); - $source_name = _($this->notice->source); $this->out->text(' '); - switch ($this->notice->source) { - case 'web': - case 'xmpp': - case 'mail': - case 'omb': - case 'system': - case 'api': - $this->out->element('span', 'device', $source_name); - break; - default: - $name = $source_name; - $url = null; + // if $ns->name and $ns->url are populated we have + // configured a source attr somewhere + if (empty($ns->name) && empty($ns->url)) { + // otherwise it's from normal channel such as web or api + $this->out->element('span', 'device', $source_name); + } else { + $name = null; + $url = null; + $title = null; if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { - $ns = Notice_source::staticGet($this->notice->source); - - if ($ns) { - $name = $ns->name; - $url = $ns->url; - } else { - $app = Oauth_application::staticGet('name', $this->notice->source); - if ($app) { - $name = $app->name; - $url = $app->source_url; - } - } + $name = $source_name; + $url = $ns->url; } Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); if (!empty($name) && !empty($url)) { $this->out->elementStart('span', 'device'); - $this->out->element('a', array('href' => $url, - 'rel' => 'external', - 'title' => $title), - $name); + + $attrs = array( + 'href' => $url, + 'rel' => 'external' + ); + + if (isset($title)) { + $attrs['title'] = $title; + } + + $this->out->element('a', $attrs, $name); $this->out->elementEnd('span'); } else { $this->out->element('span', 'device', $name); From 68634f04969d2d7bcbd1d657c466090990dea501 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 00:44:56 -0700 Subject: [PATCH 137/730] Add source link attr to statusnet:notice_info element in Atom output for notices --- classes/Notice.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 2c2c87d560..1965012797 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1215,8 +1215,14 @@ class Notice extends Memcached_DataObject $noticeInfoAttr = array( 'local_id' => $this->id, // local notice ID (useful to clients for ordering) 'source' => $this->source // the client name (source attribution) - // @todo source source_link - ); + ); + + $ns = $this->getSource(); + if ($ns) { + if (!empty($ns->url)) { + $noticeInfoAttr['source_link'] = htmlentities($ns->url); + } + } if (!empty($cur)) { $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; From 0dfef88cacde19cf0afaefbd422a7f5230091064 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 00:55:17 -0700 Subject: [PATCH 138/730] HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them --- actions/twitapisearchatom.php | 2 +- lib/apiaction.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 3eb54ccc36..6c740c4902 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -349,7 +349,7 @@ class TwitapisearchatomAction extends ApiAction $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' . $ns->name . ''; } else { $source = $ns->code; } diff --git a/lib/apiaction.php b/lib/apiaction.php index 7a6a5549b2..f3efff4021 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -266,13 +266,13 @@ class ApiAction extends Action $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' . $ns->name . ''; } else { $source = $ns->code; } } - $twitter_status['source'] = $source; + $twitter_status['source'] = htmlentities($source); $twitter_status['id'] = intval($notice->id); $replier_profile = null; From 6187266205a55db0298e02df7d6996a735d42eba Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 19:52:25 +0000 Subject: [PATCH 139/730] - OStatusPlugin should return true if it doesn't need to handle source attribution - Remove stray break statement from NoticeList --- lib/noticelist.php | 1 - plugins/OStatus/OStatusPlugin.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index e0d8bf560c..d22010335a 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -522,7 +522,6 @@ class NoticeListItem extends Widget } else { $this->out->element('span', 'device', $name); } - break; } $this->out->elementEnd('span'); } diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 5167842ca9..5b153216ef 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -452,6 +452,7 @@ class OStatusPlugin extends Plugin return false; } } + return true; } /** From 3708341857a8ae26c2936df53fede09aa17b09f8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 20:25:20 +0000 Subject: [PATCH 140/730] Allow OStatusPlugin to set the source attribution title --- lib/noticelist.php | 57 ++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index d22010335a..81da9edc0a 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -489,40 +489,37 @@ class NoticeListItem extends Widget $this->out->text(_('from')); $this->out->text(' '); + $name = $source_name; + $url = $ns->url; + $title = null; + + if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { + $name = $source_name; + $url = $ns->url; + } + Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); + // if $ns->name and $ns->url are populated we have // configured a source attr somewhere - if (empty($ns->name) && empty($ns->url)) { - // otherwise it's from normal channel such as web or api - $this->out->element('span', 'device', $source_name); + if (!empty($name) && !empty($url)) { + + $this->out->elementStart('span', 'device'); + + $attrs = array( + 'href' => $url, + 'rel' => 'external' + ); + + if (!empty($title)) { + $attrs['title'] = $title; + } + + $this->out->element('a', $attrs, $name); + $this->out->elementEnd('span'); } else { - $name = null; - $url = null; - $title = null; - - if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { - $name = $source_name; - $url = $ns->url; - } - Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); - - if (!empty($name) && !empty($url)) { - $this->out->elementStart('span', 'device'); - - $attrs = array( - 'href' => $url, - 'rel' => 'external' - ); - - if (isset($title)) { - $attrs['title'] = $title; - } - - $this->out->element('a', $attrs, $name); - $this->out->elementEnd('span'); - } else { - $this->out->element('span', 'device', $name); - } + $this->out->element('span', 'device', $name); } + $this->out->elementEnd('span'); } } From 5ea019c41ac4d6c161f3c8f287d405971d4aadea Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 21:36:13 +0000 Subject: [PATCH 141/730] Remove errant double HTML entity encoding in API source attribution --- actions/twitapisearchatom.php | 9 ++++++--- classes/Notice.php | 2 +- lib/apiaction.php | 8 ++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 6c740c4902..51e8a8881b 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -349,14 +349,17 @@ class TwitapisearchatomAction extends ApiAction $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' + . htmlspecialchars($ns->name) + . ''; } else { $source = $ns->code; } } - $this->element("twitter:source", null, - htmlentities($source)); + $this->element("twitter:source", null, $source); $this->elementStart('author'); diff --git a/classes/Notice.php b/classes/Notice.php index 1965012797..0dc7e10e79 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1220,7 +1220,7 @@ class Notice extends Memcached_DataObject $ns = $this->getSource(); if ($ns) { if (!empty($ns->url)) { - $noticeInfoAttr['source_link'] = htmlentities($ns->url); + $noticeInfoAttr['source_link'] = $ns->url; } } diff --git a/lib/apiaction.php b/lib/apiaction.php index f3efff4021..68198effc9 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -266,13 +266,17 @@ class ApiAction extends Action $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' + . htmlspecialchars($ns->name) + . ''; } else { $source = $ns->code; } } - $twitter_status['source'] = htmlentities($source); + $twitter_status['source'] = $source; $twitter_status['id'] = intval($notice->id); $replier_profile = null; From 114df39822d7007f1b08b83b4e9a26202936e8c8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 12 May 2010 15:08:01 -0700 Subject: [PATCH 142/730] Need to always emit statusnet:notice_info so it's available in profile feeds --- classes/Notice.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 0dc7e10e79..e173a24690 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1211,24 +1211,6 @@ class Notice extends Memcached_DataObject $xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE)); $xs->element('updated', null, common_date_w3dtf($this->created)); - - $noticeInfoAttr = array( - 'local_id' => $this->id, // local notice ID (useful to clients for ordering) - 'source' => $this->source // the client name (source attribution) - ); - - $ns = $this->getSource(); - if ($ns) { - if (!empty($ns->url)) { - $noticeInfoAttr['source_link'] = $ns->url; - } - } - - if (!empty($cur)) { - $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; - } - - $xs->element('statusnet:notice_info', $noticeInfoAttr, null); } if ($source) { @@ -1251,6 +1233,24 @@ class Notice extends Memcached_DataObject $xs->element('published', null, common_date_w3dtf($this->created)); $xs->element('updated', null, common_date_w3dtf($this->created)); + $noticeInfoAttr = array( + 'local_id' => $this->id, // local notice ID (useful to clients for ordering) + 'source' => $this->source // the client name (source attribution) + ); + + $ns = $this->getSource(); + if ($ns) { + if (!empty($ns->url)) { + $noticeInfoAttr['source_link'] = $ns->url; + } + } + + if (!empty($cur)) { + $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; + } + + $xs->element('statusnet:notice_info', $noticeInfoAttr, null); + if ($this->reply_to) { $reply_notice = Notice::staticGet('id', $this->reply_to); if (!empty($reply_notice)) { From 74a89b1fc37067d91d31bd66922053361eb4e616 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 19 May 2010 10:10:55 -0700 Subject: [PATCH 143/730] Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back. Should help with problems where xmppdaemon would get stuck in wrong locale. --- lib/mail.php | 20 ++++++++++---------- lib/util.php | 17 +++++++++++++++++ plugins/Facebook/facebookutil.php | 6 +++--- plugins/TwitterBridge/twitter.php | 6 +++--- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/lib/mail.php b/lib/mail.php index 5fc584e28a..a4065e8d50 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -224,9 +224,6 @@ function mail_subscribe_notify_profile($listenee, $other) if ($other->hasRight(Right::EMAILONSUBSCRIBE) && $listenee->email && $listenee->emailnotifysub) { - // use the recipient's localization - common_init_locale($listenee->language); - $profile = $listenee->getProfile(); $name = $profile->getBestName(); @@ -236,6 +233,9 @@ function mail_subscribe_notify_profile($listenee, $other) $recipients = $listenee->email; + // use the recipient's localization + common_switch_locale($listenee->language); + $headers = _mail_prepare_headers('subscribe', $listenee->nickname, $other->nickname); $headers['From'] = mail_notify_from(); $headers['To'] = $name . ' <' . $listenee->email . '>'; @@ -271,7 +271,7 @@ function mail_subscribe_notify_profile($listenee, $other) common_local_url('emailsettings')); // reset localization - common_init_locale(); + common_switch_locale(); mail_send($recipients, $headers, $body); } } @@ -473,7 +473,7 @@ function mail_confirm_sms($code, $nickname, $address) function mail_notify_nudge($from, $to) { - common_init_locale($to->language); + common_switch_locale($to->language); // TRANS: Subject for 'nudge' notification email $subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname); @@ -491,7 +491,7 @@ function mail_notify_nudge($from, $to) $from->nickname, common_local_url('all', array('nickname' => $to->nickname)), common_config('site', 'name')); - common_init_locale(); + common_switch_locale(); $headers = _mail_prepare_headers('nudge', $to->nickname, $from->nickname); @@ -525,7 +525,7 @@ function mail_notify_message($message, $from=null, $to=null) return true; } - common_init_locale($to->language); + common_switch_locale($to->language); // TRANS: Subject for direct-message notification email $subject = sprintf(_('New private message from %s'), $from->nickname); @@ -549,7 +549,7 @@ function mail_notify_message($message, $from=null, $to=null) $headers = _mail_prepare_headers('message', $to->nickname, $from->nickname); - common_init_locale(); + common_switch_locale(); return mail_to_user($to, $subject, $body, $headers); } @@ -577,7 +577,7 @@ function mail_notify_fave($other, $user, $notice) $bestname = $profile->getBestName(); - common_init_locale($other->language); + common_switch_locale($other->language); // TRANS: Subject for favorite notification email $subject = sprintf(_('%s (@%s) added your notice as a favorite'), $bestname, $user->nickname); @@ -605,7 +605,7 @@ function mail_notify_fave($other, $user, $notice) $headers = _mail_prepare_headers('fave', $other->nickname, $user->nickname); - common_init_locale(); + common_switch_locale(); mail_to_user($other, $subject, $body, $headers); } diff --git a/lib/util.php b/lib/util.php index efede1d4be..597da22c09 100644 --- a/lib/util.php +++ b/lib/util.php @@ -34,6 +34,14 @@ function common_user_error($msg, $code=400) $err->showPage(); } +/** + * This should only be used at setup; processes switching languages + * to send text to other users should use common_switch_locale(). + * + * @param string $language Locale language code (optional; empty uses + * current user's preference or site default) + * @return mixed success + */ function common_init_locale($language=null) { if(!$language) { @@ -50,6 +58,15 @@ function common_init_locale($language=null) return $ok; } +/** + * Initialize locale and charset settings and gettext with our message catalog, + * using the current user's language preference or the site default. + * + * This should generally only be run at framework initialization; code switching + * languages at runtime should call common_switch_language(). + * + * @access private + */ function common_init_language() { mb_internal_encoding('UTF-8'); diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index ac532e18bf..83664995ac 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -272,12 +272,12 @@ function remove_facebook_app($flink) function mail_facebook_app_removed($user) { - common_init_locale($user->language); - $profile = $user->getProfile(); $site_name = common_config('site', 'name'); + common_switch_locale($user->language); + $subject = sprintf( _m('Your %1$s Facebook application access has been disabled.', $site_name)); @@ -291,7 +291,7 @@ function mail_facebook_app_removed($user) "re-installing the %2\$s Facebook application.\n\nRegards,\n\n%2\$s"), $user->nickname, $site_name); - common_init_locale(); + common_switch_locale(); return mail_to_user($user, $subject, $body); } diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index 21adc7a908..896eee2dac 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -335,10 +335,10 @@ function remove_twitter_link($flink) function mail_twitter_bridge_removed($user) { - common_init_locale($user->language); - $profile = $user->getProfile(); + common_switch_locale($user->language); + $subject = sprintf(_m('Your Twitter bridge has been disabled.')); $site_name = common_config('site', 'name'); @@ -354,7 +354,7 @@ function mail_twitter_bridge_removed($user) common_local_url('twittersettings'), common_config('site', 'name')); - common_init_locale(); + common_switch_locale(); return mail_to_user($user, $subject, $body); } From 8dd29246741cc5afc56594802b1fa3fc38b9367e Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 19 May 2010 21:00:15 +0000 Subject: [PATCH 144/730] Hotpatch to add additional debug statements to FacebookPlugin's facebook posting code. --- plugins/Facebook/facebookutil.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index 83664995ac..ab2d427264 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -104,9 +104,13 @@ function facebookBroadcastNotice($notice) $status = "$prefix $notice->content"; + common_debug("FacebookPlugin - checking for publish_stream permission for user $user->id"); + $can_publish = $facebook->api_client->users_hasAppPermission('publish_stream', $fbuid); + common_debug("FacebookPlugin - checking for status_update permission for user $user->id"); + $can_update = $facebook->api_client->users_hasAppPermission('status_update', $fbuid); if (!empty($attachments) && $can_publish == 1) { @@ -114,15 +118,15 @@ function facebookBroadcastNotice($notice) $facebook->api_client->stream_publish($status, $fbattachment, null, null, $fbuid); common_log(LOG_INFO, - "Posted notice $notice->id w/attachment " . + "FacebookPlugin - Posted notice $notice->id w/attachment " . "to Facebook user's stream (fbuid = $fbuid)."); } elseif ($can_update == 1 || $can_publish == 1) { $facebook->api_client->users_setStatus($status, $fbuid, false, true); common_log(LOG_INFO, - "Posted notice $notice->id to Facebook " . + "FacebookPlugin - Posted notice $notice->id to Facebook " . "as a status update (fbuid = $fbuid)."); } else { - $msg = "Not sending notice $notice->id to Facebook " . + $msg = "FacebookPlugin - Not sending notice $notice->id to Facebook " . "because user $user->nickname hasn't given the " . 'Facebook app \'status_update\' or \'publish_stream\' permission.'; common_log(LOG_WARNING, $msg); @@ -138,7 +142,7 @@ function facebookBroadcastNotice($notice) $code = $e->getCode(); - $msg = "Facebook returned error code $code: " . + $msg = "FacebookPlugin - Facebook returned error code $code: " . $e->getMessage() . ' - ' . "Unable to update Facebook status (notice $notice->id) " . "for $user->nickname (user id: $user->id)!"; From 223795a2e430544e9702b1a6a5680fa4b8dfbb76 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 19 May 2010 15:12:39 -0700 Subject: [PATCH 145/730] Add config option for RequireValidatedEmail plugin to skip the check for folks with a trusted OpenID association. Also added an event that other plugins or local config can use to override the checks. --- plugins/RequireValidatedEmail/README | 14 ++++++ .../RequireValidatedEmailPlugin.php | 50 +++++++++++++++++-- 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/plugins/RequireValidatedEmail/README b/plugins/RequireValidatedEmail/README index 46ee24d5fe..84b1485b25 100644 --- a/plugins/RequireValidatedEmail/README +++ b/plugins/RequireValidatedEmail/README @@ -12,6 +12,20 @@ registered prior to that timestamp. addPlugin('RequireValidatedEmail', array('grandfatherCutoff' => 'Dec 7, 2009'); +You can also exclude the validation checks from OpenID accounts +connected to a trusted provider, by providing a list of regular +expressions to match their provider URLs. + +For example, to trust WikiHow and Wikipedia users: + + addPlugin('RequireValidatedEmailPlugin', array( + 'trustedOpenIDs' => array( + '!^http://\w+\.wikihow\.com/!', + '!^http://\w+\.wikipedia\.org/!', + ), + )); + + Todo: * add a more visible indicator that validation is still outstanding diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index ccefa14f62..009a2f78e1 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -37,6 +37,20 @@ class RequireValidatedEmailPlugin extends Plugin // without the validation requirement. public $grandfatherCutoff=null; + // If OpenID plugin is installed, users with a verified OpenID + // association whose provider URL matches one of these regexes + // will be considered to be sufficiently valid for our needs. + // + // For example, to trust WikiHow and Wikipedia OpenID users: + // + // addPlugin('RequireValidatedEmailPlugin', array( + // 'trustedOpenIDs' => array( + // '!^http://\w+\.wikihow\.com/!', + // '!^http://\w+\.wikipedia\.org/!', + // ), + // )); + public $trustedOpenIDs=array(); + function __construct() { parent::__construct(); @@ -90,13 +104,17 @@ class RequireValidatedEmailPlugin extends Plugin */ protected function validated($user) { - if ($this->grandfathered($user)) { - return true; - } - // The email field is only stored after validation... // Until then you'll find them in confirm_address. - return !empty($user->email); + $knownGood = !empty($user->email) || + $this->grandfathered($user) || + $this->hasTrustedOpenID($user); + + // Give other plugins a chance to override, if they can validate + // that somebody's ok despite a non-validated email. + Event::handle('RequireValidatedEmailPlugin_Override', array($user, &$knownGood)); + + return $knownGood; } /** @@ -118,6 +136,28 @@ class RequireValidatedEmailPlugin extends Plugin return false; } + /** + * Override for RequireValidatedEmail plugin. If we have a user who's + * not validated an e-mail, but did come from a trusted provider, + * we'll consider them ok. + */ + function hasTrustedOpenID($user) + { + if ($this->trustedOpenIDs && class_exists('User_openid')) { + foreach ($this->trustedOpenIDs as $regex) { + $oid = new User_openid(); + $oid->user_id = $user->id; + $oid->find(); + while ($oid->fetch()) { + if (preg_match($regex, $oid->canonical)) { + return true; + } + } + } + } + return false; + } + function onPluginVersion(&$versions) { $versions[] = array('name' => 'Require Validated Email', From 708d22848ecffdb80ca2cd9e5f4a7f84d5ae3189 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 19 May 2010 16:19:06 -0700 Subject: [PATCH 146/730] Quick fix for creating OpenID accounts authenticating against a MediaWiki site; trim the 'User:' etc from the final path segment before generating a nickname from it. Avoids ending up with nicks like 'userbrion' on your first OpenID login! --- lib/util.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/util.php b/lib/util.php index 597da22c09..59d5132ec6 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1925,6 +1925,15 @@ function common_url_to_nickname($url) $path = preg_replace('@/$@', '', $parts['path']); $path = preg_replace('@^/@', '', $path); $path = basename($path); + + // Hack for MediaWiki user pages, in the form: + // http://example.com/wiki/User:Myname + // ('User' may be localized.) + if (strpos($path, ':')) { + $parts = array_filter(explode(':', $path)); + $path = $parts[count($parts) - 1]; + } + if ($path) { return common_nicknamize($path); } From 68305d4b6848cec6afe887ee2a5735515060770e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 20 May 2010 12:46:36 -0700 Subject: [PATCH 147/730] Added block link to subscription notification emails; block action can now take a profile ID on the URL; added profile details to block page so there's an indication of who you're blocking before you pull the trigger. Fixed typo in RedirectingAction when no return-to data provided in form submission. RedirectingAction::returnToArgs() has been renamed to returnToPrevious() to avoid conflict with Action::returnToArgs() which returns arguments to be passed to other actions as return-to arguments. All callers should now be updated. More profile settings actions will now redirect through a login form if visited as a GET request, as would be expected from a bookmark, link sent in e-mail etc. --- actions/block.php | 46 ++++++++++++++++++++++++++++++-- actions/deleteuser.php | 4 +-- actions/groupblock.php | 4 +-- lib/mail.php | 10 +++++-- lib/profileformaction.php | 13 +++++++-- lib/redirectingaction.php | 9 ++++--- lib/router.php | 5 ++++ plugins/UserFlag/clearflag.php | 2 +- plugins/UserFlag/flagprofile.php | 2 +- 9 files changed, 79 insertions(+), 16 deletions(-) diff --git a/actions/block.php b/actions/block.php index 7f609c253b..239a50868d 100644 --- a/actions/block.php +++ b/actions/block.php @@ -87,13 +87,15 @@ class BlockAction extends ProfileFormAction { if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { - $this->returnToArgs(); + $this->returnToPrevious(); } elseif ($this->arg('yes')) { $this->handlePost(); - $this->returnToArgs(); + $this->returnToPrevious(); } else { $this->showPage(); } + } else { + $this->showPage(); } } @@ -118,6 +120,12 @@ class BlockAction extends ProfileFormAction */ function areYouSureForm() { + // @fixme if we ajaxify the confirmation form, skip the preview on ajax hits + $profile = new ArrayWrapper(array($this->profile)); + $preview = new ProfileList($profile, $this); + $preview->show(); + + $id = $this->profile->id; $this->elementStart('form', array('id' => 'block-' . $id, 'method' => 'post', @@ -175,4 +183,38 @@ class BlockAction extends ProfileFormAction $this->autofocus('form_action-yes'); } + /** + * Override for form session token checks; on our first hit we're just + * requesting confirmation, which doesn't need a token. We need to be + * able to take regular GET requests from email! + * + * @throws ClientException if token is bad on POST request or if we have + * confirmation parameters which could trigger something. + */ + function checkSessionToken() + { + if ($_SERVER['REQUEST_METHOD'] == 'POST' || + $this->arg('yes') || + $this->arg('no')) { + + return parent::checkSessionToken(); + } + } + + /** + * If we reached this form without returnto arguments, return to the + * current user's subscription list. + * + * @return string URL + */ + function defaultReturnTo() + { + $user = common_current_user(); + if ($user) { + return common_local_url('subscribers', + array('nickname' => $user->nickname)); + } else { + return common_local_url('public'); + } + } } diff --git a/actions/deleteuser.php b/actions/deleteuser.php index 42ef4b9f51..c0a8b20e2c 100644 --- a/actions/deleteuser.php +++ b/actions/deleteuser.php @@ -92,10 +92,10 @@ class DeleteuserAction extends ProfileFormAction { if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { - $this->returnToArgs(); + $this->returnToPrevious(); } elseif ($this->arg('yes')) { $this->handlePost(); - $this->returnToArgs(); + $this->returnToPrevious(); } else { $this->showPage(); } diff --git a/actions/groupblock.php b/actions/groupblock.php index fc95c0e669..2e06dc3249 100644 --- a/actions/groupblock.php +++ b/actions/groupblock.php @@ -117,7 +117,7 @@ class GroupblockAction extends RedirectingAction parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { - $this->returnToArgs(); + $this->returnToPrevious(); } elseif ($this->arg('yes')) { $this->blockProfile(); } elseif ($this->arg('blockto')) { @@ -195,7 +195,7 @@ class GroupblockAction extends RedirectingAction return false; } - $this->returnToArgs(); + $this->returnToPrevious(); } /** diff --git a/lib/mail.php b/lib/mail.php index a4065e8d50..ab5742e33d 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -245,6 +245,11 @@ function mail_subscribe_notify_profile($listenee, $other) $other->getBestName(), common_config('site', 'name')); + $blocklink = sprintf(_("If you believe this account is being used abusively, " . + "you can block them from your subscribers list and " . + "report as spam to site administrators at %s"), + common_local_url('block', array('profileid' => $other->id))); + // TRANS: Main body of new-subscriber notification e-mail $body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n". "\t".'%3$s'."\n\n". @@ -264,9 +269,10 @@ function mail_subscribe_notify_profile($listenee, $other) ($other->homepage) ? // TRANS: Profile info line in new-subscriber notification e-mail sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '', - ($other->bio) ? + (($other->bio) ? // TRANS: Profile info line in new-subscriber notification e-mail - sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '', + sprintf(_("Bio: %s"), $other->bio) . "\n" : '') . + "\n\n" . $blocklink . "\n", common_config('site', 'name'), common_local_url('emailsettings')); diff --git a/lib/profileformaction.php b/lib/profileformaction.php index 0ffafe5fb8..51c89a922e 100644 --- a/lib/profileformaction.php +++ b/lib/profileformaction.php @@ -60,7 +60,16 @@ class ProfileFormAction extends RedirectingAction $this->checkSessionToken(); if (!common_logged_in()) { - $this->clientError(_('Not logged in.')); + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->clientError(_('Not logged in.')); + } else { + // Redirect to login. + common_set_returnto($this->selfUrl()); + $user = common_current_user(); + if (Event::handle('RedirectToLogin', array($this, $user))) { + common_redirect(common_local_url('login'), 303); + } + } return false; } @@ -97,7 +106,7 @@ class ProfileFormAction extends RedirectingAction if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); - $this->returnToArgs(); + $this->returnToPrevious(); } } diff --git a/lib/redirectingaction.php b/lib/redirectingaction.php index f115852742..3a358f891c 100644 --- a/lib/redirectingaction.php +++ b/lib/redirectingaction.php @@ -53,12 +53,13 @@ class RedirectingAction extends Action * * To be called only after successful processing. * - * @fixme rename this -- it obscures Action::returnToArgs() which - * returns a list of arguments, and is a bit confusing. + * Note: this was named returnToArgs() up through 0.9.2, which + * caused problems because there's an Action::returnToArgs() + * already which does something different. * * @return void */ - function returnToArgs() + function returnToPrevious() { // Now, gotta figure where we go back to $action = false; @@ -77,7 +78,7 @@ class RedirectingAction extends Action if ($action) { common_redirect(common_local_url($action, $args, $params), 303); } else { - $url = $this->defaultReturnToUrl(); + $url = $this->defaultReturnTo(); } common_redirect($url, 303); } diff --git a/lib/router.php b/lib/router.php index a9d07276f3..afe44f92ad 100644 --- a/lib/router.php +++ b/lib/router.php @@ -136,6 +136,11 @@ class Router $m->connect('main/'.$a, array('action' => $a)); } + // Also need a block variant accepting ID on URL for mail links + $m->connect('main/block/:profileid', + array('action' => 'block'), + array('profileid' => '[0-9]+')); + $m->connect('main/sup/:seconds', array('action' => 'sup'), array('seconds' => '[0-9]+')); diff --git a/plugins/UserFlag/clearflag.php b/plugins/UserFlag/clearflag.php index bd6732e2da..f032527ed6 100644 --- a/plugins/UserFlag/clearflag.php +++ b/plugins/UserFlag/clearflag.php @@ -81,7 +81,7 @@ class ClearflagAction extends ProfileFormAction if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); if (!$this->boolean('ajax')) { - $this->returnToArgs(); + $this->returnToPrevious(); } } } diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php index 2d0f0abb90..018c1e8ac9 100644 --- a/plugins/UserFlag/flagprofile.php +++ b/plugins/UserFlag/flagprofile.php @@ -87,7 +87,7 @@ class FlagprofileAction extends ProfileFormAction if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); if (!$this->boolean('ajax')) { - $this->returnToArgs(); + $this->returnToPrevious(); } } } From 069a38e624836cfd3f0fa6cd0f34d9c8cc1eb564 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Fri, 21 May 2010 21:04:57 +1200 Subject: [PATCH 148/730] add comsumer_secret column to consumer --- db/08to09_pg.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index 2eac5dadf3..a1cbad8148 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -81,3 +81,5 @@ ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/; ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/; ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/; +ALTER TABLE consumer add COLUMN consumer_secret varchar(255) not null ; /*comment 'secret value'*/ + From 839592524783a686b4c5410ba5e273617132df06 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Fri, 21 May 2010 21:09:40 +1200 Subject: [PATCH 149/730] added comsumer_secret to consumer table on postgres --- db/statusnet_pg.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 9f97566a99..aad0def360 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -187,6 +187,7 @@ create index fave_modified_idx on fave using btree(modified); create table consumer ( consumer_key varchar(255) primary key /* comment 'unique identifier, root URL' */, + consumer_secret varchar(255) not null /* comment 'secret value', */, seed char(32) not null /* comment 'seed for new tokens by this consumer' */, created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, From 2c12d837c693a816541d32dd044de5277a46336d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 21 May 2010 10:12:39 -0700 Subject: [PATCH 150/730] Disable SSL peer/hostname verification for HTTPClient unless we've configured a trusted CA bundle like this: $config['http']['ssl_cafile'] = '/usr/lib/ssl/certs/ca-certificates.crt'; The previous state was failing on all HTTPS hits due to HTTP_Request2 library turning on the validation check but not specifying a CA file. --- lib/default.php | 3 +++ lib/httpclient.php | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/default.php b/lib/default.php index ab5f294ded..950c6018d8 100644 --- a/lib/default.php +++ b/lib/default.php @@ -304,4 +304,7 @@ $default = array('subscribers' => true, 'members' => true, 'peopletag' => true), + 'http' => // HTTP client settings when contacting other sites + array('ssl_cafile' => false // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt') + ), ); diff --git a/lib/httpclient.php b/lib/httpclient.php index 384626ae06..b69f718e5f 100644 --- a/lib/httpclient.php +++ b/lib/httpclient.php @@ -132,7 +132,19 @@ class HTTPClient extends HTTP_Request2 // ought to be investigated to see if we can handle // it gracefully in that case as well. $this->config['protocol_version'] = '1.0'; - + + // Default state of OpenSSL seems to have no trusted + // SSL certificate authorities, which breaks hostname + // verification and means we have a hard time communicating + // with other sites' HTTPS interfaces. + // + // Turn off verification unless we've configured a CA bundle. + if (common_config('http', 'ssl_cafile')) { + $this->config['ssl_cafile'] = common_config('http', 'ssl_cafile'); + } else { + $this->config['ssl_verify_peer'] = false; + } + parent::__construct($url, $method, $config); $this->setHeader('User-Agent', $this->userAgent()); } From cbf2e7cfea6c4360f9cc9037b242f2508964ccac Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 21 May 2010 10:18:13 -0700 Subject: [PATCH 151/730] Avoid PHP notice about undefined array index when no avatar photo available from Google profile --- plugins/OStatus/lib/discoveryhints.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php index ca54a0f5f5..34c9be2777 100644 --- a/plugins/OStatus/lib/discoveryhints.php +++ b/plugins/OStatus/lib/discoveryhints.php @@ -84,7 +84,7 @@ class DiscoveryHints { $hints['fullname'] = implode(' ', $hcard['n']); } - if (array_key_exists('photo', $hcard)) { + if (array_key_exists('photo', $hcard) && count($hcard['photo'])) { $hints['avatar'] = $hcard['photo'][0]; } From bbfd6eff0c69f038d151d3bf6c8bf9b45a64716f Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 21 May 2010 10:29:28 -0700 Subject: [PATCH 152/730] Add TweetDeck to notice sources --- db/notice_source.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/notice_source.sql b/db/notice_source.sql index f9c5256791..fbcdd6568e 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -54,6 +54,7 @@ VALUES ('tr.im','tr.im','http://tr.im/', now()), ('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', now()), ('tweenky','Tweenky','http://beta.tweenky.com/', now()), + ('TweetDeck', 'TweetDeck', 'http://www.tweetdeck.com/', now()), ('twhirl','Twhirl','http://www.twhirl.org/', now()), ('twibble','twibble','http://www.twibble.de/', now()), ('Twidge','Twidge','http://software.complete.org/twidge', now()), From afd81a540a556ef04bdc326a26268dc82b0dc5f6 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 21 May 2010 10:29:28 -0700 Subject: [PATCH 153/730] Add TweetDeck to notice sources --- db/notice_source.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/notice_source.sql b/db/notice_source.sql index f9c5256791..fbcdd6568e 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -54,6 +54,7 @@ VALUES ('tr.im','tr.im','http://tr.im/', now()), ('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', now()), ('tweenky','Tweenky','http://beta.tweenky.com/', now()), + ('TweetDeck', 'TweetDeck', 'http://www.tweetdeck.com/', now()), ('twhirl','Twhirl','http://www.twhirl.org/', now()), ('twibble','twibble','http://www.twibble.de/', now()), ('Twidge','Twidge','http://software.complete.org/twidge', now()), From cef2ded9e79b2d84fddd6e7f5af09c02c50315a8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 21 May 2010 10:29:28 -0700 Subject: [PATCH 154/730] Add TweetDeck to notice sources --- db/notice_source.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/notice_source.sql b/db/notice_source.sql index f9c5256791..fbcdd6568e 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -54,6 +54,7 @@ VALUES ('tr.im','tr.im','http://tr.im/', now()), ('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', now()), ('tweenky','Tweenky','http://beta.tweenky.com/', now()), + ('TweetDeck', 'TweetDeck', 'http://www.tweetdeck.com/', now()), ('twhirl','Twhirl','http://www.twhirl.org/', now()), ('twibble','twibble','http://www.twibble.de/', now()), ('Twidge','Twidge','http://software.complete.org/twidge', now()), From 206229875511d24a97a0aac79605f6868d21ee7f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 21 May 2010 14:07:59 -0700 Subject: [PATCH 155/730] Add $config['queue']['stomp_enqueue_to'] override for which queue server to send to. Must be set to a value that matches one of the entries in $config['queue']['stomp_server'] array, otherwise ignored. --- lib/stompqueuemanager.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php index 5d5c7ccfbd..de4ba7f01f 100644 --- a/lib/stompqueuemanager.php +++ b/lib/stompqueuemanager.php @@ -122,7 +122,19 @@ class StompQueueManager extends QueueManager public function enqueue($object, $queue) { $this->_connect(); - return $this->_doEnqueue($object, $queue, $this->defaultIdx); + if (common_config('queue', 'stomp_enqueue_on')) { + // We're trying to force all writes to a single server. + // WARNING: this might do odd things if that server connection dies. + $idx = array_search(common_config('queue', 'stomp_enqueue_on'), + $this->servers); + if ($idx === false) { + common_log(LOG_ERR, 'queue stomp_enqueue_on setting does not match our server list.'); + $idx = $this->defaultIdx; + } + } else { + $idx = $this->defaultIdx; + } + return $this->_doEnqueue($object, $queue, $idx); } /** From fa4a2d34855da5eca29d81409cb5fbd64f13faba Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 22 May 2010 20:04:46 +1200 Subject: [PATCH 156/730] added verifier and verified_callback to postgres schema and update script --- db/08to09_pg.sql | 3 +++ db/statusnet_pg.sql | 3 +++ 2 files changed, 6 insertions(+) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index a1cbad8148..ecf1008840 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -83,3 +83,6 @@ ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for loc ALTER TABLE consumer add COLUMN consumer_secret varchar(255) not null ; /*comment 'secret value'*/ +ALTER TABLE token ADD COLUMN verifier varchar(255); /* comment 'verifier string for OAuth 1.0a',*/ +ALTER TABLE token ADD COLUMN verified_callback varchar(255); /* comment 'verified callback URL for OAuth 1.0a',*/ + diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index aad0def360..d8f5286bd5 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -201,6 +201,9 @@ create table token ( type integer not null default 0 /* comment 'request or access' */, state integer default 0 /* comment 'for requests 0 = initial, 1 = authorized, 2 = used' */, + verifier varchar(255) comment 'verifier string for OAuth 1.0a', + verified_callback varchar(255) comment 'verified callback URL for OAuth 1.0a', + created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, modified timestamp /* comment 'date this record was modified' */, From f4d0f721c83fdfebeb94b62af6f781c51d557e03 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 22 May 2010 20:09:51 +1200 Subject: [PATCH 157/730] fixed up comment syntax --- db/statusnet_pg.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index d8f5286bd5..27c4adc98c 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -201,8 +201,8 @@ create table token ( type integer not null default 0 /* comment 'request or access' */, state integer default 0 /* comment 'for requests 0 = initial, 1 = authorized, 2 = used' */, - verifier varchar(255) comment 'verifier string for OAuth 1.0a', - verified_callback varchar(255) comment 'verified callback URL for OAuth 1.0a', + verifier varchar(255) /*comment 'verifier string for OAuth 1.0a'*/, + verified_callback varchar(255) /*comment 'verified callback URL for OAuth 1.0a'*/, created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, modified timestamp /* comment 'date this record was modified' */, From 249c820559a09e167c99d085172b93f65bf36bfc Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 22 May 2010 20:50:30 +1200 Subject: [PATCH 158/730] migration of data in queue_item to new table --- db/08to09_pg.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index ecf1008840..b7a0eb8e8c 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -86,3 +86,18 @@ ALTER TABLE consumer add COLUMN consumer_secret varchar(255) not null ; /*commen ALTER TABLE token ADD COLUMN verifier varchar(255); /* comment 'verifier string for OAuth 1.0a',*/ ALTER TABLE token ADD COLUMN verified_callback varchar(255); /* comment 'verified callback URL for OAuth 1.0a',*/ +create table queue_item_new ( + id serial /* comment 'unique identifier'*/, + frame bytea not null /* comment 'data: object reference or opaque string'*/, + transport varchar(8) not null /*comment 'queue for what? "email", "jabber", "sms", "irc", ...'*/, + created timestamp not null default CURRENT_TIMESTAMP /*comment 'date this record was created'*/, + claimed timestamp /*comment 'date this item was claimed'*/, + PRIMARY KEY (id) +); + +insert into queue_item_new (frame,transport,created,claimed) + select ('0x' || notice_id::text)::bytea,transport,created,claimed from queue_item; +alter table queue_item rename to queue_item_old; +alter table queue_item_new rename to queue_item; + + From bfef9184820fd1fc40d86c8e65c628c6ae88a691 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 22 May 2010 20:52:53 +1200 Subject: [PATCH 159/730] queue_item in _pg now matches mysql --- db/statusnet_pg.sql | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 27c4adc98c..3f62ab7527 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -287,14 +287,12 @@ create table remember_me ( ); create table queue_item ( - - notice_id integer not null /* comment 'notice queued' */ references notice (id) , - transport varchar(8) not null /* comment 'queue for what? "email", "jabber", "sms", "irc", ...' */, - created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, - claimed timestamp /* comment 'date this item was claimed' */, - - primary key (notice_id, transport) - + id serial /* comment 'unique identifier'*/, + frame bytea not null /* comment 'data: object reference or opaque string'*/, + transport varchar(8) not null /*comment 'queue for what? "email", "jabber", "sms", "irc", ...'*/, + created timestamp not null default CURRENT_TIMESTAMP /*comment 'date this record was created'*/, + claimed timestamp /*comment 'date this item was claimed'*/, + PRIMARY KEY (id) ); create index queue_item_created_idx on queue_item using btree(created); From dc22ed84807555f6a16c041c16b3bc607c6587d8 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 22 May 2010 17:43:56 -0700 Subject: [PATCH 160/730] Hotpatch for Facebook mirror problems: drop messages when hitting rate limit (err 341) instead of retrying forever. On unknown errors, now throwing an exception so it'll hit the message retry limits. --- plugins/Facebook/facebookutil.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index ab2d427264..045891649c 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -158,9 +158,22 @@ function facebookBroadcastNotice($notice) remove_facebook_app($flink); - } else { + } else if ($code == 341) { + // 341 Feed action request limit reached - Unable to update Facebook status + // Reposting immediately probably won't work, so drop the message for now. :( + + common_log(LOG_ERR, "Facebook rate limit hit: dropping notice $notice->id"); + return true; + } else { // Try sending again later. + // + // @fixme at the moment, returning false here could lead to an infinite loop + // if the error condition isn't actually transitory. + // + // Temporarily throwing an exception to kill the process so it'll hit our + // retry limits. + throw new Exception("Facebook error $code on notice $notice->id"); return false; } From f7add6f25f37780fde2269b254c237caea9ef98d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 24 May 2010 07:47:15 -0700 Subject: [PATCH 161/730] Handle funky notice deletion cases more gracefully: if we already have a deleted_notice entry, don't freak out when we try to save it again on the second try. --- classes/Notice.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index e173a24690..d85c8cd33a 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -97,15 +97,20 @@ class Notice extends Memcached_DataObject // For auditing purposes, save a record that the notice // was deleted. - $deleted = new Deleted_notice(); + // @fixme we have some cases where things get re-run and so the + // insert fails. + $deleted = Deleted_notice::staticGet('id', $this->id); + if (!$deleted) { + $deleted = new Deleted_notice(); - $deleted->id = $this->id; - $deleted->profile_id = $this->profile_id; - $deleted->uri = $this->uri; - $deleted->created = $this->created; - $deleted->deleted = common_sql_now(); + $deleted->id = $this->id; + $deleted->profile_id = $this->profile_id; + $deleted->uri = $this->uri; + $deleted->created = $this->created; + $deleted->deleted = common_sql_now(); - $deleted->insert(); + $deleted->insert(); + } // Clear related records From 8d8751472766d1d6b0f89616152503ad35f65ab0 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 21 May 2010 05:03:23 +0000 Subject: [PATCH 162/730] Upgrade to latest old REST API library (0.1.0) --- plugins/Facebook/facebook/facebook.php | 74 ++++++++++--------- .../facebook/facebookapi_php5_restlib.php | 56 +------------- 2 files changed, 42 insertions(+), 88 deletions(-) diff --git a/plugins/Facebook/facebook/facebook.php b/plugins/Facebook/facebook/facebook.php index 440706cbc3..76696c1d55 100644 --- a/plugins/Facebook/facebook/facebook.php +++ b/plugins/Facebook/facebook/facebook.php @@ -45,7 +45,9 @@ class Facebook { public $user; public $profile_user; public $canvas_user; + public $ext_perms = array(); protected $base_domain; + /* * Create a Facebook client like this: * @@ -104,17 +106,17 @@ class Facebook { * * For nitty-gritty details of when each of these is used, check out * http://wiki.developers.facebook.com/index.php/Verifying_The_Signature - * - * @param bool resolve_auth_token convert an auth token into a session */ - public function validate_fb_params($resolve_auth_token=true) { + public function validate_fb_params() { $this->fb_params = $this->get_valid_fb_params($_POST, 48 * 3600, 'fb_sig'); // note that with preload FQL, it's possible to receive POST params in // addition to GET, so use a different prefix to differentiate them if (!$this->fb_params) { $fb_params = $this->get_valid_fb_params($_GET, 48 * 3600, 'fb_sig'); - $fb_post_params = $this->get_valid_fb_params($_POST, 48 * 3600, 'fb_post_sig'); + $fb_post_params = $this->get_valid_fb_params($_POST, + 48 * 3600, // 48 hours + 'fb_post_sig'); $this->fb_params = array_merge($fb_params, $fb_post_params); } @@ -128,6 +130,9 @@ class Facebook { $this->fb_params['canvas_user'] : null; $this->base_domain = isset($this->fb_params['base_domain']) ? $this->fb_params['base_domain'] : null; + $this->ext_perms = isset($this->fb_params['ext_perms']) ? + explode(',', $this->fb_params['ext_perms']) + : array(); if (isset($this->fb_params['session_key'])) { $session_key = $this->fb_params['session_key']; @@ -141,13 +146,11 @@ class Facebook { $this->set_user($user, $session_key, $expires); - } - // if no Facebook parameters were found in the GET or POST variables, - // then fall back to cookies, which may have cached user information - // Cookies are also used to receive session data via the Javascript API - else if ($cookies = - $this->get_valid_fb_params($_COOKIE, null, $this->api_key)) { - + } else if ($cookies = + $this->get_valid_fb_params($_COOKIE, null, $this->api_key)) { + // if no Facebook parameters were found in the GET or POST variables, + // then fall back to cookies, which may have cached user information + // Cookies are also used to receive session data via the Javascript API $base_domain_cookie = 'base_domain_' . $this->api_key; if (isset($_COOKIE[$base_domain_cookie])) { $this->base_domain = $_COOKIE[$base_domain_cookie]; @@ -160,25 +163,6 @@ class Facebook { $cookies['session_key'], $expires); } - // finally, if we received no parameters, but the 'auth_token' GET var - // is present, then we are in the middle of auth handshake, - // so go ahead and create the session - else if ($resolve_auth_token && isset($_GET['auth_token']) && - $session = $this->do_get_session($_GET['auth_token'])) { - if ($this->generate_session_secret && - !empty($session['secret'])) { - $session_secret = $session['secret']; - } - - if (isset($session['base_domain'])) { - $this->base_domain = $session['base_domain']; - } - - $this->set_user($session['uid'], - $session['session_key'], - $session['expires'], - isset($session_secret) ? $session_secret : null); - } return !empty($this->fb_params); } @@ -309,11 +293,28 @@ class Facebook { // require_add and require_install have been removed. // see http://developer.facebook.com/news.php?blog=1&story=116 for more details - public function require_login() { - if ($user = $this->get_loggedin_user()) { + public function require_login($required_permissions = '') { + $user = $this->get_loggedin_user(); + $has_permissions = true; + + if ($required_permissions) { + $this->require_frame(); + $permissions = array_map('trim', explode(',', $required_permissions)); + foreach ($permissions as $permission) { + if (!in_array($permission, $this->ext_perms)) { + $has_permissions = false; + break; + } + } + } + + if ($user && $has_permissions) { return $user; } - $this->redirect($this->get_login_url(self::current_url(), $this->in_frame())); + + $this->redirect( + $this->get_login_url(self::current_url(), $this->in_frame(), + $required_permissions)); } public function require_frame() { @@ -342,10 +343,11 @@ class Facebook { return $page . '?' . http_build_query($params); } - public function get_login_url($next, $canvas) { + public function get_login_url($next, $canvas, $req_perms = '') { $page = self::get_facebook_url().'/login.php'; - $params = array('api_key' => $this->api_key, - 'v' => '1.0'); + $params = array('api_key' => $this->api_key, + 'v' => '1.0', + 'req_perms' => $req_perms); if ($next) { $params['next'] = $next; diff --git a/plugins/Facebook/facebook/facebookapi_php5_restlib.php b/plugins/Facebook/facebook/facebookapi_php5_restlib.php index fa1088cd00..e249a326b2 100755 --- a/plugins/Facebook/facebook/facebookapi_php5_restlib.php +++ b/plugins/Facebook/facebook/facebookapi_php5_restlib.php @@ -569,7 +569,7 @@ function toggleDisplay(id, type) { return $this->call_method('facebook.events.invite', array('eid' => $eid, 'uids' => $uids, - 'personal_message', $personal_message)); + 'personal_message' => $personal_message)); } /** @@ -1350,53 +1350,6 @@ function toggleDisplay(id, type) { ); } - /** - * Dashboard API - */ - - /** - * Set the news for the specified user. - * - * @param int $uid The user for whom you are setting news for - * @param string $news Text of news to display - * - * @return bool Success - */ - public function dashboard_setNews($uid, $news) { - return $this->call_method('facebook.dashboard.setNews', - array('uid' => $uid, - 'news' => $news) - ); - } - - /** - * Get the current news of the specified user. - * - * @param int $uid The user to get the news of - * - * @return string The text of the current news for the user - */ - public function dashboard_getNews($uid) { - return json_decode( - $this->call_method('facebook.dashboard.getNews', - array('uid' => $uid) - ), true); - } - - /** - * Set the news for the specified user. - * - * @param int $uid The user you are clearing the news of - * - * @return bool Success - */ - public function dashboard_clearNews($uid) { - return $this->call_method('facebook.dashboard.clearNews', - array('uid' => $uid) - ); - } - - /** * Creates a note with the specified title and content. @@ -2005,7 +1958,7 @@ function toggleDisplay(id, type) { * @return array A list of strings describing any compile errors for the * submitted FBML */ - function profile_setFBML($markup, + public function profile_setFBML($markup, $uid=null, $profile='', $profile_action='', @@ -3267,9 +3220,8 @@ function toggleDisplay(id, type) { } else { $get['v'] = '1.0'; } - if (isset($this->use_ssl_resources) && - $this->use_ssl_resources) { - $post['return_ssl_resources'] = true; + if (isset($this->use_ssl_resources)) { + $post['return_ssl_resources'] = (bool) $this->use_ssl_resources; } return array($get, $post); } From 777ca74500025c616ae689f9a92b3233cf8466f7 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 24 May 2010 21:25:21 +0000 Subject: [PATCH 163/730] Upgrade Facebook posting: - Use FQL to check for publish stream permission instead of old REST API - Better error handling, especially for error code 100 - More logging / better log messages --- plugins/Facebook/facebookutil.php | 320 +++++++++++++++++++++++------- 1 file changed, 247 insertions(+), 73 deletions(-) diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index 045891649c..e52a3deaef 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -81,114 +81,288 @@ function isFacebookBound($notice, $flink) { function facebookBroadcastNotice($notice) { $facebook = getFacebook(); - $flink = Foreign_link::getByUserID($notice->profile_id, FACEBOOK_SERVICE); + $flink = Foreign_link::getByUserID( + $notice->profile_id, + FACEBOOK_SERVICE + ); if (isFacebookBound($notice, $flink)) { // Okay, we're good to go, update the FB status - $status = null; $fbuid = $flink->foreign_id; $user = $flink->getUser(); - $attachments = $notice->attachments(); try { - // Get the status 'verb' (prefix) the user has set + // Check permissions - // XXX: Does this call count against our per user FB request limit? - // If so we should consider storing verb elsewhere or not storing + common_debug( + 'FacebookPlugin - checking for publish_stream permission for user ' + . "$user->nickname ($user->id), Facebook UID: $fbuid" + ); - $prefix = trim($facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX, - $fbuid)); + // NOTE: $facebook->api_client->users_hasAppPermission('publish_stream', $fbuid) + // has been returning bogus results, so we're using FQL to check for + // publish_stream permission now - $status = "$prefix $notice->content"; + $fql = "SELECT publish_stream FROM permissions WHERE uid = $fbuid"; + $result = $facebook->api_client->fql_query($fql); - common_debug("FacebookPlugin - checking for publish_stream permission for user $user->id"); + $canPublish = 0; - $can_publish = $facebook->api_client->users_hasAppPermission('publish_stream', - $fbuid); + if (!empty($result)) { + $canPublish = $result[0]['publish_stream']; + } - common_debug("FacebookPlugin - checking for status_update permission for user $user->id"); + if ($canPublish == 1) { + common_debug( + "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid " + . 'has publish_stream permission.' + ); + } else { + common_debug( + "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid " + . 'does NOT have publish_stream permission. Facebook ' + . 'returned: ' . var_export($result, true) + ); + } - $can_update = $facebook->api_client->users_hasAppPermission('status_update', - $fbuid); - if (!empty($attachments) && $can_publish == 1) { - $fbattachment = format_attachments($attachments); - $facebook->api_client->stream_publish($status, $fbattachment, - null, null, $fbuid); - common_log(LOG_INFO, - "FacebookPlugin - Posted notice $notice->id w/attachment " . - "to Facebook user's stream (fbuid = $fbuid)."); - } elseif ($can_update == 1 || $can_publish == 1) { - $facebook->api_client->users_setStatus($status, $fbuid, false, true); - common_log(LOG_INFO, - "FacebookPlugin - Posted notice $notice->id to Facebook " . - "as a status update (fbuid = $fbuid)."); + common_debug( + 'FacebookPlugin - checking for status_update permission for user ' + . "$user->nickname ($user->id), Facebook UID: $fbuid. " + ); + + $canUpdate = $facebook->api_client->users_hasAppPermission( + 'status_update', + $fbuid + ); + + if ($canUpdate == 1) { + common_debug( + "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid " + . 'has status_update permission.' + ); + } else { + common_debug( + "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid " + .'does NOT have status_update permission. Facebook ' + . 'returned: ' . var_export($can_publish, true) + ); + } + + // Post to Facebook + + if ($notice->hasAttachments() && $canPublish == 1) { + publishStream($notice, $user, $fbuid); + } elseif ($canUpdate == 1 || $canPublish == 1) { + statusUpdate($notice, $user, $fbuid); } else { $msg = "FacebookPlugin - Not sending notice $notice->id to Facebook " . - "because user $user->nickname hasn't given the " . + "because user $user->nickname has not given the " . 'Facebook app \'status_update\' or \'publish_stream\' permission.'; common_log(LOG_WARNING, $msg); } // Finally, attempt to update the user's profile box - if ($can_publish == 1 || $can_update == 1) { - updateProfileBox($facebook, $flink, $notice); + if ($canPublish == 1 || $canUpdate == 1) { + updateProfileBox($facebook, $flink, $notice, $user); } } catch (FacebookRestClientException $e) { - - $code = $e->getCode(); - - $msg = "FacebookPlugin - Facebook returned error code $code: " . - $e->getMessage() . ' - ' . - "Unable to update Facebook status (notice $notice->id) " . - "for $user->nickname (user id: $user->id)!"; - - common_log(LOG_WARNING, $msg); - - if ($code == 100 || $code == 200 || $code == 250) { - - // 100 The account is 'inactive' (probably - this is not well documented) - // 200 The application does not have permission to operate on the passed in uid parameter. - // 250 Updating status requires the extended permission status_update or publish_stream. - // see: http://wiki.developers.facebook.com/index.php/Users.setStatus#Example_Return_XML - - remove_facebook_app($flink); - - } else if ($code == 341) { - // 341 Feed action request limit reached - Unable to update Facebook status - // Reposting immediately probably won't work, so drop the message for now. :( - - common_log(LOG_ERR, "Facebook rate limit hit: dropping notice $notice->id"); - return true; - } else { - - // Try sending again later. - // - // @fixme at the moment, returning false here could lead to an infinite loop - // if the error condition isn't actually transitory. - // - // Temporarily throwing an exception to kill the process so it'll hit our - // retry limits. - throw new Exception("Facebook error $code on notice $notice->id"); - - return false; - } - + return handleFacebookError($e, $notice, $flink); } } return true; - } -function updateProfileBox($facebook, $flink, $notice) { - $fbaction = new FacebookAction($output = 'php://output', - $indent = null, $facebook, $flink); +function handleFacebookError($e, $notice, $flink) +{ + $fbuid = $flink->foreign_id; + $user = $flink->getUser(); + $code = $e->getCode(); + $errmsg = $e->getMessage(); + + // XXX: Check for any others? + switch($code) { + case 100: // Invalid parameter + $msg = "FacebookPlugin - Facebook claims notice %d was posted with an invalid parameter (error code 100):" + . "\"%s\" (Notice details: nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). " + . "Removing notice from the Facebook queue for safety."; + common_log( + LOG_ERROR, sprintf( + $msg, + $notice->id, + $errmsg, + $user->nickname, + $user->id, + $fbuid, + $notice->content + ) + ); + return true; + break; + case 200: // Permissions error + case 250: // Updating status requires the extended permission status_update + remove_facebook_app($flink); + return true; // dequeue + break; + case 341: // Feed action request limit reached + $msg = "FacebookPlugin - User %s (User ID=%d, Facebook ID=%d) has exceeded " + . "his/her limit for posting notices to Facebook today. Dequeuing " + . "notice %d."; + common_log( + LOG_INFO, sprintf( + $msg, + $user->nickname, + $user->id, + $fbuid, + $notice->id + ) + ); + // @fixme: We want to rety at a later time when the throttling has expired + // instead of just giving up. + return true; + break; + default: + $msg = "FacebookPlugin - Facebook returned an error we don't know how to deal with while trying to " + . "post notice %d. Error code: %d, error message: \"%s\". (Notice details: " + . "nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). Re-queueing " + . "notice, and will try to send again later."; + common_log( + LOG_ERROR, sprintf( + $msg, + $notice->id, + $code, + $errmsg, + $user->nickname, + $user->id, + $fbuid, + $notice->content + ) + ); + // Re-queue and try again later + return false; + break; + } +} + +function statusUpdate($notice, $user, $fbuid) +{ + common_debug( + "FacebookPlugin - Attempting to post notice $notice->id " + . "as a status update for $user->nickname ($user->id), " + . "Facebook UID: $fbuid" + ); + + $text = formatNotice($notice, $user, $fbuid); + + $facebook = getFacebook(); + $result = $facebook->api_client->users_setStatus( + $text, + $fbuid, + false, + true + ); + + common_debug('Facebook returned: ' . var_export($result, true)); + + common_log( + LOG_INFO, + "FacebookPlugin - Posted notice $notice->id as a status " + . "update for $user->nickname ($user->id), " + . "Facebook UID: $fbuid" + ); +} + +function publishStream($notice, $user, $fbuid) +{ + common_debug( + "FacebookPlugin - Attempting to post notice $notice->id " + . "as stream item with attachment for $user->nickname ($user->id), " + . "Facebook UID: $fbuid" + ); + + $text = formatNotice($notice, $user, $fbuid); + $fbattachment = format_attachments($notice->attachments()); + + $facebook = getFacebook(); + $facebook->api_client->stream_publish( + $text, + $fbattachment, + null, + null, + $fbuid + ); + + common_debug('Facebook returned: ' . var_export($result, true)); + + common_log( + LOG_INFO, + "FacebookPlugin - Posted notice $notice->id as a stream " + . "item with attachment for $user->nickname ($user->id), " + . "Facebook UID: $fbuid" + ); +} + + +function formatNotice($notice, $user, $fbuid) +{ + // Get the status 'verb' the user has set, if any + + common_debug( + "FacebookPlugin - Looking to see if $user->nickname ($user->id), " + . "Facebook UID: $fbuid has set a verb for Facebook posting..." + ); + + $facebook = getFacebook(); + $verb = trim( + $facebook->api_client->data_getUserPreference( + FACEBOOK_NOTICE_PREFIX, + $fbuid + ) + ); + + common_debug("Facebook returned " . var_export($verb, true)); + + $text = null; + + if (!empty($verb)) { + common_debug("FacebookPlugin - found a verb: $verb"); + $text = trim($verb) . ' ' . $notice->content; + } else { + common_debug("FacebookPlugin - no verb found."); + $text = $notice->content; + } + + return $text; +} + +function updateProfileBox($facebook, $flink, $notice, $user) { + + $facebook = getFacebook(); + $fbaction = new FacebookAction( + $output = 'php://output', + $indent = null, + $facebook, + $flink + ); + + common_debug( + 'FacebookPlugin - Attempting to update profile box with ' + . "content from notice $notice->id for $user->nickname ($user->id)" + . "Facebook UID: $fbuid" + ); + $fbaction->updateProfileBox($notice); + + common_debug( + 'FacebookPlugin - finished updating profile box for ' + . "$user->nickname ($user->id) Facebook UID: $fbuid" + ); + } function format_attachments($attachments) From 1f3a16bbfb41b366bea05f5ba05bb41f44108ab8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 24 May 2010 22:41:34 +0000 Subject: [PATCH 164/730] Clear up warnings I introduced by refactoring Facebook posting --- plugins/Facebook/facebookutil.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index e52a3deaef..d573c34ac1 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -147,7 +147,7 @@ function facebookBroadcastNotice($notice) common_debug( "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid " .'does NOT have status_update permission. Facebook ' - . 'returned: ' . var_export($can_publish, true) + . 'returned: ' . var_export($canPublish, true) ); } @@ -297,8 +297,6 @@ function publishStream($notice, $user, $fbuid) $fbuid ); - common_debug('Facebook returned: ' . var_export($result, true)); - common_log( LOG_INFO, "FacebookPlugin - Posted notice $notice->id as a stream " @@ -307,7 +305,6 @@ function publishStream($notice, $user, $fbuid) ); } - function formatNotice($notice, $user, $fbuid) { // Get the status 'verb' the user has set, if any @@ -350,6 +347,8 @@ function updateProfileBox($facebook, $flink, $notice, $user) { $flink ); + $fbuid = $flink->foreign_id; + common_debug( 'FacebookPlugin - Attempting to update profile box with ' . "content from notice $notice->id for $user->nickname ($user->id)" From 9cde924bb3f928d9df0519a9a6b995633eb45789 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 24 May 2010 23:27:53 +0000 Subject: [PATCH 165/730] Accidentally used the wrong log level (LOG ERROR instead of LOG_ERR) --- plugins/Facebook/facebookutil.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index d573c34ac1..0f24f5441e 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -192,7 +192,7 @@ function handleFacebookError($e, $notice, $flink) . "\"%s\" (Notice details: nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). " . "Removing notice from the Facebook queue for safety."; common_log( - LOG_ERROR, sprintf( + LOG_ERR, sprintf( $msg, $notice->id, $errmsg, @@ -232,7 +232,7 @@ function handleFacebookError($e, $notice, $flink) . "nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). Re-queueing " . "notice, and will try to send again later."; common_log( - LOG_ERROR, sprintf( + LOG_ERR, sprintf( $msg, $notice->id, $code, @@ -351,7 +351,7 @@ function updateProfileBox($facebook, $flink, $notice, $user) { common_debug( 'FacebookPlugin - Attempting to update profile box with ' - . "content from notice $notice->id for $user->nickname ($user->id)" + . "content from notice $notice->id for $user->nickname ($user->id), " . "Facebook UID: $fbuid" ); From f429c1aaa0d8fc69567d698bf033cf25f089d6c9 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 25 May 2010 16:25:35 +1200 Subject: [PATCH 166/730] the sent column wasn't being populated, needed default --- db/08to09_pg.sql | 1 + db/statusnet_pg.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index b7a0eb8e8c..1c9a31699a 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -100,4 +100,5 @@ insert into queue_item_new (frame,transport,created,claimed) alter table queue_item rename to queue_item_old; alter table queue_item_new rename to queue_item; +ALTER TABLE confirm_address ALTER column sent set default CURRENT_TIMESTAMP; diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 3f62ab7527..2db98550c9 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -276,7 +276,7 @@ create table confirm_address ( address_extra varchar(255) not null default '' /* comment 'carrier ID, for SMS' */, address_type varchar(8) not null /* comment 'address type ("email", "jabber", "sms")' */, claimed timestamp /* comment 'date this was claimed for queueing' */, - sent timestamp /* comment 'date this was sent for queueing' */, + sent timestamp default CURRENT_TIMESTAMP /* comment 'date this was sent for queueing' */, modified timestamp /* comment 'date this record was modified' */ ); From db603a39f8e521796293f694449c22679fc90caa Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Tue, 25 May 2010 13:41:23 +0200 Subject: [PATCH 167/730] Localisation updates from http://translatewiki.net --- locale/af/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/ar/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/arz/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/bg/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/br/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/ca/LC_MESSAGES/statusnet.po | 224 ++++++++++---------- locale/cs/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/de/LC_MESSAGES/statusnet.po | 225 ++++++++++---------- locale/el/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/en_GB/LC_MESSAGES/statusnet.po | 214 ++++++++++--------- locale/es/LC_MESSAGES/statusnet.po | 223 ++++++++++---------- locale/fa/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/fi/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/fr/LC_MESSAGES/statusnet.po | 225 ++++++++++---------- locale/ga/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/gl/LC_MESSAGES/statusnet.po | 288 ++++++++++++++------------ locale/he/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/hsb/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/ia/LC_MESSAGES/statusnet.po | 224 ++++++++++---------- locale/is/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/it/LC_MESSAGES/statusnet.po | 224 ++++++++++---------- locale/ja/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/ko/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/mk/LC_MESSAGES/statusnet.po | 223 ++++++++++---------- locale/nb/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/nl/LC_MESSAGES/statusnet.po | 224 ++++++++++---------- locale/nn/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/pl/LC_MESSAGES/statusnet.po | 223 ++++++++++---------- locale/pt/LC_MESSAGES/statusnet.po | 223 ++++++++++---------- locale/pt_BR/LC_MESSAGES/statusnet.po | 223 ++++++++++---------- locale/ru/LC_MESSAGES/statusnet.po | 233 +++++++++++---------- locale/statusnet.pot | 209 ++++++++++--------- locale/sv/LC_MESSAGES/statusnet.po | 224 ++++++++++---------- locale/te/LC_MESSAGES/statusnet.po | 234 +++++++++++---------- locale/tr/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/uk/LC_MESSAGES/statusnet.po | 223 ++++++++++---------- locale/vi/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/zh_CN/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- locale/zh_TW/LC_MESSAGES/statusnet.po | 213 ++++++++++--------- 39 files changed, 4428 insertions(+), 4131 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index b9f82c0f8b..79e5e7cd8e 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:16+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:36:28+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -387,7 +387,7 @@ msgstr "" #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen " @@ -395,26 +395,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Nie 'n geldige gebruikersnaam nie." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Tuisblad is nie 'n geldige URL nie." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Volledige naam is te lang (maksimum 255 karakters)." @@ -426,7 +426,7 @@ msgstr "Die beskrywing is te lank (die maksimum is %d karakters)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Ligging is te lank is (maksimum 255 karakters)." @@ -518,12 +518,12 @@ msgstr "Ongeldige token." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -588,8 +588,8 @@ msgstr "" msgid "Account" msgstr "Gebruiker" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -597,8 +597,8 @@ msgid "Nickname" msgstr "Bynaam" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Wagwoord" @@ -804,11 +804,11 @@ msgstr "Die avatar is verwyder." msgid "You already blocked that user." msgstr "U het reeds die gebruiker geblokkeer." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Blokkeer gebruiker" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -820,7 +820,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -830,7 +830,7 @@ msgstr "Nee" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Moenie hierdie gebruiker blokkeer nie" @@ -839,7 +839,7 @@ msgstr "Moenie hierdie gebruiker blokkeer nie" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -848,11 +848,11 @@ msgid "Yes" msgstr "Ja" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blokkeer hierdie gebruiker" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "" @@ -1010,7 +1010,7 @@ msgstr "Skrap hierdie applikasie" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Nie aangeteken nie." @@ -1457,7 +1457,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Nie 'n geldige e-posadres nie." @@ -1680,13 +1680,13 @@ msgstr "" #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Geen profiel verskaf nie." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Daar is geen profiel met daardie ID nie." @@ -2197,50 +2197,50 @@ msgstr "U is nie 'n lid van daardie groep nie." msgid "%1$s left group %2$s" msgstr "%1$s het die groep %2$s verlaat" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "U is reeds aangeteken." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Verkeerde gebruikersnaam of wagwoord." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Aanteken" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Teken aan" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Onthou my" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Wagwoord verloor of vergeet?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "Verkeerde gebruikersnaam of wagwoord." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2563,7 +2563,7 @@ msgid "6 or more characters" msgstr "6 of meer karakters" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Bevestig" @@ -2575,11 +2575,11 @@ msgstr "Dieselfde as wagwoord hierbo" msgid "Change" msgstr "Wysig" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Wagwoord moet 6 of meer karakters bevat." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Wagwoorde is nie dieselfde nie." @@ -2800,43 +2800,43 @@ msgstr "" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Volledige naam" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Tuisblad" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Bio" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Ligging" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2876,7 +2876,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "" @@ -3120,7 +3120,7 @@ msgstr "" msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "" @@ -3128,100 +3128,100 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "" -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Die registrasie is voltooi" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registreer" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registrasie nie toegelaat nie." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Die E-posadres bestaan reeds." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Ongeldige gebruikersnaam of wagwoord." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-pos" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3240,7 +3240,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5318,14 +5318,14 @@ msgstr "Volle naam: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Ligging: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Tuisblad: %s" @@ -5803,8 +5803,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5820,19 +5827,19 @@ msgid "" msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Beskrywing: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5846,30 +5853,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s status" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS-bevestiging" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5886,13 +5893,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nuwe privaat boodskap vanaf %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5912,13 +5919,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5940,7 +5947,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -5948,13 +5955,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6271,7 +6278,7 @@ msgstr "Daaglikse gemiddelde" msgid "All groups" msgstr "Alle groepe" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6295,7 +6302,7 @@ msgstr "Uitgelig" msgid "Popular" msgstr "Gewild" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "" @@ -6316,7 +6323,7 @@ msgstr "" msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6494,56 +6501,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "'n paar sekondes gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "ongeveer 'n minuut gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minute gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "ongeveer 'n uur gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "ongeveer een dag gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dae gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "ongeveer een maand gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maande gelede" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "ongeveer een jaar gelede" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 24253a9705..81269626b7 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:19+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:36:31+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -381,32 +381,32 @@ msgstr "تعذّر إيجاد المستخدم الهدف." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "ليس اسمًا مستعارًا صحيحًا." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "الصفحة الرئيسية ليست عنونًا صالحًا." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)" @@ -418,7 +418,7 @@ msgstr "" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "" @@ -510,12 +510,12 @@ msgstr "حجم غير صالح." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -582,8 +582,8 @@ msgstr "" msgid "Account" msgstr "الحساب" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -591,8 +591,8 @@ msgid "Nickname" msgstr "الاسم المستعار" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "كلمة السر" @@ -798,11 +798,11 @@ msgstr "حُذف الأفتار." msgid "You already blocked that user." msgstr "لقد منعت مسبقا هذا المستخدم." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "امنع المستخدم" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -814,7 +814,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -823,7 +823,7 @@ msgstr "لا" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "لا تمنع هذا المستخدم" @@ -832,7 +832,7 @@ msgstr "لا تمنع هذا المستخدم" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -840,11 +840,11 @@ msgid "Yes" msgstr "نعم" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "امنع هذا المستخدم" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "فشل حفظ معلومات المنع." @@ -1002,7 +1002,7 @@ msgstr "احذف هذا التطبيق" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "لست والجًا." @@ -1443,7 +1443,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "ليس عنوان بريد صالح." @@ -1666,13 +1666,13 @@ msgstr "المستخدم مسكت من قبل." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "لا ملف شخصي مُحدّد." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "لا ملف شخصي بهذه الهوية." @@ -2185,51 +2185,51 @@ msgstr "لست عضوا في تلك المجموعة." msgid "%1$s left group %2$s" msgstr "%1$s ترك المجموعة %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "والج بالفعل." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "اسم المستخدم أو كلمة السر غير صحيحان." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "لُج" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "لُج إلى الموقع" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "تذكّرني" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "لُج تلقائيًا في المستقبل؛ هذا الخيار ليس مُعدًا للحواسيب المشتركة!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "أنسيت كلمة السر؟" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" "لأسباب أمنية، من فضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "لُج باسم مستخدم وكلمة سر" -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2553,7 +2553,7 @@ msgid "6 or more characters" msgstr "6 أحرف أو أكثر" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "أكّد" @@ -2565,11 +2565,11 @@ msgstr "نفس كلمة السر أعلاه" msgid "Change" msgstr "غيّر" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "يجب أن تكون كلمة السر 6 حروف أو أكثر." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "كلمتا السر غير متطابقتين." @@ -2791,43 +2791,43 @@ msgstr "معلومات الملف الشخصي" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "الاسم الكامل" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "الصفحة الرئيسية" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "تكلم عن نفسك واهتمامتك في %d حرف" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "صِف نفسك واهتماماتك" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "السيرة" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "الموقع" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\"" @@ -2868,7 +2868,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "اشترك تلقائيًا بأي شخص يشترك بي (يفضل أن يستخدم لغير البشر)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "" @@ -3118,7 +3118,7 @@ msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر." msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "خطأ أثناء ضبط المستخدم." @@ -3126,100 +3126,100 @@ msgstr "خطأ أثناء ضبط المستخدم." msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "عذرا، رمز دعوة غير صالح." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "لا يُسمح بالتسجيل." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "عنوان البريد الإلكتروني موجود مسبقًا." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "اسم مستخدم أو كلمة سر غير صالحة." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 حروف أو أكثر. مطلوب." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "نفس كلمة السر أعلاه. مطلوب." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "البريد الإلكتروني" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3238,7 +3238,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5348,14 +5348,14 @@ msgstr "الاسم الكامل: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "الموقع: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "الصفحة الرئيسية: %s" @@ -5893,8 +5893,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5920,19 +5927,19 @@ msgstr "" "غيّر خيارات البريد الإلكتروني والإشعار في %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "السيرة: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5946,30 +5953,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "حالة %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "تأكيد الرسالة القصيرة" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "لقد نبهك %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5986,13 +5993,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "رسالة خاصة جديدة من %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6012,13 +6019,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6040,7 +6047,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6048,13 +6055,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "لقد أرسل %s (@%s) إشعارًا إليك" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6371,7 +6378,7 @@ msgstr "المُعدّل اليومي" msgid "All groups" msgstr "كل المجموعات" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6395,7 +6402,7 @@ msgstr "مُختارون" msgid "Popular" msgstr "محبوبة" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "لا مدخلات رجوع إلى." @@ -6416,7 +6423,7 @@ msgstr "كرّر هذا الإشعار" msgid "Revoke the \"%s\" role from this user" msgstr "امنع هذا المستخدم من هذه المجموعة" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6595,56 +6602,56 @@ msgid "Moderator" msgstr "مراقب" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "قبل يوم تقريبا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "قبل شهر تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "قبل سنة تقريبًا" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 12f575846f..e6155391f5 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:22+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:36:34+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -388,32 +388,32 @@ msgstr "تعذّر إيجاد المستخدم الهدف." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "" #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "ليس اسمًا مستعارًا صحيحًا." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)" @@ -425,7 +425,7 @@ msgstr "" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "" @@ -518,12 +518,12 @@ msgstr "حجم غير صالح." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -590,8 +590,8 @@ msgstr "" msgid "Account" msgstr "الحساب" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -599,8 +599,8 @@ msgid "Nickname" msgstr "الاسم المستعار" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "كلمه السر" @@ -807,11 +807,11 @@ msgstr "حُذف الأفتار." msgid "You already blocked that user." msgstr "لقد منعت مسبقا هذا المستخدم." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "امنع المستخدم" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -823,7 +823,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -833,7 +833,7 @@ msgstr "لا" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "لا تمنع هذا المستخدم" @@ -842,7 +842,7 @@ msgstr "لا تمنع هذا المستخدم" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -851,11 +851,11 @@ msgid "Yes" msgstr "نعم" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "امنع هذا المستخدم" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "فشل حفظ معلومات المنع." @@ -1018,7 +1018,7 @@ msgstr "احذف هذا الإشعار" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "لست والجًا." @@ -1466,7 +1466,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "ليس عنوان بريد صالح." @@ -1692,13 +1692,13 @@ msgstr "المستخدم مسكت من قبل." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "لا ملف شخصى مُحدّد." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "لا ملف شخصى بهذه الهويه." @@ -2210,50 +2210,50 @@ msgstr "لست عضوا فى تلك المجموعه." msgid "%1$s left group %2$s" msgstr "%1$s ساب جروپ %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "والج بالفعل." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "اسم المستخدم أو كلمه السر غير صحيحان." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "لُج" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "لُج إلى الموقع" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "تذكّرني" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "أنسيت كلمه السر؟" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "اسم المستخدم أو كلمه السر غير صحيحان." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2577,7 +2577,7 @@ msgid "6 or more characters" msgstr "" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "أكّد" @@ -2589,11 +2589,11 @@ msgstr "نفس كلمه السر أعلاه" msgid "Change" msgstr "غيّر" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "يجب أن تكون كلمه السر 6 حروف أو أكثر." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "كلمتا السر غير متطابقتين." @@ -2814,43 +2814,43 @@ msgstr "معلومات الملف الشخصي" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "الاسم الكامل" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "الصفحه الرئيسية" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "صِف نفسك واهتماماتك" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "السيرة" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "الموقع" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2890,7 +2890,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "" @@ -3140,7 +3140,7 @@ msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر." msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "خطأ أثناء ضبط المستخدم." @@ -3148,100 +3148,100 @@ msgstr "خطأ أثناء ضبط المستخدم." msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "عذرا، رمز دعوه غير صالح." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "لا يُسمح بالتسجيل." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "عنوان البريد الإلكترونى موجود مسبقًا." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "اسم مستخدم أو كلمه سر غير صالحه." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 حروف أو أكثر. مطلوب." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "نفس كلمه السر أعلاه. مطلوب." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "البريد الإلكتروني" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3260,7 +3260,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5393,14 +5393,14 @@ msgstr "الاسم الكامل: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "الموقع: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "الصفحه الرئيسية: %s" @@ -5888,8 +5888,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5905,19 +5912,19 @@ msgid "" msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "عن نفسك: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5931,30 +5938,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "حاله %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5971,13 +5978,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "رساله خاصه جديده من %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5997,13 +6004,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6025,7 +6032,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6033,13 +6040,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6357,7 +6364,7 @@ msgstr "" msgid "All groups" msgstr "كل المجموعات" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6381,7 +6388,7 @@ msgstr "مُختارون" msgid "Popular" msgstr "مشهورة" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "لا مدخلات رجوع إلى." @@ -6402,7 +6409,7 @@ msgstr "كرر هذا الإشعار" msgid "Revoke the \"%s\" role from this user" msgstr "امنع هذا المستخدم من هذه المجموعة" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6582,56 +6589,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "قبل يوم تقريبا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "قبل شهر تقريبًا" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "قبل سنه تقريبًا" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 10f4fc66e2..517719b491 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:25+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:36:38+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -387,7 +387,7 @@ msgstr "Целевият потребител не беше открит." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Псевдонимът може да съдържа само малки букви, числа и никакво разстояние " @@ -395,26 +395,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Опитайте друг псевдоним, този вече е зает." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Неправилен псевдоним." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Адресът на личната страница не е правилен URL." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Пълното име е твърде дълго (макс. 255 знака)" @@ -426,7 +426,7 @@ msgstr "Описанието е твърде дълго (до %d символа) #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Името на местоположението е твърде дълго (макс. 255 знака)." @@ -518,12 +518,12 @@ msgstr "Неправилен размер." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -590,8 +590,8 @@ msgstr "" msgid "Account" msgstr "Сметка" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -599,8 +599,8 @@ msgid "Nickname" msgstr "Псевдоним" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Парола" @@ -810,11 +810,11 @@ msgstr "Аватарът е изтрит." msgid "You already blocked that user." msgstr "Вече сте блокирали този потребител." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Блокиране на потребителя" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -826,7 +826,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -835,7 +835,7 @@ msgstr "Не" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Да не се блокира този потребител" @@ -844,7 +844,7 @@ msgstr "Да не се блокира този потребител" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -852,11 +852,11 @@ msgid "Yes" msgstr "Да" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Блокиране на потребителя" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Грешка при записване данните за блокирането." @@ -1015,7 +1015,7 @@ msgstr "Изтриване на това приложение" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Не сте влезли в системата." @@ -1475,7 +1475,7 @@ msgid "Cannot normalize that email address" msgstr "Грешка при нормализиране адреса на е-пощата" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Неправилен адрес на е-поща." @@ -1710,13 +1710,13 @@ msgstr "Потребителят вече е заглушен." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Не е указан профил." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Не е открит профил с такъв идентификатор." @@ -2281,40 +2281,40 @@ msgstr "Не членувате в тази група." msgid "%1$s left group %2$s" msgstr "%1$s напусна групата %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Вече сте влезли." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Грешно име или парола." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Забранено." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Вход" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Вход в сайта" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Запомни ме" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Загубена или забравена парола" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2322,12 +2322,12 @@ msgstr "" "За по-голяма сигурност, моля въведете отново потребителското си име и парола " "при промяна на настройките." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "Вход с име и парола" -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2669,7 +2669,7 @@ msgid "6 or more characters" msgstr "6 или повече знака" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Потвърждаване" @@ -2681,11 +2681,11 @@ msgstr "Също като паролата по-горе" msgid "Change" msgstr "Промяна" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Паролата трябва да е 6 или повече знака." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Паролите не съвпадат." @@ -2908,43 +2908,43 @@ msgstr "Данни на профила" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Пълно име" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Лична страница" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "Адрес на личната ви страница, блог или профил в друг сайт" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Опишете себе си и интересите си в до %d букви" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Опишете себе си и интересите си" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "За мен" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Местоположение" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Къде се намирате (град, община, държава и т.н.)" @@ -2986,7 +2986,7 @@ msgstr "" "Автоматично абониране за всеки, който се абонира за мен (подходящо за " "ботове)." -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Биографията е твърде дълга (до %d символа)." @@ -3234,7 +3234,7 @@ msgstr "Паролата трябва да е от поне 6 знака." msgid "Password and confirmation do not match." msgstr "Паролата и потвърждението й не съвпадат." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Грешка в настройките на потребителя." @@ -3242,103 +3242,103 @@ msgstr "Грешка в настройките на потребителя." msgid "New password successfully saved. You are now logged in." msgstr "Новата парола е запазена. Влязохте успешно." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" -#: actions/register.php:92 +#: actions/register.php:99 #, fuzzy msgid "Sorry, invalid invitation code." msgstr "Грешка в кода за потвърждение." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Записването е успешно." -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистриране" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Записването не е позволено." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Не можете да се регистрате, ако не сте съгласни с лиценза." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Адресът на е-поща вече се използва." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Неправилно име или парола." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "От 1 до 64 малки букви или цифри, без пунктоация и интервали. Задължително " "поле." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 или повече знака. Задължително поле." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Същото като паролата по-горе. Задължително поле." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Е-поща" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Използва се само за промени, обяви или възстановяване на паролата" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "По-дълго име, за предпочитане \"истинското\" ви име." -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3371,7 +3371,7 @@ msgstr "" "Благодарим, че се включихте в сайта и дано ползването на услугата ви носи " "само приятни мигове!" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5556,14 +5556,14 @@ msgstr "Пълно име: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Местоположение: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Домашна страница: %s" @@ -6050,8 +6050,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s вече получава бележките ви в %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6077,19 +6084,19 @@ msgstr "" "Може да смените адреса и настройките за уведомяване по е-поща на %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Биография: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Нов адрес на е-поща за публикщуване в %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6103,30 +6110,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Състояние на %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Потвърждение за SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "Очаква се потвърждение за този телефонен номер." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Побутнати сте от %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6143,13 +6150,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Ново лично съобщение от %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6169,13 +6176,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) отбеляза бележката ви като любима" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6197,7 +6204,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6205,13 +6212,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6533,7 +6540,7 @@ msgstr "" msgid "All groups" msgstr "Всички групи" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6557,7 +6564,7 @@ msgstr "Избрано" msgid "Popular" msgstr "Популярно" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Липсват аргументи return-to." @@ -6578,7 +6585,7 @@ msgstr "Повтаряне на тази бележка" msgid "Revoke the \"%s\" role from this user" msgstr "Списък с потребителите в тази група." -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6761,56 +6768,56 @@ msgid "Moderator" msgstr "Модератор" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "преди няколко секунди" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "преди около минута" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "преди около час" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "преди около %d часа" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "преди около ден" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "преди около месец" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "преди около %d месеца" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "преди около година" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 0c64a7aa0c..fb28431ff1 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:28+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:36:41+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -383,32 +383,32 @@ msgstr "Diposubl eo kavout an implijer pal." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Implijet eo dija al lesanv-se. Klaskit unan all." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "N'eo ket ul lesanv mat." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)." @@ -420,7 +420,7 @@ msgstr "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)." @@ -511,12 +511,12 @@ msgstr "Fichenn direizh." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -581,8 +581,8 @@ msgstr "" msgid "Account" msgstr "Kont" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -590,8 +590,8 @@ msgid "Nickname" msgstr "Lesanv" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Ger-tremen" @@ -797,11 +797,11 @@ msgstr "Dilammet eo bet an Avatar." msgid "You already blocked that user." msgstr "Stanket o peus dija an implijer-mañ." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Stankañ an implijer-mañ" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -813,7 +813,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -822,7 +822,7 @@ msgstr "Nann" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Arabat stankañ an implijer-mañ" @@ -831,7 +831,7 @@ msgstr "Arabat stankañ an implijer-mañ" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -839,11 +839,11 @@ msgid "Yes" msgstr "Ya" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Stankañ an implijer-mañ" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Diposubl eo enrollañ an titouroù stankañ." @@ -1002,7 +1002,7 @@ msgstr "Dilemel ar poelad-se" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Nann-luget." @@ -1443,7 +1443,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "N'eo ket ur chomlec'h postel reizh." @@ -1663,13 +1663,13 @@ msgstr "An implijer-mañ en deus dija ar roll-mañ." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "N'eo bet resisaet profil ebet" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "N'eus profil ebet gant an ID-mañ." @@ -2181,43 +2181,43 @@ msgstr "N'oc'h ket un ezel eus ar strollad-mañ." msgid "%1$s left group %2$s" msgstr "%1$s en deus kuitaet ar strollad %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Kevreet oc'h dija." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Anv implijer pe ger-tremen direizh." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" "Ur fazi 'zo bet e-pad hizivadenn an implijer. Moarvat n'oc'h ket aotreet " "evit en ober." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Kevreañ" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Kevreañ d'al lec'hienn" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Kaout soñj" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Digeriñ va dalc'h war-eeun ar wechoù o tont ; arabat en ober war " "urzhiataeroù rannet pe publik !" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Ha kollet o peus ho ker-tremen ?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2225,11 +2225,11 @@ msgstr "" "Evit abegoù a surentezh, mar plij adlakait hoc'h anv implijer hag ho ker-" "tremen a-benn enrollañ ho penndibaboù." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Kevreit gant ho anv implijer hag ho ker-tremen." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2554,7 +2554,7 @@ msgid "6 or more characters" msgstr "6 arouezenn pe muioc'h" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Kadarnaat" @@ -2566,11 +2566,11 @@ msgstr "Memestra eget ar ger tremen a-us" msgid "Change" msgstr "Kemmañ" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Rankout a ra ar ger-tremen bezañ gant 6 arouezenn d'an nebeutañ." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Ne glot ket ar gerioù-tremen." @@ -2794,43 +2794,43 @@ msgstr "Titouroù ar profil" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Anv klok" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pajenn degemer" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Buhezskrid" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Lec'hiadur" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\"" @@ -2874,7 +2874,7 @@ msgstr "" "En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet " "evit an implijerien nann-denel)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Re hir eo ar bio (%d arouezenn d'ar muiañ)." @@ -3129,7 +3129,7 @@ msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ." msgid "Password and confirmation do not match." msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer." @@ -3137,104 +3137,104 @@ msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer." msgid "New password successfully saved. You are now logged in." msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" "Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em " "enskrivañ." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Digarezit, kod pedadenn direizh." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Krouet eo bet ar gont." -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Krouiñ ur gont" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "N'eo ket aotreet krouiñ kontoù." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" "Rankout a reoc'h bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur " "gont." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Implijet eo dija ar chomlec'h postel-se." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Anv implijer pe ger-tremen direizh." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 arouezenn pe muioc'h. Rekis." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Memestra hag ar ger-tremen a-us. Rekis." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Postel" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3253,7 +3253,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5341,14 +5341,14 @@ msgstr "Anv klok : %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Lec'hiadur : %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Lec'hienn Web : %s" @@ -5829,8 +5829,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5846,19 +5853,19 @@ msgid "" msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Chomlec'h postel nevez evit embann e %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5872,30 +5879,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Statud %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Kadarnadur SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5912,13 +5919,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Kemenadenn personel nevez a-berzh %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5938,13 +5945,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5966,7 +5973,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -5977,13 +5984,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) en deus kaset deoc'h ur c'hemenn" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6300,7 +6307,7 @@ msgstr "Keidenn pemdeziek" msgid "All groups" msgstr "An holl strolladoù" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6324,7 +6331,7 @@ msgstr "" msgid "Popular" msgstr "Poblek" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "" @@ -6345,7 +6352,7 @@ msgstr "Adkregiñ gant an ali-mañ" msgid "Revoke the \"%s\" role from this user" msgstr "Stankañ an implijer-mañ eus ar strollad-se" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6523,56 +6530,56 @@ msgid "Moderator" msgstr "Habasker" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "un nebeud eilennoù zo" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "1 vunutenn zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "%d munutenn zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "1 eurvezh zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "%d eurvezh zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "1 devezh zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "%d devezh zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "miz zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "%d miz zo well-wazh" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "bloaz zo well-wazh" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index d2bb7867a1..3422296611 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:32+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:36:45+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -398,7 +398,7 @@ msgstr "No s'ha pogut trobar l'usuari de destinació." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "El sobrenom ha de tenir només lletres minúscules i números i no pot tenir " @@ -406,26 +406,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Aquest sobrenom ja existeix. Prova un altre. " #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Sobrenom no vàlid." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "La pàgina personal no és un URL vàlid." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)." @@ -437,7 +437,7 @@ msgstr "La descripció és massa llarga (màx. %d caràcters)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "La ubicació és massa llarga (màx. 255 caràcters)." @@ -528,12 +528,12 @@ msgstr "El testimoni no és vàlid." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -605,8 +605,8 @@ msgstr "" msgid "Account" msgstr "Compte" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -614,8 +614,8 @@ msgid "Nickname" msgstr "Sobrenom" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Contrasenya" @@ -824,11 +824,11 @@ msgstr "S'ha eliminat l'avatar." msgid "You already blocked that user." msgstr "Ja heu blocat l'usuari." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Bloca l'usuari" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -843,7 +843,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -852,7 +852,7 @@ msgstr "No" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "No bloquis l'usuari" @@ -861,7 +861,7 @@ msgstr "No bloquis l'usuari" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -869,11 +869,11 @@ msgid "Yes" msgstr "Sí" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloca aquest usuari" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "No s'ha pogut desar la informació del bloc." @@ -1034,7 +1034,7 @@ msgstr "Elimina aquesta aplicació" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "No heu iniciat una sessió." @@ -1483,7 +1483,7 @@ msgid "Cannot normalize that email address" msgstr "No es pot normalitzar l'adreça electrònica." #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Adreça de correu electrònic no vàlida." @@ -1711,13 +1711,13 @@ msgstr "L'usuari ja té aquest rol." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "No s'ha especificat cap perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "No hi ha cap perfil amb aquesta ID." @@ -2286,43 +2286,43 @@ msgstr "No ets membre d'aquest grup." msgid "%1$s left group %2$s" msgstr "%1$s ha abandonat el grup %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Ja estàs connectat." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Nom d'usuari o contrasenya incorrectes." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" "S'ha produït un error en definir l'usuari. Probablement no hi esteu " "autoritzat." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Inici de sessió" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Accedir al lloc" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Recorda'm" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Inicia la sessió automàticament en el futur; no ho activeu en ordinadors " "compartits!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Contrasenya oblidada o perduda?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2330,11 +2330,11 @@ msgstr "" "Per raons de seguretat, torneu a escriure el vostre nom d'usuari i " "contrasenya abans de canviar la vostra configuració." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Inicieu una sessió amb nom d'usuari i contrasenya" -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2671,7 +2671,7 @@ msgid "6 or more characters" msgstr "6 o més caràcters" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Confirmar" @@ -2683,11 +2683,11 @@ msgstr "Igual a la contrasenya de dalt" msgid "Change" msgstr "Canviar" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Les contrasenyes no coincideixen." @@ -2914,43 +2914,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "1-64 lletres en minúscula o números, sense signes de puntuació o espais" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nom complet" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pàgina personal" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL del teu web, blog o perfil en un altre lloc" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Descriviu qui sou i els vostres interessos en %d caràcters" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Feu una descripció personal i interessos" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Biografia" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Ubicació" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»" @@ -2994,7 +2994,7 @@ msgstr "" "Subscripció automàtica a qualsevol qui em tingui subscrit (ideal per no-" "humans)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "La biografia és massa llarga (màx. %d caràcters)." @@ -3258,7 +3258,7 @@ msgstr "La contrasenya ha de tenir 6 o més caràcters." msgid "Password and confirmation do not match." msgstr "La contrasenya i la confirmació no coincideixen." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Error en configurar l'usuari." @@ -3266,39 +3266,39 @@ msgstr "Error en configurar l'usuari." msgid "New password successfully saved. You are now logged in." msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Ho sentim, però només la gent convidada pot registrar-s'hi." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "El codi d'invitació no és vàlid." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registre satisfactori" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registre" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registre no permès." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "No pots registrar-te si no estàs d'acord amb la llicència." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "L'adreça de correu electrònic ja existeix." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Nom d'usuari o contrasenya invàlids." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3306,57 +3306,58 @@ msgstr "" "Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i " "enllaçar a amics i col·legues. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 lletres en minúscula o números, sense puntuacions ni espais. Requerit." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 o més caràcters. Requerit." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Igual a la contrasenya de dalt. Requerit." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Correu electrònic" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Nom llarg, preferiblement el vostre nom «real»" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "El contingut i les dades de %1$s són privades i confidencials." +msgstr "" +"Entenc que el contingut i les dades de %1$s són privades i confidencials." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "El meu text i els meus fitxers són copyright de %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "El meu text i els meus fitxers es troben sota el meu propi copyright." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Tots els drets reservats." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3366,7 +3367,7 @@ msgstr "" "les dades privades: contrasenya, adreça de correu electrònic, adreça de " "missatgeria instantània i número de telèfon." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3399,7 +3400,7 @@ msgstr "" "\n" "Gràcies per registrar-vos-hi i esperem que en gaudiu." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5598,14 +5599,14 @@ msgstr "Nom complet: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Localització: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Pàgina web: %s" @@ -6140,8 +6141,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s ara està escoltant els teus avisos a %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6167,19 +6175,19 @@ msgstr "" "Canvieu la vostra adreça electrònica o les opcions d'avís a %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Biografia: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Nou correu electrònic per publicar a %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6201,30 +6209,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s estat" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Confirmació SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s: confirmeu-ho si teniu aquest número de telèfon amb aquest codi:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Has estat reclamat per %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6251,13 +6259,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nou missatge privat de %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6291,13 +6299,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) ha afegit el vostre avís com a preferit" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6335,7 +6343,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6346,13 +6354,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) us ha enviat un avís a la vostra atenció" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6703,7 +6711,7 @@ msgstr "Mitjana diària" msgid "All groups" msgstr "Tots els grups" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Mètode no implementat" @@ -6727,7 +6735,7 @@ msgstr "Destacat" msgid "Popular" msgstr "Popular" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "No hi ha arguments de retorn." @@ -6748,7 +6756,7 @@ msgstr "Repeteix l'avís" msgid "Revoke the \"%s\" role from this user" msgstr "Revoca el rol «%s» de l'usuari" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "No s'ha definit cap usuari únic per al mode d'usuari únic." @@ -6926,56 +6934,56 @@ msgid "Moderator" msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "fa pocs segons" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "fa un minut" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "fa una hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "fa un dia" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "fa %d dies" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "fa un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "fa un any" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 81489316b9..3bf855f72b 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:35+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:36:48+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -399,32 +399,32 @@ msgstr "Nelze aktualizovat uživatele" #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Přezdívka může obsahovat pouze malá písmena a čísla bez mezer" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Přezdívku již někdo používá. Zkuste jinou" #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Není platnou přezdívkou." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Stránka není platnou URL." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)" @@ -436,7 +436,7 @@ msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Umístění příliš dlouhé (maximálně 255 znaků)" @@ -531,12 +531,12 @@ msgstr "Neplatná velikost" #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -605,8 +605,8 @@ msgstr "" msgid "Account" msgstr "O nás" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -614,8 +614,8 @@ msgid "Nickname" msgstr "Přezdívka" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Heslo" @@ -832,12 +832,12 @@ msgstr "Avatar smazán." msgid "You already blocked that user." msgstr "Již jste přihlášen" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "Žádný takový uživatel." -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -849,7 +849,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -859,7 +859,7 @@ msgstr "Ne" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Žádný takový uživatel." @@ -869,7 +869,7 @@ msgstr "Žádný takový uživatel." #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -878,11 +878,11 @@ msgid "Yes" msgstr "Ano" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Zablokovat tohoto uživatele" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "" @@ -1051,7 +1051,7 @@ msgstr "Odstranit toto oznámení" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Nepřihlášen" @@ -1519,7 +1519,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Není platnou mailovou adresou." @@ -1756,13 +1756,13 @@ msgstr "Uživatel nemá profil." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "" @@ -2303,51 +2303,51 @@ msgstr "Neodeslal jste nám profil" msgid "%1$s left group %2$s" msgstr "%1 statusů na %2" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Již přihlášen" -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Neplatné jméno nebo heslo" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Neautorizován." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Přihlásit" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Zapamatuj si mě" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Příště automaticky přihlásit; ne pro počítače, které používá " -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Ztracené nebo zapomenuté heslo?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "Neplatné jméno nebo heslo" -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2688,7 +2688,7 @@ msgid "6 or more characters" msgstr "6 a více znaků" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Heslo znovu" @@ -2700,11 +2700,11 @@ msgstr "Stejné jako heslo výše" msgid "Change" msgstr "Změnit" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Hesla nesouhlasí" @@ -2940,43 +2940,43 @@ msgstr "Neznámý profil" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Celé jméno" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Moje stránky" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách." -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Popiš sebe a své zájmy ve 140 znacích" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Popište sebe a své zájmy" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "O mě" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Umístění" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Místo. Město, stát." @@ -3016,7 +3016,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)" @@ -3268,7 +3268,7 @@ msgstr "Heslo musí být alespoň 6 znaků dlouhé" msgid "Password and confirmation do not match." msgstr "Heslo a potvrzení nesouhlasí" -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Chyba nastavení uživatele" @@ -3276,94 +3276,94 @@ msgstr "Chyba nastavení uživatele" msgid "New password successfully saved. You are now logged in." msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" -#: actions/register.php:92 +#: actions/register.php:99 #, fuzzy msgid "Sorry, invalid invitation code." msgstr "Chyba v ověřovacím kódu" -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registrace úspěšná" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrovat" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "" -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Emailová adresa již existuje" -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Neplatné jméno nebo heslo" -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Email" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla." -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3372,7 +3372,7 @@ msgstr "" " až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní " "číslo." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3391,7 +3391,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5598,14 +5598,14 @@ msgstr "Celé jméno" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "" @@ -6105,8 +6105,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1 od teď naslouchá tvým sdělením v %2" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6128,19 +6135,19 @@ msgstr "" "%4$s.\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "O mě" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6154,30 +6161,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6194,13 +6201,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6220,13 +6227,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%1 od teď naslouchá tvým sdělením v %2" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6248,7 +6255,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6256,13 +6263,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6591,7 +6598,7 @@ msgstr "" msgid "All groups" msgstr "" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6616,7 +6623,7 @@ msgstr "" msgid "Popular" msgstr "Hledání lidí" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "Žádný takový dokument." @@ -6640,7 +6647,7 @@ msgstr "Odstranit toto oznámení" msgid "Revoke the \"%s\" role from this user" msgstr "Žádný takový uživatel." -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6827,56 +6834,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "před pár sekundami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "asi před minutou" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "asi před %d minutami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "asi před hodinou" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "asi před %d hodinami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "asi přede dnem" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "před %d dny" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "asi před měsícem" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "asi před %d mesíci" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "asi před rokem" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index b221c99baa..6a6a5cbfa2 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -7,6 +7,7 @@ # Author@translatewiki.net: Michael # Author@translatewiki.net: Michi # Author@translatewiki.net: Pill +# Author@translatewiki.net: The Evil IP address # Author@translatewiki.net: Umherirrender # -- # This file is distributed under the same license as the StatusNet package. @@ -15,12 +16,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:38+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:36:51+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -404,7 +405,7 @@ msgstr "Konnte keine Statusmeldungen finden." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. " @@ -412,27 +413,27 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Ungültiger Nutzername." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "" "Homepage ist keine gültige URL. URL’s müssen ein Präfix wie http enthalten." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)." @@ -444,7 +445,7 @@ msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)." @@ -535,12 +536,12 @@ msgstr "Ungültiges Token." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -610,8 +611,8 @@ msgstr "" msgid "Account" msgstr "Profil" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -619,8 +620,8 @@ msgid "Nickname" msgstr "Nutzername" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Passwort" @@ -831,11 +832,11 @@ msgstr "Avatar gelöscht." msgid "You already blocked that user." msgstr "Du hast diesen Benutzer bereits blockiert." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Benutzer blockieren" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -850,7 +851,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -859,7 +860,7 @@ msgstr "Nein" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Diesen Benutzer freigeben" @@ -868,7 +869,7 @@ msgstr "Diesen Benutzer freigeben" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -876,11 +877,11 @@ msgid "Yes" msgstr "Ja" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Diesen Benutzer blockieren" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Konnte Blockierungsdaten nicht speichern." @@ -1040,7 +1041,7 @@ msgstr "Programm löschen" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Nicht angemeldet." @@ -1494,7 +1495,7 @@ msgid "Cannot normalize that email address" msgstr "Konnte diese E-Mail-Adresse nicht normalisieren" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Ungültige E-Mail-Adresse." @@ -1722,13 +1723,13 @@ msgstr "Nutzer hat diese Aufgabe bereits" #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Kein Profil angegeben." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Kein Benutzer-Profil mit dieser ID." @@ -2302,40 +2303,40 @@ msgstr "Du bist kein Mitglied dieser Gruppe." msgid "%1$s left group %2$s" msgstr "%1$s hat die Gruppe %2$s verlassen" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Bereits angemeldet." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Falscher Benutzername oder Passwort." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" "Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Anmelden" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "An Seite anmelden" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Anmeldedaten merken" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Passwort vergessen?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2343,11 +2344,11 @@ msgstr "" "Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort " "ein, bevor die Änderungen an deinen Einstellungen übernommen werden." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Mit Nutzernamen und Passwort anmelden." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2686,7 +2687,7 @@ msgid "6 or more characters" msgstr "6 oder mehr Zeichen" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Bestätigen" @@ -2698,11 +2699,11 @@ msgstr "Gleiches Passwort wie zuvor" msgid "Change" msgstr "Ändern" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Passwörter stimmen nicht überein." @@ -2929,44 +2930,44 @@ msgstr "Profilinformation" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Vollständiger Name" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Homepage" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "" "URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Beschreibe dich selbst und deine Interessen in %d Zeichen" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Beschreibe dich selbst und deine Interessen" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Biografie" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Aufenthaltsort" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“" @@ -3010,7 +3011,7 @@ msgstr "" "Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-" "Menschen)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Die Biografie ist zu lang (max. %d Zeichen)" @@ -3274,7 +3275,7 @@ msgstr "Passwort muss mehr als 6 Zeichen enthalten" msgid "Password and confirmation do not match." msgstr "Passwort und seine Bestätigung stimmen nicht überein." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Fehler bei den Nutzereinstellungen." @@ -3282,40 +3283,40 @@ msgstr "Fehler bei den Nutzereinstellungen." msgid "New password successfully saved. You are now logged in." msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Entschuldigung, ungültiger Bestätigungscode." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registrierung erfolgreich" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrieren" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registrierung nicht gestattet" -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" "Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Diese E-Mail-Adresse existiert bereits." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Benutzername oder Passwort falsch." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3323,59 +3324,60 @@ msgstr "" "Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du " "Nachrichten und Links mit deinen Freunden und Kollegen teilen. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. " "Pflicht." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 oder mehr Buchstaben. Pflicht." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Gleiches Passwort wie zuvor. Pflichteingabe." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-Mail" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Wird nur für Updates, wichtige Mitteilungen und zur " "Passwortwiederherstellung verwendet" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Längerer Name, bevorzugt dein „echter“ Name" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "Inhalte und Daten von %1$s sind privat und vertraulich." +msgstr "" +"Mir ist bewusst, dass Inhalte und Daten von %1$s privat und vertraulich sind." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "Meine Texte und Dateien sind urheberrechtlich geschützt durch %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "Meine Texte und Dateien verbleiben unter meinem eigenen Urheberrecht." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Alle Rechte vorbehalten." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3384,7 +3386,7 @@ msgstr "" "Abgesehen von folgenden Daten: Passwort, Email Adresse, IM Adresse und " "Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3417,7 +3419,7 @@ msgstr "" "\n" "Danke für deine Anmeldung, wir hoffen das dir der Service gefällt." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5611,14 +5613,14 @@ msgstr "Vollständiger Name: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Standort: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" @@ -6153,8 +6155,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s hat deine Nachrichten auf %2$s abonniert." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6181,19 +6190,19 @@ msgstr "" "$s ändern.\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Biografie: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Neue E-Mail-Adresse um auf %s zu schreiben" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6215,18 +6224,18 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s Status" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS-Konfiguration" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" @@ -6234,13 +6243,13 @@ msgstr "" "handelt:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Du wurdest von %s angestupst" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6268,13 +6277,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Neue private Nachricht von %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6308,13 +6317,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) hat deine Nachricht als Favorit gespeichert" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6346,7 +6355,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6357,14 +6366,14 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" "%s (@%s) hat dir eine Nachricht gesendet um deine Aufmerksamkeit zu erlangen" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6715,7 +6724,7 @@ msgstr "Tagesdurchschnitt" msgid "All groups" msgstr "Alle Gruppen" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Nicht unterstützte Methode." @@ -6739,7 +6748,7 @@ msgstr "Beliebte Benutzer" msgid "Popular" msgstr "Beliebte Beiträge" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Kein Rückkehr Argument." @@ -6760,7 +6769,7 @@ msgstr "Diese Nachricht wiederholen" msgid "Revoke the \"%s\" role from this user" msgstr "Widerrufe die \"%s\" Rolle von diesem Benutzer" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Kein einzelner Nutzer für den Ein-Benutzer-Modus ausgewählt." @@ -6938,56 +6947,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "vor einer Minute" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "vor einer Stunde" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "vor einem Tag" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "vor einem Monat" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "vor einem Jahr" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 4e8f62afe4..6bf33f0858 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:41+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:36:54+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -396,32 +396,32 @@ msgstr "Απέτυχε η εύρεση οποιασδήποτε κατάστασ #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "" #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)." @@ -433,7 +433,7 @@ msgstr "Η περιγραφή είναι πολύ μεγάλη (μέγιστο % #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)." @@ -526,12 +526,12 @@ msgstr "Μήνυμα" #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -598,8 +598,8 @@ msgstr "" msgid "Account" msgstr "Λογαριασμός" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -607,8 +607,8 @@ msgid "Nickname" msgstr "Ψευδώνυμο" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Κωδικός" @@ -818,11 +818,11 @@ msgstr "Ρυθμίσεις OpenID" msgid "You already blocked that user." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -834,7 +834,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -844,7 +844,7 @@ msgstr "Όχι" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." @@ -854,7 +854,7 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -863,11 +863,11 @@ msgid "Yes" msgstr "Ναι" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "" @@ -1033,7 +1033,7 @@ msgstr "Περιγράψτε την ομάδα ή το θέμα" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "" @@ -1499,7 +1499,7 @@ msgid "Cannot normalize that email address" msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "" @@ -1732,13 +1732,13 @@ msgstr "" #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "" @@ -2262,39 +2262,39 @@ msgstr "" msgid "%1$s left group %2$s" msgstr "" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Ήδη συνδεδεμένος." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Λάθος όνομα χρήστη ή κωδικός" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Σύνδεση" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Αυτόματη σύνδεση στο μέλλον. ΟΧΙ για κοινόχρηστους υπολογιστές!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2302,12 +2302,12 @@ msgstr "" "Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό " "σας, πριν αλλάξετε τις ρυθμίσεις σας." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "Σύνδεση με όνομα χρήστη και κωδικό" -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2642,7 +2642,7 @@ msgid "6 or more characters" msgstr "6 ή περισσότεροι χαρακτήρες" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Επιβεβαίωση" @@ -2654,11 +2654,11 @@ msgstr "" msgid "Change" msgstr "Αλλαγή" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Οι κωδικοί δεν ταυτίζονται." @@ -2886,44 +2886,44 @@ msgstr "" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Ονοματεπώνυμο" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Αρχική σελίδα" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 #, fuzzy msgid "Describe yourself and your interests" msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Βιογραφικό" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Τοποθεσία" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2966,7 +2966,7 @@ msgstr "" "Αυτόματα γίνε συνδρομητής σε όσους γίνονται συνδρομητές σε μένα (χρήση " "κυρίως από λογισμικό και όχι ανθρώπους)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)." @@ -3215,7 +3215,7 @@ msgstr "Ο κωδικός πρέπει να είναι 6 χαρακτήρες ή msgid "Password and confirmation do not match." msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "" @@ -3223,93 +3223,93 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "" -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "" -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Η διεύθυνση email υπάρχει ήδη." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "" -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά. Απαραίτητο." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 ή περισσότεροι χαρακτήρες. Απαραίτητο." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Email" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3318,7 +3318,7 @@ msgstr "" "εκτός από τα εξής προσωπικά δεδομένα: κωδικός πρόσβασης, διεύθυνση email, " "διεύθυνση IM, τηλεφωνικό νούμερο." -#: actions/register.php:576 +#: actions/register.php:583 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3352,7 +3352,7 @@ msgstr "" "Ευχαριστούμε που εγγράφηκες και ευχόμαστε να περάσεις καλά με την υπηρεσία " "μας." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5502,14 +5502,14 @@ msgstr "Ονοματεπώνυμο" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "" @@ -5993,8 +5993,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6010,7 +6017,7 @@ msgid "" msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "" @@ -6018,13 +6025,13 @@ msgstr "" "\n" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6038,30 +6045,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Κατάσταση του/της %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νούμερο τηλεφώνου." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6078,13 +6085,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6104,13 +6111,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6132,7 +6139,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6140,13 +6147,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6468,7 +6475,7 @@ msgstr "" msgid "All groups" msgstr "" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6492,7 +6499,7 @@ msgstr "Προτεινόμενα" msgid "Popular" msgstr "Δημοφιλή" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "" @@ -6515,7 +6522,7 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6698,56 +6705,56 @@ msgid "Moderator" msgstr "Συντονιστής" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index a3c1605ee7..fe597b75c3 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to British English # +# Author@translatewiki.net: Brion # Author@translatewiki.net: Bruce89 # Author@translatewiki.net: CiaranG # Author@translatewiki.net: Reedy @@ -10,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:44+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:36:58+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -394,32 +395,32 @@ msgstr "Could not find target user." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Nickname must have only lowercase letters and numbers, and no spaces." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Nickname already in use. Try another one." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Not a valid nickname." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Homepage is not a valid URL." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Full name is too long (max 255 chars)." @@ -431,7 +432,7 @@ msgstr "Description is too long (max %d chars)" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Location is too long (max 255 chars)." @@ -522,12 +523,12 @@ msgstr "Invalid token." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -597,8 +598,8 @@ msgstr "" msgid "Account" msgstr "Account" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -606,8 +607,8 @@ msgid "Nickname" msgstr "Nickname" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Password" @@ -813,11 +814,11 @@ msgstr "Avatar deleted." msgid "You already blocked that user." msgstr "You already blocked that user." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Block user" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -832,7 +833,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -841,7 +842,7 @@ msgstr "No" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Do not block this user" @@ -850,7 +851,7 @@ msgstr "Do not block this user" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -858,11 +859,11 @@ msgid "Yes" msgstr "Yes" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Block this user" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Failed to save block information." @@ -1023,7 +1024,7 @@ msgstr "Delete this application" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Not logged in." @@ -1472,7 +1473,7 @@ msgid "Cannot normalize that email address" msgstr "Cannot normalise that e-mail address" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Not a valid e-mail address." @@ -1698,13 +1699,13 @@ msgstr "User already has this role." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "No profile specified." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "No profile with that ID." @@ -2266,39 +2267,39 @@ msgstr "You are not a member of that group." msgid "%1$s left group %2$s" msgstr "%1$s left group %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Already logged in." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Incorrect username or password." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Error setting user. You are probably not authorised." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Login" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Login to site" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Remember me" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Automatically login in the future; not for shared computers!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Lost or forgotten password?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2306,11 +2307,11 @@ msgstr "" "For security reasons, please re-enter your user name and password before " "changing your settings." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Login with your username and password." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2640,7 +2641,7 @@ msgid "6 or more characters" msgstr "6 or more characters" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Confirm" @@ -2652,11 +2653,11 @@ msgstr "Same as password above" msgid "Change" msgstr "Change" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Password must be 6 or more characters." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Passwords don't match." @@ -2879,43 +2880,43 @@ msgstr "Profile information" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 lowercase letters or numbers, no punctuation or spaces" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Full name" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Homepage" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL of your homepage, blog, or profile on another site" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Describe yourself and your interests in %d chars" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Describe yourself and your interests" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Bio" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Location" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Where you are, like \"City, State (or Region), Country\"" @@ -2957,7 +2958,7 @@ msgid "" msgstr "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Bio is too long (max %d chars)." @@ -3212,7 +3213,7 @@ msgstr "Password must be 6 chars or more." msgid "Password and confirmation do not match." msgstr "Password and confirmation do not match." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Error setting user." @@ -3220,93 +3221,93 @@ msgstr "Error setting user." msgid "New password successfully saved. You are now logged in." msgstr "New password successfully saved. You are now logged in." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Sorry, only invited people can register." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Sorry, invalid invitation code." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registration successful" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Register" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registration not allowed." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "You can't register if you don't agree to the licence." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "E-mail address already exists." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Invalid username or password." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 or more characters. Required." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Same as password above. Required." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mail" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Used only for updates, announcements, and password recovery" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Longer name, preferably your \"real\" name" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3315,7 +3316,7 @@ msgstr "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3348,7 +3349,7 @@ msgstr "" "\n" "Thanks for signing up and we hope you enjoy using this service." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5488,14 +5489,14 @@ msgstr "Fullname: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Location: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" @@ -6011,8 +6012,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s is now listening to your notices on %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6038,19 +6046,19 @@ msgstr "" "Change your email address or notification options at %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Bio: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "New e-mail address for posting to %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6072,30 +6080,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s status" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS confirmation" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s: confirm you own this phone number with this code:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "You've been nudged by %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6112,13 +6120,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "New private message from %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6138,13 +6146,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) added your notice as a favorite" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6166,7 +6174,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6174,13 +6182,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6497,7 +6505,7 @@ msgstr "" msgid "All groups" msgstr "All groups" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6521,7 +6529,7 @@ msgstr "Featured" msgid "Popular" msgstr "Popular" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "No return-to arguments." @@ -6542,7 +6550,7 @@ msgstr "Repeat this notice" msgid "Revoke the \"%s\" role from this user" msgstr "Revoke the \"%s\" role from this user" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6720,56 +6728,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "a few seconds ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "about a minute ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "about an hour ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "about a day ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "about %d days ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "about a month ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "about %d months ago" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "about a year ago" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 268cb5c5d2..fce4f361ca 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:47+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:02+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -397,7 +397,7 @@ msgstr "No se pudo encontrar ningún usuario de destino." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "El usuario debe tener solamente letras minúsculas y números y no puede tener " @@ -405,26 +405,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "El usuario ya existe. Prueba con otro." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Usuario inválido" #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "La página de inicio no es un URL válido." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Tu nombre es demasiado largo (max. 255 carac.)" @@ -436,7 +436,7 @@ msgstr "La descripción es demasiado larga (máx. %d caracteres)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "La ubicación es demasiado larga (máx. 255 caracteres)." @@ -527,12 +527,12 @@ msgstr "Token inválido." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -605,8 +605,8 @@ msgstr "" msgid "Account" msgstr "Cuenta" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -614,8 +614,8 @@ msgid "Nickname" msgstr "Usuario" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Contraseña" @@ -823,11 +823,11 @@ msgstr "Imagen borrada." msgid "You already blocked that user." msgstr "Ya has bloqueado a este usuario." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquear usuario." -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -842,7 +842,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -851,7 +851,7 @@ msgstr "No" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "No bloquear a este usuario" @@ -860,7 +860,7 @@ msgstr "No bloquear a este usuario" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -868,11 +868,11 @@ msgid "Yes" msgstr "Sí" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloquear este usuario." -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "No se guardó información de bloqueo." @@ -1034,7 +1034,7 @@ msgstr "Borrar esta aplicación" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "No conectado." @@ -1486,7 +1486,7 @@ msgid "Cannot normalize that email address" msgstr "No se puede normalizar esta dirección de correo electrónico." #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Correo electrónico no válido" @@ -1714,13 +1714,13 @@ msgstr "El usuario ya tiene esta función." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "No se especificó perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "No existe perfil con ese ID" @@ -2289,41 +2289,41 @@ msgstr "No eres miembro de este grupo." msgid "%1$s left group %2$s" msgstr "%1$s ha dejado el grupo %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Ya estás conectado." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Nombre de usuario o contraseña incorrectos." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Error al configurar el usuario. Posiblemente no tengas autorización." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Inicio de sesión" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Ingresar a sitio" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Recordarme" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores " "compartidos! " -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "¿Contraseña olvidada o perdida?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2331,11 +2331,11 @@ msgstr "" "Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y " "contraseña antes de cambiar tu configuración." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Ingresar con tu nombre de usuario y contraseña." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2672,7 +2672,7 @@ msgid "6 or more characters" msgstr "6 o más caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Confirmar" @@ -2684,11 +2684,11 @@ msgstr "Igual a la contraseña de arriba" msgid "Change" msgstr "Cambiar" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Cotrnaseña debe tener 6 o más caracteres." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Las contraseñas no coinciden" @@ -2915,43 +2915,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "1-64 letras en minúscula o números, sin signos de puntuación o espacios" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nombre completo" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Página de inicio" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "El URL de tu página de inicio, blog o perfil en otro sitio" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Descríbete y cuéntanos tus intereses en %d caracteres" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Descríbete y cuéntanos acerca de tus intereses" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Biografía" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Ubicación" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\"" @@ -2995,7 +2995,7 @@ msgstr "" "Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor " "para no-humanos)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "La biografía es muy larga (máx. %d caracteres)." @@ -3264,7 +3264,7 @@ msgstr "La contraseña debe tener 6 o más caracteres." msgid "Password and confirmation do not match." msgstr "La contraseña y la confirmación no coinciden." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Error al configurar el usuario." @@ -3272,39 +3272,39 @@ msgstr "Error al configurar el usuario." msgid "New password successfully saved. You are now logged in." msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Disculpa, sólo personas invitadas pueden registrarse." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "El código de invitación no es válido." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registro exitoso." -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrarse" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registro de usuario no permitido." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "No puedes registrarte si no estás de acuerdo con la licencia." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "La dirección de correo electrónico ya existe." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Usuario o contraseña inválidos." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3312,58 +3312,60 @@ msgstr "" "Con este formulario puedes crear una nueva cuenta. Después podrás publicar " "avisos y enviar vínculos de ellos a tus amigos y colegas. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 letras en minúscula o números, sin signos de puntuación o espacios. " "Requerido." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 o más caracters. Requerido." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Igual a la contraseña de arriba. Requerida" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Correo electrónico" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Nombre más largo, preferiblemente tu nombre \"real\"" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "El contenido y datos de %1$s son privados y confidenciales." +msgstr "" +"Entiendo que el contenido y los datos de %1$s son privados y confidenciales." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" +"Mi texto y archivos est'an protegidos por los derecho de autor de %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "Mi texto y archivos permanecen bajo mi propio derecho de autor." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Todos los derechos reservados." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3373,7 +3375,7 @@ msgstr "" "información privada: contraseña, dirección de correo electrónico, dirección " "de mensajería instantánea y número de teléfono." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3406,7 +3408,7 @@ msgstr "" "\n" "¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5602,14 +5604,14 @@ msgstr "Nombre completo: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Lugar: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Página de inicio: %s" @@ -6146,8 +6148,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s ahora está escuchando tus avisos en %2$s" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6175,19 +6184,19 @@ msgstr "" "Cambia tus preferencias de notificaciones a tu correo electrónico en %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Bio: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Nueva dirección de correo para postear a %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6209,30 +6218,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "estado de %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS confirmación" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s: Confirma que este es tu número de teléfono mediante este código:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s te ha dado un toque" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6260,13 +6269,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nuevo mensaje privado de %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6300,13 +6309,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) agregó tu aviso como un favorito" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6344,7 +6353,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6355,13 +6364,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) ha enviado un aviso a tu atención" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6711,7 +6720,7 @@ msgstr "Promedio diario" msgid "All groups" msgstr "Todos los grupos" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Método no implementado." @@ -6735,7 +6744,7 @@ msgstr "Destacado" msgid "Popular" msgstr "Popular" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "No hay respuesta a los argumentos." @@ -6756,7 +6765,7 @@ msgstr "Responder este aviso." msgid "Revoke the \"%s\" role from this user" msgstr "Revocar el rol \"%s\" de este usuario" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Ningún usuario sólo definido para modo monousuario." @@ -6934,56 +6943,56 @@ msgid "Moderator" msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "hace unos segundos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "hace un minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "hace una hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "hace un día" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "hace %d días" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "hace un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "hace %d meses" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "hace un año" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index c4a039c318..f7d5d4c792 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:56+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:10+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -392,32 +392,32 @@ msgstr "نمی‌توان کاربر هدف را پیدا کرد." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "لقب باید شامل حروف کوچک و اعداد و بدون فاصله باشد." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "لقب نا معتبر." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "برگهٔ آغازین یک نشانی معتبر نیست." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "نام کامل طولانی است (۲۵۵ حرف در حالت بیشینه(." @@ -429,7 +429,7 @@ msgstr "توصیف بسیار زیاد است (حداکثر %d حرف)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "مکان طولانی است (حداکثر ۲۵۵ حرف)" @@ -522,12 +522,12 @@ msgstr "اندازه‌ی نادرست" #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -593,8 +593,8 @@ msgstr "" msgid "Account" msgstr "حساب کاربری" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -602,8 +602,8 @@ msgid "Nickname" msgstr "نام کاربری" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "گذرواژه" @@ -814,11 +814,11 @@ msgstr "چهره پاک شد." msgid "You already blocked that user." msgstr "شما هم اکنون آن کاربر را مسدود کرده اید." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "مسدود کردن کاربر" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -834,7 +834,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -844,7 +844,7 @@ msgstr "خیر" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "کاربر را مسدود نکن" @@ -853,7 +853,7 @@ msgstr "کاربر را مسدود نکن" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -862,11 +862,11 @@ msgid "Yes" msgstr "بله" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "کاربر را مسدود کن" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "" @@ -1034,7 +1034,7 @@ msgstr "این پیام را پاک کن" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "شما به سیستم وارد نشده اید." @@ -1500,7 +1500,7 @@ msgid "Cannot normalize that email address" msgstr "نمی‌توان نشانی را قانونی کرد" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "یک آدرس ایمیل معتبر نیست." @@ -1732,13 +1732,13 @@ msgstr "کاربر قبلا ساکت شده است." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "کاربری مشخص نشده است." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "کاربری با چنین شناسه‌ای وجود ندارد." @@ -2273,39 +2273,39 @@ msgstr "شما یک کاربر این گروه نیستید." msgid "%1$s left group %2$s" msgstr "%s گروه %s را ترک کرد." -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "قبلا وارد شده" -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "نام کاربری یا رمز عبور نادرست." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "خطا در تنظیم کاربر. شما احتمالا اجازه ی این کار را ندارید." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "ورود" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "ورود به وب‌گاه" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "مرا به یاد بسپار" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "رمز عبور خود را گم یا فراموش کرده اید؟" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2313,12 +2313,12 @@ msgstr "" "به دلایل امنیتی، لطفا نام کاربری و رمز عبور خود را قبل از تغییر تنظیمات " "دوباره وارد نمایید." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "وارد شدن با یک نام کاربری و کلمه ی عبور" -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2665,7 +2665,7 @@ msgid "6 or more characters" msgstr "۶ نویسه یا بیش‌تر" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "تایید" @@ -2677,11 +2677,11 @@ msgstr "مثل رمز عبور بالا" msgid "Change" msgstr "تغییر" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "گذرواژه‌ها مطابقت ندارند." @@ -2907,43 +2907,43 @@ msgstr "اطلاعات شناس‌نامه" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "نام‌کامل" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "صفحهٔ خانگی" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا مشخصات کاربری‌تان در یک وب‌گاه دیگر" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "خودتان و علایقتان را توصیف کنید." -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "شرح‌حال" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "موقعیت" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2983,7 +2983,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "" @@ -3231,7 +3231,7 @@ msgstr "کلمه ی عبور باید ۶ کاراکتر یا بیشتر باشد msgid "Password and confirmation do not match." msgstr "کلمه ی عبور و تاییدیه ی آن با هم تطابق ندارند." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "" @@ -3239,93 +3239,93 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "کلمه ی عبور جدید با موفقیت ذخیره شد. شما الان وارد شده اید." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "با عرض معذرت، تنها افراد دعوت شده می توانند ثبت نام کنند." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "با عرض تاسف، کد دعوت نا معتبر است." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "ثبت نام با موفقیت انجام شد." -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "ثبت نام" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "اجازه‌ی ثبت نام داده نشده است." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "شما نمی توانید ثبت نام کنید اگر با لیسانس( جواز ) موافقت نکنید." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "آدرس ایمیل از قبل وجود دارد." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "نام کاربری یا کلمه ی عبور نا معتبر." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "۱-۶۴ حرف کوچک یا اعداد، بدون نشانه گذاری یا فاصله نیاز است." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "۶ کاراکتر یا بیشتر نیاز است." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "پست الکترونیکی" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "نام بلند تر، به طور بهتر نام واقعیتان" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3334,7 +3334,7 @@ msgstr "" "به استثنای این داده ی محرمانه : کلمه ی عبور، آدرس ایمیل، آدرس IM، و شماره " "تلفن." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3353,7 +3353,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5508,14 +5508,14 @@ msgstr "نام کامل : %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "موقعیت : %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "صفحه خانگی : %s" @@ -5995,8 +5995,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%2$s از حالا به خبر های شما گوش میده %1$s" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6012,19 +6019,19 @@ msgid "" msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "موقعیت : %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "%s ادرس ایمیل جدید برای" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6044,30 +6051,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "وضعیت %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "تایید پیامک" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "منتظر تاییدیه برای این شماره تلفن." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6084,13 +6091,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6110,13 +6117,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr " خبر شما را به علایق خود اضافه کرد %s (@%s)" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6138,7 +6145,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6146,13 +6153,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "به توجه شما یک خبر فرستاده شده %s (@%s)" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6474,7 +6481,7 @@ msgstr "" msgid "All groups" msgstr "تمام گروه‌ها" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6498,7 +6505,7 @@ msgstr "خصوصیت" msgid "Popular" msgstr "محبوب" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "" @@ -6520,7 +6527,7 @@ msgstr "" msgid "Revoke the \"%s\" role from this user" msgstr "دسترسی کاربر را به گروه مسدود کن" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6699,56 +6706,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "چند ثانیه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "حدود یک دقیقه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "حدود %d دقیقه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "حدود یک ساعت پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "حدود %d ساعت پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "حدود یک روز پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "حدود %d روز پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "حدود یک ماه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "حدود %d ماه پیش" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "حدود یک سال پیش" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 48a25ce224..4e7b510e27 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:39:53+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:07+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -408,7 +408,7 @@ msgstr "Ei löytynyt yhtään päivitystä." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman " @@ -416,26 +416,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Tunnus on jo käytössä. Yritä toista tunnusta." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Tuo ei ole kelvollinen tunnus." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Kotisivun verkko-osoite ei ole toimiva." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Koko nimi on liian pitkä (max 255 merkkiä)." @@ -447,7 +447,7 @@ msgstr "kuvaus on liian pitkä (max 140 merkkiä)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)." @@ -540,12 +540,12 @@ msgstr "Koko ei kelpaa." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -615,8 +615,8 @@ msgstr "" msgid "Account" msgstr "Käyttäjätili" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -624,8 +624,8 @@ msgid "Nickname" msgstr "Tunnus" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Salasana" @@ -839,11 +839,11 @@ msgstr "Kuva poistettu." msgid "You already blocked that user." msgstr "Sinä olet jo estänyt tämän käyttäjän." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Estä käyttäjä" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -855,7 +855,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -865,7 +865,7 @@ msgstr "Ei" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Älä estä tätä käyttäjää" @@ -874,7 +874,7 @@ msgstr "Älä estä tätä käyttäjää" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -883,11 +883,11 @@ msgid "Yes" msgstr "Kyllä" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Estä tämä käyttäjä" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Käyttäjän estotiedon tallennus epäonnistui." @@ -1053,7 +1053,7 @@ msgstr "Poista tämä päivitys" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Et ole kirjautunut sisään." @@ -1531,7 +1531,7 @@ msgid "Cannot normalize that email address" msgstr "Ei voida normalisoida sähköpostiosoitetta" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Tuo ei ole kelvollinen sähköpostiosoite." @@ -1767,13 +1767,13 @@ msgstr "Käyttäjä on asettanut eston sinulle." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Profiilia ei ole määritelty." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Ei profiilia tuolle ID:lle." @@ -2338,42 +2338,42 @@ msgstr "Sinä et kuulu tähän ryhmään." msgid "%1$s left group %2$s" msgstr "%s erosi ryhmästä %s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Olet jo kirjautunut sisään." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Väärä käyttäjätunnus tai salasana" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Sinulla ei ole valtuutusta tähän." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Kirjaudu sisään" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Kirjaudu sisään" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Muista minut" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla " "useampi käyttäjä!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Oletko hukannut tai unohtanut salasanasi?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2381,12 +2381,12 @@ msgstr "" "Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen " "asetuksiesi muuttamista." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla" -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2733,7 +2733,7 @@ msgid "6 or more characters" msgstr "6 tai useampia merkkejä" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Vahvista" @@ -2745,11 +2745,11 @@ msgstr "Sama kuin ylläoleva salasana" msgid "Change" msgstr "Vaihda" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Salasanassa pitää olla 6 tai useampia merkkejä." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Salasanat eivät täsmää." @@ -2990,43 +2990,43 @@ msgstr "" "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai " "välilyöntejä" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Koko nimi" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Kotisivu" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite." -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Tietoja" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Kotipaikka" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\"" @@ -3070,7 +3070,7 @@ msgstr "" "Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin " "ihmiskäyttäjille)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)." @@ -3322,7 +3322,7 @@ msgstr "Salasanassa pitää olla 6 tai useampia merkkejä." msgid "Password and confirmation do not match." msgstr "Salasana ja salasanan vahvistus eivät täsmää." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Virhe tapahtui käyttäjän asettamisessa." @@ -3331,97 +3331,97 @@ msgid "New password successfully saved. You are now logged in." msgstr "" "Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Virheellinen kutsukoodin." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Rekisteröityminen onnistui" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Rekisteröidy" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Rekisteröityminen ei ole sallittu." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Sähköpostiosoite on jo käytössä." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Käyttäjätunnus tai salasana ei kelpaa." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai " "välilyöntejä. Pakollinen." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 tai useampia merkkejä. Pakollinen." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Sama kuin ylläoleva salasana. Pakollinen." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Sähköposti" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja " "salasanan uudelleen käyttöönottoon." -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Pitempi nimi, mieluiten oikea nimesi" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3430,7 +3430,7 @@ msgstr "" "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, " "puhelinnumero." -#: actions/register.php:576 +#: actions/register.php:583 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3463,7 +3463,7 @@ msgstr "" "\n" "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5703,14 +5703,14 @@ msgstr "Koko nimi: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Kotipaikka: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Kotisivu: %s" @@ -6204,8 +6204,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6231,7 +6238,7 @@ msgstr "" "Voit vaihtaa sähköpostiosoitetta tai ilmoitusasetuksiasi %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "" @@ -6239,13 +6246,13 @@ msgstr "" "\n" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6267,30 +6274,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s päivitys" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS vahvistus" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "Odotetaan vahvistusta tälle puhelinnumerolle." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s tönäisi sinua" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6307,13 +6314,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Uusi yksityisviesti käyttäjältä %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6333,13 +6340,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s lisäsi päivityksesi suosikkeihinsa" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6361,7 +6368,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6369,13 +6376,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6704,7 +6711,7 @@ msgstr "" msgid "All groups" msgstr "Kaikki ryhmät" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6728,7 +6735,7 @@ msgstr "Esittelyssä" msgid "Popular" msgstr "Suosituimmat" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "Ei id parametria." @@ -6752,7 +6759,7 @@ msgstr "Vastaa tähän päivitykseen" msgid "Revoke the \"%s\" role from this user" msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6942,56 +6949,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "muutama sekunti sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "noin minuutti sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "noin tunti sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "noin päivä sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "noin kuukausi sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "noin vuosi sitten" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index f5e2e9a91c..d28c3721e0 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:00+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:14+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -401,7 +401,7 @@ msgstr "Impossible de trouver l’utilisateur cible." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Les pseudos ne peuvent contenir que des caractères minuscules et des " @@ -409,26 +409,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Pseudo déjà utilisé. Essayez-en un autre." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Pseudo invalide." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "L’adresse du site personnel n’est pas un URL valide. " #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Nom complet trop long (maximum de 255 caractères)." @@ -440,7 +440,7 @@ msgstr "La description est trop longue (%d caractères maximum)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Emplacement trop long (maximum de 255 caractères)." @@ -531,12 +531,12 @@ msgstr "Jeton incorrect." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -613,8 +613,8 @@ msgstr "" msgid "Account" msgstr "Compte" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -622,8 +622,8 @@ msgid "Nickname" msgstr "Pseudo" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Mot de passe" @@ -833,11 +833,11 @@ msgstr "Avatar supprimé." msgid "You already blocked that user." msgstr "Vous avez déjà bloqué cet utilisateur." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquer cet utilisateur" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -852,7 +852,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -861,7 +861,7 @@ msgstr "Non" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Ne pas bloquer cet utilisateur" @@ -870,7 +870,7 @@ msgstr "Ne pas bloquer cet utilisateur" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -878,11 +878,11 @@ msgid "Yes" msgstr "Oui" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloquer cet utilisateur" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Impossible d’enregistrer les informations de blocage." @@ -1043,7 +1043,7 @@ msgstr "Supprimer cette application" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Non connecté." @@ -1494,7 +1494,7 @@ msgid "Cannot normalize that email address" msgstr "Impossible d’utiliser cette adresse courriel" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Adresse courriel invalide." @@ -1721,13 +1721,13 @@ msgstr "L’utilisateur a déjà ce rôle." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Aucun profil n’a été spécifié." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Aucun profil ne correspond à cet identifiant." @@ -2304,43 +2304,43 @@ msgstr "Vous n’êtes pas membre de ce groupe." msgid "%1$s left group %2$s" msgstr "%1$s a quitté le groupe %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Déjà connecté." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Identifiant ou mot de passe incorrect." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" "Erreur lors de la mise en place de l’utilisateur. Vous n’y êtes probablement " "pas autorisé." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Ouvrir une session" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Ouverture de session" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Se souvenir de moi" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Ouvrir automatiquement ma session à l’avenir (déconseillé pour les " "ordinateurs publics ou partagés)" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Mot de passe perdu ?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2348,11 +2348,11 @@ msgstr "" "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et " "votre mot de passe afin d’enregistrer vos préférences." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Ouvrez une session avec un identifiant et un mot de passe." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2692,7 +2692,7 @@ msgid "6 or more characters" msgstr "6 caractères ou plus" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Confirmer" @@ -2704,11 +2704,11 @@ msgstr "Identique au mot de passe ci-dessus" msgid "Change" msgstr "Modifier" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Votre mot de passe doit contenir au moins 6 caractères." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Les mots de passe ne correspondent pas." @@ -2935,43 +2935,43 @@ msgstr "Information de profil" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nom complet" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Site personnel" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Décrivez vous et vos intérêts en %d caractères" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Décrivez vous et vos interêts" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Bio" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Emplacement" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »" @@ -3015,7 +3015,7 @@ msgstr "" "M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour " "les utilisateurs non-humains)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "La bio est trop longue (%d caractères maximum)." @@ -3280,7 +3280,7 @@ msgstr "Le mot de passe doit contenir au moins 6 caractères." msgid "Password and confirmation do not match." msgstr "Le mot de passe et sa confirmation ne correspondent pas." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Erreur lors de la configuration de l’utilisateur." @@ -3289,39 +3289,39 @@ msgid "New password successfully saved. You are now logged in." msgstr "" "Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Désolé, code d’invitation invalide." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Compte créé avec succès" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Créer un compte" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Création de compte non autorisée." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Vous devez accepter les termes de la licence pour créer un compte." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Cette adresse courriel est déjà utilisée." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Identifiant ou mot de passe incorrect." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3329,58 +3329,60 @@ msgstr "" "Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite " "poster des avis and et vous relier à des amis et collègues. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 caractères ou plus. Requis." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Identique au mot de passe ci-dessus. Requis." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Courriel" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Utilisé uniquement pour les mises à jour, les notifications, et la " "récupération de mot de passe" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Nom plus long, votre \"vrai\" nom de préférence" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "Le contenu et les données de %1$s sont privés et confidentiels." +msgstr "" +"Je comprends que le contenu et les données de %1$s sont privés et " +"confidentiels." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "Mon texte et les fichiers sont protégés par copyright par %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "Mon texte et les fichiers restent sous mon propre droit d'auteur." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Tous droits réservés." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3390,7 +3392,7 @@ msgstr "" "données personnelles : mot de passe, adresse électronique, adresse de " "messagerie instantanée, numéro de téléphone." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3424,7 +3426,7 @@ msgstr "" "Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre " "service." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5629,14 +5631,14 @@ msgstr "Nom complet : %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Emplacement : %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Site Web : %s" @@ -6180,8 +6182,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s suit maintenant vos avis sur %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6207,19 +6216,19 @@ msgstr "" "Changez votre adresse de courriel ou vos options de notification sur %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Bio : %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Nouvelle adresse courriel pour poster dans %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6241,31 +6250,31 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Statut de %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Confirmation SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" "%s : confirmez que vous possédez ce numéro de téléphone grâce à ce code :" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Vous avez reçu un clin d’œil de %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6293,13 +6302,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nouveau message personnel de %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6333,13 +6342,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) a ajouté un de vos avis à ses favoris" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6378,7 +6387,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6389,13 +6398,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) vous a envoyé un avis" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6744,7 +6753,7 @@ msgstr "Moyenne journalière" msgid "All groups" msgstr "Tous les groupes" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Méthode non implémentée." @@ -6768,7 +6777,7 @@ msgstr "En vedette" msgid "Popular" msgstr "Populaires" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Aucun argument de retour." @@ -6789,7 +6798,7 @@ msgstr "Reprendre cet avis" msgid "Revoke the \"%s\" role from this user" msgstr "Révoquer le rôle « %s » de cet utilisateur" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur." @@ -6967,56 +6976,56 @@ msgid "Moderator" msgstr "Modérateur" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "il y a quelques secondes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "il y a 1 minute" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "il y a 1 heure" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "il y a 1 jour" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "il y a 1 mois" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "il y a environ 1 an" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 64a4d3e3bf..5aaa495d74 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:04+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:17+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -406,32 +406,32 @@ msgstr "Non se puido atopar ningún estado" #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Non é un alcume válido." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "A páxina persoal semella que non é unha URL válida." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "O nome completo é demasiado longo (max 255 car)." @@ -443,7 +443,7 @@ msgstr "O teu Bio é demasiado longo (max 140 car.)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "A localización é demasiado longa (max 255 car.)." @@ -536,12 +536,12 @@ msgstr "Tamaño inválido." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -610,8 +610,8 @@ msgstr "" msgid "Account" msgstr "Sobre" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -619,8 +619,8 @@ msgid "Nickname" msgstr "Alcume" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Contrasinal" @@ -839,11 +839,11 @@ msgstr "Avatar actualizado." msgid "You already blocked that user." msgstr "Xa bloqueaches a este usuario." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquear usuario" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -858,7 +858,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -868,7 +868,7 @@ msgstr "No" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Bloquear usuario" @@ -878,7 +878,7 @@ msgstr "Bloquear usuario" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -887,12 +887,12 @@ msgid "Yes" msgstr "Si" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "Bloquear usuario" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Erro ao gardar información de bloqueo." @@ -1062,7 +1062,7 @@ msgstr "Eliminar chío" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Non está logueado." @@ -1551,7 +1551,7 @@ msgid "Cannot normalize that email address" msgstr "Esa dirección de correo non se pode normalizar " #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Non é un enderezo de correo válido." @@ -1789,13 +1789,13 @@ msgstr "O usuario bloqueoute." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Non se especificou ningún perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Non se atopou un perfil con ese ID." @@ -2370,40 +2370,40 @@ msgstr "Non estás suscrito a ese perfil" msgid "%1$s left group %2$s" msgstr "%s / Favoritos dende %s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Sesión xa iniciada" -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Usuario ou contrasinal incorrectos." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Non está autorizado." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Inicio de sesión" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Lembrarme" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "¿Perdeches a contrasinal?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2411,12 +2411,12 @@ msgstr "" "Por razóns de seguranza, por favor re-insire o teu nome de usuario e " "contrasinal antes de cambiar as túas preferenzas." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "Accede co teu nome de usuario e contrasinal." -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2764,7 +2764,7 @@ msgid "6 or more characters" msgstr "6 ou máis caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Confirmar" @@ -2776,11 +2776,11 @@ msgstr "Igual que a contrasinal de enriba" msgid "Change" msgstr "Modificado" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "A contrasinal debe ter 6 caracteres ou máis." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "As contrasinais non coinciden" @@ -3019,44 +3019,44 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome completo" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Páxina persoal" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 #, fuzzy msgid "Describe yourself and your interests" msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Bio" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Localización" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "¿Onde estas, coma \"Cidade, Provincia, País\"" @@ -3100,7 +3100,7 @@ msgstr "" "Suscribirse automáticamente a calquera que se suscriba a min (o mellor para " "non humáns)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "O teu Bio é demasiado longo (max 140 car.)." @@ -3359,7 +3359,7 @@ msgstr "A contrasinal debe ter 6 caracteres ou máis." msgid "Password and confirmation do not match." msgstr "A contrasinal e a súa confirmación non coinciden." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Acounteceu un erro configurando o usuario." @@ -3367,40 +3367,40 @@ msgstr "Acounteceu un erro configurando o usuario." msgid "New password successfully saved. You are now logged in." msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Desculpa, só se pode rexistrar a xente con invitación." -#: actions/register.php:92 +#: actions/register.php:99 #, fuzzy msgid "Sorry, invalid invitation code." msgstr "Acounteceu un erro co código de confirmación." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Xa estas rexistrado!!" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrar" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Non se permite o rexistro neste intre." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Non podes rexistrarte se non estas de acordo coa licenza." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "O enderezo de correo xa existe." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Usuario ou contrasinal inválidos." -#: actions/register.php:343 +#: actions/register.php:350 #, fuzzy msgid "" "With this form you can create a new account. You can then post notices and " @@ -3410,58 +3410,58 @@ msgstr "" "chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? " "Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "De 1 a 64 letras minúsculas ou números, nin espazos nin signos de " "puntuación. Requerido." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 ou máis caracteres. Requerido." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "A mesma contrasinal que arriba. Requerido." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Correo Electrónico" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Empregado só para actualizacións, novidades, e recuperación de contrasinais" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Nome máis longo, preferiblemente o teu nome \"real\"" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3470,7 +3470,7 @@ msgstr "" " agás esta informción privada: contrasinal, dirección de correo electrónico, " "dirección IM, número de teléfono." -#: actions/register.php:576 +#: actions/register.php:583 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3502,7 +3502,7 @@ msgstr "" "\n" "Grazas por rexistrarte e esperamos que laretexes moito." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5766,14 +5766,14 @@ msgstr "Nome completo: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Ubicación: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Páxina persoal: %s" @@ -6323,8 +6323,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s está a escoitar os teus chíos %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6346,19 +6353,19 @@ msgstr "" "%4$s.\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "Ubicación: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Nova dirección de email para posterar en %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6380,30 +6387,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Estado de %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Confirmación de SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "Agardando a confirmación neste número de teléfono." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s douche un toque" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6430,13 +6437,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "%s enviouche unha nova mensaxe privada" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6470,13 +6477,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s gustoulle o teu chío" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, fuzzy, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6510,7 +6517,7 @@ msgstr "" "%5$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6518,13 +6525,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6863,7 +6870,7 @@ msgstr "" msgid "All groups" msgstr "Tódalas etiquetas" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6888,7 +6895,7 @@ msgstr "Destacado" msgid "Popular" msgstr "Popular" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "Non hai argumento id." @@ -6912,7 +6919,7 @@ msgstr "Non se pode eliminar este chíos." msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -7109,56 +7116,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "fai uns segundos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "fai un minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "fai unha hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "fai un día" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "fai %d días" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "fai un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "fai %d meses" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "fai un ano" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index 6639ecf5a2..59aafd22da 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:10+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:21+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -394,7 +394,7 @@ msgstr "Non se puido atopar o usuario de destino." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "O alcume debe ter só letras en minúscula e números, e non pode ter espazos " @@ -402,26 +402,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Ese alcume xa está en uso. Probe con outro." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "O formato do alcume non é correcto." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "O URL da páxina persoal non é correcto." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)." @@ -433,7 +433,7 @@ msgstr "A descrición é longa de máis (o máximo son %d caracteres)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "A localidade é longa de máis (o máximo son 255 caracteres)." @@ -524,12 +524,12 @@ msgstr "Pase incorrecto." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -601,8 +601,8 @@ msgstr "" msgid "Account" msgstr "Conta" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -610,8 +610,8 @@ msgid "Nickname" msgstr "Alcume" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Contrasinal" @@ -821,11 +821,11 @@ msgstr "Borrouse o avatar." msgid "You already blocked that user." msgstr "Xa bloqueou ese usuario." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquear o usuario" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -840,7 +840,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -849,7 +849,7 @@ msgstr "Non" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Non bloquear este usuario" @@ -858,7 +858,7 @@ msgstr "Non bloquear este usuario" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -866,11 +866,11 @@ msgid "Yes" msgstr "Si" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloquear este usuario" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Non se puido gardar a información do bloqueo." @@ -1031,7 +1031,7 @@ msgstr "Borrar a aplicación" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Non iniciou sesión." @@ -1487,7 +1487,7 @@ msgid "Cannot normalize that email address" msgstr "Non se pode normalizar ese enderezo de correo electrónico" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "O enderezo de correo electrónico é incorrecto." @@ -1713,13 +1713,13 @@ msgstr "O usuario xa ten este rol." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Non se especificou ningún perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Ningún perfil ten esa ID." @@ -2231,8 +2231,8 @@ msgid "" msgstr "" "%1$s convidouno a unirse a el en %2$s (%3$s).\n" "\n" -"%2$s é un servizo de microblogue que lle permite estar ao día coas persoas " -"que coñece e coas que lle interesen.\n" +"%2$s é un servizo de mensaxes de blogue curtas que lle permite estar ao día " +"coas persoas que coñece e coas que lle interesen.\n" "\n" "Tamén pode compartir novas persoais, pensamentos ou a súa vida en liña con " "outros coñecidos. Tamén está moi ben para coñecer xente con intereses " @@ -2285,43 +2285,43 @@ msgstr "Non pertence a ese grupo." msgid "%1$s left group %2$s" msgstr "%1$s deixou o grupo %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Xa se identificou." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Nome de usuario ou contrasinal incorrectos." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" "Houbo un erro ao configurar o usuario. Probablemente non estea autorizado " "para facelo." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Identificarse" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Identificarse no sitio" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Lembrádeme" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Identificarse automaticamente no futuro. Non se aconsella en computadoras " "compartidas!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Esqueceu ou perdeu o contrasinal?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2329,11 +2329,11 @@ msgstr "" "Por razóns de seguridade, volva introducir o seu nome de usuario e " "contrasinal antes de cambiar a súa configuración." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Identifíquese co seu nome de usuario e contrasinal." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2670,7 +2670,7 @@ msgid "6 or more characters" msgstr "Seis ou máis caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Confirmar" @@ -2682,11 +2682,11 @@ msgstr "Igual ao contrasinal anterior" msgid "Change" msgstr "Cambiar" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "O contrasinal debe conter seis ou máis caracteres." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Os contrasinais non coinciden." @@ -2913,43 +2913,43 @@ msgstr "" "Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, " "espazos, tiles ou eñes" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome completo" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Páxina persoal" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Descríbase a vostede e mailos seus intereses en %d caracteres" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Descríbase a vostede e mailos seus intereses" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Biografía" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Lugar" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”" @@ -2993,7 +2993,7 @@ msgstr "" "Subscribirse automaticamente a quen se subscriba a min (o mellor para os " "bots)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "A biografía é longa de máis (o límite son %d caracteres)." @@ -3091,11 +3091,11 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" -"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/" -"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre " -"[StatusNet](http://status.net/). [Únase agora](%%action.register%%) para " -"compartir notas persoais cos amigos, a familia e os compañeiros! ([Máis " -"información](%%doc.help%%))" +"Isto é %%site.name%%, un servizo de [mensaxes de blogue curtas](http://en." +"wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de " +"software libre [StatusNet](http://status.net/). [Únase agora](%%action." +"register%%) para compartir notas persoais cos amigos, a familia e os " +"compañeiros! ([Máis información](%%doc.help%%))" #: actions/public.php:247 #, php-format @@ -3104,9 +3104,9 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" -"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/" -"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre " -"[StatusNet](http://status.net/)." +"Isto é %%site.name%%, un servizo de [mensaxes de blogue curtas](http://en." +"wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de " +"software libre [StatusNet](http://status.net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" @@ -3261,7 +3261,7 @@ msgstr "O contrasinal debe ter seis ou máis caracteres." msgid "Password and confirmation do not match." msgstr "O contrasinal e a confirmación non coinciden." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Houbo un erro ao configurar o usuario." @@ -3269,39 +3269,39 @@ msgstr "Houbo un erro ao configurar o usuario." msgid "New password successfully saved. You are now logged in." msgstr "O novo contrasinal gardouse correctamente. Agora está identificado." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Só se pode rexistrar mediante invitación." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "O código da invitación é incorrecto." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Rexistrouse correctamente" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrarse" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Non se permite o rexistro." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Non pode rexistrarse se non acepta a licenza." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "O enderezo de correo electrónico xa existe." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "O nome de usuario ou contrasinal non son correctos." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3309,58 +3309,61 @@ msgstr "" "Con este formulario pode crear unha conta nova. Entón poderá publicar notas " "e porse en contacto con amigos e compañeiros. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, " "espazos, tiles ou eñes. Obrigatorio." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 ou máis caracteres. Obrigatorio." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "O mesmo contrasinal que o anterior. Obrigatorio." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Correo electrónico" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Só se utiliza para actualizacións, anuncios e recuperación de contrasinais" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Nome longo, preferiblemente o seu nome \"real\"" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "O contido e os datos de %1$s son privados e confidenciais." +msgstr "Entendo que o contido e os datos de %1$s son privados e confidenciais." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" +"Os meus textos e ficheiros están protexidos polos dereitos de autor de %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" +"Os meus textos e ficheiros están protexidos polos meus propios dereitos de " +"autor." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Todos os dereitos reservados." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3370,7 +3373,7 @@ msgstr "" "datos privados: contrasinais, enderezos de correo electrónico e mensaxería " "instantánea e números de teléfono." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3402,7 +3405,7 @@ msgstr "" "\n" "Grazas por rexistrarse. Esperamos que goce deste servizo." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3419,8 +3422,8 @@ msgid "" msgstr "" "Para subscribirse, pode [identificarse](%%action.login%%) ou [rexistrar](%%" "action.register%%) unha conta nova. Se xa ten unha conta nun [sitio de " -"microblogging compatible](%%doc.openmublog%%), introduza a continuación o " -"URL do seu perfil." +"mensaxes de blogue curtas compatible](%%doc.openmublog%%), introduza a " +"continuación o URL do seu perfil." #: actions/remotesubscribe.php:112 msgid "Remote subscribe" @@ -3444,7 +3447,8 @@ msgstr "URL do perfil" #: actions/remotesubscribe.php:134 msgid "URL of your profile on another compatible microblogging service" -msgstr "URL do seu perfil noutro servizo de microblogue compatible" +msgstr "" +"URL do seu perfil noutro servizo de mensaxes de blogue curtas compatible" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:406 @@ -3823,8 +3827,8 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de " -"[microblogue](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " +"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes " +"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " "baseado na ferramenta de software libre [StatusNet](http://status.net/). Os " "seus membros comparten mensaxes curtas sobre as súas vidas e intereses. " "[Únase agora](%%%%action.register%%%%) para pasar a formar parte deste grupo " @@ -3838,8 +3842,8 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" -"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de " -"[microblogue](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " +"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes " +"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " "baseado na ferramenta de software libre [StatusNet](http://status.net/). Os " "seus membros comparten mensaxes curtas sobre as súas vidas e intereses. " @@ -3934,11 +3938,11 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]" -"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na " -"ferramenta de software libre [StatusNet](http://status.net/). [Únase agora](%" -"%%%action.register%%%%) para seguir as notas de **%s** e de moita máis " -"xente! ([Máis información](%%%%doc.help%%%%))" +"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [mensaxes de " +"blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " +"baseado na ferramenta de software libre [StatusNet](http://status.net/). " +"[Únase agora](%%%%action.register%%%%) para seguir as notas de **%s** e de " +"moita máis xente! ([Máis información](%%%%doc.help%%%%))" #: actions/showstream.php:248 #, php-format @@ -3947,9 +3951,9 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" -"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]" -"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na " -"ferramenta de software libre [StatusNet](http://status.net/). " +"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [mensaxes de " +"blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) " +"baseado na ferramenta de software libre [StatusNet](http://status.net/). " #: actions/showstream.php:305 #, php-format @@ -4000,7 +4004,8 @@ msgstr "Nome do sitio" #: actions/siteadminpanel.php:225 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -"O nome do seu sitio, como por exemplo \"O microblogue da miña empresa\"" +"O nome do seu sitio, como por exemplo \"O sitio de mensaxes de blogue curtas " +"da miña empresa\"" #: actions/siteadminpanel.php:229 msgid "Brought by" @@ -5190,14 +5195,14 @@ msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." msgstr "" -"**%%site.name%%** é un servizo de microblogue ofrecido por [%%site.broughtby%" -"%](%%site.broughtbyurl%%)." +"**%%site.name%%** é un servizo de mensaxes de blogue curtas ofrecido por [%%" +"site.broughtby%%](%%site.broughtbyurl%%)." #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. #: lib/action.php:820 #, php-format msgid "**%%site.name%%** is a microblogging service." -msgstr "**%%site.name%%** é un servizo de microblogue." +msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas." #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. #: lib/action.php:824 @@ -5207,9 +5212,9 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" -"Utiliza a versión %s do software de microblogue [StatusNet](http://status." -"net/), dispoñible baixo a [Licenza Pública Xeral Affero de GNU](http://www." -"fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)." +"Utiliza a versión %s do software de mensaxes de blogue curtas [StatusNet]" +"(http://status.net/), dispoñible baixo a [Licenza Pública Xeral Affero de " +"GNU](http://www.fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)." #. TRANS: DT element for StatusNet site content license. #: lib/action.php:840 @@ -5596,14 +5601,14 @@ msgstr "Nome completo: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Localidade: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Sitio web: %s" @@ -6138,8 +6143,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "Agora %1$s segue as súas notas en %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6166,19 +6178,19 @@ msgstr "" "notificación en %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Biografía: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Novo enderezo de correo electrónico para publicar en %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6200,31 +6212,31 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Estado de %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Confirmación dos SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" "%s: utilice o seguinte código para confirmar que o número de teléfono é seu:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s fíxolle un aceno" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6252,13 +6264,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nova mensaxe privada de %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6292,13 +6304,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) marcou a súa nota como favorita" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6337,7 +6349,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6348,13 +6360,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) enviou unha nota á súa atención" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6701,7 +6713,7 @@ msgstr "Media diaria" msgid "All groups" msgstr "Todos os grupos" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Aínda non se implantou o método." @@ -6725,7 +6737,7 @@ msgstr "Salientadas" msgid "Popular" msgstr "Populares" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Sen argumentos \"return-to\"." @@ -6746,7 +6758,7 @@ msgstr "Repetir esta nota" msgid "Revoke the \"%s\" role from this user" msgstr "Revogarlle o rol \"%s\" a este usuario" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Non se estableceu ningún usuario único para o modo de usuario único." @@ -6924,56 +6936,56 @@ msgid "Moderator" msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "hai uns segundos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "hai como un minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "hai como %d minutos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "hai como unha hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "hai como %d horas" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "hai como un día" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "hai como %d días" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "hai como un mes" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "hai como %d meses" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "hai como un ano" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 486fc32858..09b597d2e2 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:14+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:29+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -397,32 +397,32 @@ msgstr "עידכון המשתמש נכשל." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "כינוי יכול להכיל רק אותיות אנגליות קטנות ומספרים, וללא רווחים." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "כינוי זה כבר תפוס. נסה כינוי אחר." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "שם משתמש לא חוקי." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "לאתר הבית יש כתובת לא חוקית." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "השם המלא ארוך מידי (מותרות 255 אותיות בלבד)" @@ -434,7 +434,7 @@ msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיו #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)." @@ -529,12 +529,12 @@ msgstr "גודל לא חוקי." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -603,8 +603,8 @@ msgstr "" msgid "Account" msgstr "אודות" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -612,8 +612,8 @@ msgid "Nickname" msgstr "כינוי" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "סיסמה" @@ -831,12 +831,12 @@ msgstr "התמונה עודכנה." msgid "You already blocked that user." msgstr "כבר נכנסת למערכת!" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "אין משתמש כזה." -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -848,7 +848,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -858,7 +858,7 @@ msgstr "לא" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "אין משתמש כזה." @@ -868,7 +868,7 @@ msgstr "אין משתמש כזה." #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -877,12 +877,12 @@ msgid "Yes" msgstr "כן" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "אין משתמש כזה." -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "" @@ -1051,7 +1051,7 @@ msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אות #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "לא מחובר." @@ -1526,7 +1526,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "" @@ -1763,13 +1763,13 @@ msgstr "למשתמש אין פרופיל." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "" @@ -2311,51 +2311,51 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" msgid "%1$s left group %2$s" msgstr "הסטטוס של %1$s ב-%2$s " -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "כבר מחובר." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "שם משתמש או סיסמה לא נכונים." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "לא מורשה." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "היכנס" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "זכור אותי" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "שכחת או איבדת את הסיסמה?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "שם המשתמש או הסיסמה לא חוקיים" -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2696,7 +2696,7 @@ msgid "6 or more characters" msgstr "לפחות 6 אותיות" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "אשר" @@ -2708,11 +2708,11 @@ msgstr "זהה לסיסמה למעלה" msgid "Change" msgstr "שנה" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "הסיסמאות לא תואמות." @@ -2947,44 +2947,44 @@ msgstr "פרופיל לא מוכר" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים." -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "שם מלא" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "אתר בית" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר " -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 #, fuzzy msgid "Describe yourself and your interests" msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "ביוגרפיה" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "מיקום" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\"" @@ -3024,7 +3024,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)" @@ -3274,7 +3274,7 @@ msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות." msgid "Password and confirmation do not match." msgstr "הסיסמה ואישורה אינן תואמות." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "שגיאה ביצירת שם המשתמש." @@ -3282,101 +3282,101 @@ msgstr "שגיאה ביצירת שם המשתמש." msgid "New password successfully saved. You are now logged in." msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למערכת." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" -#: actions/register.php:92 +#: actions/register.php:99 #, fuzzy msgid "Sorry, invalid invitation code." msgstr "שגיאה באישור הקוד." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "הירשם" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "" -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "לא ניתן להירשם ללא הסכמה לרשיון" -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "" -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "שם המשתמש או הסיסמה לא חוקיים" -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr " לפחות 6 אותיות. שדה חובה." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "לשימוש רק במקרים של עידכונים, הודעות מערכת, ושיחזורי סיסמאות" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3395,7 +3395,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5601,14 +5601,14 @@ msgstr "שם מלא" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "" @@ -6107,8 +6107,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6129,19 +6136,19 @@ msgstr "" " %4$s.\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "אודות: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6155,30 +6162,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6195,13 +6202,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6221,13 +6228,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6249,7 +6256,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6257,13 +6264,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6594,7 +6601,7 @@ msgstr "" msgid "All groups" msgstr "" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6619,7 +6626,7 @@ msgstr "" msgid "Popular" msgstr "אנשים" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "אין מסמך כזה." @@ -6643,7 +6650,7 @@ msgstr "אין הודעה כזו." msgid "Revoke the \"%s\" role from this user" msgstr "אין משתמש כזה." -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6833,56 +6840,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "לפני מספר שניות" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "לפני כדקה" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "לפני כ-%d דקות" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "לפני כשעה" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "לפני כ-%d שעות" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "לפני כיום" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "לפני כ-%d ימים" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "לפני כחודש" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "לפני כ-%d חודשים" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "לפני כשנה" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 8600eaf7da..defca6e333 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:17+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:32+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -381,32 +381,32 @@ msgstr "" #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Přimjeno so hižo wužiwa. Spytaj druhe." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Žane płaćiwe přimjeno." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Startowa strona njeje płaćiwy URL." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)." @@ -418,7 +418,7 @@ msgstr "Wopisanje je předołho (maks. %d znamješkow)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Městno je předołho (maks. 255 znamješkow)." @@ -509,12 +509,12 @@ msgstr "Njepłaćiwy token." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -579,8 +579,8 @@ msgstr "" msgid "Account" msgstr "Konto" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -588,8 +588,8 @@ msgid "Nickname" msgstr "Přimjeno" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Hesło" @@ -796,11 +796,11 @@ msgstr "Awatar zničeny." msgid "You already blocked that user." msgstr "Sy tutoho wužiwarja hižo zablokował." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Wužiwarja blokować" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -812,7 +812,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -821,7 +821,7 @@ msgstr "Ně" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Tutoho wužiwarja njeblokować" @@ -830,7 +830,7 @@ msgstr "Tutoho wužiwarja njeblokować" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -838,11 +838,11 @@ msgid "Yes" msgstr "Haj" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Tutoho wužiwarja blokować" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "" @@ -1000,7 +1000,7 @@ msgstr "Tutu aplikaciju zničić" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Njepřizjewjeny." @@ -1442,7 +1442,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Njepłaćiwa e-mejlowa adresa." @@ -1661,13 +1661,13 @@ msgstr "Wužiwar hižo ma tutu rólu." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Žadyn profil podaty." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Žadyn profil z tym ID." @@ -2179,49 +2179,49 @@ msgstr "Njejsy čłon teje skupiny." msgid "%1$s left group %2$s" msgstr "" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Hižo přizjewjeny." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Wopačne wužiwarske mjeno abo hesło." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Přizjewić" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Při sydle přizjewić" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Składować" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Hesło zhubjene abo zabyte?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2542,7 +2542,7 @@ msgid "6 or more characters" msgstr "6 abo wjace znamješkow" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Wobkrućić" @@ -2554,11 +2554,11 @@ msgstr "" msgid "Change" msgstr "Změnić" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Hesło dyrbi 6 abo wjace znamješkow měć." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Hesle so njekryjetej." @@ -2778,43 +2778,43 @@ msgstr "Profilowe informacije" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Dospołne mjeno" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Startowa strona" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Biografija" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Městno" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2854,7 +2854,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Biografija je předołha (maks. %d znamješkow)." @@ -3100,7 +3100,7 @@ msgstr "Hesło dyrbi 6 znamješkow abo wjace měć." msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "" @@ -3108,100 +3108,100 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Wodaj, njepłaćiwy přeprošenski kod." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registrowanje wuspěšne" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrować" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registracija njedowolena." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "E-mejlowa adresa hižo eksistuje." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Njepłaćiwe wužiwarske mjeno abo hesło." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 abo wjace znamješkow. Trěbne." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Jenake kaž hesło horjeka. Trěbne." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mejl" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3220,7 +3220,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5288,14 +5288,14 @@ msgstr "Dospołne mjeno: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Městno: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "" @@ -5777,8 +5777,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5794,19 +5801,19 @@ msgid "" msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Biografija: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5820,30 +5827,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS-wobkrućenje" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5860,13 +5867,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nowa priwatna powěsć wot %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5886,13 +5893,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) je twoju zdźělenku jako faworit přidał" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5914,7 +5921,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -5922,13 +5929,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6245,7 +6252,7 @@ msgstr "" msgid "All groups" msgstr "Wšě skupiny" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6269,7 +6276,7 @@ msgstr "" msgid "Popular" msgstr "Woblubowany" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Žane wróćenske argumenty." @@ -6290,7 +6297,7 @@ msgstr "Tutu zdźělenku wospjetować" msgid "Revoke the \"%s\" role from this user" msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6468,56 +6475,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "před něšto sekundami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "před něhdźe jednej mjeńšinu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "před %d mjeńšinami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "před něhdźe jednej hodźinu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "před něhdźe %d hodźinami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "před něhdźe jednym dnjom" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "před něhdźe %d dnjemi" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "před něhdźe jednym měsacom" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "před něhdźe %d měsacami" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "před něhdźe jednym lětom" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 18617e5c55..409b38ab96 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:20+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:36+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -391,32 +391,32 @@ msgstr "Non poteva trovar le usator de destination." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Pseudonymo ja in uso. Proba un altere." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Non un pseudonymo valide." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Le pagina personal non es un URL valide." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Le nomine complete es troppo longe (max. 255 characteres)." @@ -428,7 +428,7 @@ msgstr "Description es troppo longe (max %d charachteres)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Loco es troppo longe (max. 255 characteres)." @@ -519,12 +519,12 @@ msgstr "Indicio invalide." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -597,8 +597,8 @@ msgstr "" msgid "Account" msgstr "Conto" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -606,8 +606,8 @@ msgid "Nickname" msgstr "Pseudonymo" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Contrasigno" @@ -818,11 +818,11 @@ msgstr "Avatar delite." msgid "You already blocked that user." msgstr "Tu ha ja blocate iste usator." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Blocar usator" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -837,7 +837,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -846,7 +846,7 @@ msgstr "No" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Non blocar iste usator" @@ -855,7 +855,7 @@ msgstr "Non blocar iste usator" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -863,11 +863,11 @@ msgid "Yes" msgstr "Si" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blocar iste usator" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Falleva de salveguardar le information del blocada." @@ -1028,7 +1028,7 @@ msgstr "Deler iste application" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Non identificate." @@ -1478,7 +1478,7 @@ msgid "Cannot normalize that email address" msgstr "Non pote normalisar iste adresse de e-mail" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Adresse de e-mail invalide." @@ -1705,13 +1705,13 @@ msgstr "Le usator ha ja iste rolo." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Nulle profilo specificate." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Non existe un profilo con iste ID." @@ -2279,42 +2279,42 @@ msgstr "Tu non es membro de iste gruppo." msgid "%1$s left group %2$s" msgstr "%1$s quitava le gruppo %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Tu es ja identificate." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Nomine de usator o contrasigno incorrecte." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" "Error de acceder al conto de usator. Tu probabilemente non es autorisate." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Aperir session" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Identificar te a iste sito" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Memorar me" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Aperir session automaticamente in le futuro; non pro computatores usate in " "commun!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Contrasigno perdite o oblidate?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2322,11 +2322,11 @@ msgstr "" "Pro motivos de securitate, per favor re-entra tu nomine de usator e " "contrasigno ante de cambiar tu configurationes." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Aperi un session con tu nomine de usator e contrasigno." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2662,7 +2662,7 @@ msgid "6 or more characters" msgstr "6 o plus characteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Confirmar" @@ -2674,11 +2674,11 @@ msgstr "Identic al contrasigno hic supra" msgid "Change" msgstr "Cambiar" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Le contrasigno debe haber al minus 6 characteres." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Le contrasignos non corresponde." @@ -2904,43 +2904,43 @@ msgstr "Information de profilo" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 minusculas o numeros, sin punctuation o spatios" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nomine complete" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pagina personal" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL de tu pagina personal, blog o profilo in un altere sito" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Describe te e tu interesses in %d characteres" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Describe te e tu interesses" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Bio" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Loco" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\"" @@ -2983,7 +2983,7 @@ msgid "" msgstr "" "Subscriber me automaticamente a qui se subscribe a me (utile pro non-humanos)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Bio es troppo longe (max %d chars)." @@ -3244,7 +3244,7 @@ msgstr "Le contrasigno debe haber 6 characteres o plus." msgid "Password and confirmation do not match." msgstr "Contrasigno e confirmation non corresponde." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Error durante le configuration del usator." @@ -3252,39 +3252,39 @@ msgstr "Error durante le configuration del usator." msgid "New password successfully saved. You are now logged in." msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Pardono, solmente le personas invitate pote registrar se." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Pardono, le codice de invitation es invalide." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registration succedite" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Crear conto" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registration non permittite." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Tu non pote crear un conto si tu non accepta le licentia." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Le adresse de e-mail existe ja." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Nomine de usator o contrasigno invalide." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3292,57 +3292,58 @@ msgstr "" "Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar " "notas e mitter te in contacto con amicos e collegas. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requirite." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 o plus characteres. Requirite." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Identic al contrasigno hic supra. Requirite." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mail" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Usate solmente pro actualisationes, notificationes e recuperation de " "contrasigno" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "Le contento e datos de %1$s es private e confidential." +msgstr "" +"io comprende que le contento e datos de %1$s es private e confidential." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "Le derecto de autor pro mi texto e files es in possession de %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "Le derecto de autor pro mi texto e files resta in mi possession." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Tote le derectos reservate." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3352,7 +3353,7 @@ msgstr "" "contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de " "telephono." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3384,7 +3385,7 @@ msgstr "" "\n" "Gratias pro inscriber te, e nos spera que iste servicio te place." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5571,14 +5572,14 @@ msgstr "Nomine complete: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Loco: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Pagina personal: %s" @@ -6112,8 +6113,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s seque ora tu notas in %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6139,19 +6147,19 @@ msgstr "" "Cambia tu adresse de e-mail o optiones de notification a %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Bio: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Nove adresse de e-mail pro publicar in %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6173,30 +6181,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Stato de %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Confirmation SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s: confirma que tu possede iste numero de telephono con iste codice:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s te ha pulsate" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6224,13 +6232,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nove message private de %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6264,13 +6272,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) ha addite tu nota como favorite" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6309,7 +6317,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6320,13 +6328,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) ha inviate un nota a tu attention" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6674,7 +6682,7 @@ msgstr "Media de cata die" msgid "All groups" msgstr "Tote le gruppos" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Methodo non implementate." @@ -6698,7 +6706,7 @@ msgstr "In evidentia" msgid "Popular" msgstr "Popular" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Nulle parametro return-to." @@ -6719,7 +6727,7 @@ msgstr "Repeter iste nota" msgid "Revoke the \"%s\" role from this user" msgstr "Revocar le rolo \"%s\" de iste usator" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Nulle signule usator definite pro le modo de singule usator." @@ -6897,56 +6905,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "alcun secundas retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "circa un minuta retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "circa %d minutas retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "circa un hora retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "circa %d horas retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "circa un die retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "circa %d dies retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "circa un mense retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "circa %d menses retro" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "circa un anno retro" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index b3ced814dd..4160147146 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:24+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:39+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -399,32 +399,32 @@ msgstr "" #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Ekki tækt stuttnefni." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Heimasíða er ekki gild vefslóð." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)." @@ -436,7 +436,7 @@ msgstr "Lýsing er of löng (í mesta lagi 140 tákn)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)." @@ -531,12 +531,12 @@ msgstr "Ótæk stærð." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -604,8 +604,8 @@ msgstr "" msgid "Account" msgstr "Aðgangur" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -613,8 +613,8 @@ msgid "Nickname" msgstr "Stuttnefni" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Lykilorð" @@ -828,11 +828,11 @@ msgstr "" msgid "You already blocked that user." msgstr "Þú hefur nú þegar lokað á þennan notanda." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Loka á notanda" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -844,7 +844,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -854,7 +854,7 @@ msgstr "Nei" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Opna á þennan notanda" @@ -864,7 +864,7 @@ msgstr "Opna á þennan notanda" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -873,11 +873,11 @@ msgid "Yes" msgstr "Já" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Loka á þennan notanda" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Mistókst að vista upplýsingar um notendalokun" @@ -1043,7 +1043,7 @@ msgstr "Eyða þessu babli" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Ekki innskráð(ur)." @@ -1516,7 +1516,7 @@ msgid "Cannot normalize that email address" msgstr "Get ekki staðlað þetta tölvupóstfang" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Ekki tækt tölvupóstfang." @@ -1754,13 +1754,13 @@ msgstr "Notandi hefur enga persónulega síðu." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Engin persónuleg síða tilgreind" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Engin persónulega síða með þessu einkenni" @@ -2320,42 +2320,42 @@ msgstr "Þú ert ekki meðlimur í þessum hópi." msgid "%1$s left group %2$s" msgstr "%s gekk úr hópnum %s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Þú hefur nú þegar skráð þig inn." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Rangt notendanafn eða lykilorð." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Engin heimild." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Innskráning" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Skrá þig inn á síðuna" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Muna eftir mér" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila " "með þér!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Tapað eða gleymt lykilorð?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2363,12 +2363,12 @@ msgstr "" "Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og " "lykilorð áður en þú breytir stillingunum þínum." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "Skráðu þig inn með notendanafni og lykilorði" -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2715,7 +2715,7 @@ msgid "6 or more characters" msgstr "6 eða fleiri tákn" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Staðfesta" @@ -2727,11 +2727,11 @@ msgstr "Sama og lykilorðið hér fyrir ofan" msgid "Change" msgstr "Breyta" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Lykilorðin passa ekki saman." @@ -2967,46 +2967,46 @@ msgstr "Upplýsingar á persónulegri síðu" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullt nafn" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Heimasíða" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "" "Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru " "vefsvæði" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Lýstu þér og áhugamálum þínum í 140 táknum" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 #, fuzzy msgid "Describe yourself and your interests" msgstr "Lýstu þér og þínum " -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Lýsing" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Staðsetning" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Staðsetning þín, eins og \"borg, sýsla, land\"" @@ -3050,7 +3050,7 @@ msgstr "" "Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér " "(best fyrir ómannlega notendur)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)." @@ -3299,7 +3299,7 @@ msgstr "Lykilorð verður að vera 6 tákn eða fleiri." msgid "Password and confirmation do not match." msgstr "Lykilorð og staðfesting passa ekki saman." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Villa kom upp í stillingu notanda." @@ -3307,102 +3307,102 @@ msgstr "Villa kom upp í stillingu notanda." msgid "New password successfully saved. You are now logged in." msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)" -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "" -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Nýskráning tókst" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Nýskrá" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Nýskráning ekki leyfð." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Tölvupóstfang er nú þegar skráð." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Ótækt notendanafn eða lykilorð." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 eða fleiri tákn. Nauðsynlegt" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Tölvupóstur" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða." -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:576 +#: actions/register.php:583 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3435,7 +3435,7 @@ msgstr "" "\n" "Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5651,14 +5651,14 @@ msgstr "Fullt nafn: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Staðsetning: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Heimasíða: %s" @@ -6149,8 +6149,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s er að hlusta á bablið þitt á %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6166,7 +6173,7 @@ msgid "" msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "" @@ -6174,13 +6181,13 @@ msgstr "" "\n" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Nýtt tölvupóstfang til að senda á %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6202,30 +6209,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Staða %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS staðfesting" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "Býð eftir staðfestingu varðandi þetta símanúmer." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s ýtti við þér" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6242,13 +6249,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Ný persónuleg skilaboð frá %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6268,13 +6275,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s heldur upp á babl frá þér" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6296,7 +6303,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6304,13 +6311,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6637,7 +6644,7 @@ msgstr "" msgid "All groups" msgstr "Allir hópar" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6661,7 +6668,7 @@ msgstr "Í sviðsljósinu" msgid "Popular" msgstr "Vinsælt" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "Ekkert einkenni gefið upp." @@ -6685,7 +6692,7 @@ msgstr "Svara þessu babli" msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6870,56 +6877,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "fyrir um einum degi síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "fyrir um einu ári síðan" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index ed159ea92b..c5eb4957ab 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:28+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:43+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -395,7 +395,7 @@ msgstr "Impossibile trovare l'utente destinazione." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Il soprannome deve essere composto solo da lettere minuscole e numeri, senza " @@ -403,26 +403,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Soprannome già in uso. Prova con un altro." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Non è un soprannome valido." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "L'indirizzo della pagina web non è valido." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Nome troppo lungo (max 255 caratteri)." @@ -434,7 +434,7 @@ msgstr "La descrizione è troppo lunga (max %d caratteri)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Ubicazione troppo lunga (max 255 caratteri)." @@ -525,12 +525,12 @@ msgstr "Token non valido." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -601,8 +601,8 @@ msgstr "" msgid "Account" msgstr "Account" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -610,8 +610,8 @@ msgid "Nickname" msgstr "Soprannome" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Password" @@ -819,11 +819,11 @@ msgstr "Immagine eliminata." msgid "You already blocked that user." msgstr "Hai già bloccato quell'utente." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Blocca utente" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -838,7 +838,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -847,7 +847,7 @@ msgstr "No" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Non bloccare questo utente" @@ -856,7 +856,7 @@ msgstr "Non bloccare questo utente" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -864,11 +864,11 @@ msgid "Yes" msgstr "Sì" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blocca questo utente" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Salvataggio delle informazioni per il blocco non riuscito." @@ -1028,7 +1028,7 @@ msgstr "Elimina l'applicazione" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Accesso non effettuato." @@ -1481,7 +1481,7 @@ msgid "Cannot normalize that email address" msgstr "Impossibile normalizzare quell'indirizzo email" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Non è un indirizzo email valido." @@ -1709,13 +1709,13 @@ msgstr "L'utente ricopre già questo ruolo." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Nessun profilo specificato." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Nessun profilo con quel ID." @@ -2282,39 +2282,39 @@ msgstr "Non fai parte di quel gruppo." msgid "%1$s left group %2$s" msgstr "%1$s ha lasciato il gruppo %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Accesso già effettuato." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Nome utente o password non corretto." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Accedi" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Accedi al sito" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Ricordami" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Accedi automaticamente in futuro; non per computer condivisi!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Password persa o dimenticata?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2322,11 +2322,11 @@ msgstr "" "Per motivi di sicurezza, è necessario che tu inserisca il tuo nome utente e " "la tua password prima di modificare le impostazioni." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Accedi con nome utente e password." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2661,7 +2661,7 @@ msgid "6 or more characters" msgstr "6 o più caratteri" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Conferma" @@ -2673,11 +2673,11 @@ msgstr "Stessa password di sopra" msgid "Change" msgstr "Modifica" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "La password deve essere di 6 o più caratteri." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Le password non corrispondono." @@ -2904,43 +2904,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pagina web" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL della tua pagina web, blog o profilo su un altro sito" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Descriviti assieme ai tuoi interessi in %d caratteri" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Descrivi te e i tuoi interessi" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Biografia" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Ubicazione" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Dove ti trovi, tipo \"città, regione, stato\"" @@ -2983,7 +2983,7 @@ msgstr "" "Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-" "umani)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "La biografia è troppo lunga (max %d caratteri)." @@ -3242,7 +3242,7 @@ msgstr "La password deve essere lunga almeno 6 caratteri." msgid "Password and confirmation do not match." msgstr "La password e la conferma non corrispondono." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Errore nell'impostare l'utente." @@ -3250,39 +3250,39 @@ msgstr "Errore nell'impostare l'utente." msgid "New password successfully saved. You are now logged in." msgstr "Nuova password salvata con successo. Hai effettuato l'accesso." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Solo le persone invitate possono registrarsi." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Codice di invito non valido." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registrazione riuscita" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrati" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registrazione non consentita." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Non puoi registrarti se non accetti la licenza." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Indirizzo email già esistente." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Nome utente o password non valido." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3291,56 +3291,57 @@ msgstr "" "successivamente inviare messaggi e metterti in contatto con i tuoi amici e " "colleghi. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 o più caratteri; richiesta" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Stessa password di sopra; richiesta" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Email" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Usata solo per aggiornamenti, annunci e recupero password" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, preferibilmente il tuo \"vero\" nome" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "I contenuti e i dati di %1$s sono privati e confidenziali." +msgstr "" +"Comprendo che i contenuti e i dati di %1$s sono privati e confidenziali." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "I miei testi e i miei file sono copyright di %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "I miei testi e file restano sotto il mio diretto copyright." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Tutti i diritti riservati." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3350,7 +3351,7 @@ msgstr "" "dati personali: password, indirizzo email, indirizzo messaggistica " "istantanea e numero di telefono." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3384,7 +3385,7 @@ msgstr "" "Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo " "servizio." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5572,14 +5573,14 @@ msgstr "Nome completo: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Posizione: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Pagina web: %s" @@ -6117,8 +6118,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6144,19 +6152,19 @@ msgstr "" "Modifica il tuo indirizzo email o le opzioni di notifica presso %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Biografia: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Nuovo indirizzo email per inviare messaggi a %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6178,31 +6186,31 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "stato di %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Conferma SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" "%s: conferma che questo numero di telefono sia tuo utilizzando questo codice:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s ti ha richiamato" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6230,13 +6238,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nuovo messaggio privato da %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6270,13 +6278,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6315,7 +6323,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6326,13 +6334,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) ti ha inviato un messaggio" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6680,7 +6688,7 @@ msgstr "Media giornaliera" msgid "All groups" msgstr "Tutti i gruppi" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Metodo non implementato" @@ -6704,7 +6712,7 @@ msgstr "In evidenza" msgid "Popular" msgstr "Famosi" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Nessun argomento return-to." @@ -6725,7 +6733,7 @@ msgstr "Ripeti questo messaggio" msgid "Revoke the \"%s\" role from this user" msgstr "Revoca il ruolo \"%s\" a questo utente" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Nessun utente singolo definito per la modalità single-user." @@ -6903,56 +6911,56 @@ msgid "Moderator" msgstr "Moderatore" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "pochi secondi fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "circa un minuto fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "circa un'ora fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "circa un giorno fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "circa un mese fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "circa un anno fa" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 36b8105244..1348e0ad90 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:31+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:46+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -396,7 +396,7 @@ msgstr "ターゲットユーザーを見つけられません。" #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用" @@ -404,26 +404,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。" #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "有効なニックネームではありません。" #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "ホームページのURLが不適切です。" #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "フルネームが長すぎます。（255字まで）" @@ -435,7 +435,7 @@ msgstr "記述が長すぎます。（最長140字）" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "場所が長すぎます。（255字まで）" @@ -527,12 +527,12 @@ msgstr "不正なトークン。" #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -599,8 +599,8 @@ msgstr "" msgid "Account" msgstr "アカウント" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -608,8 +608,8 @@ msgid "Nickname" msgstr "ニックネーム" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "パスワード" @@ -816,11 +816,11 @@ msgstr "アバターが削除されました。" msgid "You already blocked that user." msgstr "そのユーザはすでにブロック済みです。" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "ユーザをブロック" -#: actions/block.php:130 +#: actions/block.php:138 #, fuzzy msgid "" "Are you sure you want to block this user? Afterwards, they will be " @@ -836,7 +836,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -846,7 +846,7 @@ msgstr "No" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "このユーザをアンブロックする" @@ -855,7 +855,7 @@ msgstr "このユーザをアンブロックする" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -864,11 +864,11 @@ msgid "Yes" msgstr "Yes" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "このユーザをブロックする" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "ブロック情報の保存に失敗しました。" @@ -1029,7 +1029,7 @@ msgstr "このアプリケーションを削除" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "ログインしていません。" @@ -1487,7 +1487,7 @@ msgid "Cannot normalize that email address" msgstr "そのメールアドレスを正規化できません" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "有効なメールアドレスではありません。" @@ -1723,13 +1723,13 @@ msgstr "ユーザは既に黙っています。" #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "プロファイル記述がありません。" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "そのＩＤのプロファイルがありません。" @@ -2300,39 +2300,39 @@ msgstr "あなたはそのグループのメンバーではありません。" msgid "%1$s left group %2$s" msgstr "%1$s はグループ %2$s に残りました。" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "既にログインしています。" -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "ユーザ名またはパスワードが間違っています。" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。" -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "ログイン" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "サイトへログイン" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "ログイン状態を保持" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "パスワードを紛失、忘れた？" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2340,12 +2340,12 @@ msgstr "" "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し" "て下さい。" -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "ユーザ名とパスワードでログイン" -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2682,7 +2682,7 @@ msgid "6 or more characters" msgstr "6文字以上" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "パスワード確認" @@ -2694,11 +2694,11 @@ msgstr "上と同じパスワード" msgid "Change" msgstr "変更" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "パスワードは6文字以上にする必要があります。" -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "パスワードが一致しません。" @@ -2924,43 +2924,43 @@ msgstr "プロファイル情報" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "フルネーム" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "ホームページ" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "%d字以内で自分自身と自分の興味について書いてください" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "自分自身と自分の興味について書いてください" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "自己紹介" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "場所" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」" @@ -3002,7 +3002,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "自分をフォローしている者を自動的にフォローする (BOTに最適)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "自己紹介が長すぎます (最長140文字)。" @@ -3263,7 +3263,7 @@ msgstr "パスワードは6字以上でなければいけません。" msgid "Password and confirmation do not match." msgstr "パスワードと確認が一致しません。" -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "ユーザ設定エラー" @@ -3271,39 +3271,39 @@ msgstr "ユーザ設定エラー" msgid "New password successfully saved. You are now logged in." msgstr "新しいパスワードの保存に成功しました。ログインしています。" -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "すみません、招待された人々だけが登録できます。" -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "すみません、不正な招待コード。" -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "登録成功" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "登録" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "登録は許可されていません。" -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "ライセンスに同意頂けない場合は登録できません。" -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "メールアドレスが既に存在します。" -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "不正なユーザ名またはパスワード。" -#: actions/register.php:343 +#: actions/register.php:350 #, fuzzy msgid "" "With this form you can create a new account. You can then post notices and " @@ -3312,63 +3312,63 @@ msgstr "" "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や" "同僚にリンクできます。 " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6文字以上。必須です。" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "上のパスワードと同じです。 必須。" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "メール" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "長い名前" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号" -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3401,7 +3401,7 @@ msgstr "" "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん" "で使ってくれることを願っています。" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5628,14 +5628,14 @@ msgstr "フルネーム： %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "場所: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "ホームページ: %s" @@ -6125,8 +6125,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s は %2$s であなたのつぶやきを聞いています。" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6152,19 +6159,19 @@ msgstr "" "%8$s でメールアドレスか通知オプションを変えてください。\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "自己紹介: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "%s へ投稿のための新しいメールアドレス" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, fuzzy, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6186,30 +6193,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s の状態" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS確認" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "この電話番号は確認待ちです。" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "あなたは %s に合図されています" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, fuzzy, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6237,13 +6244,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "%s からの新しいプライベートメッセージ" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, fuzzy, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6277,13 +6284,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, fuzzy, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6322,7 +6329,7 @@ msgstr "" "%6%s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6330,13 +6337,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) はあなた宛てにつぶやきを送りました" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6669,7 +6676,7 @@ msgstr "" msgid "All groups" msgstr "全てのグループ" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "未実装のメソッド。" @@ -6693,7 +6700,7 @@ msgstr "フィーチャーされた" msgid "Popular" msgstr "人気" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "return-to 引数がありません。" @@ -6714,7 +6721,7 @@ msgstr "このつぶやきを繰り返す" msgid "Revoke the \"%s\" role from this user" msgstr "このグループからこのユーザをブロック" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "single-user　モードのためのシングルユーザが定義されていません。" @@ -6896,56 +6903,56 @@ msgid "Moderator" msgstr "管理" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "数秒前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "約 1 分前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "約 %d 分前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "約 1 時間前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "約 %d 時間前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "約 1 日前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "約 %d 日前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "約 1 ヵ月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "約 %d ヵ月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "約 1 年前" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index bd688f7563..6d74052fd5 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:35+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:49+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -383,7 +383,7 @@ msgstr "타겟 이용자를 찾을 수 없습니다." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니" @@ -391,26 +391,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "유효한 별명이 아닙니다" #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "홈페이지 주소형식이 올바르지 않습니다." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "실명이 너무 깁니다. (최대 255글자)" @@ -422,7 +422,7 @@ msgstr "설명이 너무 깁니다. (최대 %d 글자)" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "위치가 너무 깁니다. (최대 255글자)" @@ -515,12 +515,12 @@ msgstr "옳지 않은 크기" #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -589,8 +589,8 @@ msgstr "" msgid "Account" msgstr "계정" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -598,8 +598,8 @@ msgid "Nickname" msgstr "별명" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "비밀 번호" @@ -807,11 +807,11 @@ msgstr "아바타가 삭제되었습니다." msgid "You already blocked that user." msgstr "이미 차단된 이용자입니다." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "사용자를 차단합니다." -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -825,7 +825,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -835,7 +835,7 @@ msgstr "아니오" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "이용자를 차단하지 않는다." @@ -844,7 +844,7 @@ msgstr "이용자를 차단하지 않는다." #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -853,11 +853,11 @@ msgid "Yes" msgstr "네, 맞습니다." #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "이 사용자 차단하기" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "정보차단을 저장하는데 실패했습니다." @@ -1022,7 +1022,7 @@ msgstr "이 게시글 삭제하기" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "로그인하고 있지 않습니다." @@ -1491,7 +1491,7 @@ msgid "Cannot normalize that email address" msgstr "그 이메일 주소를 정규화 할 수 없습니다." #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "유효한 이메일 주소가 아닙니다." @@ -1726,13 +1726,13 @@ msgstr "회원이 당신을 차단해왔습니다." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "프로필을 지정하지 않았습니다." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "해당 ID의 프로필이 없습니다." @@ -2294,52 +2294,52 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다." msgid "%1$s left group %2$s" msgstr "%s가 그룹%s를 떠났습니다." -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "이미 로그인 하셨습니다." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "틀린 계정 또는 비밀 번호" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "인증이 되지 않았습니다." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "로그인" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "사이트에 로그인하세요." -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "자동 로그인" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "비밀 번호를 잊으셨나요?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "사용자 이름과 비밀번호로 로그인" -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2683,7 +2683,7 @@ msgid "6 or more characters" msgstr "6글자 이상" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "인증" @@ -2695,11 +2695,11 @@ msgstr "위와 같은 비밀 번호" msgid "Change" msgstr "변환" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "비밀번호는 6자리 이상이어야 합니다." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "비밀 번호가 일치하지 않습니다." @@ -2936,44 +2936,44 @@ msgstr "프로필 정보" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다." -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "실명" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "홈페이지" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "140자 이내에서 자기 소개" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 #, fuzzy msgid "Describe yourself and your interests" msgstr "당신에 대해 소개해주세요." -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "자기소개" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "위치" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라" @@ -3013,7 +3013,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "나에게 구독하는 사람에게 자동 구독 신청" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "자기소개가 너무 깁니다. (최대 140글자)" @@ -3264,7 +3264,7 @@ msgstr "비밀 번호는 6자 이상이어야 합니다." msgid "Password and confirmation do not match." msgstr "비밀 번호가 일치하지 않습니다." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "사용자 세팅 오류" @@ -3273,103 +3273,103 @@ msgid "New password successfully saved. You are now logged in." msgstr "" "새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다." -#: actions/register.php:92 +#: actions/register.php:99 #, fuzzy msgid "Sorry, invalid invitation code." msgstr "확인 코드 오류" -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "회원 가입이 성공적입니다." -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "회원가입" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "가입이 허용되지 않습니다." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "이메일 주소가 이미 존재 합니다." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "사용자 이름이나 비밀 번호가 틀렸습니다." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필수 " "입력." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6글자 이상이 필요합니다." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "위와 같은 비밀 번호. 필수 사항." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "이메일" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요." -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "더욱 긴 이름을 요구합니다." -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호" -#: actions/register.php:576 +#: actions/register.php:583 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3402,7 +3402,7 @@ msgstr "" "\n" "다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5623,14 +5623,14 @@ msgstr "전체이름: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "위치: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "홈페이지: %s" @@ -6119,8 +6119,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6140,7 +6147,7 @@ msgstr "" "그럼 이만,%4$s.\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "" @@ -6148,13 +6155,13 @@ msgstr "" "\n" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "%s에 포스팅 할 새로운 이메일 주소" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6170,30 +6177,30 @@ msgstr "" "오.이메일 사용법은 %3$s 페이지를 보십시오.안녕히,%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s 상태" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS 인증" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "이 전화 번호는 인증 대기중입니다." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s 사용자가 찔러 봤습니다." #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6210,13 +6217,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다." #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6236,13 +6243,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s님이 당신의 게시글을 좋아하는 글로 추가했습니다." #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6264,7 +6271,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6272,13 +6279,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6607,7 +6614,7 @@ msgstr "" msgid "All groups" msgstr "모든 그룹" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6631,7 +6638,7 @@ msgstr "피쳐링됨" msgid "Popular" msgstr "인기있는" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "id 인자가 없습니다." @@ -6655,7 +6662,7 @@ msgstr "이 게시글에 대해 답장하기" msgid "Revoke the \"%s\" role from this user" msgstr "이 그룹의 회원리스트" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6845,56 +6852,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "몇 초 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "1분 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "%d분 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "1시간 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "%d시간 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "하루 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "%d일 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "1달 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "%d달 전" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "1년 전" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 2f4fca4712..88a8eb4ac3 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:38+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:53+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -398,32 +398,32 @@ msgstr "Не можев да го пронајдам целниот корисн #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Тој прекар е во употреба. Одберете друг." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Неправилен прекар." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Главната страница не е важечка URL-адреса." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Целото име е предолго (максимум 255 знаци)" @@ -435,7 +435,7 @@ msgstr "Описот е предолг (дозволено е највеќе %d #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Локацијата е предолга (максимумот е 255 знаци)." @@ -526,12 +526,12 @@ msgstr "Погрешен жетон." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -601,8 +601,8 @@ msgstr "" msgid "Account" msgstr "Сметка" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -610,8 +610,8 @@ msgid "Nickname" msgstr "Прекар" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Лозинка" @@ -821,11 +821,11 @@ msgstr "Аватарот е избришан." msgid "You already blocked that user." msgstr "Веќе го имате блокирано тој корисник." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Блокирај корисник" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -841,7 +841,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -850,7 +850,7 @@ msgstr "Не" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Не го блокирај корисников" @@ -859,7 +859,7 @@ msgstr "Не го блокирај корисников" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -867,11 +867,11 @@ msgid "Yes" msgstr "Да" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Блокирај го корисников" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Не можев да ги снимам инофрмациите за блокот." @@ -1032,7 +1032,7 @@ msgstr "Избриши го програмов" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Не сте најавени." @@ -1484,7 +1484,7 @@ msgid "Cannot normalize that email address" msgstr "Неможам да ја нормализирам таа е-поштенска адреса" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Неправилна адреса за е-пошта." @@ -1712,13 +1712,13 @@ msgstr "Корисникот веќе ја има таа улога." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Нема назначено профил." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Нема профил со тоа ID." @@ -2289,41 +2289,41 @@ msgstr "Не членувате во таа група." msgid "%1$s left group %2$s" msgstr "%1$s ја напушти групата %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Веќе сте најавени." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Неточно корисничко име или лозинка" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Грешка при поставувањето на корисникот. Веројатно не се заверени." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Најава" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Најавете се" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Запамети ме" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Следниот пат најавете се автоматски; не е за компјутери кои ги делите со " "други!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Ја загубивте или заборавивте лозинката?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2331,11 +2331,11 @@ msgstr "" "Поради безбедносни причини треба повторно да го внесете Вашето корисничко " "име и лозинка пред да ги смените Вашите нагодувања." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Најавете се со корисничко име и лозинка." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2671,7 +2671,7 @@ msgid "6 or more characters" msgstr "6 или повеќе знаци" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Потврди" @@ -2683,11 +2683,11 @@ msgstr "Исто како лозинката погоре" msgid "Change" msgstr "Промени" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Лозинката мора да содржи барем 6 знаци." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Лозинките не се совпаѓаат." @@ -2914,43 +2914,43 @@ msgstr "Информации за профил" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места." -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Цело име" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Домашна страница" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL на Вашата домашна страница, блог или профил на друга веб-страница." -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Опишете се себеси и своите интереси во %d знаци." -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Опишете се себеси и Вашите интереси" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Биографија" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Локација" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“." @@ -2994,7 +2994,7 @@ msgstr "" "Автоматски претплаќај ме на секој што се претплаќа на мене (најдобро за " "ботови и сл.)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Биографијата е преголема (највеќе до %d знаци)." @@ -3257,7 +3257,7 @@ msgstr "Лозинката мора да биде од најмалку 6 зна msgid "Password and confirmation do not match." msgstr "Двете лозинки не се совпаѓаат." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Грешка во поставувањето на корисникот." @@ -3265,39 +3265,39 @@ msgstr "Грешка во поставувањето на корисникот." msgid "New password successfully saved. You are now logged in." msgstr "Новата лозинка е успешно зачувана. Сега сте најавени." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Жалиме, регистрацијата е само со покана." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Жалиме, неважечки код за поканата." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Регистрацијата е успешна" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрирај се" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Регистрирањето не е дозволено." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Адресата веќе постои." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Погрешно име или лозинка." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3305,57 +3305,59 @@ msgstr "" "Со овој образец можете да создадете нова сметка. Потоа ќе можете да " "објавувате забелешки и да се поврзувате со пријатели и колеги. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 мали букви или бројки, без интерпункциски знаци и празни места. " "Задолжително поле." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "Барем 6 знаци. Задолжително поле." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Исто што и лозинката погоре. Задолжително поле." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Е-пошта" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Се користи само за подновувања, објави и повраќање на лозинка." -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Подолго име, по можност Вашето вистинско име и презиме" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "Содржината и податоците на %1$s се лични и доверливи." +msgstr "Сфаќам дека содржината и податоците на %1$s се лични и доверливи." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "Авторското правво на мојот текст и податотеки го има %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" +"Јас ја задржувам сопственоста на авторското право врз мојот текст и " +"податотеки." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Сите права задржани." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3364,7 +3366,7 @@ msgstr "" "Мојот текст и податотеки се достапни под %s, освен следниве приватни " "податоци: лозинка, е-пошта, IM-адреса и телефонски број." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3398,7 +3400,7 @@ msgstr "" "Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа " "служба." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5593,14 +5595,14 @@ msgstr "Име и презиме: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Локација: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Домашна страница: %s" @@ -6135,8 +6137,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s сега ги следи Вашите забелешки на %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6163,19 +6172,19 @@ msgstr "" "$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Биографија: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Нова е-поштенска адреса за објавување на %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6197,30 +6206,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Статус на %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Потврда за СМС" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s: потврдете го како свој телефонскиов број со следниов код:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s Ве подбуцна" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6248,13 +6257,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Нова приватна порака од %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6288,13 +6297,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) додаде Ваша забелешка како омилена" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6333,7 +6342,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6344,13 +6353,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) Ви испрати забелешка што сака да ја прочитате" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6701,7 +6710,7 @@ msgstr "Дневен просек" msgid "All groups" msgstr "Сите групи" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Неимплементиран метод." @@ -6725,7 +6734,7 @@ msgstr "Избрани" msgid "Popular" msgstr "Популарно" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Нема return-to аргументи." @@ -6746,7 +6755,7 @@ msgstr "Повтори ја забелешкава" msgid "Revoke the \"%s\" role from this user" msgstr "Одземи му ја улогата „%s“ на корисников" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Не е зададен корисник за еднокорисничкиот режим." @@ -6924,56 +6933,56 @@ msgid "Moderator" msgstr "Модератор" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "пред неколку секунди" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "пред една минута" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "пред еден час" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "пред %d часа" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "пред еден ден" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "пред %d денови" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "пред еден месец" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "пред %d месеца" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "пред една година" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 5e5539e576..c53a641691 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:41+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:56+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -393,32 +393,32 @@ msgstr "Kunne ikke finne målbruker." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Det nicket er allerede i bruk. Prøv et annet." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Ugyldig nick." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Hjemmesiden er ikke en gyldig URL." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Beklager, navnet er for langt (max 250 tegn)." @@ -430,7 +430,7 @@ msgstr "Beskrivelsen er for lang (maks %d tegn)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Plassering er for lang (maks 255 tegn)." @@ -521,12 +521,12 @@ msgstr "Ugyldig symbol." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -594,8 +594,8 @@ msgstr "" msgid "Account" msgstr "Konto" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -603,8 +603,8 @@ msgid "Nickname" msgstr "Nick" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Passord" @@ -810,11 +810,11 @@ msgstr "Avatar slettet." msgid "You already blocked that user." msgstr "Du har allerede blokkert den brukeren." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Blokker brukeren" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -829,7 +829,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -838,7 +838,7 @@ msgstr "Nei" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Ikke blokker denne brukeren" @@ -847,7 +847,7 @@ msgstr "Ikke blokker denne brukeren" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -855,11 +855,11 @@ msgid "Yes" msgstr "Ja" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blokker denne brukeren" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Kunne ikke lagre blokkeringsinformasjon." @@ -1020,7 +1020,7 @@ msgstr "Slett dette programmet" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Ikke logget inn." @@ -1468,7 +1468,7 @@ msgid "Cannot normalize that email address" msgstr "Klarer ikke normalisere epostadressen" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Ugyldig e-postadresse." @@ -1695,13 +1695,13 @@ msgstr "Bruker har allerede denne rollen." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Ingen profil oppgitt." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Ingen profil med den ID'en." @@ -2258,40 +2258,40 @@ msgstr "Du er ikke et medlem av den gruppen." msgid "%1$s left group %2$s" msgstr "%1$s forlot gruppe %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Allerede innlogget." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Feil brukernavn eller passord" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Feil ved innstilling av bruker. Du er mest sannsynlig kke autorisert." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Logg inn" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Logg inn på nettstedet" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Husk meg" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Mistet eller glemt passordet?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2299,11 +2299,11 @@ msgstr "" "Av sikkerhetsmessige årsaker, skriv inn brukernavn og passord på nytt før du " "endrer innstillingene dine." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Logg inn med brukernavn og passord." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2637,7 +2637,7 @@ msgid "6 or more characters" msgstr "6 eller flere tegn" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Bekreft" @@ -2649,11 +2649,11 @@ msgstr "Samme som passord ovenfor" msgid "Change" msgstr "Endre" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Passord må være minst 6 tegn." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Passordene var ikke like." @@ -2877,43 +2877,43 @@ msgstr "Profilinformasjon" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullt navn" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Hjemmesiden" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside." -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Beskriv degselv og dine interesser med %d tegn" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Beskriv degselv og dine interesser" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Om meg" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Plassering" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»" @@ -2956,7 +2956,7 @@ msgid "" msgstr "" "Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "«Om meg» er for lang (maks %d tegn)." @@ -3217,7 +3217,7 @@ msgstr "Passordet må bestå av 6 eller flere tegn." msgid "Password and confirmation do not match." msgstr "Passord og bekreftelse samsvarer ikke." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Feil ved innstilling av bruker." @@ -3225,39 +3225,39 @@ msgstr "Feil ved innstilling av bruker." msgid "New password successfully saved. You are now logged in." msgstr "Nytt passord ble lagret. Du er nå logget inn." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Beklager, kun inviterte personer kan registrere seg." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Beklager, ugyldig invitasjonskode." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registrering vellykket" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrer" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registrering ikke tillatt." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Du kan ikke registrere deg om du ikke godtar lisensvilkårene." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "E-postadressen finnes allerede." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Ugyldig brukernavn eller passord" -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3265,56 +3265,56 @@ msgstr "" "Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og " "knytte deg til venner og kollegaer. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 eller flere tegn. Påkrevd." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Samme som passord over. Kreves." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-post" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Lengre navn, helst ditt \"ekte\" navn" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3323,7 +3323,7 @@ msgstr "" "Mine tekster og filer er tilgjengelig under %s med unntak av disse private " "dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3356,7 +3356,7 @@ msgstr "" "\n" "Takk for at du registrerte deg og vi håper du kommer til å like tjenesten." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5502,14 +5502,14 @@ msgstr "Fullt navn: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Posisjon: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Hjemmeside: %s" @@ -6004,8 +6004,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s lytter nå til dine notiser på %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6031,19 +6038,19 @@ msgstr "" "Endre e-postadressen din eller dine varslingsvalg på %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Biografi: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Ny e-postadresse for posting til %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6065,30 +6072,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s status" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS-bekreftelse" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s: bekreft telefonnummeret ditt med denne koden:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Du har blitt knuffet av %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6116,13 +6123,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Ny privat melding fra %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6156,13 +6163,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s /@%s) la din notis til som en favoritt" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6200,7 +6207,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6211,13 +6218,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) sendte en notis for din oppmerksomhet" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6562,7 +6569,7 @@ msgstr "Daglig gjennomsnitt" msgid "All groups" msgstr "Alle grupper" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Ikke-implementert metode." @@ -6587,7 +6594,7 @@ msgstr "" msgid "Popular" msgstr "" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "" @@ -6608,7 +6615,7 @@ msgstr "Repeter denne notisen" msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6791,56 +6798,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "noen få sekunder siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "omtrent ett minutt siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "omtrent én time siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "omtrent én dag siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "omtrent én måned siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "omtrent %d måneder siden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "omtrent ett år siden" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 2fb17c45fe..0e9304401c 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:48+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:08+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -399,7 +399,7 @@ msgstr "Het was niet mogelijk de doelgebruiker te vinden." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties " @@ -407,27 +407,27 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "" "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Ongeldige gebruikersnaam!" #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "De thuispagina is geen geldige URL." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "De volledige naam is te lang (maximaal 255 tekens)." @@ -439,7 +439,7 @@ msgstr "De beschrijving is te lang (maximaal %d tekens)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Locatie is te lang (maximaal 255 tekens)." @@ -530,12 +530,12 @@ msgstr "Ongeldig token." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -611,8 +611,8 @@ msgstr "" msgid "Account" msgstr "Gebruiker" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -620,8 +620,8 @@ msgid "Nickname" msgstr "Gebruikersnaam" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Wachtwoord" @@ -831,11 +831,11 @@ msgstr "De avatar is verwijderd." msgid "You already blocked that user." msgstr "U hebt deze gebruiker reeds geblokkeerd." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Gebruiker blokkeren" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -850,7 +850,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -859,7 +859,7 @@ msgstr "Nee" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Gebruiker niet blokkeren" @@ -868,7 +868,7 @@ msgstr "Gebruiker niet blokkeren" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -876,11 +876,11 @@ msgid "Yes" msgstr "Ja" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Deze gebruiker blokkeren" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan." @@ -1041,7 +1041,7 @@ msgstr "Deze applicatie verwijderen" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Niet aangemeld." @@ -1493,7 +1493,7 @@ msgid "Cannot normalize that email address" msgstr "Kan het emailadres niet normaliseren" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Geen geldig e-mailadres." @@ -1726,13 +1726,13 @@ msgstr "Deze gebruiker heeft deze rol al." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Er is geen profiel opgegeven." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Er is geen profiel met dat ID." @@ -2306,41 +2306,41 @@ msgstr "U bent geen lid van deze groep" msgid "%1$s left group %2$s" msgstr "%1$s heeft de groep %2$s verlaten" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "U bent al aangemeld." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "De gebruikersnaam of wachtwoord is onjuist." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" "Er is een fout opgetreden bij het maken van de instellingen. U hebt " "waarschijnlijk niet de juiste rechten." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Aanmelden" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Aanmelden" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Aanmeldgegevens onthouden" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Wachtwoord kwijt of vergeten?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2348,11 +2348,11 @@ msgstr "" "Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals " "invoeren alvorens u uw instellingen kunt wijzigen." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Aanmelden met uw gebruikersnaam en wachtwoord." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2691,7 +2691,7 @@ msgid "6 or more characters" msgstr "Zes of meer tekens" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Bevestigen" @@ -2703,11 +2703,11 @@ msgstr "Gelijk aan het wachtwoord hierboven" msgid "Change" msgstr "Wijzigen" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Het wachtwoord moet zes of meer tekens bevatten." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "De wachtwoorden komen niet overeen." @@ -2934,43 +2934,43 @@ msgstr "Profielinformatie" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Volledige naam" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Thuispagina" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "De URL van uw thuispagina, blog of profiel bij een andere website" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Geef een beschrijving van uzelf en uw interesses in %d tekens" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Beschrijf uzelf en uw interesses" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Beschrijving" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Locatie" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"" @@ -3014,7 +3014,7 @@ msgstr "" "Automatisch abonneren bij abonnement op mij (beste voor automatische " "processen)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "De beschrijving is te lang (maximaal %d tekens)." @@ -3283,7 +3283,7 @@ msgstr "Het wachtwoord moet uit zes of meer tekens bestaan." msgid "Password and confirmation do not match." msgstr "Het wachtwoord en de bevestiging komen niet overeen." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker." @@ -3291,39 +3291,39 @@ msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker." msgid "New password successfully saved. You are now logged in." msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "U kunt zich alleen registreren als u wordt uitgenodigd." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Sorry. De uitnodigingscode is ongeldig." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "De registratie is voltooid" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registreren" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registratie is niet toegestaan." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Het e-mailadres bestaat al." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Ongeldige gebruikersnaam of wachtwoord." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3331,55 +3331,56 @@ msgstr "" "Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u " "mededelingen uitsturen en contact maken met vrienden en collega's. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "Zes of meer tekens. Verplicht" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Gelijk aan het wachtwoord hierboven. Verplicht" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mail" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Een langere naam, mogelijk uw echte naam" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk." +msgstr "" +"Ik begrijp dat inhoud en gegevens van %1$s persoonlijk en vertrouwelijk zijn." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "Voor mijn teksten en bestanden rust het auteursrecht bij %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "Ik ben de rechthebbende voor mijn teksten en bestanden." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Alle rechten voorbehouden." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3389,7 +3390,7 @@ msgstr "" "behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, " "telefoonnummer." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3423,7 +3424,7 @@ msgstr "" "Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u " "ervan verwacht." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5637,14 +5638,14 @@ msgstr "Volledige naam: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Locatie: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Thuispagina: %s" @@ -6187,8 +6188,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s volgt nu uw berichten %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6214,19 +6222,19 @@ msgstr "" "Wijzig uw e-mailadres of instellingen op %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Beschrijving: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Nieuw e-mailadres om e-mail te versturen aan %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6248,30 +6256,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s status" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS-bevestiging" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s: bevestig dat u deze telefoon bezit met deze code:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s heeft u gepord" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6300,13 +6308,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "U hebt een nieuw privébericht van %s." #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6341,13 +6349,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) heeft uw mededeling als favoriet toegevoegd" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6386,7 +6394,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6397,13 +6405,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) heeft u een mededeling gestuurd" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6755,7 +6763,7 @@ msgstr "Dagelijks gemiddelde" msgid "All groups" msgstr "Alle groepen" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Methode niet geïmplementeerd." @@ -6779,7 +6787,7 @@ msgstr "Uitgelicht" msgid "Popular" msgstr "Populair" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Er zijn geen \"terug naar\"-parameters opgegeven." @@ -6800,7 +6808,7 @@ msgstr "Deze mededeling herhalen" msgid "Revoke the \"%s\" role from this user" msgstr "De gebruikersrol \"%s\" voor deze gebruiker intrekken" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Er is geen gebruiker gedefinieerd voor single-usermodus." @@ -6978,56 +6986,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "een paar seconden geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "ongeveer een uur geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "ongeveer een dag geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "ongeveer een maand geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "ongeveer een jaar geleden" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index f1437b8aa0..d955b36987 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:45+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:37:59+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -401,32 +401,32 @@ msgstr "Kan ikkje finna einkvan status." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Kallenamnet er allereie i bruk. Prøv eit anna." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Ikkje eit gyldig brukarnamn." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Heimesida er ikkje ei gyldig internettadresse." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)." @@ -438,7 +438,7 @@ msgstr "skildringa er for lang (maks 140 teikn)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Plassering er for lang (maksimalt 255 teikn)." @@ -533,12 +533,12 @@ msgstr "Ugyldig storleik." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -606,8 +606,8 @@ msgstr "" msgid "Account" msgstr "Konto" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -615,8 +615,8 @@ msgid "Nickname" msgstr "Kallenamn" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Passord" @@ -832,11 +832,11 @@ msgstr "Lasta opp brukarbilete." msgid "You already blocked that user." msgstr "Du har allereie blokkert denne brukaren." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Blokker brukaren" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -848,7 +848,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -858,7 +858,7 @@ msgstr "Nei" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Lås opp brukaren" @@ -868,7 +868,7 @@ msgstr "Lås opp brukaren" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -877,11 +877,11 @@ msgid "Yes" msgstr "Jau" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blokkér denne brukaren" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Lagring av informasjon feila." @@ -1049,7 +1049,7 @@ msgstr "Slett denne notisen" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Ikkje logga inn" @@ -1532,7 +1532,7 @@ msgid "Cannot normalize that email address" msgstr "Klarar ikkje normalisera epostadressa" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Ikkje ei gyldig epostadresse." @@ -1770,13 +1770,13 @@ msgstr "Brukar har blokkert deg." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Ingen vald profil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Fann ingen profil med den IDen." @@ -2343,40 +2343,40 @@ msgstr "Du er ikkje medlem av den gruppa." msgid "%1$s left group %2$s" msgstr "%s forlot %s gruppa" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Allereie logga inn." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Feil brukarnamn eller passord" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Ikkje autorisert." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Logg inn" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Logg inn " -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Hugs meg" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)." -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Mista eller gløymd passord?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2384,12 +2384,12 @@ msgstr "" "Skriv inn brukarnam og passord før du endrar innstillingar (av " "tryggleiksomsyn)." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "Log inn med brukarnamn og passord." -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2736,7 +2736,7 @@ msgid "6 or more characters" msgstr "6 eller fleire teikn" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Godta" @@ -2748,11 +2748,11 @@ msgstr "Samme passord som over" msgid "Change" msgstr "Endra" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Passord må være minst 6 teikn." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Passorda var ikkje like." @@ -2989,44 +2989,44 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullt namn" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Heimeside" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side." -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Skriv om deg og interessene dine med 140 teikn" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 #, fuzzy msgid "Describe yourself and your interests" msgstr "Skildra deg sjølv og din" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Om meg" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Plassering" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»" @@ -3069,7 +3069,7 @@ msgid "" msgstr "" "Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "«Om meg» er for lang (maks 140 " @@ -3321,7 +3321,7 @@ msgstr "Passord må vera 6 tekn eller meir." msgid "Password and confirmation do not match." msgstr "Passord og stadfesting stemmer ikkje." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Feil ved å setja brukar." @@ -3329,97 +3329,97 @@ msgstr "Feil ved å setja brukar." msgid "New password successfully saved. You are now logged in." msgstr "Lagra det nye passordet. Du er logga inn." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Beklage, men kun inviterte kan registrere seg." -#: actions/register.php:92 +#: actions/register.php:99 #, fuzzy msgid "Sorry, invalid invitation code." msgstr "Feil med stadfestingskode." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registreringa gikk bra" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrér" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registrering ikkje tillatt." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Epostadressa finst allereie." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Ugyldig brukarnamn eller passord." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom. " "Kravd." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 eller fleire teikn. Kravd." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Samme som passord over. Påkrevd." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Epost" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3428,7 +3428,7 @@ msgstr "" " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og " "telefonnummer." -#: actions/register.php:576 +#: actions/register.php:583 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3460,7 +3460,7 @@ msgstr "" "\n" "Takk for at du blei med, og vi håpar du vil lika tenesta!" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5692,14 +5692,14 @@ msgstr "Fullt namn: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Stad: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Heimeside: %s" @@ -6190,8 +6190,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s høyrer no på notisane dine på %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6213,7 +6220,7 @@ msgstr "" "%4$s.\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "" @@ -6221,13 +6228,13 @@ msgstr "" "\n" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Ny epostadresse for å oppdatera %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6248,30 +6255,30 @@ msgstr "" "Helsing frå %4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s status" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS bekreftelse" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "Ventar på godkjenning for dette telefonnummeret." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Du har blitt dulta av %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6288,13 +6295,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Ny privat melding fra %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6314,13 +6321,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s la til di melding som ein favoritt" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6342,7 +6349,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6350,13 +6357,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6685,7 +6692,7 @@ msgstr "" msgid "All groups" msgstr "Alle gruppar" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6709,7 +6716,7 @@ msgstr "Framheva" msgid "Popular" msgstr "Populære" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "Manglar argumentet ID." @@ -6733,7 +6740,7 @@ msgstr "Svar på denne notisen" msgid "Revoke the \"%s\" role from this user" msgstr "Ei liste over brukarane i denne gruppa." -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6923,56 +6930,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "eit par sekund sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "omtrent ein time sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "omtrent ein dag sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "omtrent ein månad sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "~%d månadar sidan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "omtrent eitt år sidan" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index a6082d4f10..4d4c85c3a8 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:51+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:11+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -400,32 +400,32 @@ msgstr "Nie można odnaleźć użytkownika docelowego." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Pseudonim jest już używany. Spróbuj innego." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "To nie jest prawidłowy pseudonim." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Strona domowa nie jest prawidłowym adresem URL." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)." @@ -437,7 +437,7 @@ msgstr "Opis jest za długi (maksymalnie %d znaków)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Położenie jest za długie (maksymalnie 255 znaków)." @@ -528,12 +528,12 @@ msgstr "Nieprawidłowy token." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -602,8 +602,8 @@ msgstr "" msgid "Account" msgstr "Konto" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -611,8 +611,8 @@ msgid "Nickname" msgstr "Pseudonim" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Hasło" @@ -818,11 +818,11 @@ msgstr "Usunięto awatar." msgid "You already blocked that user." msgstr "Użytkownik jest już zablokowany." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Zablokuj użytkownika" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -837,7 +837,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -846,7 +846,7 @@ msgstr "Nie" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Nie blokuj tego użytkownika" @@ -855,7 +855,7 @@ msgstr "Nie blokuj tego użytkownika" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -863,11 +863,11 @@ msgid "Yes" msgstr "Tak" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Zablokuj tego użytkownika" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Zapisanie informacji o blokadzie nie powiodło się." @@ -1027,7 +1027,7 @@ msgstr "Usuń tę aplikację" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Niezalogowany." @@ -1475,7 +1475,7 @@ msgid "Cannot normalize that email address" msgstr "Nie można znormalizować tego adresu e-mail" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "To nie jest prawidłowy adres e-mail." @@ -1703,13 +1703,13 @@ msgstr "Użytkownik ma już tę rolę." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Nie podano profilu." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Brak profilu o tym identyfikatorze." @@ -2272,41 +2272,41 @@ msgstr "Nie jesteś członkiem tej grupy." msgid "%1$s left group %2$s" msgstr "Użytkownik %1$s opuścił grupę %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Jesteś już zalogowany." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Niepoprawna nazwa użytkownika lub hasło." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Zaloguj się" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Zaloguj się na witrynie" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Zapamiętaj mnie" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Automatyczne logowanie. Nie należy używać na komputerach używanych przez " "wiele osób." -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Zgubione lub zapomniane hasło?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2314,11 +2314,11 @@ msgstr "" "Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed " "zmienianiem ustawień." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Logowanie za pomocą nazwy użytkownika i hasła." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2650,7 +2650,7 @@ msgid "6 or more characters" msgstr "6 lub więcej znaków" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Potwierdź" @@ -2662,11 +2662,11 @@ msgstr "Takie samo jak powyższe hasło" msgid "Change" msgstr "Zmień" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Hasło musi mieć sześć lub więcej znaków." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Hasła nie pasują do siebie." @@ -2893,43 +2893,43 @@ msgstr "Informacje o profilu" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Imię i nazwisko" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Strona domowa" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Opisz się i swoje zainteresowania w %d znakach" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Opisz się i swoje zainteresowania" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "O mnie" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Położenie" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\"" @@ -2972,7 +2972,7 @@ msgid "" msgstr "" "Automatycznie subskrybuj każdego, kto mnie subskrybuje (najlepsze dla botów)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)." @@ -3233,7 +3233,7 @@ msgstr "Hasło musi mieć sześć lub więcej znaków." msgid "Password and confirmation do not match." msgstr "Hasło i potwierdzenie nie pasują do siebie." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Błąd podczas ustawiania użytkownika." @@ -3241,40 +3241,40 @@ msgstr "Błąd podczas ustawiania użytkownika." msgid "New password successfully saved. You are now logged in." msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Tylko zaproszone osoby mogą się rejestrować." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Nieprawidłowy kod zaproszenia." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Rejestracja powiodła się" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Zarejestruj się" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Rejestracja nie jest dozwolona." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" "Nie można się zarejestrować, jeśli nie zgadzasz się z warunkami licencji." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Adres e-mail już istnieje." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Nieprawidłowa nazwa użytkownika lub hasło." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3282,56 +3282,56 @@ msgstr "" "Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać " "wpisy i połączyć się z przyjaciółmi i kolegami. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 lub więcej znaków. Wymagane." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Takie samo jak powyższe hasło. Wymagane." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mail" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "Treść i dane %1$s są prywatne i poufne." +msgstr "Rozumiem, że treść i dane %1$s są prywatne i poufne." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "Moje teksty i pliki są objęte prawami autorskimi %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "Moje teksty i pliki pozostają pod moimi prawami autorskimi." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Wszystkie prawa zastrzeżone." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3340,7 +3340,7 @@ msgstr "" "Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi " "danymi: hasło, adres e-mail, adres komunikatora i numer telefonu." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3373,7 +3373,7 @@ msgstr "" "Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi " "sprawi ci przyjemność." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5567,14 +5567,14 @@ msgstr "Imię i nazwisko: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Położenie: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Strona domowa: %s" @@ -6114,8 +6114,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6141,19 +6148,19 @@ msgstr "" "Zmień adres e-mail lub opcje powiadamiania na %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "O mnie: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Nowy adres e-mail do wysyłania do %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6175,30 +6182,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Stan użytkownika %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Potwierdzenie SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s: proszę potwierdzić własny numer telefonu za pomocą tego kodu:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Zostałeś szturchnięty przez %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6226,13 +6233,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nowa prywatna wiadomość od użytkownika %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6266,13 +6273,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "Użytkownik %s (@%s) dodał twój wpis jako ulubiony" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6311,7 +6318,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6322,13 +6329,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "Użytkownik %s (@%s) wysłał wpis wymagający twojej uwagi" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6674,7 +6681,7 @@ msgstr "Dziennie średnio" msgid "All groups" msgstr "Wszystkie grupy" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Niezaimplementowana metoda." @@ -6698,7 +6705,7 @@ msgstr "Znane" msgid "Popular" msgstr "Popularne" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Brak parametrów powrotu." @@ -6719,7 +6726,7 @@ msgstr "Powtórz ten wpis" msgid "Revoke the \"%s\" role from this user" msgstr "Unieważnij rolę \"%s\" tego użytkownika" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" "Nie określono pojedynczego użytkownika dla trybu pojedynczego użytkownika." @@ -6898,56 +6905,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "kilka sekund temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "około minutę temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "około %d minut temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "około godzinę temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "około %d godzin temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "blisko dzień temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "około %d dni temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "około miesiąc temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "około %d miesięcy temu" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "około rok temu" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index f1368936a2..4f40435bd2 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:55+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:15+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -393,32 +393,32 @@ msgstr "Não foi possível encontrar o utilizador de destino." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Utilizador já é usado. Tente outro." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Utilizador não é válido." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Página de ínicio não é uma URL válida." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Nome completo demasiado longo (máx. 255 caracteres)." @@ -430,7 +430,7 @@ msgstr "Descrição demasiado longa (máx. 140 caracteres)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Localidade demasiado longa (máx. 255 caracteres)." @@ -521,12 +521,12 @@ msgstr "Chave inválida." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -594,8 +594,8 @@ msgstr "" msgid "Account" msgstr "Conta" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -603,8 +603,8 @@ msgid "Nickname" msgstr "Utilizador" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Senha" @@ -810,11 +810,11 @@ msgstr "Avatar apagado." msgid "You already blocked that user." msgstr "Já bloqueou esse utilizador." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquear utilizador" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -829,7 +829,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -838,7 +838,7 @@ msgstr "Não" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Não bloquear este utilizador" @@ -847,7 +847,7 @@ msgstr "Não bloquear este utilizador" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -855,11 +855,11 @@ msgid "Yes" msgstr "Sim" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloquear este utilizador" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Não foi possível gravar informação do bloqueio." @@ -1020,7 +1020,7 @@ msgstr "Apagar esta aplicação" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Não iniciou sessão." @@ -1474,7 +1474,7 @@ msgid "Cannot normalize that email address" msgstr "Não é possível normalizar esse endereço electrónico" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Correio electrónico é inválido." @@ -1701,13 +1701,13 @@ msgstr "O utilizador já tem esta função." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Não foi especificado um perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Não foi encontrado um perfil com essa identificação." @@ -2274,41 +2274,41 @@ msgstr "Não é um membro desse grupo." msgid "%1$s left group %2$s" msgstr "%1$s deixou o grupo %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Sessão já foi iniciada." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Nome de utilizador ou senha incorrectos." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Entrar" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Iniciar sessão no site" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Lembrar-me neste computador" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "De futuro, iniciar sessão automaticamente. Não usar em computadores " "partilhados!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Perdeu ou esqueceu-se da senha?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2316,11 +2316,11 @@ msgstr "" "Por razões de segurança, por favor re-introduza o seu nome de utilizador e " "senha antes de alterar as configurações." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Iniciar sessão com um nome de utilizador e senha." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2651,7 +2651,7 @@ msgid "6 or more characters" msgstr "6 ou mais caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Confirmação" @@ -2663,11 +2663,11 @@ msgstr "Repita a senha nova" msgid "Change" msgstr "Modificar" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Senha tem de ter 6 ou mais caracteres." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Senhas não coincidem." @@ -2893,43 +2893,43 @@ msgstr "Informação do perfil" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome completo" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Página pessoal" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Descreva-se e aos seus interesses (máx. 140 caracteres)" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Descreva-se e aos seus interesses" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Biografia" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Localidade" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Onde está, por ex. \"Cidade, Região, País\"" @@ -2971,7 +2971,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Biografia demasiado extensa (máx. %d caracteres)." @@ -3236,7 +3236,7 @@ msgstr "Senha tem de ter 6 ou mais caracteres." msgid "Password and confirmation do not match." msgstr "A senha e a confirmação não coincidem." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Erro ao configurar utilizador." @@ -3244,39 +3244,39 @@ msgstr "Erro ao configurar utilizador." msgid "New password successfully saved. You are now logged in." msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Desculpe, só pessoas convidadas se podem registar." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Desculpe, código de convite inválido." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registo efectuado" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registar" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registo não é permitido." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Não se pode registar se não aceita a licença." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Correio electrónico já existe." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Nome de utilizador ou senha inválidos." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3284,56 +3284,60 @@ msgstr "" "Com este formulário pode criar uma conta nova. Poderá então publicar notas e " "ligar-se a amigos e colegas. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 ou mais caracteres. Obrigatório." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Repita a senha acima. Obrigatório." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Correio" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Usado apenas para actualizações, anúncios e recuperação da senha" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\"" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "O conteúdo e dados do site %1$s são privados e confidenciais." +msgstr "" +"Compreendo que o conteúdo e dados do site %1$s são privados e confidenciais." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" +"Os meus textos e ficheiros estão protegidos pelos direitos de autor de %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" +"Os meus textos e ficheiros permanecem protegidos pelos meus próprios " +"direitos de autor." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Todos os direitos reservados." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3343,7 +3347,7 @@ msgstr "" "estes dados privados: senha, endereço de correio electrónico, endereço de " "mensageiro instantâneo, número de telefone." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3376,7 +3380,7 @@ msgstr "" "\n" "Obrigado por se ter registado e esperamos que se divirta usando este serviço." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5564,14 +5568,14 @@ msgstr "Nome completo: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Localidade: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Página pessoal: %s" @@ -6104,8 +6108,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s está agora a ouvir as suas notas em %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6132,19 +6143,19 @@ msgstr "" "8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Bio: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Novo endereço electrónico para publicar no site %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6166,30 +6177,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Estado de %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Confirmação SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s: confirme que este número de telefone é seu com este código:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s envia-lhe um toque" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6217,13 +6228,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nova mensagem privada de %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6257,13 +6268,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) adicionou a sua nota às favoritas." #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6301,7 +6312,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6312,13 +6323,13 @@ msgstr "" "\n" "\t%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) enviou uma nota à sua atenção" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6667,7 +6678,7 @@ msgstr "Média diária" msgid "All groups" msgstr "Todos os grupos" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Método não implementado." @@ -6691,7 +6702,7 @@ msgstr "Destaques" msgid "Popular" msgstr "Populares" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Sem argumentos return-to." @@ -6712,7 +6723,7 @@ msgstr "Repetir esta nota" msgid "Revoke the \"%s\" role from this user" msgstr "Retirar a função \"%s\" a este utilizador" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Nenhum utilizador único definido para o modo de utilizador único." @@ -6890,56 +6901,56 @@ msgid "Moderator" msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "há alguns segundos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "há cerca de um minuto" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "há cerca de %d minutos" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "há cerca de uma hora" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "há cerca de %d horas" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "há cerca de um dia" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "há cerca de %d dias" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "há cerca de um mês" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "há cerca de %d meses" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "há cerca de um ano" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index a464b0cae1..250df50dbb 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:40:58+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:18+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -398,7 +398,7 @@ msgstr "Não foi possível encontrar usuário de destino." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "A identificação deve conter apenas letras minúsculas e números e não pode " @@ -406,26 +406,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Esta identificação já está em uso. Tente outro." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Não é uma identificação válida." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "A URL informada não é válida." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Nome completo muito extenso (máx. 255 caracteres)" @@ -437,7 +437,7 @@ msgstr "Descrição muito extensa (máximo %d caracteres)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Localização muito extensa (máx. 255 caracteres)." @@ -528,12 +528,12 @@ msgstr "Token inválido." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -607,8 +607,8 @@ msgstr "" msgid "Account" msgstr "Conta" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -616,8 +616,8 @@ msgid "Nickname" msgstr "Usuário" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Senha" @@ -824,11 +824,11 @@ msgstr "O avatar foi excluído." msgid "You already blocked that user." msgstr "Você já bloqueou esse usuário." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Bloquear usuário" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -844,7 +844,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -853,7 +853,7 @@ msgstr "Não" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Não bloquear este usuário" @@ -862,7 +862,7 @@ msgstr "Não bloquear este usuário" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -870,11 +870,11 @@ msgid "Yes" msgstr "Sim" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Bloquear este usuário" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Não foi possível salvar a informação de bloqueio." @@ -1035,7 +1035,7 @@ msgstr "Excluir esta aplicação" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Você não está autenticado." @@ -1488,7 +1488,7 @@ msgid "Cannot normalize that email address" msgstr "Não foi possível normalizar este endereço de e-mail" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Não é um endereço de e-mail válido." @@ -1717,13 +1717,13 @@ msgstr "O usuário já possui este papel." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Não foi especificado nenhum perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Não foi encontrado nenhum perfil com esse ID." @@ -2293,42 +2293,42 @@ msgstr "Você não é um membro desse grupo." msgid "%1$s left group %2$s" msgstr "%1$s deixou o grupo %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Já está autenticado." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Nome de usuário e/ou senha incorreto(s)." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" "Erro na configuração do usuário. Você provavelmente não tem autorização." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Entrar" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Autenticar-se no site" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Lembrar neste computador" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Entra automaticamente da próxima vez, sem pedir a senha. Não use em " "computadores compartilhados!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Perdeu ou esqueceu sua senha?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2336,11 +2336,11 @@ msgstr "" "Por razões de segurança, por favor, digite novamente seu nome de usuário e " "senha antes de alterar suas configurações." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Autentique-se com seu nome de usuário e senha." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2679,7 +2679,7 @@ msgid "6 or more characters" msgstr "No mínimo 6 caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Confirmar" @@ -2691,11 +2691,11 @@ msgstr "Igual à senha acima" msgid "Change" msgstr "Alterar" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "A senha deve ter, no mínimo, 6 caracteres." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "As senhas não coincidem." @@ -2921,43 +2921,43 @@ msgstr "Informações do perfil" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome completo" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Site" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL do seu site, blog ou perfil em outro site" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Descreva a si mesmo e os seus interesses em %d caracteres" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Descreva a si mesmo e os seus interesses" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Descrição" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Localização" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Onde você está, ex: \"cidade, estado (ou região), país\"" @@ -3000,7 +3000,7 @@ msgid "" msgstr "" "Assinar automaticamente à quem me assinar (melhor para perfis não humanos)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "A descrição é muito extensa (máximo %d caracteres)." @@ -3264,7 +3264,7 @@ msgstr "A senha deve ter 6 ou mais caracteres." msgid "Password and confirmation do not match." msgstr "A senha e a confirmação não coincidem." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Erro na configuração do usuário." @@ -3274,39 +3274,39 @@ msgstr "" "A nova senha foi salva com sucesso. A partir de agora você já está " "autenticado." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Desculpe, mas somente convidados podem se registrar." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Desculpe, mas o código do convite é inválido." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registro realizado com sucesso" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrar-se" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Não é permitido o registro." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Você não pode se registrar se não aceitar a licença." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "O endereço de e-mail já existe." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Nome de usuário e/ou senha inválido(s)" -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3314,56 +3314,58 @@ msgstr "" "Através deste formulário você pode criar uma nova conta. A partir daí você " "pode publicar mensagens e se conectar a amigos e colegas. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "No mínimo 6 caracteres. Obrigatório." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Igual à senha acima. Obrigatório." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-mail" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Usado apenas para atualizações, anúncios e recuperações de senha" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, de preferência seu nome \"real\"" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "O conteúdo e os dados de %1$s são privados e confidenciais." +msgstr "" +"Eu entendo que o conteúdo e os dados de %1$s são particulares e " +"confidenciais." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "Meus textos e arquivos estão licenciados sob a %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "Meus textos e arquivos permanecem sob meus próprios direitos autorais." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3373,7 +3375,7 @@ msgstr "" "particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo " "e número de telefone." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3406,7 +3408,7 @@ msgstr "" "\n" "Obrigado por se registrar e esperamos que você aproveite o serviço." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5595,14 +5597,14 @@ msgstr "Nome completo: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Localização: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Site: %s" @@ -6139,8 +6141,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s agora está acompanhando suas mensagens no %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6166,19 +6175,19 @@ msgstr "" "Altere seu endereço de e-mail e suas opções de notificação em %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Descrição: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Novo endereço de e-mail para publicar no %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6200,30 +6209,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "Mensagem de %s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Confirmação de SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "Aguardando a confirmação deste número de telefone." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Você teve a atenção chamada por %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6251,13 +6260,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nova mensagem particular de %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6291,13 +6300,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) marcou sua mensagem como favorita" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6335,7 +6344,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6343,13 +6352,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) enviou uma mensagem citando você" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6677,7 +6686,7 @@ msgstr "Média diária" msgid "All groups" msgstr "Todos os grupos" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Método não implementado." @@ -6701,7 +6710,7 @@ msgstr "Em destaque" msgid "Popular" msgstr "Popular" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Sem argumentos return-to." @@ -6722,7 +6731,7 @@ msgstr "Repetir esta mensagem" msgid "Revoke the \"%s\" role from this user" msgstr "Revoga o papel \"%s\" deste usuário" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Nenhum usuário definido para o modo de usuário único." @@ -6900,56 +6909,56 @@ msgid "Moderator" msgstr "Moderador" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "alguns segundos atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "cerca de 1 minuto atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "cerca de %d minutos atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "cerca de 1 hora atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "cerca de %d horas atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "cerca de 1 dia atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "cerca de %d dias atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "cerca de 1 mês atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "cerca de %d meses atrás" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "cerca de 1 ano atrás" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 249d59d655..02fcda7d94 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:41:01+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:21+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -28,7 +28,7 @@ msgstr "" #. TRANS: Menu item for site administration #: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375 msgid "Access" -msgstr "Принять" +msgstr "Доступ" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -402,33 +402,33 @@ msgstr "Не удаётся найти целевого пользователя #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Имя должно состоять только из прописных букв и цифр и не иметь пробелов." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Неверное имя." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "URL Главной страницы неверен." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Полное имя слишком длинное (не больше 255 знаков)." @@ -440,7 +440,7 @@ msgstr "Слишком длинное описание (максимум %d си #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Слишком длинное месторасположение (максимум 255 знаков)." @@ -531,12 +531,12 @@ msgstr "Неправильный токен" #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -606,8 +606,8 @@ msgstr "" msgid "Account" msgstr "Настройки" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -615,8 +615,8 @@ msgid "Nickname" msgstr "Имя" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Пароль" @@ -823,11 +823,11 @@ msgstr "Аватара удалена." msgid "You already blocked that user." msgstr "Вы уже заблокировали этого пользователя." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Заблокировать пользователя." -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -842,7 +842,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -851,7 +851,7 @@ msgstr "Нет" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Не блокировать этого пользователя" @@ -860,7 +860,7 @@ msgstr "Не блокировать этого пользователя" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -868,11 +868,11 @@ msgid "Yes" msgstr "Да" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Заблокировать пользователя." -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Не удаётся сохранить информацию о блокировании." @@ -1033,7 +1033,7 @@ msgstr "Удалить это приложение" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Не авторизован." @@ -1492,7 +1492,7 @@ msgid "Cannot normalize that email address" msgstr "Не удаётся стандартизировать этот электронный адрес" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Неверный электронный адрес." @@ -1720,13 +1720,13 @@ msgstr "Пользователь уже имеет эту роль." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Профиль не определен." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Нет профиля с таким ID." @@ -2295,39 +2295,39 @@ msgstr "Вы не являетесь членом этой группы." msgid "%1$s left group %2$s" msgstr "%1$s покинул группу %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Вы уже авторизовались." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Некорректное имя или пароль." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Вход" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Авторизоваться" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Запомнить меня" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Потеряли или забыли пароль?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2335,11 +2335,11 @@ msgstr "" "По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем " "изменять Ваши установки." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Войти с вашим именем участника и паролем." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2673,7 +2673,7 @@ msgid "6 or more characters" msgstr "6 или больше знаков" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Подтверждение" @@ -2685,11 +2685,11 @@ msgstr "Тот же пароль, что и выше" msgid "Change" msgstr "Изменить" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Пароль должен быть длиной не менее 6 символов." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Пароли не совпадают." @@ -2764,7 +2764,7 @@ msgstr "Путь к сайту" #: actions/pathsadminpanel.php:246 msgid "Path to locales" -msgstr "Пусть к локализациям" +msgstr "Путь к локализациям" #: actions/pathsadminpanel.php:246 msgid "Directory path to locales" @@ -2913,43 +2913,43 @@ msgstr "Информация профиля" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 латинских строчных буквы или цифры, без пробелов" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Полное имя" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Главная" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "Адрес твоей страницы, дневника или профиля на другом портале" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Опишите себя и свои увлечения при помощи %d символов" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Опишите себя и свои интересы" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Биография" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Месторасположение" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Где вы находитесь, например «Город, область, страна»" @@ -2991,7 +2991,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "Автоматически подписываться на всех, кто подписался на меня" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Слишком длинная биография (максимум %d символов)." @@ -3251,7 +3251,7 @@ msgstr "Пароль должен быть длиной не менее 6 сим msgid "Password and confirmation do not match." msgstr "Пароль и его подтверждение не совпадают." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Ошибка в установках пользователя." @@ -3259,41 +3259,41 @@ msgstr "Ошибка в установках пользователя." msgid "New password successfully saved. You are now logged in." msgstr "Новый пароль успешно сохранён. Вы авторизовались." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Простите, регистрация только по приглашению." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Извините, неверный пригласительный код." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Регистрация успешна!" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрация" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Регистрация недопустима." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" "Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного " "соглашения." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Такой электронный адрес уже задействован." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Неверное имя или пароль." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3302,56 +3302,58 @@ msgstr "" "получите возможность публиковать короткие сообщения и устанавливать связи с " "друзьями и коллегами. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 или более символов. Обязательное поле." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Тот же пароль что и сверху. Обязательное поле." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Email" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Нужна только для обновлений, осведомлений и восстановления пароля." -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Полное имя, предпочтительно Ваше настоящее имя" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "Содержание и данные %1$s являются личными и конфиденциальными." +msgstr "" +"Я понимаю, что содержание и данные %1$s являются частными и " +"конфиденциальными." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "Авторским правом на мои тексты и файлы обладает %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "Авторские права на мои тексты и файлы остаются за мной." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Все права защищены." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3360,7 +3362,7 @@ msgstr "" "Мои тексты и файлы доступны на условиях %s, за исключением следующей личной " "информации: пароля, почтового адреса, номера мессенджера и номера телефона." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3394,7 +3396,7 @@ msgstr "" "Спасибо за то, что присоединились к нам, надеемся, что вы получите " "удовольствие от использования данного сервиса!" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -4522,7 +4524,7 @@ msgstr "Пользователь" #: actions/useradminpanel.php:70 msgid "User settings for this StatusNet site." -msgstr "Пользовательские настройки для этого сайта StatusNet." +msgstr "Настройки пользователя для этого сайта StatusNet." #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." @@ -5111,7 +5113,7 @@ msgstr "Поиск" #. TRANS: Menu item for site administration #: lib/action.php:515 lib/adminpanelaction.php:399 msgid "Site notice" -msgstr "Новая запись" +msgstr "Уведомление сайта" #. TRANS: DT element for local views block. String is hidden in default CSS. #: lib/action.php:582 @@ -5583,14 +5585,14 @@ msgstr "Полное имя: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Месторасположение: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Домашняя страница: %s" @@ -6128,8 +6130,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s теперь следит за вашими записями на %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6155,19 +6164,19 @@ msgstr "" "Измените email-адрес и настройки уведомлений на %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Биография: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Новый электронный адрес для постинга %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6189,30 +6198,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s статус" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Подтверждение СМС" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s. Подтвердите, что это ваш телефон, следующим кодом:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Вас «подтолкнул» пользователь %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6240,13 +6249,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Новое приватное сообщение от %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6280,13 +6289,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) добавил вашу запись в число своих любимых" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6324,7 +6333,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6335,13 +6344,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) отправил запись для вашего внимания" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6688,7 +6697,7 @@ msgstr "Среднесуточная" msgid "All groups" msgstr "Все группы" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Нереализованный метод." @@ -6712,7 +6721,7 @@ msgstr "Особые" msgid "Popular" msgstr "Популярное" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Нет аргумента return-to." @@ -6733,7 +6742,7 @@ msgstr "Повторить эту запись" msgid "Revoke the \"%s\" role from this user" msgstr "Отозвать у этого пользователя роль «%s»" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Ни задан пользователь для однопользовательского режима." @@ -6911,56 +6920,56 @@ msgid "Moderator" msgstr "Модератор" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "пару секунд назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "около минуты назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(ы) назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "около часа назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "около %d часа(ов) назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "около дня назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "около %d дня(ей) назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "около месяца назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "около %d месяца(ев) назад" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "около года назад" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index da42f33dd5..5763c7b954 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -377,32 +377,32 @@ msgstr "" #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "" #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "" #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "" #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "" @@ -414,7 +414,7 @@ msgstr "" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "" @@ -505,12 +505,12 @@ msgstr "" #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -575,8 +575,8 @@ msgstr "" msgid "Account" msgstr "" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -584,8 +584,8 @@ msgid "Nickname" msgstr "" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "" @@ -791,11 +791,11 @@ msgstr "" msgid "You already blocked that user." msgstr "" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -807,7 +807,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -816,7 +816,7 @@ msgstr "" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "" @@ -825,7 +825,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -833,11 +833,11 @@ msgid "Yes" msgstr "" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "" @@ -995,7 +995,7 @@ msgstr "" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "" @@ -1436,7 +1436,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "" @@ -1655,13 +1655,13 @@ msgstr "" #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "" @@ -2167,49 +2167,49 @@ msgstr "" msgid "%1$s left group %2$s" msgstr "" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "" -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "" -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2530,7 +2530,7 @@ msgid "6 or more characters" msgstr "" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "" @@ -2542,11 +2542,11 @@ msgstr "" msgid "Change" msgstr "" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "" @@ -2766,43 +2766,43 @@ msgstr "" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2842,7 +2842,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "" @@ -3086,7 +3086,7 @@ msgstr "" msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "" @@ -3094,100 +3094,100 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "" -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "" -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "" -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "" -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3206,7 +3206,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5274,14 +5274,14 @@ msgstr "" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "" @@ -5757,8 +5757,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5774,19 +5781,19 @@ msgid "" msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5800,30 +5807,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5840,13 +5847,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5866,13 +5873,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5894,7 +5901,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -5902,13 +5909,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6225,7 +6232,7 @@ msgstr "" msgid "All groups" msgstr "" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6249,7 +6256,7 @@ msgstr "" msgid "Popular" msgstr "" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "" @@ -6270,7 +6277,7 @@ msgstr "" msgid "Revoke the \"%s\" role from this user" msgstr "" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6448,56 +6455,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 0cd352cbc1..bd24ccc003 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:41:05+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:25+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -390,33 +390,33 @@ msgstr "Kunde inte hitta målanvändare." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Smeknamnet används redan. Försök med ett annat." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Inte ett giltigt smeknamn." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Hemsida är inte en giltig webbadress." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Fullständigt namn är för långt (max 255 tecken)." @@ -428,7 +428,7 @@ msgstr "Beskrivning är för lång (max 140 tecken)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Beskrivning av plats är för lång (max 255 tecken)." @@ -519,12 +519,12 @@ msgstr "Ogiltig token." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -592,8 +592,8 @@ msgstr "" msgid "Account" msgstr "Konto" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -601,8 +601,8 @@ msgid "Nickname" msgstr "Smeknamn" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Lösenord" @@ -809,11 +809,11 @@ msgstr "Avatar borttagen." msgid "You already blocked that user." msgstr "Du har redan blockerat denna användare." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Blockera användare" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -828,7 +828,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -837,7 +837,7 @@ msgstr "Nej" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Blockera inte denna användare" @@ -846,7 +846,7 @@ msgstr "Blockera inte denna användare" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -854,11 +854,11 @@ msgid "Yes" msgstr "Ja" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Blockera denna användare" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Misslyckades att spara blockeringsinformation." @@ -1020,7 +1020,7 @@ msgstr "Ta bort denna applikation" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Inte inloggad." @@ -1470,7 +1470,7 @@ msgid "Cannot normalize that email address" msgstr "Kan inte normalisera den e-postadressen" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Inte en giltig e-postadress." @@ -1698,13 +1698,13 @@ msgstr "Användaren har redan denna roll." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Ingen profil angiven." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Ingen profil med det ID:t." @@ -2271,39 +2271,39 @@ msgstr "Du är inte en medlem i den gruppen." msgid "%1$s left group %2$s" msgstr "%1$s lämnade grupp %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Redan inloggad." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Felaktigt användarnamn eller lösenord." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Logga in" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Logga in på webbplatsen" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Kom ihåg mig" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Logga in automatiskt i framtiden; inte för delade datorer!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Tappat bort eller glömt ditt lösenord?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2311,11 +2311,11 @@ msgstr "" "Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord " "igen innan du ändrar dina inställningar." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Logga in med ditt användarnamn och lösenord." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2649,7 +2649,7 @@ msgid "6 or more characters" msgstr "Minst 6 tecken" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Bekräfta" @@ -2661,11 +2661,11 @@ msgstr "Samma som lösenordet ovan" msgid "Change" msgstr "Ändra" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Lösenordet måste vara minst 6 tecken." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Lösenorden matchar inte." @@ -2890,43 +2890,43 @@ msgstr "Profilinformation" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullständigt namn" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Hemsida" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL till din hemsida, blogg eller profil på en annan webbplats." -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Beskriv dig själv och dina intressen med högst 140 tecken" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Beskriv dig själv och dina intressen" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Biografi" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Plats" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Var du håller till, såsom \"Stad, Län, Land\"" @@ -2970,7 +2970,7 @@ msgstr "" "Prenumerera automatiskt på den som prenumererar på mig (bäst för icke-" "människa) " -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Biografin är för lång (max %d tecken)." @@ -3232,7 +3232,7 @@ msgstr "Lösenordet måste vara minst 6 tecken." msgid "Password and confirmation do not match." msgstr "Lösenord och bekräftelse matchar inte." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Fel uppstog i användarens inställning" @@ -3240,39 +3240,39 @@ msgstr "Fel uppstog i användarens inställning" msgid "New password successfully saved. You are now logged in." msgstr "Nya lösenordet sparat. Du är nu inloggad." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "Tyvärr, bara inbjudna personer kan registrera sig." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Tyvärr, ogiltig inbjudningskod." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Registreringen genomförd" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrera" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Registrering inte tillåten." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Du kan inte registrera dig om du inte godkänner licensen." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "E-postadressen finns redan." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Ogiltigt användarnamn eller lösenord." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3280,59 +3280,60 @@ msgstr "" "Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser " "och ansluta till vänner och kollegor. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas " "i." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "Minst 6 tecken. Måste fyllas i." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Samma som lösenordet ovan. Måste fyllas i." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "E-post" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Används endast för uppdateringar, tillkännagivanden och återskapande av " "lösenord" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "Innehåll och data av %1$s är privat och konfidensiell." +msgstr "" +"Jag förstår att innehåll och data av %1$s är privata och konfidentiella." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "Upphovsrätten till min text och mina filer innehas av %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "Upphovsrätten till min text och mina filer är fortsatt min." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Alla rättigheter reserverade." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3341,7 +3342,7 @@ msgstr "" "Mina texter och filer är tillgängliga under %s med undantag av den här " "privata datan: lösenord, e-postadress, IM-adress, telefonnummer." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3374,7 +3375,7 @@ msgstr "" "Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda " "denna tjänst." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5556,14 +5557,14 @@ msgstr "Fullständigt namn: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Plats: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Hemsida: %s" @@ -6094,8 +6095,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s lyssnar nu på dina notiser på %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6121,19 +6129,19 @@ msgstr "" "Ändra din e-postadress eller notiferingsinställningar på %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Biografi: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Ny e-postadress för att skicka till %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6155,30 +6163,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s status" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS-bekräftelse" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "%s: bekräfta detta telefonnummer med denna kod:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Du har blivit knuffad av %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6206,13 +6214,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Nytt privat meddelande från %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6246,13 +6254,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) lade till din notis som en favorit" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6290,7 +6298,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6301,13 +6309,13 @@ msgstr "" "\n" "\t%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) skickade en notis för din uppmärksamhet" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6655,7 +6663,7 @@ msgstr "Dagligt genomsnitt" msgid "All groups" msgstr "Alla grupper" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Inte implementerad metod." @@ -6679,7 +6687,7 @@ msgstr "Profilerade" msgid "Popular" msgstr "Populärt" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Inga \"return-to\"-argument." @@ -6700,7 +6708,7 @@ msgstr "Upprepa denna notis" msgid "Revoke the \"%s\" role from this user" msgstr "Återkalla rollen \"%s\" från denna användare" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Ingen enskild användare definierad för enanvändarläge." @@ -6878,56 +6886,56 @@ msgid "Moderator" msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "ett par sekunder sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "för nån minut sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "för en timma sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "för en dag sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "för en månad sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "för %d månader sedan" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "för ett år sedan" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index c205085d35..ac611ff536 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:41:08+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:28+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -386,32 +386,32 @@ msgstr "లక్ష్యిత వాడుకరిని కనుగొన #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "సరైన పేరు కాదు." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "హోమ్ పేజీ URL సరైనది కాదు." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)." @@ -423,7 +423,7 @@ msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అ #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)." @@ -515,12 +515,12 @@ msgstr "తప్పుడు పరిమాణం." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -587,8 +587,8 @@ msgstr "" msgid "Account" msgstr "ఖాతా" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -596,8 +596,8 @@ msgid "Nickname" msgstr "పేరు" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "సంకేతపదం" @@ -674,7 +674,7 @@ msgstr "%s యొక్క మైక్రోబ్లాగు" #: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" -msgstr "" +msgstr "%1$s / %2$sని పేర్కొన్న నోటీసులు" #: actions/apitimelinementions.php:130 #, php-format @@ -707,9 +707,9 @@ msgid "Notices tagged with %s" msgstr "" #: actions/apitimelinetag.php:106 actions/tagrss.php:65 -#, fuzzy, php-format +#, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "%s యొక్క మైక్రోబ్లాగు" +msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!" #: actions/attachment.php:73 msgid "No such attachment." @@ -805,11 +805,11 @@ msgstr "అవతారాన్ని తొలగించాం." msgid "You already blocked that user." msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "వాడుకరిని నిరోధించు" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -823,7 +823,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -832,7 +832,7 @@ msgstr "కాదు" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "ఈ వాడుకరిని నిరోధించకు" @@ -841,7 +841,7 @@ msgstr "ఈ వాడుకరిని నిరోధించకు" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -849,11 +849,11 @@ msgid "Yes" msgstr "అవును" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "ఈ వాడుకరిని నిరోధించు" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం." @@ -901,9 +901,9 @@ msgstr "అటువంటి వాడుకరి లేరు." #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 -#, fuzzy, php-format +#, php-format msgid "Post to %s" -msgstr "%s పై గుంపులు" +msgstr "%sకి టపాచెయ్యి" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -1015,7 +1015,7 @@ msgstr "ఈ ఉపకరణాన్ని తొలగించు" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "లోనికి ప్రవేశించలేదు." @@ -1270,9 +1270,8 @@ msgid "Callback URL is not valid." msgstr "" #: actions/editapplication.php:258 -#, fuzzy msgid "Could not update application." -msgstr "గుంపుని తాజాకరించలేకున్నాం." +msgstr "ఉపకరణాన్ని తాజాకరించలేకున్నాం." #: actions/editgroup.php:56 #, php-format @@ -1462,7 +1461,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:" @@ -1683,13 +1682,13 @@ msgstr "వాడుకరికి ఇప్పటికే ఈ పాత్ర #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "" @@ -2235,50 +2234,50 @@ msgstr "మీరు ఆ గుంపులో సభ్యులు కాద msgid "%1$s left group %2$s" msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "ఇప్పటికే లోనికి ప్రవేశించారు." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "ప్రవేశించండి" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "సైటు లోనికి ప్రవేశించు" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "నన్ను గుర్తుంచుకో" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "మీ సంకేతపదం మర్చిపోయారా?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2480,9 +2479,8 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 -#, fuzzy msgid "Notice has no profile." -msgstr "వాడుకరికి ప్రొఫైలు లేదు." +msgstr "నోటీసుకి ప్రొఫైలు లేదు." #: actions/oembed.php:86 actions/shownotice.php:175 #, php-format @@ -2611,7 +2609,7 @@ msgid "6 or more characters" msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "నిర్థారించు" @@ -2623,11 +2621,11 @@ msgstr "పై సంకేతపదం వలెనే" msgid "Change" msgstr "మార్చు" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "సంకేతపదం తప్పనిసరిగా 6 లేదా అంతకంటే ఎక్కువ అక్షరాలుండాలి." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "సంకేతపదాలు సరిపోలలేదు." @@ -2858,43 +2856,43 @@ msgstr "ప్రొఫైలు సమాచారం" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "పూర్తి పేరు" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "హోమ్ పేజీ" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "స్వపరిచయం" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "ప్రాంతం" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\"" @@ -2934,7 +2932,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)." @@ -3183,7 +3181,7 @@ msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్ msgid "Password and confirmation do not match." msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "" @@ -3191,93 +3189,93 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "క్షమించండి, తప్పు ఆహ్వాన సంకేతం." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "నమోదు విజయవంతం" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "నమోదు" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "నమోదు అనుమతించబడదు." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "ఈమెయిల్" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం." -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3286,7 +3284,7 @@ msgstr "" "నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM " "చిరునామా, మరియు ఫోన్ నంబర్." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3317,7 +3315,7 @@ msgstr "" "\n" "నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3469,9 +3467,8 @@ msgid "You cannot revoke user roles on this site." msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "వాడుకరికి ప్రొఫైలు లేదు." +msgstr "వాడుకరికి ఈ పాత్ర లేదు." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -4654,7 +4651,7 @@ msgstr "" #: actions/version.php:189 msgid "Plugins" -msgstr "" +msgstr "ప్లగిన్లు" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. #: actions/version.php:196 lib/action.php:779 @@ -5460,14 +5457,14 @@ msgstr "పూర్తిపేరు: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "ప్రాంతం: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "హోంపేజీ: %s" @@ -5958,8 +5955,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని వింటున్నారు." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5985,19 +5989,19 @@ msgstr "" "మీ ఈమెయిలు చిరునామాని లేదా గమనింపుల ఎంపికలను %8$s వద్ద మార్చుకోండి\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "స్వపరిచయం: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6011,30 +6015,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s స్థితి" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS నిర్ధారణ" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "ఈ ఫోను నంబరు యొక్క నిర్ధారణకై వేచివుంది." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6062,13 +6066,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "%s నుండి కొత్త అంతరంగిక సందేశం" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6102,13 +6106,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) మీ నోటీసుని ఇష్టపడ్డారు" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6146,7 +6150,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6157,13 +6161,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) మీకు ఒక నోటీసుని పంపించారు" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6511,7 +6515,7 @@ msgstr "రోజువారీ సగటు" msgid "All groups" msgstr "అన్ని గుంపులు" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6535,7 +6539,7 @@ msgstr "విశేషం" msgid "Popular" msgstr "ప్రాచుర్యం" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "అటువంటి పత్రమేమీ లేదు." @@ -6557,7 +6561,7 @@ msgstr "ఈ నోటీసుని పునరావృతించు" msgid "Revoke the \"%s\" role from this user" msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6740,56 +6744,56 @@ msgid "Moderator" msgstr "సమన్వయకర్త" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "కొన్ని క్షణాల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "%d గంటల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "%d రోజుల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "ఓ నెల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "%d నెలల క్రితం" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 54d1a00d7f..6247728edd 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:41:12+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:32+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -400,7 +400,7 @@ msgstr "Kullanıcı güncellenemedi." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk " @@ -408,26 +408,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Takma ad kullanımda. Başka bir tane deneyin." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Geçersiz bir takma ad." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Başlangıç sayfası adresi geçerli bir URL değil." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Tam isim çok uzun (azm: 255 karakter)." @@ -439,7 +439,7 @@ msgstr "Hakkında bölümü çok uzun (azm 140 karakter)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Yer bilgisi çok uzun (azm: 255 karakter)." @@ -534,12 +534,12 @@ msgstr "Geçersiz büyüklük." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -608,8 +608,8 @@ msgstr "" msgid "Account" msgstr "Hakkında" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -617,8 +617,8 @@ msgid "Nickname" msgstr "Takma ad" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Parola" @@ -836,12 +836,12 @@ msgstr "Avatar güncellendi." msgid "You already blocked that user." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "Böyle bir kullanıcı yok." -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -853,7 +853,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -863,7 +863,7 @@ msgstr "Durum mesajları" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Böyle bir kullanıcı yok." @@ -873,7 +873,7 @@ msgstr "Böyle bir kullanıcı yok." #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -881,12 +881,12 @@ msgid "Yes" msgstr "" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "Böyle bir kullanıcı yok." -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "" @@ -1055,7 +1055,7 @@ msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Giriş yapılmadı." @@ -1528,7 +1528,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Geçersiz bir eposta adresi." @@ -1763,13 +1763,13 @@ msgstr "Kullanıcının profili yok." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "" @@ -2312,41 +2312,41 @@ msgstr "Bize o profili yollamadınız" msgid "%1$s left group %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Zaten giriş yapılmış." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Yanlış kullanıcı adı veya parola." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Yetkilendirilmemiş." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Giriş" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Beni hatırla" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Parolamı unuttum veya kaybettim" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2354,12 +2354,12 @@ msgstr "" "Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı " "ve parolanızı tekrar giriniz." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "Geçersiz kullanıcı adı veya parola." -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2700,7 +2700,7 @@ msgid "6 or more characters" msgstr "6 veya daha fazla karakter" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Onayla" @@ -2712,11 +2712,11 @@ msgstr "yukarıdaki parolanın aynısı" msgid "Change" msgstr "Değiştir" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Parolalar birbirini tutmuyor." @@ -2954,45 +2954,45 @@ msgstr "" "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin " "verilmez" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Tam İsim" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Başlangıç Sayfası" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "" "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 #, fuzzy msgid "Describe yourself and your interests" msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Hakkında" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Yer" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi" @@ -3032,7 +3032,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "Hakkında bölümü çok uzun (azm 140 karakter)." @@ -3284,7 +3284,7 @@ msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır." msgid "Password and confirmation do not match." msgstr "Parola ve onaylaması birbirini tutmuyor." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Kullanıcı ayarlamada hata oluştu." @@ -3292,95 +3292,95 @@ msgstr "Kullanıcı ayarlamada hata oluştu." msgid "New password successfully saved. You are now logged in." msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" -#: actions/register.php:92 +#: actions/register.php:99 #, fuzzy msgid "Sorry, invalid invitation code." msgstr "Onay kodu hatası." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Kayıt" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "" -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Eposta adresi zaten var." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Geçersiz kullanıcı adı veya parola." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Eposta" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır." -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3389,7 +3389,7 @@ msgstr "" "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon " "numarası." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3408,7 +3408,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5606,14 +5606,14 @@ msgstr "Tam İsim" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "" @@ -6112,8 +6112,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s %2$s'da durumunuzu takip ediyor" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6135,19 +6142,19 @@ msgstr "" "%4$s.\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "Hakkında" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6161,30 +6168,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s durum" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6201,13 +6208,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6227,13 +6234,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%1$s %2$s'da durumunuzu takip ediyor" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6255,7 +6262,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6263,13 +6270,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6598,7 +6605,7 @@ msgstr "" msgid "All groups" msgstr "" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6623,7 +6630,7 @@ msgstr "" msgid "Popular" msgstr "Kişi Arama" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "Böyle bir belge yok." @@ -6647,7 +6654,7 @@ msgstr "Böyle bir durum mesajı yok." msgid "Revoke the \"%s\" role from this user" msgstr "Böyle bir kullanıcı yok." -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6835,56 +6842,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "birkaç saniye önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "yaklaşık bir gün önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "yaklaşık bir ay önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index ce85953d62..d980cbc7db 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:41:15+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:35+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -395,7 +395,7 @@ msgstr "Не вдалося знайти цільового користувач #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких " @@ -403,26 +403,26 @@ msgstr "" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Це ім’я вже використовується. Спробуйте інше." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Це недійсне ім’я користувача." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Веб-сторінка має недійсну URL-адресу." #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Повне ім’я задовге (255 знаків максимум)" @@ -434,7 +434,7 @@ msgstr "Опис надто довгий (%d знаків максимум)." #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Розташування надто довге (255 знаків максимум)." @@ -525,12 +525,12 @@ msgstr "Невірний токен." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -602,8 +602,8 @@ msgstr "" msgid "Account" msgstr "Акаунт" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -611,8 +611,8 @@ msgid "Nickname" msgstr "Ім’я користувача" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Пароль" @@ -820,11 +820,11 @@ msgstr "Аватару видалено." msgid "You already blocked that user." msgstr "Цього користувача вже заблоковано." -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 msgid "Block user" msgstr "Блокувати користувача" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -839,7 +839,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -848,7 +848,7 @@ msgstr "Ні" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 msgid "Do not block this user" msgstr "Не блокувати цього користувача" @@ -857,7 +857,7 @@ msgstr "Не блокувати цього користувача" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -865,11 +865,11 @@ msgid "Yes" msgstr "Так" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 msgid "Block this user" msgstr "Блокувати користувача" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "Збереження інформації про блокування завершилось невдачею." @@ -1030,7 +1030,7 @@ msgstr "Видалити додаток" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Не увійшли." @@ -1477,7 +1477,7 @@ msgid "Cannot normalize that email address" msgstr "Не можна полагодити цю поштову адресу" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Це недійсна електронна адреса." @@ -1703,13 +1703,13 @@ msgstr "Користувач вже має цю роль." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "Не визначено жодного профілю." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "Не визначено профілю з таким ID." @@ -2279,41 +2279,41 @@ msgstr "Ви не є учасником цієї групи." msgid "%1$s left group %2$s" msgstr "%1$s залишив групу %2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Тепер Ви увійшли." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Неточне ім’я або пароль." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "Помилка. Можливо, Ви не авторизовані." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Увійти" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "Вхід на сайт" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Пам’ятати мене" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Автоматично входити у майбутньому; не для комп’ютерів загального " "користування!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Загубили або забули пароль?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2321,11 +2321,11 @@ msgstr "" "З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як " "змінювати налаштування." -#: actions/login.php:270 +#: actions/login.php:292 msgid "Login with your username and password." msgstr "Увійти використовуючи ім’я та пароль." -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2661,7 +2661,7 @@ msgid "6 or more characters" msgstr "6 або більше знаків" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Підтвердити" @@ -2673,11 +2673,11 @@ msgstr "Такий само, як і пароль вище" msgid "Change" msgstr "Змінити" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "Пароль має складатись з 6-ти або більше знаків." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Паролі не співпадають." @@ -2902,43 +2902,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Повне ім’я" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Веб-сторінка" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL-адреса Вашої веб-сторінки, блоґу, або профілю на іншому сайті" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Опишіть себе та свої інтереси (%d знаків)" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" msgstr "Опишіть себе та свої інтереси" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Про себе" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Розташування" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Де Ви живете, на кшталт «Місто, область (регіон), країна»" @@ -2981,7 +2981,7 @@ msgid "" msgstr "" "Автоматично підписуватись до тих, хто підписався до мене. (Слава роботам!)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, php-format msgid "Bio is too long (max %d chars)." msgstr "Ви перевищили ліміт (%d знаків максимум)." @@ -3243,7 +3243,7 @@ msgstr "Пароль має складатись з 6-ти або більше msgid "Password and confirmation do not match." msgstr "Пароль та підтвердження не співпадають." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Помилка в налаштуваннях користувача." @@ -3251,40 +3251,40 @@ msgstr "Помилка в налаштуваннях користувача." msgid "New password successfully saved. You are now logged in." msgstr "Новий пароль успішно збережено. Тепер Ви увійшли." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" "Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут." -#: actions/register.php:92 +#: actions/register.php:99 msgid "Sorry, invalid invitation code." msgstr "Даруйте, помилка у коді запрошення." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Реєстрація успішна" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Реєстрація" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "Реєстрацію не дозволено." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Ця адреса вже використовується." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Недійсне ім’я або пароль." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -3292,57 +3292,57 @@ msgstr "" "Ця форма дозволить вам створити новий акаунт. Ви зможете робити дописи і " "будете в курсі справ ваших друзів та колег. " -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. " "Неодмінно." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 або більше знаків. Неодмінно." -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Такий само, як і пароль вище. Неодмінно." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Пошта" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Використовується лише для оновлень, оголошень та відновлення паролю" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Повне ім’я, звісно ж Ваше справжнє ім’я :)" -#: actions/register.php:511 -#, fuzzy, php-format +#: actions/register.php:518 +#, php-format msgid "" "I understand that content and data of %1$s are private and confidential." -msgstr "Зміст і дані %1$s є приватними і конфіденційними." +msgstr "Я розумію, що зміст і дані %1$s є приватними і конфіденційними." -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." -msgstr "" +msgstr "Авторські права на мої тексти і файли належать %1$s." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." -msgstr "" +msgstr "Авторські права на мої тексти і файли залишаються за мною." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Всі права захищені." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3351,7 +3351,7 @@ msgstr "" "Мої тексти і файли доступні під %s, окрім цих приватних даних: пароль, " "електронна адреса, адреса IM, телефонний номер." -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3384,7 +3384,7 @@ msgstr "" "Дякуємо, що зареєструвались у нас, і, сподіваємось, Вам сподобається наш " "сервіс." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5566,14 +5566,14 @@ msgstr "Повне ім’я: %s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "Розташування: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "Веб-сторінка: %s" @@ -6107,8 +6107,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s тепер слідкує за Вашими дописами на %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6134,19 +6141,19 @@ msgstr "" "Змінити електронну адресу або умови сповіщення — %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, php-format msgid "Bio: %s" msgstr "Про себе: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Нова електронна адреса для надсилання повідомлень на %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6168,18 +6175,18 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s статус" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Підтвердження СМС" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" @@ -6187,13 +6194,13 @@ msgstr "" "скориставшись даним кодом:" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "Вас спробував «розштовхати» %s" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6221,13 +6228,13 @@ msgstr "" "%4$s\n" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Нове приватне повідомлення від %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6261,13 +6268,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) додав(ла) Ваш допис обраних" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6305,7 +6312,7 @@ msgstr "" "%6$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6316,13 +6323,13 @@ msgstr "" "\n" "%s" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) пропонує до Вашої уваги наступний допис" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6670,7 +6677,7 @@ msgstr "Середньодобове" msgid "All groups" msgstr "Всі групи" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "Метод не виконується." @@ -6694,7 +6701,7 @@ msgstr "Постаті" msgid "Popular" msgstr "Популярне" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 msgid "No return-to arguments." msgstr "Немає аргументів return-to." @@ -6715,7 +6722,7 @@ msgstr "Повторити цей допис" msgid "Revoke the \"%s\" role from this user" msgstr "Відкликати роль \"%s\" для цього користувача" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "Користувача для однокористувацького режиму не визначено." @@ -6893,56 +6900,56 @@ msgid "Moderator" msgstr "Модератор" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "мить тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "хвилину тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "годину тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "день тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "місяць тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "близько %d місяців тому" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "рік тому" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index de5d64dc13..074f4b78fa 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:41:18+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:38+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -404,32 +404,32 @@ msgstr "Không tìm thấy bất kỳ trạng thái nào." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Biệt hiệu phải là chữ viết thường hoặc số và không có khoảng trắng." #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác." #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "Biệt hiệu không hợp lệ." #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Trang chủ không phải là URL" #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)." @@ -441,7 +441,7 @@ msgstr "Lý lịch quá dài (không quá 140 ký tự)" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Tên khu vực quá dài (không quá 255 ký tự)." @@ -536,12 +536,12 @@ msgstr "Kích thước không hợp lệ." #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -610,8 +610,8 @@ msgstr "" msgid "Account" msgstr "Giới thiệu" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -619,8 +619,8 @@ msgid "Nickname" msgstr "Biệt danh" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "Mật khẩu" @@ -840,12 +840,12 @@ msgstr "Hình đại diện đã được cập nhật." msgid "You already blocked that user." msgstr "Bạn đã theo những người này:" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "Ban user" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -857,7 +857,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -867,7 +867,7 @@ msgstr "Không" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "Bỏ chặn người dùng này" @@ -877,7 +877,7 @@ msgstr "Bỏ chặn người dùng này" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -886,12 +886,12 @@ msgid "Yes" msgstr "Có" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "Ban user" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "" @@ -1060,7 +1060,7 @@ msgstr "Xóa tin nhắn" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Chưa đăng nhập." @@ -1555,7 +1555,7 @@ msgid "Cannot normalize that email address" msgstr "Không thể bình thường hóa địa chỉ GTalk này" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "Địa chỉ email không hợp lệ." @@ -1803,13 +1803,13 @@ msgstr "Người dùng không có thông tin." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 #, fuzzy msgid "No profile with that ID." msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." @@ -2394,40 +2394,40 @@ msgstr "Bạn chưa cập nhật thông tin riêng" msgid "%1$s left group %2$s" msgstr "%s và nhóm" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "Đã đăng nhập." -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "Sai tên đăng nhập hoặc mật khẩu." -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Chưa được phép." -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "Đăng nhập" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "Nhớ tôi" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "Mất hoặc quên mật khẩu?" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -2435,12 +2435,12 @@ msgstr "" "Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay " "đổi trong điều chỉnh." -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "Sai tên đăng nhập hoặc mật khẩu." -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2793,7 +2793,7 @@ msgid "6 or more characters" msgstr "Nhiều hơn 6 ký tự" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "Xác nhận" @@ -2805,12 +2805,12 @@ msgstr "Cùng mật khẩu ở trên" msgid "Change" msgstr "Thay đổi" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 #, fuzzy msgid "Password must be 6 or more characters." msgstr "Mật khẩu phải nhiều hơn 6 ký tự." -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "Mật khẩu không khớp." @@ -3052,44 +3052,44 @@ msgstr "Hồ sơ này không biết" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay " -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Tên đầy đủ" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "Trang chủ hoặc Blog" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên " -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 #, fuzzy msgid "Describe yourself and your interests" msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "Lý lịch" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "Thành phố" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\"" @@ -3129,7 +3129,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "Tự động theo những người nào đăng ký theo tôi" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "Lý lịch quá dài (không quá 140 ký tự)" @@ -3385,7 +3385,7 @@ msgstr "Mật khẩu phải nhiều hơn 6 ký tự." msgid "Password and confirmation do not match." msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau." -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "Lỗi xảy ra khi tạo thành viên." @@ -3393,104 +3393,104 @@ msgstr "Lỗi xảy ra khi tạo thành viên." msgid "New password successfully saved. You are now logged in." msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây giờ." -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" -#: actions/register.php:92 +#: actions/register.php:99 #, fuzzy msgid "Sorry, invalid invitation code." msgstr "Lỗi xảy ra với mã xác nhận." -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "Đăng ký thành công" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "Đăng ký" -#: actions/register.php:135 +#: actions/register.php:142 #, fuzzy msgid "Registration not allowed." msgstr "Biệt hiệu không được cho phép." -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản." -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "Địa chỉ email đã tồn tại." -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ." -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay khoảng trắng. Bắt " "buộc." -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "Nhiều hơn 6 ký tự. Bắt buộc" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "Cùng mật khẩu ở trên. Bắt buộc." #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "Email" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật khẩu" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "Họ tên đầy đủ của bạn, tốt nhất là tên thật của bạn." -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại" -#: actions/register.php:576 +#: actions/register.php:583 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3521,7 +3521,7 @@ msgstr "" "\n" "Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này." -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5769,14 +5769,14 @@ msgstr "Tên đầy đủ" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, fuzzy, php-format msgid "Location: %s" msgstr "Thành phố: %s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, fuzzy, php-format msgid "Homepage: %s" msgstr "Trang chủ hoặc Blog: %s" @@ -6300,8 +6300,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s." +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6323,19 +6330,19 @@ msgstr "" "%4$s.\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "Thành phố: %s" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "Dia chi email moi de gui tin nhan den %s" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6357,30 +6364,30 @@ msgstr "" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, fuzzy, php-format msgid "%s status" msgstr "Trạng thái của %1$s vào %2$s" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "Xác nhận SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "Đó không phải là số điện thoại của bạn." #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6397,13 +6404,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "Bạn có tin nhắn riêng từ %s" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6437,13 +6444,13 @@ msgstr "" "%5$s\n" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, fuzzy, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6478,7 +6485,7 @@ msgstr "" "%5$s\n" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6486,13 +6493,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6830,7 +6837,7 @@ msgstr "" msgid "All groups" msgstr "Nhóm" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6857,7 +6864,7 @@ msgstr "" msgid "Popular" msgstr "Tên tài khoản" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "Không có tài liệu nào." @@ -6881,7 +6888,7 @@ msgstr "Trả lời tin nhắn này" msgid "Revoke the \"%s\" role from this user" msgstr "Ban user" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -7078,56 +7085,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "vài giây trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "1 phút trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "1 giờ trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "1 ngày trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "1 tháng trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "1 năm trước" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 771e303de5..c19106ce16 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:41:21+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:42+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -402,32 +402,32 @@ msgstr "找不到任何信息。" #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "昵称只能使用小写字母和数字，不包含空格。" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "昵称已被使用，换一个吧。" #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "不是有效的昵称。" #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "主页的URL不正确。" #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "全名过长(不能超过 255 个字符)。" @@ -439,7 +439,7 @@ msgstr "描述过长(不能超过140字符)。" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "位置过长(不能超过255个字符)。" @@ -534,12 +534,12 @@ msgstr "大小不正确。" #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -607,8 +607,8 @@ msgstr "" msgid "Account" msgstr "帐号" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -616,8 +616,8 @@ msgid "Nickname" msgstr "昵称" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "密码" @@ -835,12 +835,12 @@ msgstr "头像已更新。" msgid "You already blocked that user." msgstr "您已成功阻止该用户：" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "阻止用户" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -852,7 +852,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 #, fuzzy @@ -862,7 +862,7 @@ msgstr "否" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "取消阻止次用户" @@ -872,7 +872,7 @@ msgstr "取消阻止次用户" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 #, fuzzy @@ -881,12 +881,12 @@ msgid "Yes" msgstr "是" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "阻止该用户" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "保存阻止信息失败。" @@ -1058,7 +1058,7 @@ msgstr "删除通告" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "未登录。" @@ -1540,7 +1540,7 @@ msgid "Cannot normalize that email address" msgstr "无法识别此电子邮件" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "不是有效的电子邮件。" @@ -1781,14 +1781,14 @@ msgstr "用户没有个人信息。" #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 #, fuzzy msgid "No profile specified." msgstr "没有收件人。" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 #, fuzzy msgid "No profile with that ID." msgstr "没有找到此ID的信息。" @@ -2354,51 +2354,51 @@ msgstr "您未告知此个人信息" msgid "%1$s left group %2$s" msgstr "%s 离开群 %s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "已登录。" -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "用户名或密码不正确。" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "未认证。" -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "登录" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "登录" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "记住登录状态" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "忘记了密码？" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "由于安全原因，修改设置前需要输入用户名和密码。" -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "输入用户名和密码以登录。" -#: actions/login.php:273 +#: actions/login.php:295 #, fuzzy, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2743,7 +2743,7 @@ msgid "6 or more characters" msgstr "6 个或更多字符" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "确认" @@ -2755,11 +2755,11 @@ msgstr "相同的密码" msgid "Change" msgstr "修改" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "密码必须包含 6 个或更多字符。" -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "密码不匹配。" @@ -2995,44 +2995,44 @@ msgstr "未知的帐号" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 到 64 个小写字母或数字，不包含标点及空白" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "全名" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "主页" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "您的主页、博客或在其他站点的URL" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "用不超过140个字符描述您自己和您的爱好" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 #, fuzzy msgid "Describe yourself and your interests" msgstr "用不超过140个字符描述您自己和您的爱好" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "自述" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "位置" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "你的位置，格式类似\"城市，省份，国家\"" @@ -3072,7 +3072,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "自述过长(不能超过140字符)。" @@ -3325,7 +3325,7 @@ msgstr "密码必须是 6 个字符或更多。" msgid "Password and confirmation do not match." msgstr "密码和确认不匹配。" -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "保存用户设置时出错。" @@ -3333,101 +3333,101 @@ msgstr "保存用户设置时出错。" msgid "New password successfully saved. You are now logged in." msgstr "新密码已保存，您现在已登录。" -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "对不起，请邀请那些能注册的人。" -#: actions/register.php:92 +#: actions/register.php:99 #, fuzzy msgid "Sorry, invalid invitation code." msgstr "验证码出错。" -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "注册成功。" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "注册" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "不允许注册。" -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "您必须同意此授权方可注册。" -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "电子邮件地址已存在。" -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "用户名或密码不正确。" -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1 到 64 个小写字母或数字，不包含标点及空白。此项必填。" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "6 个或更多字符。此项必填。" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "相同的密码。此项必填。" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "电子邮件" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "只用于更新、通告或密码恢复" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "长名字，最好是“实名”" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。" -#: actions/register.php:576 +#: actions/register.php:583 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3458,7 +3458,7 @@ msgstr "" "\n" "感谢您的注册，希望您喜欢这个服务。" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5696,14 +5696,14 @@ msgstr "全名：%s" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "位置：%s" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "主页：%s" @@ -6204,8 +6204,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s 开始关注您的 %2$s 信息。" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6226,7 +6233,7 @@ msgstr "" "为您效力的 %4$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "" @@ -6234,13 +6241,13 @@ msgstr "" "\n" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "新的电子邮件地址，用于发布 %s 信息" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6261,30 +6268,30 @@ msgstr "" "为您效力的 %4$s" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "%s 状态" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "SMS短信确认" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, fuzzy, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "等待确认此电话号码。" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "%s 振铃呼叫你" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6301,13 +6308,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "%s 发送了新的私人信息" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6327,13 +6334,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s 收藏了您的通告" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6355,7 +6362,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6363,13 +6370,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6705,7 +6712,7 @@ msgstr "" msgid "All groups" msgstr "所有组" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6731,7 +6738,7 @@ msgstr "特征" msgid "Popular" msgstr "用户" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "没有这份文档。" @@ -6755,7 +6762,7 @@ msgstr "无法删除通告。" msgid "Revoke the \"%s\" role from this user" msgstr "该组成员列表。" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6952,56 +6959,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "几秒前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "一分钟前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "一小时前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "一天前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "%d 天前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "一个月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "%d 个月前" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "一年前" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 43e6effc8d..fff611bd7e 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 15:39+0000\n" -"PO-Revision-Date: 2010-05-16 15:41:24+0000\n" +"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"PO-Revision-Date: 2010-05-25 11:38:46+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" +"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -394,32 +394,32 @@ msgstr "無法更新使用者" #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 -#: actions/register.php:205 +#: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "暱稱請用小寫字母或數字，勿加空格。" #: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 -#: actions/register.php:208 +#: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "此暱稱已有人使用。再試試看別的吧。" #: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 -#: actions/register.php:210 +#: actions/register.php:217 msgid "Not a valid nickname." msgstr "" #: actions/apigroupcreate.php:198 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 -#: actions/register.php:217 +#: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "個人首頁位址錯誤" #: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 -#: actions/register.php:220 +#: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "全名過長（最多255字元）" @@ -431,7 +431,7 @@ msgstr "自我介紹過長(共140個字元)" #: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 -#: actions/register.php:227 +#: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "地點過長（共255個字）" @@ -525,12 +525,12 @@ msgstr "尺寸錯誤" #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 -#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:350 -#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/register.php:172 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 #: actions/unsubscribe.php:69 actions/userauthorization.php:52 @@ -599,8 +599,8 @@ msgstr "" msgid "Account" msgstr "關於" -#: actions/apioauthauthorize.php:313 actions/login.php:230 -#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/apioauthauthorize.php:313 actions/login.php:252 +#: actions/profilesettings.php:106 actions/register.php:431 #: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:132 @@ -608,8 +608,8 @@ msgid "Nickname" msgstr "暱稱" #. TRANS: Link description in user account settings menu. -#: actions/apioauthauthorize.php:316 actions/login.php:233 -#: actions/register.php:429 lib/accountsettingsaction.php:125 +#: actions/apioauthauthorize.php:316 actions/login.php:255 +#: actions/register.php:436 lib/accountsettingsaction.php:125 msgid "Password" msgstr "" @@ -823,12 +823,12 @@ msgstr "更新個人圖像" msgid "You already blocked that user." msgstr "無此使用者" -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158 +#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158 #, fuzzy msgid "Block user" msgstr "無此使用者" -#: actions/block.php:130 +#: actions/block.php:138 msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " @@ -840,7 +840,7 @@ msgstr "" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:145 actions/deleteapplication.php:154 +#: actions/block.php:153 actions/deleteapplication.php:154 #: actions/deletenotice.php:147 actions/deleteuser.php:152 #: actions/groupblock.php:178 msgctxt "BUTTON" @@ -849,7 +849,7 @@ msgstr "" #. TRANS: Submit button title for 'No' when blocking a user. #. TRANS: Submit button title for 'No' when deleting a user. -#: actions/block.php:149 actions/deleteuser.php:156 +#: actions/block.php:157 actions/deleteuser.php:156 #, fuzzy msgid "Do not block this user" msgstr "無此使用者" @@ -859,7 +859,7 @@ msgstr "無此使用者" #. TRANS: Button label on the delete notice form. #. TRANS: Button label on the delete user form. #. TRANS: Button label on the form to block a user from a group. -#: actions/block.php:152 actions/deleteapplication.php:161 +#: actions/block.php:160 actions/deleteapplication.php:161 #: actions/deletenotice.php:154 actions/deleteuser.php:159 #: actions/groupblock.php:185 msgctxt "BUTTON" @@ -867,12 +867,12 @@ msgid "Yes" msgstr "" #. TRANS: Submit button title for 'Yes' when blocking a user. -#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80 +#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80 #, fuzzy msgid "Block this user" msgstr "無此使用者" -#: actions/block.php:179 +#: actions/block.php:187 msgid "Failed to save block information." msgstr "" @@ -1041,7 +1041,7 @@ msgstr "請在140個字以內描述你自己與你的興趣" #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96 #: actions/tagother.php:33 actions/unsubscribe.php:52 -#: lib/adminpanelaction.php:73 lib/profileformaction.php:63 +#: lib/adminpanelaction.php:73 lib/profileformaction.php:64 #: lib/settingsaction.php:72 msgid "Not logged in." msgstr "" @@ -1509,7 +1509,7 @@ msgid "Cannot normalize that email address" msgstr "" #. TRANS: Message given saving e-mail address that not valid. -#: actions/emailsettings.php:366 actions/register.php:201 +#: actions/emailsettings.php:366 actions/register.php:208 #: actions/siteadminpanel.php:144 msgid "Not a valid email address." msgstr "此信箱無效" @@ -1742,13 +1742,13 @@ msgstr "" #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 -#: lib/profileformaction.php:70 +#: lib/profileformaction.php:79 msgid "No profile specified." msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: actions/unsubscribe.php:84 lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:86 msgid "No profile with that ID." msgstr "" @@ -2272,50 +2272,50 @@ msgstr "" msgid "%1$s left group %2$s" msgstr "%1$s的狀態是%2$s" -#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 +#: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." msgstr "已登入" -#: actions/login.php:126 +#: actions/login.php:148 msgid "Incorrect username or password." msgstr "使用者名稱或密碼錯誤" -#: actions/login.php:132 actions/otp.php:120 +#: actions/login.php:154 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 +#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79 msgid "Login" msgstr "登入" -#: actions/login.php:227 +#: actions/login.php:249 msgid "Login to site" msgstr "" -#: actions/login.php:236 actions/register.php:478 +#: actions/login.php:258 actions/register.php:485 msgid "Remember me" msgstr "" -#: actions/login.php:237 actions/register.php:480 +#: actions/login.php:259 actions/register.php:487 msgid "Automatically login in the future; not for shared computers!" msgstr "未來在同一部電腦自動登入" -#: actions/login.php:247 +#: actions/login.php:269 msgid "Lost or forgotten password?" msgstr "遺失或忘記密碼了嗎？" -#: actions/login.php:266 +#: actions/login.php:288 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更改設定。" -#: actions/login.php:270 +#: actions/login.php:292 #, fuzzy msgid "Login with your username and password." msgstr "使用者名稱或密碼無效" -#: actions/login.php:273 +#: actions/login.php:295 #, php-format msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." @@ -2648,7 +2648,7 @@ msgid "6 or more characters" msgstr "6個以上字元" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:433 +#: actions/register.php:440 msgid "Confirm" msgstr "確認" @@ -2660,11 +2660,11 @@ msgstr "" msgid "Change" msgstr "更改" -#: actions/passwordsettings.php:154 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:237 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:157 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:240 msgid "Passwords don't match." msgstr "" @@ -2892,44 +2892,44 @@ msgstr "" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格" -#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/profilesettings.php:111 actions/register.php:455 #: actions/showgroup.php:256 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "全名" #. TRANS: Form input field label. -#: actions/profilesettings.php:115 actions/register.php:453 +#: actions/profilesettings.php:115 actions/register.php:460 #: lib/applicationeditform.php:244 lib/groupeditform.php:161 msgid "Homepage" msgstr "個人首頁" -#: actions/profilesettings.php:117 actions/register.php:455 +#: actions/profilesettings.php:117 actions/register.php:462 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:461 +#: actions/profilesettings.php:122 actions/register.php:468 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "請在140個字以內描述你自己與你的興趣" -#: actions/profilesettings.php:125 actions/register.php:464 +#: actions/profilesettings.php:125 actions/register.php:471 #, fuzzy msgid "Describe yourself and your interests" msgstr "請在140個字以內描述你自己與你的興趣" -#: actions/profilesettings.php:127 actions/register.php:466 +#: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" msgstr "自我介紹" -#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/profilesettings.php:132 actions/register.php:478 #: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:165 msgid "Location" msgstr "地點" -#: actions/profilesettings.php:134 actions/register.php:473 +#: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2969,7 +2969,7 @@ msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -#: actions/profilesettings.php:228 actions/register.php:223 +#: actions/profilesettings.php:228 actions/register.php:230 #, fuzzy, php-format msgid "Bio is too long (max %d chars)." msgstr "自我介紹過長(共140個字元)" @@ -3216,7 +3216,7 @@ msgstr "" msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:388 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." msgstr "使用者設定發生錯誤" @@ -3224,101 +3224,101 @@ msgstr "使用者設定發生錯誤" msgid "New password successfully saved. You are now logged in." msgstr "新密碼已儲存成功。你已登入。" -#: actions/register.php:85 actions/register.php:189 actions/register.php:405 +#: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." msgstr "" -#: actions/register.php:92 +#: actions/register.php:99 #, fuzzy msgid "Sorry, invalid invitation code." msgstr "確認碼發生錯誤" -#: actions/register.php:112 +#: actions/register.php:119 msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 +#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85 msgid "Register" msgstr "" -#: actions/register.php:135 +#: actions/register.php:142 msgid "Registration not allowed." msgstr "" -#: actions/register.php:198 +#: actions/register.php:205 msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:212 +#: actions/register.php:219 msgid "Email address already exists." msgstr "此電子信箱已註冊過了" -#: actions/register.php:243 actions/register.php:265 +#: actions/register.php:250 actions/register.php:272 msgid "Invalid username or password." msgstr "使用者名稱或密碼無效" -#: actions/register.php:343 +#: actions/register.php:350 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:425 +#: actions/register.php:432 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:430 +#: actions/register.php:437 msgid "6 or more characters. Required." msgstr "" -#: actions/register.php:434 +#: actions/register.php:441 msgid "Same as password above. Required." msgstr "" #. TRANS: Link description in user account settings menu. -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:445 actions/register.php:449 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132 msgid "Email" msgstr "電子信箱" -#: actions/register.php:439 actions/register.php:443 +#: actions/register.php:446 actions/register.php:450 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:450 +#: actions/register.php:457 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:511 +#: actions/register.php:518 #, php-format msgid "" "I understand that content and data of %1$s are private and confidential." msgstr "" -#: actions/register.php:521 +#: actions/register.php:528 #, php-format msgid "My text and files are copyright by %1$s." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. -#: actions/register.php:525 +#: actions/register.php:532 msgid "My text and files remain under my own copyright." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. -#: actions/register.php:528 +#: actions/register.php:535 msgid "All rights reserved." msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. -#: actions/register.php:533 +#: actions/register.php:540 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "不包含這些個人資料：密碼、電子信箱、線上即時通信箱、電話號碼" -#: actions/register.php:576 +#: actions/register.php:583 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3337,7 +3337,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:600 +#: actions/register.php:607 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5498,14 +5498,14 @@ msgstr "全名" #. TRANS: Whois output. %s is the location of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:422 lib/mail.php:263 +#: lib/command.php:422 lib/mail.php:268 #, php-format msgid "Location: %s" msgstr "" #. TRANS: Whois output. %s is the homepage of the queried user. #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/command.php:426 lib/mail.php:266 +#: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" msgstr "" @@ -5995,8 +5995,15 @@ msgstr "" msgid "%1$s is now listening to your notices on %2$s." msgstr "現在%1$s在%2$s成為你的粉絲囉" +#: lib/mail.php:248 +#, php-format +msgid "" +"If you believe this account is being used abusively, you can block them from " +"your subscribers list and report as spam to site administrators at %s" +msgstr "" + #. TRANS: Main body of new-subscriber notification e-mail -#: lib/mail.php:249 +#: lib/mail.php:254 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -6019,19 +6026,19 @@ msgstr "" "敬上。\n" #. TRANS: Profile info line in new-subscriber notification e-mail -#: lib/mail.php:269 +#: lib/mail.php:274 #, fuzzy, php-format msgid "Bio: %s" msgstr "自我介紹" #. TRANS: Subject of notification mail for new posting email address -#: lib/mail.php:298 +#: lib/mail.php:304 #, php-format msgid "New email address for posting to %s" msgstr "" #. TRANS: Body of notification mail for new posting email address -#: lib/mail.php:302 +#: lib/mail.php:308 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -6045,30 +6052,30 @@ msgid "" msgstr "" #. TRANS: Subject line for SMS-by-email notification messages -#: lib/mail.php:427 +#: lib/mail.php:433 #, php-format msgid "%s status" msgstr "" #. TRANS: Subject line for SMS-by-email address confirmation message -#: lib/mail.php:454 +#: lib/mail.php:460 msgid "SMS confirmation" msgstr "" #. TRANS: Main body heading for SMS-by-email address confirmation message -#: lib/mail.php:457 +#: lib/mail.php:463 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email -#: lib/mail.php:478 +#: lib/mail.php:484 #, php-format msgid "You've been nudged by %s" msgstr "" #. TRANS: Body for 'nudge' notification email -#: lib/mail.php:483 +#: lib/mail.php:489 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6085,13 +6092,13 @@ msgid "" msgstr "" #. TRANS: Subject for direct-message notification email -#: lib/mail.php:530 +#: lib/mail.php:536 #, php-format msgid "New private message from %s" msgstr "" #. TRANS: Body for direct-message notification email -#: lib/mail.php:535 +#: lib/mail.php:541 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6111,13 +6118,13 @@ msgid "" msgstr "" #. TRANS: Subject for favorite notification email -#: lib/mail.php:583 +#: lib/mail.php:589 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "現在%1$s在%2$s成為你的粉絲囉" #. TRANS: Body for favorite notification email -#: lib/mail.php:586 +#: lib/mail.php:592 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6139,7 +6146,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:645 +#: lib/mail.php:651 #, php-format msgid "" "The full conversation can be read here:\n" @@ -6147,13 +6154,13 @@ msgid "" "\t%s" msgstr "" -#: lib/mail.php:651 +#: lib/mail.php:657 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" #. TRANS: Body of @-reply notification e-mail. -#: lib/mail.php:654 +#: lib/mail.php:660 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6480,7 +6487,7 @@ msgstr "" msgid "All groups" msgstr "" -#: lib/profileformaction.php:114 +#: lib/profileformaction.php:123 msgid "Unimplemented method." msgstr "" @@ -6504,7 +6511,7 @@ msgstr "" msgid "Popular" msgstr "" -#: lib/redirectingaction.php:94 +#: lib/redirectingaction.php:95 #, fuzzy msgid "No return-to arguments." msgstr "無此文件" @@ -6528,7 +6535,7 @@ msgstr "無此通知" msgid "Revoke the \"%s\" role from this user" msgstr "無此使用者" -#: lib/router.php:704 +#: lib/router.php:709 msgid "No single user defined for single-user mode." msgstr "" @@ -6714,56 +6721,56 @@ msgid "Moderator" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1083 +#: lib/util.php:1100 msgid "a few seconds ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1086 +#: lib/util.php:1103 msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1090 +#: lib/util.php:1107 #, php-format msgid "about %d minutes ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1093 +#: lib/util.php:1110 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1097 +#: lib/util.php:1114 #, php-format msgid "about %d hours ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1100 +#: lib/util.php:1117 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1104 +#: lib/util.php:1121 #, php-format msgid "about %d days ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1107 +#: lib/util.php:1124 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1111 +#: lib/util.php:1128 #, php-format msgid "about %d months ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1114 +#: lib/util.php:1131 msgid "about a year ago" msgstr "" From 09dab2ce5ae819c73d7984822d418c43f1fba223 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 25 May 2010 15:40:38 +0000 Subject: [PATCH 168/730] Dequeue notice when we hit any Facebook error. --- plugins/Facebook/facebookutil.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index 0f24f5441e..c7b0f02c31 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -229,8 +229,8 @@ function handleFacebookError($e, $notice, $flink) default: $msg = "FacebookPlugin - Facebook returned an error we don't know how to deal with while trying to " . "post notice %d. Error code: %d, error message: \"%s\". (Notice details: " - . "nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). Re-queueing " - . "notice, and will try to send again later."; + . "nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). Removing notice " + . "from the Facebook queue for safety."; common_log( LOG_ERR, sprintf( $msg, @@ -243,8 +243,7 @@ function handleFacebookError($e, $notice, $flink) $notice->content ) ); - // Re-queue and try again later - return false; + return true; // dequeue break; } } From f98609204fb9b5966b9e4c9e4bf8bf605656c31c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 25 May 2010 11:36:42 -0700 Subject: [PATCH 169/730] Backing out locale switch change to see if this affects our mystery memory leak. Revert "Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back." This reverts commit 74a89b1fc37067d91d31bd66922053361eb4e616. --- lib/mail.php | 20 ++++++++++---------- lib/util.php | 17 ----------------- plugins/Facebook/facebookutil.php | 6 +++--- plugins/TwitterBridge/twitter.php | 6 +++--- 4 files changed, 16 insertions(+), 33 deletions(-) diff --git a/lib/mail.php b/lib/mail.php index ab5742e33d..f45b2d333f 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -224,6 +224,9 @@ function mail_subscribe_notify_profile($listenee, $other) if ($other->hasRight(Right::EMAILONSUBSCRIBE) && $listenee->email && $listenee->emailnotifysub) { + // use the recipient's localization + common_init_locale($listenee->language); + $profile = $listenee->getProfile(); $name = $profile->getBestName(); @@ -233,9 +236,6 @@ function mail_subscribe_notify_profile($listenee, $other) $recipients = $listenee->email; - // use the recipient's localization - common_switch_locale($listenee->language); - $headers = _mail_prepare_headers('subscribe', $listenee->nickname, $other->nickname); $headers['From'] = mail_notify_from(); $headers['To'] = $name . ' <' . $listenee->email . '>'; @@ -277,7 +277,7 @@ function mail_subscribe_notify_profile($listenee, $other) common_local_url('emailsettings')); // reset localization - common_switch_locale(); + common_init_locale(); mail_send($recipients, $headers, $body); } } @@ -479,7 +479,7 @@ function mail_confirm_sms($code, $nickname, $address) function mail_notify_nudge($from, $to) { - common_switch_locale($to->language); + common_init_locale($to->language); // TRANS: Subject for 'nudge' notification email $subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname); @@ -497,7 +497,7 @@ function mail_notify_nudge($from, $to) $from->nickname, common_local_url('all', array('nickname' => $to->nickname)), common_config('site', 'name')); - common_switch_locale(); + common_init_locale(); $headers = _mail_prepare_headers('nudge', $to->nickname, $from->nickname); @@ -531,7 +531,7 @@ function mail_notify_message($message, $from=null, $to=null) return true; } - common_switch_locale($to->language); + common_init_locale($to->language); // TRANS: Subject for direct-message notification email $subject = sprintf(_('New private message from %s'), $from->nickname); @@ -555,7 +555,7 @@ function mail_notify_message($message, $from=null, $to=null) $headers = _mail_prepare_headers('message', $to->nickname, $from->nickname); - common_switch_locale(); + common_init_locale(); return mail_to_user($to, $subject, $body, $headers); } @@ -583,7 +583,7 @@ function mail_notify_fave($other, $user, $notice) $bestname = $profile->getBestName(); - common_switch_locale($other->language); + common_init_locale($other->language); // TRANS: Subject for favorite notification email $subject = sprintf(_('%s (@%s) added your notice as a favorite'), $bestname, $user->nickname); @@ -611,7 +611,7 @@ function mail_notify_fave($other, $user, $notice) $headers = _mail_prepare_headers('fave', $other->nickname, $user->nickname); - common_switch_locale(); + common_init_locale(); mail_to_user($other, $subject, $body, $headers); } diff --git a/lib/util.php b/lib/util.php index 59d5132ec6..eed61d0291 100644 --- a/lib/util.php +++ b/lib/util.php @@ -34,14 +34,6 @@ function common_user_error($msg, $code=400) $err->showPage(); } -/** - * This should only be used at setup; processes switching languages - * to send text to other users should use common_switch_locale(). - * - * @param string $language Locale language code (optional; empty uses - * current user's preference or site default) - * @return mixed success - */ function common_init_locale($language=null) { if(!$language) { @@ -58,15 +50,6 @@ function common_init_locale($language=null) return $ok; } -/** - * Initialize locale and charset settings and gettext with our message catalog, - * using the current user's language preference or the site default. - * - * This should generally only be run at framework initialization; code switching - * languages at runtime should call common_switch_language(). - * - * @access private - */ function common_init_language() { mb_internal_encoding('UTF-8'); diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index c7b0f02c31..9c35276b76 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -461,12 +461,12 @@ function remove_facebook_app($flink) function mail_facebook_app_removed($user) { + common_init_locale($user->language); + $profile = $user->getProfile(); $site_name = common_config('site', 'name'); - common_switch_locale($user->language); - $subject = sprintf( _m('Your %1$s Facebook application access has been disabled.', $site_name)); @@ -480,7 +480,7 @@ function mail_facebook_app_removed($user) "re-installing the %2\$s Facebook application.\n\nRegards,\n\n%2\$s"), $user->nickname, $site_name); - common_switch_locale(); + common_init_locale(); return mail_to_user($user, $subject, $body); } diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index 896eee2dac..21adc7a908 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -335,9 +335,9 @@ function remove_twitter_link($flink) function mail_twitter_bridge_removed($user) { - $profile = $user->getProfile(); + common_init_locale($user->language); - common_switch_locale($user->language); + $profile = $user->getProfile(); $subject = sprintf(_m('Your Twitter bridge has been disabled.')); @@ -354,7 +354,7 @@ function mail_twitter_bridge_removed($user) common_local_url('twittersettings'), common_config('site', 'name')); - common_switch_locale(); + common_init_locale(); return mail_to_user($user, $subject, $body); } From 3d4ce6f10b94d487e8eff89f689fba22327634f0 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 25 May 2010 12:31:16 -0700 Subject: [PATCH 170/730] Revert "Backing out locale switch change to see if this affects our mystery memory leak." This reverts commit f98609204fb9b5966b9e4c9e4bf8bf605656c31c. --- lib/mail.php | 20 ++++++++++---------- lib/util.php | 17 +++++++++++++++++ plugins/Facebook/facebookutil.php | 6 +++--- plugins/TwitterBridge/twitter.php | 6 +++--- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/lib/mail.php b/lib/mail.php index f45b2d333f..ab5742e33d 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -224,9 +224,6 @@ function mail_subscribe_notify_profile($listenee, $other) if ($other->hasRight(Right::EMAILONSUBSCRIBE) && $listenee->email && $listenee->emailnotifysub) { - // use the recipient's localization - common_init_locale($listenee->language); - $profile = $listenee->getProfile(); $name = $profile->getBestName(); @@ -236,6 +233,9 @@ function mail_subscribe_notify_profile($listenee, $other) $recipients = $listenee->email; + // use the recipient's localization + common_switch_locale($listenee->language); + $headers = _mail_prepare_headers('subscribe', $listenee->nickname, $other->nickname); $headers['From'] = mail_notify_from(); $headers['To'] = $name . ' <' . $listenee->email . '>'; @@ -277,7 +277,7 @@ function mail_subscribe_notify_profile($listenee, $other) common_local_url('emailsettings')); // reset localization - common_init_locale(); + common_switch_locale(); mail_send($recipients, $headers, $body); } } @@ -479,7 +479,7 @@ function mail_confirm_sms($code, $nickname, $address) function mail_notify_nudge($from, $to) { - common_init_locale($to->language); + common_switch_locale($to->language); // TRANS: Subject for 'nudge' notification email $subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname); @@ -497,7 +497,7 @@ function mail_notify_nudge($from, $to) $from->nickname, common_local_url('all', array('nickname' => $to->nickname)), common_config('site', 'name')); - common_init_locale(); + common_switch_locale(); $headers = _mail_prepare_headers('nudge', $to->nickname, $from->nickname); @@ -531,7 +531,7 @@ function mail_notify_message($message, $from=null, $to=null) return true; } - common_init_locale($to->language); + common_switch_locale($to->language); // TRANS: Subject for direct-message notification email $subject = sprintf(_('New private message from %s'), $from->nickname); @@ -555,7 +555,7 @@ function mail_notify_message($message, $from=null, $to=null) $headers = _mail_prepare_headers('message', $to->nickname, $from->nickname); - common_init_locale(); + common_switch_locale(); return mail_to_user($to, $subject, $body, $headers); } @@ -583,7 +583,7 @@ function mail_notify_fave($other, $user, $notice) $bestname = $profile->getBestName(); - common_init_locale($other->language); + common_switch_locale($other->language); // TRANS: Subject for favorite notification email $subject = sprintf(_('%s (@%s) added your notice as a favorite'), $bestname, $user->nickname); @@ -611,7 +611,7 @@ function mail_notify_fave($other, $user, $notice) $headers = _mail_prepare_headers('fave', $other->nickname, $user->nickname); - common_init_locale(); + common_switch_locale(); mail_to_user($other, $subject, $body, $headers); } diff --git a/lib/util.php b/lib/util.php index eed61d0291..59d5132ec6 100644 --- a/lib/util.php +++ b/lib/util.php @@ -34,6 +34,14 @@ function common_user_error($msg, $code=400) $err->showPage(); } +/** + * This should only be used at setup; processes switching languages + * to send text to other users should use common_switch_locale(). + * + * @param string $language Locale language code (optional; empty uses + * current user's preference or site default) + * @return mixed success + */ function common_init_locale($language=null) { if(!$language) { @@ -50,6 +58,15 @@ function common_init_locale($language=null) return $ok; } +/** + * Initialize locale and charset settings and gettext with our message catalog, + * using the current user's language preference or the site default. + * + * This should generally only be run at framework initialization; code switching + * languages at runtime should call common_switch_language(). + * + * @access private + */ function common_init_language() { mb_internal_encoding('UTF-8'); diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index 9c35276b76..c7b0f02c31 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -461,12 +461,12 @@ function remove_facebook_app($flink) function mail_facebook_app_removed($user) { - common_init_locale($user->language); - $profile = $user->getProfile(); $site_name = common_config('site', 'name'); + common_switch_locale($user->language); + $subject = sprintf( _m('Your %1$s Facebook application access has been disabled.', $site_name)); @@ -480,7 +480,7 @@ function mail_facebook_app_removed($user) "re-installing the %2\$s Facebook application.\n\nRegards,\n\n%2\$s"), $user->nickname, $site_name); - common_init_locale(); + common_switch_locale(); return mail_to_user($user, $subject, $body); } diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index 21adc7a908..896eee2dac 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -335,10 +335,10 @@ function remove_twitter_link($flink) function mail_twitter_bridge_removed($user) { - common_init_locale($user->language); - $profile = $user->getProfile(); + common_switch_locale($user->language); + $subject = sprintf(_m('Your Twitter bridge has been disabled.')); $site_name = common_config('site', 'name'); @@ -354,7 +354,7 @@ function mail_twitter_bridge_removed($user) common_local_url('twittersettings'), common_config('site', 'name')); - common_init_locale(); + common_switch_locale(); return mail_to_user($user, $subject, $body); } From 95159112b2331ee832a4cf1e711cb8f1f0193c44 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 25 May 2010 13:09:21 -0700 Subject: [PATCH 171/730] Hotpatch for infinite redirection-following loop seen processing URLs to http://clojure.org/ -- if we end up with an unstable redirect target (final item in a redirect chain ends up redirecting us somewhere else when we visit it again), just save the last version we saw instead of trying to start over. Pretty much everything in File and File_redirection initial processing needs to be rewritten to be non-awful; this code is very hard to follow and very easy to make huge bugs. A fair amount of the complication is probably obsoleted by the redirection following being built into HTTPClient now. --- classes/File.php | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/classes/File.php b/classes/File.php index 33273bbdcc..8297e50910 100644 --- a/classes/File.php +++ b/classes/File.php @@ -116,7 +116,11 @@ class File extends Memcached_DataObject return false; } - function processNew($given_url, $notice_id=null) { + /** + * @fixme refactor this mess, it's gotten pretty scary. + * @param bool $followRedirects + */ + function processNew($given_url, $notice_id=null, $followRedirects=true) { if (empty($given_url)) return -1; // error, no url to process $given_url = File_redirection::_canonUrl($given_url); if (empty($given_url)) return -1; // error, no url to process @@ -124,6 +128,10 @@ class File extends Memcached_DataObject if (empty($file)) { $file_redir = File_redirection::staticGet('url', $given_url); if (empty($file_redir)) { + // @fixme for new URLs this also looks up non-redirect data + // such as target content type, size, etc, which we need + // for File::saveNew(); so we call it even if not following + // new redirects. $redir_data = File_redirection::where($given_url); if (is_array($redir_data)) { $redir_url = $redir_data['url']; @@ -134,11 +142,19 @@ class File extends Memcached_DataObject throw new ServerException("Can't process url '$given_url'"); } // TODO: max field length - if ($redir_url === $given_url || strlen($redir_url) > 255) { + if ($redir_url === $given_url || strlen($redir_url) > 255 || !$followRedirects) { $x = File::saveNew($redir_data, $given_url); $file_id = $x->id; } else { - $x = File::processNew($redir_url, $notice_id); + // This seems kind of messed up... for now skipping this part + // if we're already under a redirect, so we don't go into + // horrible infinite loops if we've been given an unstable + // redirect (where the final destination of the first request + // doesn't match what we get when we ask for it again). + // + // Seen in the wild with clojure.org, which redirects through + // wikispaces for auth and appends session data in the URL params. + $x = File::processNew($redir_url, $notice_id, /*followRedirects*/false); $file_id = $x->id; File_redirection::saveNew($redir_data, $file_id, $given_url); } From d9a89d174ad1cb28669a8f3c76be23f27c182d58 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 25 May 2010 21:08:25 +0000 Subject: [PATCH 172/730] Small update to the README: Facebook has changed the name of one of its application settings fields. --- plugins/Facebook/README | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/Facebook/README b/plugins/Facebook/README index 14c1d32419..532f1d82e4 100644 --- a/plugins/Facebook/README +++ b/plugins/Facebook/README @@ -38,11 +38,11 @@ editor or write them down. In Facebook's application editor, specify the following URLs for your app: -- Canvas Callback URL : http://example.net/mublog/facebook/app/ -- Post-Remove Callback URL: http://example.net/mublog/facebook/app/remove -- Post-Add Redirect URL : http://apps.facebook.com/yourapp/ -- Canvas Page URL : http://apps.facebook.com/yourapp/ -- Connect URL : http://example.net/mublog/ +- Canvas Callback URL : http://example.net/mublog/facebook/app/ +- Post-Remove Callback URL : http://example.net/mublog/facebook/app/remove +- Post-Authorize Redirect URL : http://apps.facebook.com/yourapp/ +- Canvas Page URL : http://apps.facebook.com/yourapp/ +- Connect URL : http://example.net/mublog/ *** ATTENTION *** These URLs have changed slightly since StatusNet version 0.8.1, From 9193c110f14e09523791683e7799a45163b881c2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 20 May 2010 12:21:29 -0700 Subject: [PATCH 173/730] WikiHowProfile plugin; pulls avatar from WikiHow profile pages when registering or adding account with OpenID. (Full name, location, homepage, and bio are also on the profile page but not marked up in a way they can be easily retrieved yet.) OpenID plugin: Added events at OpenID account creation and update time to allow additional customizations for particular sites. --- plugins/OpenID/finishaddopenid.php | 11 +- plugins/OpenID/finishopenidlogin.php | 10 +- plugins/OpenID/openid.php | 11 +- plugins/WikiHowProfile/README | 6 + .../WikiHowProfile/WikiHowProfilePlugin.php | 196 ++++++++++++++++++ 5 files changed, 225 insertions(+), 9 deletions(-) create mode 100644 plugins/WikiHowProfile/README create mode 100644 plugins/WikiHowProfile/WikiHowProfilePlugin.php diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php index 991e6584ee..18e150a83c 100644 --- a/plugins/OpenID/finishaddopenid.php +++ b/plugins/OpenID/finishaddopenid.php @@ -126,12 +126,15 @@ class FinishaddopenidAction extends Action $this->message(_m('Error connecting user.')); return; } - if ($sreg) { - if (!oid_update_user($cur, $sreg)) { - $this->message(_m('Error updating profile')); - return; + if (Event::handle('StartOpenIDUpdateUser', array($cur, $canonical, &$sreg))) { + if ($sreg) { + if (!oid_update_user($cur, $sreg)) { + $this->message(_m('Error updating profile')); + return; + } } } + Event::handle('EndOpenIDUpdateUser', array($cur, $canonical, $sreg)); // success! diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index 32b092a0bd..60d46d4ce9 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -280,6 +280,8 @@ class FinishopenidloginAction extends Action return; } + Event::handle('StartOpenIDCreateNewUser', array($canonical, &$sreg)); + $location = ''; if (!empty($sreg['country'])) { if ($sreg['postcode']) { @@ -319,6 +321,8 @@ class FinishopenidloginAction extends Action $result = oid_link_user($user->id, $canonical, $display); + Event::handle('EndOpenIDCreateNewUser', array($user, $canonical, $sreg)); + oid_set_last($display); common_set_user($user); common_real_login(true); @@ -358,7 +362,11 @@ class FinishopenidloginAction extends Action return; } - oid_update_user($user, $sreg); + if (Event::handle('StartOpenIDUpdateUser', array($user, $canonical, &$sreg))) { + oid_update_user($user, $sreg); + } + Event::handle('EndOpenIDUpdateUser', array($user, $canonical, $sreg)); + oid_set_last($display); common_set_user($user); common_real_login(true); diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 4ec336e1c3..cdeedbf4d0 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -212,11 +212,14 @@ function _oid_print_instructions() 'OpenID provider.')); } -# update a user from sreg parameters - -function oid_update_user(&$user, &$sreg) +/** + * Update a user from sreg parameters + * @param User $user + * @param array $sreg fields from OpenID sreg response + * @access private + */ +function oid_update_user($user, $sreg) { - $profile = $user->getProfile(); $orig_profile = clone($profile); diff --git a/plugins/WikiHowProfile/README b/plugins/WikiHowProfile/README new file mode 100644 index 0000000000..ee6096c9fb --- /dev/null +++ b/plugins/WikiHowProfile/README @@ -0,0 +1,6 @@ +This is an additional plugin which piggybacks on OpenID authentication to pull +profile information from WikiHow user pages when creating or updating accounts. + +WikiHow runs a customized MediaWiki setup, with locally-built extensions to add +profile features such as an avatar. As this additional info isn't yet exposed +through OpenID, we need to pull it separately. diff --git a/plugins/WikiHowProfile/WikiHowProfilePlugin.php b/plugins/WikiHowProfile/WikiHowProfilePlugin.php new file mode 100644 index 0000000000..b72bd55d6d --- /dev/null +++ b/plugins/WikiHowProfile/WikiHowProfilePlugin.php @@ -0,0 +1,196 @@ +. + * + * @category Plugins + * @package StatusNet + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Sample plugin main class + * + * Each plugin requires a main class to interact with the StatusNet system. + * + * @category Plugins + * @package WikiHowProfilePlugin + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +class WikiHowProfilePlugin extends Plugin +{ + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'WikiHow avatar fetcher', + 'version' => STATUSNET_VERSION, + 'author' => 'Brion Vibber', + 'homepage' => 'http://status.net/wiki/Plugin:Sample', + 'rawdescription' => + _m('Fetches avatar and other profile info for WikiHow users when setting up an account via OpenID.')); + return true; + } + + /** + * Hook for OpenID user creation; we'll pull the avatar. + * + * @param User $user + * @param string $canonical OpenID provider URL + * @param array $sreg query data from provider + */ + function onEndOpenIDCreateNewUser($user, $canonical, $sreg) + { + $this->updateProfile($user, $canonical); + return true; + } + + /** + * Hook for OpenID profile updating; we'll pull the avatar. + * + * @param User $user + * @param string $canonical OpenID provider URL (wiki profile page) + * @param array $sreg query data from provider + */ + function onEndOpenIDUpdateUser($user, $canonical, $sreg) + { + $this->updateProfile($user, $canonical); + return true; + } + + /** + * @param User $user + * @param string $canonical OpenID provider URL (wiki profile page) + */ + private function updateProfile($user, $canonical) + { + $prefix = 'http://www.wikihow.com/User:'; + + if (substr($canonical, 0, strlen($prefix)) == $prefix) { + // Yes, it's a WikiHow user! + $profile = $this->fetchProfile($canonical); + + if (!empty($profile['avatar'])) { + $this->saveAvatar($user, $profile['avatar']); + } + } + } + + /** + * Given a user's WikiHow profile URL, find their avatar. + * + * @param string $profileUrl user page on the wiki + * + * @return array of data; possible members: + * 'avatar' => full URL to avatar image + * + * @throws Exception on various low-level failures + * + * @todo pull location, web site, and about sections -- they aren't currently marked up cleanly. + */ + private function fetchProfile($profileUrl) + { + $client = HTTPClient::start(); + $response = $client->get($profileUrl); + if (!$response->isOk()) { + throw new Exception("WikiHow profile page fetch failed."); + // HTTP error response already logged. + return false; + } + + // Suppress warnings during HTML parsing; non-well-formed bits will + // spew horrible warning everywhere even though it works fine. + $old = error_reporting(); + error_reporting($old & ~E_WARNING); + + $dom = new DOMDocument(); + $ok = $dom->loadHTML($response->getBody()); + + error_reporting($old); + + if (!$ok) { + throw new Exception("HTML parse failure during check for WikiHow avatar."); + return false; + } + + $data = array(); + + $avatar = $dom->getElementById('avatarULimg'); + if ($avatar) { + $src = $avatar->getAttribute('src'); + + $base = new Net_URL2($profileUrl); + $absolute = $base->resolve($src); + $avatarUrl = strval($absolute); + + common_log(LOG_DEBUG, "WikiHow avatar found for $profileUrl - $avatarUrl"); + $data['avatar'] = $avatarUrl; + } + + return $data; + } + + /** + * Actually save the avatar we found locally. + * + * @param User $user + * @param string $url to avatar URL + * @todo merge wrapper funcs for this into common place for 1.0 core + */ + private function saveAvatar($user, $url) + { + if (!common_valid_http_url($url)) { + throw new ServerException(sprintf(_m("Invalid avatar URL %s"), $url)); + } + + // @fixme this should be better encapsulated + // ripped from OStatus via oauthstore.php (for old OMB client) + $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar'); + if (!copy($url, $temp_filename)) { + throw new ServerException(sprintf(_m("Unable to fetch avatar from %s"), $url)); + } + + $profile = $user->getProfile(); + $id = $profile->id; + // @fixme should we be using different ids? + + $imagefile = new ImageFile($id, $temp_filename); + $filename = Avatar::filename($id, + image_type_to_extension($imagefile->type), + null, + common_timestamp()); + rename($temp_filename, Avatar::path($filename)); + $profile->setOriginal($filename); + } + +} + From 80d1e86a7c54521f364600c85c9f29ff29aaa611 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 26 May 2010 00:39:44 +0000 Subject: [PATCH 174/730] Add repeat info to statusnet:notice_info Atom element --- classes/Notice.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index d85c8cd33a..3d7d21533b 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1240,7 +1240,7 @@ class Notice extends Memcached_DataObject $noticeInfoAttr = array( 'local_id' => $this->id, // local notice ID (useful to clients for ordering) - 'source' => $this->source // the client name (source attribution) + 'source' => $this->source, // the client name (source attribution) ); $ns = $this->getSource(); @@ -1251,7 +1251,11 @@ class Notice extends Memcached_DataObject } if (!empty($cur)) { - $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; + $noticeInfoAttr['favorite'] = ($cur->hasFave($this)) ? "true" : "false"; + } + + if (!empty($this->repeat_of)) { + $noticeInfoAttr['repeat_of'] = $this->repeat_of; } $xs->element('statusnet:notice_info', $noticeInfoAttr, null); From 3e9b35677746ba0a9877fd1a20ef4e3ae52bc7b5 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 26 May 2010 20:31:36 +0000 Subject: [PATCH 175/730] Remove settting/getting a 'verb' for Facebook stream entries / status updates. Facebook has disabled the ability to store user preferences via their old REST API, causing our application to break. Also, verbs in status updates seem to be deprecated, and stream posts don't seem to have a verb. --- plugins/Facebook/facebooksettings.php | 21 --------------- plugins/Facebook/facebookutil.php | 39 ++------------------------- 2 files changed, 2 insertions(+), 58 deletions(-) diff --git a/plugins/Facebook/facebooksettings.php b/plugins/Facebook/facebooksettings.php index 766d0e1996..f94a346b57 100644 --- a/plugins/Facebook/facebooksettings.php +++ b/plugins/Facebook/facebooksettings.php @@ -54,22 +54,11 @@ class FacebooksettingsAction extends FacebookAction $noticesync = $this->boolean('noticesync'); $replysync = $this->boolean('replysync'); - $prefix = $this->trimmed('prefix'); $original = clone($this->flink); $this->flink->set_flags($noticesync, false, $replysync, false); $result = $this->flink->update($original); - if ($prefix == '' || $prefix == '0') { - // Facebook bug: saving empty strings to prefs now fails - // http://bugs.developers.facebook.com/show_bug.cgi?id=7110 - $trimmed = $prefix . ' '; - } else { - $trimmed = substr($prefix, 0, 128); - } - $this->facebook->api_client->data_setUserPreference(FACEBOOK_NOTICE_PREFIX, - $trimmed); - if ($result === false) { $this->showForm(_m('There was a problem saving your sync preferences!')); } else { @@ -110,16 +99,6 @@ class FacebooksettingsAction extends FacebookAction $this->elementStart('li'); - $prefix = trim($this->facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX)); - - $this->input('prefix', _m('Prefix'), - ($prefix) ? $prefix : null, - _m('A string to prefix notices with.')); - - $this->elementEnd('li'); - - $this->elementStart('li'); - $this->submit('save', _m('Save')); $this->elementEnd('li'); diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index c7b0f02c31..1290fed557 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -256,11 +256,9 @@ function statusUpdate($notice, $user, $fbuid) . "Facebook UID: $fbuid" ); - $text = formatNotice($notice, $user, $fbuid); - $facebook = getFacebook(); $result = $facebook->api_client->users_setStatus( - $text, + $notice->content, $fbuid, false, true @@ -284,12 +282,11 @@ function publishStream($notice, $user, $fbuid) . "Facebook UID: $fbuid" ); - $text = formatNotice($notice, $user, $fbuid); $fbattachment = format_attachments($notice->attachments()); $facebook = getFacebook(); $facebook->api_client->stream_publish( - $text, + $notice->content, $fbattachment, null, null, @@ -304,38 +301,6 @@ function publishStream($notice, $user, $fbuid) ); } -function formatNotice($notice, $user, $fbuid) -{ - // Get the status 'verb' the user has set, if any - - common_debug( - "FacebookPlugin - Looking to see if $user->nickname ($user->id), " - . "Facebook UID: $fbuid has set a verb for Facebook posting..." - ); - - $facebook = getFacebook(); - $verb = trim( - $facebook->api_client->data_getUserPreference( - FACEBOOK_NOTICE_PREFIX, - $fbuid - ) - ); - - common_debug("Facebook returned " . var_export($verb, true)); - - $text = null; - - if (!empty($verb)) { - common_debug("FacebookPlugin - found a verb: $verb"); - $text = trim($verb) . ' ' . $notice->content; - } else { - common_debug("FacebookPlugin - no verb found."); - $text = $notice->content; - } - - return $text; -} - function updateProfileBox($facebook, $flink, $notice, $user) { $facebook = getFacebook(); From eed0facc87781e25e59337f1371489742a945764 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 27 May 2010 03:00:58 +0000 Subject: [PATCH 176/730] added user_location_prefs to upgrade script --- db/08to09_pg.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index b7a0eb8e8c..cc1edc5ec0 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -101,3 +101,13 @@ alter table queue_item rename to queue_item_old; alter table queue_item_new rename to queue_item; +create table user_location_prefs ( + user_id integer not null /*comment 'user who has the preference'*/ references "user" (id), + share_location int default 1 /* comment 'Whether to share location data'*/, + created timestamp not null /*comment 'date this record was created'*/, + modified timestamp /* comment 'date this record was modified'*/, + + primary key (user_id) +); + + From 11398190f0614ec73ecdfefc9d29cbe3f7703323 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 27 May 2010 03:00:58 +0000 Subject: [PATCH 177/730] added user_location_prefs to upgrade script --- db/08to09_pg.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index 1c9a31699a..de228c117b 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -102,3 +102,13 @@ alter table queue_item_new rename to queue_item; ALTER TABLE confirm_address ALTER column sent set default CURRENT_TIMESTAMP; +create table user_location_prefs ( + user_id integer not null /*comment 'user who has the preference'*/ references "user" (id), + share_location int default 1 /* comment 'Whether to share location data'*/, + created timestamp not null /*comment 'date this record was created'*/, + modified timestamp /* comment 'date this record was modified'*/, + + primary key (user_id) +); + + From af4fd327429fcc01769b33ece458a77a37b2463f Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 27 May 2010 03:06:42 +0000 Subject: [PATCH 178/730] added the inbox table to postgres upgrade script --- db/08to09_pg.sql | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index cc1edc5ec0..c2fabf63ba 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -110,4 +110,12 @@ create table user_location_prefs ( primary key (user_id) ); +create table inbox ( + + user_id integer not null /* comment 'user receiving the notice' */ references "user" (id), + notice_ids bytea /* comment 'packed list of notice ids' */, + + primary key (user_id) + +); From cc25ec175530a691686087db4c23a1a28ffd1b62 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 27 May 2010 03:06:42 +0000 Subject: [PATCH 179/730] added the inbox table to postgres upgrade script --- db/08to09_pg.sql | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index de228c117b..498a94e68a 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -111,4 +111,12 @@ create table user_location_prefs ( primary key (user_id) ); +create table inbox ( + + user_id integer not null /* comment 'user receiving the notice' */ references "user" (id), + notice_ids bytea /* comment 'packed list of notice ids' */, + + primary key (user_id) + +); From bcca10f5268ac2c2945479dd93d2f302478e02f9 Mon Sep 17 00:00:00 2001 From: Marcel van der Boom Date: Thu, 27 May 2010 19:25:45 +0200 Subject: [PATCH 180/730] Add implementation of API method home_timeline method --- plugins/TwitterBridge/twitteroauthclient.php | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/plugins/TwitterBridge/twitteroauthclient.php b/plugins/TwitterBridge/twitteroauthclient.php index d895d8c73c..6b821ba181 100644 --- a/plugins/TwitterBridge/twitteroauthclient.php +++ b/plugins/TwitterBridge/twitteroauthclient.php @@ -217,6 +217,36 @@ class TwitterOAuthClient extends OAuthClient return $statuses; } + /** + * Calls Twitter's /statuses/home_timeline API method + * + * @param int $since_id show statuses after this id + * @param int $max_id show statuses before this id + * @param int $cnt number of statuses to show + * @param int $page page number + * + * @return mixed an array of statuses, similare to friends_timeline, except including retweets + */ + function statusesHomeTimeline($since_id = null, $max_id = null, + $cnt = null, $page = null) + { + + $url = 'https://twitter.com/statuses/home_timeline.json'; + $params = array('since_id' => $since_id, + 'max_id' => $max_id, + 'count' => $cnt, + 'page' => $page); + $qry = http_build_query($params); + + if (!empty($qry)) { + $url .= "?$qry"; + } + + $response = $this->oAuthGet($url); + $statuses = json_decode($response); + return $statuses; + } + /** * Calls Twitter's /statuses/friends API method * From 4211b7f01188b4ab64407e32b380366a048102f4 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 27 May 2010 11:21:52 -0700 Subject: [PATCH 181/730] - Implement statusesHomeTimeline() in TwitterBasicAuthClient - Make TwitterStatusFetcher pull home_timeline (includes retweets) instead of friends_timeline --- .../daemons/twitterstatusfetcher.php | 2 +- .../TwitterBridge/twitterbasicauthclient.php | 31 ++++++++++++++++++- plugins/TwitterBridge/twitteroauthclient.php | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php index 7c624fdb3b..03a4bd3f34 100755 --- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php +++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php @@ -186,7 +186,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon $timeline = null; try { - $timeline = $client->statusesFriendsTimeline(); + $timeline = $client->statusesHomeTimeline(); } catch (Exception $e) { common_log(LOG_WARNING, $this->name() . ' - Twitter client unable to get friends timeline for user ' . diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php index 2c18c94695..cc68b50100 100644 --- a/plugins/TwitterBridge/twitterbasicauthclient.php +++ b/plugins/TwitterBridge/twitterbasicauthclient.php @@ -2,7 +2,7 @@ /** * StatusNet, the distributed open-source microblogging tool * - * Class for doing OAuth calls against Twitter + * Class for doing HTTP basic auth calls against Twitter * * PHP version 5 * @@ -125,6 +125,35 @@ class TwitterBasicAuthClient return $statuses; } + /** + * Calls Twitter's /statuses/home_timeline API method + * + * @param int $since_id show statuses after this id + * @param int $max_id show statuses before this id + * @param int $cnt number of statuses to show + * @param int $page page number + * + * @return mixed an array of statuses similar to friends timeline but including retweets + */ + function statusesFriendsTimeline($since_id = null, $max_id = null, + $cnt = null, $page = null) + { + $url = 'https://twitter.com/statuses/home_timeline.json'; + $params = array('since_id' => $since_id, + 'max_id' => $max_id, + 'count' => $cnt, + 'page' => $page); + $qry = http_build_query($params); + + if (!empty($qry)) { + $url .= "?$qry"; + } + + $response = $this->httpRequest($url); + $statuses = json_decode($response); + return $statuses; + } + /** * Calls Twitter's /statuses/friends API method * diff --git a/plugins/TwitterBridge/twitteroauthclient.php b/plugins/TwitterBridge/twitteroauthclient.php index 6b821ba181..f6ef786752 100644 --- a/plugins/TwitterBridge/twitteroauthclient.php +++ b/plugins/TwitterBridge/twitteroauthclient.php @@ -225,7 +225,7 @@ class TwitterOAuthClient extends OAuthClient * @param int $cnt number of statuses to show * @param int $page page number * - * @return mixed an array of statuses, similare to friends_timeline, except including retweets + * @return mixed an array of statuses, similar to friends_timeline but including retweets */ function statusesHomeTimeline($since_id = null, $max_id = null, $cnt = null, $page = null) From c5b61078e1548fba2820620e2e8f5fcbbda611a8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 27 May 2010 13:49:23 -0700 Subject: [PATCH 182/730] Pass auth user into Atom feed generators (needed for outputting favorited status in statusnet:notice_info tag) --- actions/apitimelinefavorites.php | 2 +- actions/apitimelinefriends.php | 2 +- actions/apitimelinegroup.php | 2 +- actions/apitimelinehome.php | 2 +- actions/apitimelinementions.php | 2 +- actions/apitimelinepublic.php | 2 +- actions/apitimelineretweetsofme.php | 2 +- actions/apitimelinetag.php | 2 +- actions/apitimelineuser.php | 2 +- lib/atomgroupnoticefeed.php | 5 +++-- lib/atomnoticefeed.php | 17 +++++++++++++++-- lib/atomusernoticefeed.php | 5 +++-- 12 files changed, 30 insertions(+), 15 deletions(-) diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index 79632447ef..a889b49182 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -150,7 +150,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction header('Content-Type: application/atom+xml; charset=utf-8'); - $atom = new AtomNoticeFeed(); + $atom = new AtomNoticeFeed($this->auth_user); $atom->setId($id); $atom->setTitle($title); diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index ac350ab1b7..9c6ffcf9c5 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -152,7 +152,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction header('Content-Type: application/atom+xml; charset=utf-8'); - $atom = new AtomNoticeFeed(); + $atom = new AtomNoticeFeed($this->auth_user); $atom->setId($id); $atom->setTitle($title); diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index 56d1de094c..76fa74767e 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -105,7 +105,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction function showTimeline() { // We'll pull common formatting out of this for other formats - $atom = new AtomGroupNoticeFeed($this->group); + $atom = new AtomGroupNoticeFeed($this->group, $this->auth_user); $self = $this->getSelfUri(); diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php index 1618c9923c..2a6b7bf5c1 100644 --- a/actions/apitimelinehome.php +++ b/actions/apitimelinehome.php @@ -151,7 +151,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction header('Content-Type: application/atom+xml; charset=utf-8'); - $atom = new AtomNoticeFeed(); + $atom = new AtomNoticeFeed($this->auth_user); $atom->setId($id); $atom->setTitle($title); diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index c3aec7c5af..dc39122e57 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -151,7 +151,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction header('Content-Type: application/atom+xml; charset=utf-8'); - $atom = new AtomNoticeFeed(); + $atom = new AtomNoticeFeed($this->auth_user); $atom->setId($id); $atom->setTitle($title); diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php index 9034614253..49062e603e 100644 --- a/actions/apitimelinepublic.php +++ b/actions/apitimelinepublic.php @@ -130,7 +130,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction header('Content-Type: application/atom+xml; charset=utf-8'); - $atom = new AtomNoticeFeed(); + $atom = new AtomNoticeFeed($this->auth_user); $atom->setId($id); $atom->setTitle($title); diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php index c77912fd0f..ea922fc427 100644 --- a/actions/apitimelineretweetsofme.php +++ b/actions/apitimelineretweetsofme.php @@ -117,7 +117,7 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction header('Content-Type: application/atom+xml; charset=utf-8'); - $atom = new AtomNoticeFeed(); + $atom = new AtomNoticeFeed($this->auth_user); $atom->setId($id); $atom->setTitle($title); diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php index fed1437ea8..c21b227020 100644 --- a/actions/apitimelinetag.php +++ b/actions/apitimelinetag.php @@ -138,7 +138,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction header('Content-Type: application/atom+xml; charset=utf-8'); - $atom = new AtomNoticeFeed(); + $atom = new AtomNoticeFeed($this->auth_user); $atom->setId($id); $atom->setTitle($title); diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 11431a82ca..9ee6abaf54 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -115,7 +115,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction // We'll use the shared params from the Atom stub // for other feed types. - $atom = new AtomUserNoticeFeed($this->user); + $atom = new AtomUserNoticeFeed($this->user, $this->auth_user); $link = common_local_url( 'showstream', diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php index 08c1c707c5..7934a4f9e5 100644 --- a/lib/atomgroupnoticefeed.php +++ b/lib/atomgroupnoticefeed.php @@ -50,12 +50,13 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed * Constructor * * @param Group $group the group for the feed + * @param User $cur the current authenticated user, if any * @param boolean $indent flag to turn indenting on or off * * @return void */ - function __construct($group, $indent = true) { - parent::__construct($indent); + function __construct($group, $cur = null, $indent = true) { + parent::__construct($cur, $indent); $this->group = $group; $title = sprintf(_("%s timeline"), $group->nickname); diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php index 35a45118ce..ef44de4b6c 100644 --- a/lib/atomnoticefeed.php +++ b/lib/atomnoticefeed.php @@ -44,9 +44,22 @@ if (!defined('STATUSNET')) */ class AtomNoticeFeed extends Atom10Feed { - function __construct($indent = true) { + var $cur; + + /** + * Constructor - adds a bunch of XML namespaces we need in our + * notice-specific Atom feeds, and allows setting the current + * authenticated user (useful for API methods). + * + * @param User $cur the current authenticated user (optional) + * @param boolean $indent Whether to indent XML output + * + */ + function __construct($cur = null, $indent = true) { parent::__construct($indent); + $this->cur = $cur; + // Feeds containing notice info use these namespaces $this->addNamespace( @@ -115,7 +128,7 @@ class AtomNoticeFeed extends Atom10Feed $source = $this->showSource(); $author = $this->showAuthor(); - $cur = common_current_user(); + $cur = empty($this->cur) ? common_current_user() : $this->cur; $this->addEntryRaw($notice->asAtomEntry(false, $source, $author, $cur)); } diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php index 428cc2de2f..b569d93790 100644 --- a/lib/atomusernoticefeed.php +++ b/lib/atomusernoticefeed.php @@ -50,13 +50,14 @@ class AtomUserNoticeFeed extends AtomNoticeFeed * Constructor * * @param User $user the user for the feed + * @param User $cur the current authenticated user, if any * @param boolean $indent flag to turn indenting on or off * * @return void */ - function __construct($user, $indent = true) { - parent::__construct($indent); + function __construct($user, $cur = null, $indent = true) { + parent::__construct($cur, $indent); $this->user = $user; if (!empty($user)) { $profile = $user->getProfile(); From 697a9948df3c9d4275b3525227007bfd5a1c5709 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 27 May 2010 14:18:08 -0700 Subject: [PATCH 183/730] Ticket #2329: fix for use of _m() translation functions from outside of plugin directories --- lib/language.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/language.php b/lib/language.php index 64b59e7396..3846b8f358 100644 --- a/lib/language.php +++ b/lib/language.php @@ -205,12 +205,20 @@ function _mdomain($backtrace) if (DIRECTORY_SEPARATOR !== '/') { $path = strtr($path, DIRECTORY_SEPARATOR, '/'); } - $cut = strpos($path, '/plugins/') + 9; - $cut2 = strpos($path, '/', $cut); - if ($cut && $cut2) { - $cached[$path] = substr($path, $cut, $cut2 - $cut); - } else { + $plug = strpos($path, '/plugins/'); + if ($plug === false) { + // We're not in a plugin; return null for the default domain. return null; + } else { + $cut = $plug + 9; + $cut2 = strpos($path, '/', $cut); + if ($cut2) { + $cached[$path] = substr($path, $cut, $cut2 - $cut); + } else { + // We might be running directly from the plugins dir? + // If so, there's no place to store locale info. + return null; + } } } return $cached[$path]; From 6317f7d92bf94f8563a7d9392631d0da06b3042b Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 27 May 2010 18:26:47 -0400 Subject: [PATCH 184/730] Assigning my copyrights to the Free Software Foundation --- actions/all.php | 1 + actions/apifavoritecreate.php | 1 + actions/apifavoritedestroy.php | 1 + actions/apigroupcreate.php | 1 + actions/apigroupismember.php | 1 + actions/apigroupjoin.php | 1 + actions/apigroupleave.php | 1 + actions/apigrouplist.php | 1 + actions/apigrouplistall.php | 1 + actions/apigroupmembership.php | 1 + actions/apigroupshow.php | 1 + actions/apistatusesdestroy.php | 1 + actions/apistatusesshow.php | 1 + actions/apistatusesupdate.php | 1 + actions/apitimelinefavorites.php | 1 + actions/apitimelinefriends.php | 1 + actions/apitimelinegroup.php | 1 + actions/apitimelinehome.php | 1 + actions/apitimelinementions.php | 1 + actions/apitimelinepublic.php | 1 + actions/apitimelinetag.php | 1 + actions/apitimelineuser.php | 1 + actions/geocode.php | 1 + actions/oembed.php | 1 + actions/publicxrds.php | 3 +++ actions/version.php | 2 ++ classes/Notice.php | 1 + index.php | 1 + install.php | 1 + lib/apiaction.php | 1 + lib/apiauth.php | 1 + lib/apibareauth.php | 3 ++- lib/apiprivateauth.php | 1 + lib/authenticationplugin.php | 1 + lib/authorizationplugin.php | 1 + lib/installer.php | 1 + lib/xrdsoutputter.php | 1 + plugins/Autocomplete/AutocompletePlugin.php | 3 ++- plugins/Autocomplete/autocomplete.php | 1 + plugins/BitlyUrl/BitlyUrlPlugin.php | 2 +- plugins/CasAuthentication/CasAuthenticationPlugin.php | 2 +- plugins/ClientSideShorten/ClientSideShortenPlugin.php | 2 +- plugins/ClientSideShorten/shorten.php | 1 + plugins/EmailAuthentication/EmailAuthenticationPlugin.php | 2 +- plugins/FirePHP/FirePHPPlugin.php | 8 +++++--- plugins/Imap/ImapPlugin.php | 4 +++- plugins/Imap/imapmanager.php | 2 ++ plugins/InfiniteScroll/InfiniteScrollPlugin.php | 2 +- plugins/LdapAuthentication/LdapAuthenticationPlugin.php | 2 +- plugins/LdapAuthorization/LdapAuthorizationPlugin.php | 2 +- plugins/LdapCommon/LdapCommon.php | 2 +- plugins/LdapCommon/MemcacheSchemaCache.php | 2 +- plugins/LilUrl/LilUrlPlugin.php | 2 +- plugins/Mapstraction/allmap.php | 1 + plugins/Mapstraction/map.php | 1 + plugins/Mapstraction/usermap.php | 1 + plugins/MemcachedPlugin.php | 8 ++++++-- plugins/Minify/MinifyPlugin.php | 1 + plugins/OpenID/OpenIDPlugin.php | 4 ++++ plugins/OpenID/openidserver.php | 2 ++ plugins/PtitUrl/PtitUrlPlugin.php | 2 +- .../RequireValidatedEmail/RequireValidatedEmailPlugin.php | 5 +++-- .../ReverseUsernameAuthenticationPlugin.php | 2 +- plugins/SimpleUrl/SimpleUrlPlugin.php | 2 +- plugins/TabFocus/TabFocusPlugin.php | 2 +- plugins/TightUrl/TightUrlPlugin.php | 2 +- plugins/UrlShortener/UrlShortenerPlugin.php | 1 + 67 files changed, 90 insertions(+), 25 deletions(-) diff --git a/actions/all.php b/actions/all.php index a977fce954..a6738863b2 100644 --- a/actions/all.php +++ b/actions/all.php @@ -27,6 +27,7 @@ * @author Craig Andrews * @author Jeffery To * @author Zach Copley + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license GNU Affero General Public License http://www.gnu.org/licenses/ * @link http://status.net */ diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php index 00b6349b0a..0447a92ba2 100644 --- a/actions/apifavoritecreate.php +++ b/actions/apifavoritecreate.php @@ -25,6 +25,7 @@ * @author Evan Prodromou * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php index c4daf480e6..9f2efdd003 100644 --- a/actions/apifavoritedestroy.php +++ b/actions/apifavoritedestroy.php @@ -25,6 +25,7 @@ * @author Evan Prodromou * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php index 3eb3ae5fcc..d216c15cd4 100644 --- a/actions/apigroupcreate.php +++ b/actions/apigroupcreate.php @@ -26,6 +26,7 @@ * @author Jeffery To * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php index f51c747dfb..eaa4769f3e 100644 --- a/actions/apigroupismember.php +++ b/actions/apigroupismember.php @@ -26,6 +26,7 @@ * @author Jeffery To * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php index 28df72fa9a..5265ec629e 100644 --- a/actions/apigroupjoin.php +++ b/actions/apigroupjoin.php @@ -26,6 +26,7 @@ * @author Jeffery To * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php index f6e52b26e8..8c100d58a8 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -26,6 +26,7 @@ * @author Jeffery To * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php index 3ea2c30cbb..148c802f43 100644 --- a/actions/apigrouplist.php +++ b/actions/apigrouplist.php @@ -26,6 +26,7 @@ * @author Jeffery To * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php index bd05fa3ea8..a8317608d7 100644 --- a/actions/apigrouplistall.php +++ b/actions/apigrouplistall.php @@ -26,6 +26,7 @@ * @author Jeffery To * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php index c97b27fac4..ffd5c7c7d5 100644 --- a/actions/apigroupmembership.php +++ b/actions/apigroupmembership.php @@ -26,6 +26,7 @@ * @author Jeffery To * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php index 8e471689a8..2998e505e2 100644 --- a/actions/apigroupshow.php +++ b/actions/apigroupshow.php @@ -26,6 +26,7 @@ * @author Jeffery To * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php index f7d52f0208..250b4236b0 100644 --- a/actions/apistatusesdestroy.php +++ b/actions/apistatusesdestroy.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php index 0315d2953e..476820a43d 100644 --- a/actions/apistatusesshow.php +++ b/actions/apistatusesshow.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index a0a81f3368..d65a068f50 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Zach Copley * @copyright 2009-2010 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index a889b49182..7228960c0b 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -25,6 +25,7 @@ * @author Evan Prodromou * @author Zach Copley * @copyright 2009-2010 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index a3340ff46c..40ce35979b 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Zach Copley * @copyright 2009-2010 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index 76fa74767e..c4a6a18d24 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -26,6 +26,7 @@ * @author Jeffery To * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php index 0470e96aa4..27eb741691 100644 --- a/actions/apitimelinehome.php +++ b/actions/apitimelinehome.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index dc39122e57..ed1ad20e32 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php index 5b88c97d99..f901642882 100644 --- a/actions/apitimelinepublic.php +++ b/actions/apitimelinepublic.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php index c21b227020..c7ec172aeb 100644 --- a/actions/apitimelinetag.php +++ b/actions/apitimelinetag.php @@ -26,6 +26,7 @@ * @author Jeffery To * @author Zach Copley * @copyright 2009-2010 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 9ee6abaf54..17a2836639 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/geocode.php b/actions/geocode.php index e883c6ce41..d934930608 100644 --- a/actions/geocode.php +++ b/actions/geocode.php @@ -37,6 +37,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @category Action * @package StatusNet * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ diff --git a/actions/oembed.php b/actions/oembed.php index 1503aa9c2b..e25e4cb259 100644 --- a/actions/oembed.php +++ b/actions/oembed.php @@ -23,6 +23,7 @@ * @package StatusNet * @author Evan Prodromou * @copyright 2008 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/actions/publicxrds.php b/actions/publicxrds.php index 5fd4eead7d..8f0337e4f7 100644 --- a/actions/publicxrds.php +++ b/actions/publicxrds.php @@ -8,7 +8,9 @@ * @category Action * @package StatusNet * @author Evan Prodromou + * @author Craig Andrews * @author Robin Millette + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ * @@ -44,6 +46,7 @@ require_once INSTALLDIR.'/lib/xrdsoutputter.php'; * @author Evan Prodromou * @author Robin Millette * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ * diff --git a/actions/version.php b/actions/version.php index b6593e5edb..9e4e836d24 100644 --- a/actions/version.php +++ b/actions/version.php @@ -41,6 +41,8 @@ if (!defined('STATUSNET')) { * @category Info * @package StatusNet * @author Evan Prodromou + * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 * @link http://status.net/ */ diff --git a/classes/Notice.php b/classes/Notice.php index 2613b17376..c8cfb5abb9 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Sarven Capadisli * @author Tom Adams + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license GNU Affero General Public License http://www.gnu.org/licenses/ */ diff --git a/index.php b/index.php index fa9f67269c..d68a057c4b 100644 --- a/index.php +++ b/index.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Sarven Capadisli * @author Tom Adams + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * * @license GNU Affero General Public License http://www.gnu.org/licenses/ */ diff --git a/install.php b/install.php index 08555d19b9..158d51fa33 100644 --- a/install.php +++ b/install.php @@ -31,6 +31,7 @@ * @author Sarven Capadisli * @author Tom Adams * @author Zach Copley + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license GNU Affero General Public License http://www.gnu.org/licenses/ * @version 0.9.x * @link http://status.net diff --git a/lib/apiaction.php b/lib/apiaction.php index 80a8a08d10..7085c096ba 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -28,6 +28,7 @@ * @author Toby Inkster * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/lib/apiauth.php b/lib/apiauth.php index 9c68e27713..91cb64262b 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -30,6 +30,7 @@ * @author Sarven Capadisli * @author Zach Copley * @copyright 2009-2010 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/lib/apibareauth.php b/lib/apibareauth.php index 2d29c1ddd6..da7af12614 100644 --- a/lib/apibareauth.php +++ b/lib/apibareauth.php @@ -32,6 +32,7 @@ * @author Sarven Capadisli * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -106,4 +107,4 @@ class ApiBareAuthAction extends ApiAuthAction return false; } -} \ No newline at end of file +} diff --git a/lib/apiprivateauth.php b/lib/apiprivateauth.php index 5d00330053..5e78c65a19 100644 --- a/lib/apiprivateauth.php +++ b/lib/apiprivateauth.php @@ -31,6 +31,7 @@ * @author Sarven Capadisli * @author Zach Copley * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/lib/authenticationplugin.php b/lib/authenticationplugin.php index 0a3763e2e4..dbdf206298 100644 --- a/lib/authenticationplugin.php +++ b/lib/authenticationplugin.php @@ -22,6 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/lib/authorizationplugin.php b/lib/authorizationplugin.php index 3790bccf4b..d71f772435 100644 --- a/lib/authorizationplugin.php +++ b/lib/authorizationplugin.php @@ -22,6 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/lib/installer.php b/lib/installer.php index 58ffbfef7e..1cad2fd20a 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -32,6 +32,7 @@ * @author Sarven Capadisli * @author Tom Adams * @author Zach Copley + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license GNU Affero General Public License http://www.gnu.org/licenses/ * @version 0.9.x * @link http://status.net diff --git a/lib/xrdsoutputter.php b/lib/xrdsoutputter.php index 4b77ed5a3a..95dc73300a 100644 --- a/lib/xrdsoutputter.php +++ b/lib/xrdsoutputter.php @@ -23,6 +23,7 @@ * @package StatusNet * @author Craig Andrews * @copyright 2008 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php index b2b18bf275..b2be365dd6 100644 --- a/plugins/Autocomplete/AutocompletePlugin.php +++ b/plugins/Autocomplete/AutocompletePlugin.php @@ -22,7 +22,8 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2010 Free Software Foundation http://fsf.org + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php index 379390ffdf..9a30ba01d9 100644 --- a/plugins/Autocomplete/autocomplete.php +++ b/plugins/Autocomplete/autocomplete.php @@ -23,6 +23,7 @@ * @package StatusNet * @author Craig Andrews * @copyright 2008-2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php index f7f28b4d6c..11e3c0b84b 100644 --- a/plugins/BitlyUrl/BitlyUrlPlugin.php +++ b/plugins/BitlyUrl/BitlyUrlPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php index 203e5fe420..1662db3eba 100644 --- a/plugins/CasAuthentication/CasAuthenticationPlugin.php +++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php index ba1f7d3a7c..57f5ad89e0 100644 --- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php +++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/ClientSideShorten/shorten.php b/plugins/ClientSideShorten/shorten.php index 07c19e2e7c..f67cbf3b28 100644 --- a/plugins/ClientSideShorten/shorten.php +++ b/plugins/ClientSideShorten/shorten.php @@ -23,6 +23,7 @@ * @package StatusNet * @author Craig Andrews * @copyright 2008-2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php index 406c000731..4c018537b8 100644 --- a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php +++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/FirePHP/FirePHPPlugin.php b/plugins/FirePHP/FirePHPPlugin.php index 9143ff69ca..d984ec1af4 100644 --- a/plugins/FirePHP/FirePHPPlugin.php +++ b/plugins/FirePHP/FirePHPPlugin.php @@ -24,11 +24,13 @@ Author URI: http://candrews.integralblue.com/ * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . - */ - -/** + * @category Plugin * @package MinifyPlugin * @maintainer Craig Andrews + * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ */ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php index d1e920b009..66be799d3e 100644 --- a/plugins/Imap/ImapPlugin.php +++ b/plugins/Imap/ImapPlugin.php @@ -21,8 +21,9 @@ * * @category Plugin * @package StatusNet - * @author Zach Copley + * @author Craig Andrews * @copyright 2009-2010 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org + * @maintainer Craig Andrews * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php index a4d1a5d05c..50c1b5a208 100644 --- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php +++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index 0dfc4c63be..52d326287f 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php index 97103d158e..3842385cf9 100644 --- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php +++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php index ee436d8243..1f1647a753 100644 --- a/plugins/LdapCommon/LdapCommon.php +++ b/plugins/LdapCommon/LdapCommon.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/LdapCommon/MemcacheSchemaCache.php b/plugins/LdapCommon/MemcacheSchemaCache.php index 6b91d17d64..4ee2e8e16a 100644 --- a/plugins/LdapCommon/MemcacheSchemaCache.php +++ b/plugins/LdapCommon/MemcacheSchemaCache.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php index c3e37c0c0f..1c3d6f84b3 100644 --- a/plugins/LilUrl/LilUrlPlugin.php +++ b/plugins/LilUrl/LilUrlPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php index e73aa76e8e..5dab670e26 100644 --- a/plugins/Mapstraction/allmap.php +++ b/plugins/Mapstraction/allmap.php @@ -38,6 +38,7 @@ if (!defined('STATUSNET')) { * @package StatusNet * @author Evan Prodromou * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php index b809c1b8e2..7dab8e10a9 100644 --- a/plugins/Mapstraction/map.php +++ b/plugins/Mapstraction/map.php @@ -38,6 +38,7 @@ if (!defined('STATUSNET')) { * @package StatusNet * @author Evan Prodromou * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/Mapstraction/usermap.php b/plugins/Mapstraction/usermap.php index ff47b6adaf..094334f605 100644 --- a/plugins/Mapstraction/usermap.php +++ b/plugins/Mapstraction/usermap.php @@ -38,6 +38,7 @@ if (!defined('STATUSNET')) { * @package StatusNet * @author Evan Prodromou * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/MemcachedPlugin.php b/plugins/MemcachedPlugin.php index 707e6db9aa..77b989b951 100644 --- a/plugins/MemcachedPlugin.php +++ b/plugins/MemcachedPlugin.php @@ -22,8 +22,10 @@ * * @category Cache * @package StatusNet - * @author Evan Prodromou , Craig Andrews + * @author Evan Prodromou + * @author Craig Andrews * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -43,8 +45,10 @@ if (!defined('STATUSNET')) { * * @category Cache * @package StatusNet - * @author Evan Prodromou , Craig Andrews + * @author Evan Prodromou + * @author Craig Andrews * @copyright 2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index 69def60641..13010e75a1 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -29,6 +29,7 @@ Author URI: http://candrews.integralblue.com/ /** * @package MinifyPlugin * @maintainer Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org */ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index fdcfacfa5d..7d6a5dc000 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -20,7 +20,9 @@ * @category Plugin * @package StatusNet * @author Evan Prodromou + * @author Craig Andrews * @copyright 2009-2010 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -38,6 +40,8 @@ if (!defined('STATUSNET')) { * @category Plugin * @package StatusNet * @author Evan Prodromou + * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ * @link http://openid.net/ diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php index f7e3a45f20..0e16881c5f 100644 --- a/plugins/OpenID/openidserver.php +++ b/plugins/OpenID/openidserver.php @@ -23,6 +23,7 @@ * @package StatusNet * @author Craig Andrews * @copyright 2008-2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -43,6 +44,7 @@ require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php'); * @category Settings * @package StatusNet * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php index ddba942e6d..2963e8997b 100644 --- a/plugins/PtitUrl/PtitUrlPlugin.php +++ b/plugins/PtitUrl/PtitUrlPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index 009a2f78e1..af75b96e0b 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -21,8 +21,9 @@ * * @category Plugin * @package StatusNet - * @author Craig Andrews , Brion Vibber - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @author Craig Andrews + * @author Brion Vibber + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php index dac5a15884..8a05a77340 100644 --- a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php +++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php index 6eac7dbb1e..5e2e858782 100644 --- a/plugins/SimpleUrl/SimpleUrlPlugin.php +++ b/plugins/SimpleUrl/SimpleUrlPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/TabFocus/TabFocusPlugin.php b/plugins/TabFocus/TabFocusPlugin.php index bf89c478c3..46e329d8a4 100644 --- a/plugins/TabFocus/TabFocusPlugin.php +++ b/plugins/TabFocus/TabFocusPlugin.php @@ -23,7 +23,7 @@ * @package StatusNet * @author Craig Andrews * @author Paul Irish - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php index e2d494a7bd..b8e5addb11 100644 --- a/plugins/TightUrl/TightUrlPlugin.php +++ b/plugins/TightUrl/TightUrlPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/UrlShortener/UrlShortenerPlugin.php b/plugins/UrlShortener/UrlShortenerPlugin.php index 027624b7ae..41f64bb26d 100644 --- a/plugins/UrlShortener/UrlShortenerPlugin.php +++ b/plugins/UrlShortener/UrlShortenerPlugin.php @@ -22,6 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ From fcf698d9ce482721baa19adc2b29be81f7bf017a Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 28 May 2010 01:08:49 +0200 Subject: [PATCH 185/730] Localisation updates from http://translatewiki.net --- locale/ca/LC_MESSAGES/statusnet.po | 253 +++++++++++++++-------------- locale/nl/LC_MESSAGES/statusnet.po | 252 ++++++++++++++-------------- locale/pl/LC_MESSAGES/statusnet.po | 253 +++++++++++++++-------------- locale/statusnet.pot | 246 ++++++++++++++-------------- locale/uk/LC_MESSAGES/statusnet.po | 253 +++++++++++++++-------------- 5 files changed, 634 insertions(+), 623 deletions(-) diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 3422296611..a278da72a5 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:36:45+0000\n" +"POT-Creation-Date: 2010-05-27 22:55+0000\n" +"PO-Revision-Date: 2010-05-27 22:56:26+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r66982); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -87,24 +87,24 @@ msgid "Save" msgstr "Desa" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "No existeix la pàgina." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -117,7 +117,7 @@ msgid "No such user." msgstr "No existeix l'usuari." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s i amics, pàgina %2$d" @@ -125,33 +125,33 @@ msgstr "%1$s i amics, pàgina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s i amics" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Canal dels amics de %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Canal dels amics de %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Canal dels amics de %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -159,7 +159,7 @@ msgstr "" "Aquesta és la línia temporal de %s i amics, però ningú hi ha publicat res " "encara." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -169,7 +169,7 @@ msgstr "" "publiqueu quelcom personal." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -179,7 +179,7 @@ msgstr "" "quelcom per reclamar-li l'atenció](%%%%action.newnotice%%%%?status_textarea=%" "3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -189,14 +189,14 @@ msgstr "" "publiqueu un avís a la seva atenció." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Un mateix i amics" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualitzacions de %1$s i amics a %2$s!" @@ -207,22 +207,22 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "No s'ha trobat el mètode API!" @@ -232,11 +232,11 @@ msgstr "No s'ha trobat el mètode API!" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Aquest mètode requereix POST." @@ -268,7 +268,7 @@ msgstr "No s'ha pogut desar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -346,24 +346,24 @@ msgstr "" "No es pot enviar missatges directes a usuaris que no siguin els vostres " "amics." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "No s'ha trobat cap estat amb aquest ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Aquest estat ja és un preferit." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "No es pot crear el preferit." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "L'estat no és un preferit." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "No s'ha pogut eliminar el preferit." @@ -396,7 +396,7 @@ msgstr "No s'ha pogut determinar l'usuari d'origen." msgid "Could not find target user." msgstr "No s'ha pogut trobar l'usuari de destinació." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -404,113 +404,113 @@ msgstr "" "El sobrenom ha de tenir només lletres minúscules i números i no pot tenir " "espais." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Aquest sobrenom ja existeix. Prova un altre. " -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Sobrenom no vàlid." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "La pàgina personal no és un URL vàlid." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "La descripció és massa llarga (màx. %d caràcters)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "La ubicació és massa llarga (màx. 255 caràcters)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Hi ha massa àlies! Màxim %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "L'àlies no és vàlid: «%s»." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "L'àlies «%s» ja està en ús. Proveu-ne un altre." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "L'àlies no pot ser el mateix que el sobrenom." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "No s'ha trobat el grup." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Ja sou membre del grup." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "L'administrador us ha blocat del grup." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "No sou un membre del grup." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Grups de %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "%1$s grups dels que %2$s és membre." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s grups" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "grups sobre %s" @@ -525,7 +525,7 @@ msgstr "El testimoni no és vàlid." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -631,11 +631,11 @@ msgstr "Permet" msgid "Allow or deny access to your account information." msgstr "Permet o denega l'accés a la informació del vostre compte." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Aquest mètode requereix POST o DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "No podeu eliminar l'estat d'un altre usuari." @@ -652,25 +652,25 @@ msgstr "No podeu repetir els vostres propis avisos." msgid "Already repeated that notice." msgstr "Avís duplicat." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "S'ha eliminat l'estat." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "No s'ha trobat cap estatus amb la ID trobada." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Massa llarg. La longitud màxima és de %d caràcters." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "No s'ha trobat." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt." @@ -679,32 +679,32 @@ msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt msgid "Unsupported format." msgstr "El format no està implementat." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Preferits de %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualitzacions preferides per %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualitzacions que mencionen %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s actualitzacions que responen a avisos de %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s línia temporal pública" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s actualitzacions de tothom!" @@ -719,12 +719,12 @@ msgstr "Repetit a %s" msgid "Repeats of %s" msgstr "Repeticions de %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Aviso etiquetats amb %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualitzacions etiquetades amb %1$s el %2$s!" @@ -1857,7 +1857,7 @@ msgstr "Fes l'usuari administrador" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s línia temporal" @@ -2542,30 +2542,30 @@ msgstr "" "Els desenvolupadors poden editar els paràmetres de registre de llurs " "aplicacions " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "L'avís no té cap perfil." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "estat de %1$s a %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "El tipus de contingut %s no està permès." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Si us plau, només URL %s sobre HTTP pla." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -3557,7 +3557,7 @@ msgstr "No podeu revocar els rols d'usuari en aquest lloc." msgid "User doesn't have this role." msgstr "L'usuari no té aquest rol." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3614,7 +3614,7 @@ msgid "Icon" msgstr "Icona" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Nom" @@ -3625,7 +3625,7 @@ msgid "Organization" msgstr "Organització" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descripció" @@ -4607,7 +4607,7 @@ msgstr "" "us als avisos d'aquest usuari. Si no heu demanat subscriure-us als avisos de " "ningú, feu clic a «Rebutja»." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Llicència" @@ -4736,18 +4736,18 @@ msgstr "Proveu de [cercar grups](%%action.groupsearch%%) i unir-vos-hi." #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualitzacions de %1$s a %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4756,11 +4756,11 @@ msgstr "" "El lloc funciona gràcies a %1$s versió %2$s. Copyright 2008-2010 StatusNet, " "Inc. i col·laboradors." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Col·laboració" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4772,7 +4772,7 @@ msgstr "" "i com la publica la Free Software Foundation; tant per a la versió 3 de la " "llicència, com (a la vostra discreció) per a una versió posterior. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4784,7 +4784,7 @@ msgstr "" "comercialització o idoneïtat per a cap propòsit en particular. Consulteu la " "llicència GNU Affero General Public License per a més detalls. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4793,20 +4793,20 @@ msgstr "" "Hauríeu d'haver rebut una còpia de la llicència GNU Affero General Public " "License juntament amb el programa. Si no és així, consulteu %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Connectors" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Versió" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Autoria" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4815,13 +4815,13 @@ msgstr "" "Cap fitxer pot ser major de %d bytes i el fitxer que heu enviat era de %d " "bytes. Proveu de pujar una versió de mida menor." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Un fitxer d'aquesta mida excediria la vostra quota d'usuari de %d bytes." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4861,28 +4861,28 @@ msgid "Could not update message with new URI." msgstr "No s'ha pogut inserir el missatge amb la nova URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "" "S'ha produït un error de la base de dades en inserir una etiqueta de " "coixinet (%): %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "S'ha produït un problema en desar l'avís. És massa llarg." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "S'ha produït un problema en desar l'avís. Usuari desconegut." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Massa avisos massa ràpid; pren un respir i publica de nou en uns minuts." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4890,21 +4890,21 @@ msgstr "" "Massa missatges duplicats en massa poc temps; preneu un respir i torneu a " "enviar en uns minuts." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Ha estat bandejat de publicar avisos en aquest lloc." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "S'ha produït un problema en desar la safata d'entrada del grup." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5368,7 +5368,7 @@ msgid "Snapshots configuration" msgstr "Configuració de les instantànies" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "El recurs API requereix accés de lectura i d'escriptura, però només en teniu " @@ -5501,11 +5501,11 @@ msgstr "Avisos on apareix l'adjunt" msgid "Tags for this attachment" msgstr "Etiquetes de l'adjunció" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "El canvi de contrasenya ha fallat" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "No es permet el canvi de contrasenya" @@ -6147,6 +6147,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Si creieu que el compte s'està fent servir de forma abusiva, podeu blocar-lo " +"de la llista dels vostres subscriptors i notificar-lo com a brossa als " +"administradors del lloc a %s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 0e9304401c..cec30f745b 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:08+0000\n" +"POT-Creation-Date: 2010-05-27 22:55+0000\n" +"PO-Revision-Date: 2010-05-27 22:57:42+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r66982); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -85,24 +85,24 @@ msgid "Save" msgstr "Opslaan" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Deze pagina bestaat niet." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -115,7 +115,7 @@ msgid "No such user." msgstr "Onbekende gebruiker." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s en vrienden, pagina %2$d" @@ -123,33 +123,33 @@ msgstr "%1$s en vrienden, pagina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s en vrienden" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Feed voor vrienden van %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Feed voor vrienden van %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Feed voor vrienden van %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -157,7 +157,7 @@ msgstr "" "Dit is de tijdlijn voor %s en vrienden, maar niemand heeft nog mededelingen " "geplaatst." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -167,7 +167,7 @@ msgstr "" "groups%%) of plaats zelf berichten." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -177,7 +177,7 @@ msgstr "" "bericht voor die gebruiker plaatsen](%%%%action.newnotice%%%%?" "status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -187,14 +187,14 @@ msgstr "" "een bericht sturen." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "U en vrienden" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates van %1$s en vrienden op %2$s." @@ -205,22 +205,22 @@ msgstr "Updates van %1$s en vrienden op %2$s." #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "De API-functie is niet aangetroffen." @@ -230,11 +230,11 @@ msgstr "De API-functie is niet aangetroffen." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Deze methode vereist een POST." @@ -266,7 +266,7 @@ msgstr "Het was niet mogelijk het profiel op te slaan." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -344,24 +344,24 @@ msgstr "" "U kunt geen privéberichten sturen aan gebruikers die niet op uw " "vriendenlijst staan." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Er is geen status gevonden met dit ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Deze mededeling staat al in uw favorietenlijst." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Het was niet mogelijk een favoriet aan te maken." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Deze mededeling staat niet in uw favorietenlijst." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "" "Het was niet mogelijk deze mededeling van uw favorietenlijst te verwijderen." @@ -397,7 +397,7 @@ msgstr "Het was niet mogelijk de brongebruiker te bepalen." msgid "Could not find target user." msgstr "Het was niet mogelijk de doelgebruiker te vinden." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -405,114 +405,114 @@ msgstr "" "De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties " "zijn niet toegestaan." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "" "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Ongeldige gebruikersnaam!" -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "De thuispagina is geen geldige URL." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "De volledige naam is te lang (maximaal 255 tekens)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "De beschrijving is te lang (maximaal %d tekens)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Locatie is te lang (maximaal 255 tekens)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Te veel aliassen! Het maximale aantal is %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Ongeldige alias: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "De alias \"%s\" wordt al gebruikt. Geef een andere alias op." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "De groep is niet aangetroffen." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "U bent al lid van die groep." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "U bent geen lid van deze groep." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Groepen van %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "Groepen op de site %1$s waar %2$s lid van is." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s groepen" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "groepen op %s" @@ -527,7 +527,7 @@ msgstr "Ongeldig token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -637,11 +637,11 @@ msgstr "Toestaan" msgid "Allow or deny access to your account information." msgstr "Toegang tot uw gebruikersgegevens toestaan of ontzeggen." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Deze methode vereist een POST of DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "U kunt de status van een andere gebruiker niet verwijderen." @@ -658,25 +658,25 @@ msgstr "U kunt uw eigen mededeling niet herhalen." msgid "Already repeated that notice." msgstr "U hebt die mededeling al herhaald." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "De status is verwijderd." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Er is geen status gevonden met dit ID." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "De mededeling is te lang. Gebruik maximaal %d tekens." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Niet aangetroffen." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -687,32 +687,32 @@ msgstr "" msgid "Unsupported format." msgstr "Niet-ondersteund bestandsformaat." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favorieten van %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Updates over %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s publieke tijdlijn" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s updates van iedereen" @@ -727,12 +727,12 @@ msgstr "Herhaald naar %s" msgid "Repeats of %s" msgstr "Herhaald van %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Mededelingen met het label %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Updates met het label %1$s op %2$s!" @@ -1875,7 +1875,7 @@ msgstr "Deze gebruiker beheerder maken" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s tijdlijn" @@ -2565,30 +2565,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" "Ontwikkelaars kunnen de registratiegegevens voor hun applicaties bewerken " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Mededeling heeft geen profiel." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Status van %1$s op %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Inhoudstype %s wordt niet ondersteund." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Alleen URL's voor %s via normale HTTP alstublieft." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -3581,7 +3581,7 @@ msgstr "U kunt geen gebruikersrollen intrekken op deze website." msgid "User doesn't have this role." msgstr "Deze gebruiker heeft deze rol niet." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3638,7 +3638,7 @@ msgid "Icon" msgstr "Icoon" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Naam" @@ -3649,7 +3649,7 @@ msgid "Organization" msgstr "Organisatie" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beschrijving" @@ -4639,7 +4639,7 @@ msgstr "" "aangegeven dat u zich op de mededelingen van een gebruiker wilt abonneren, " "klik dan op \"Afwijzen\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licentie" @@ -4769,18 +4769,18 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Updates van %1$s op %2$s." -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4789,11 +4789,11 @@ msgstr "" "Deze website wordt aangedreven door %1$2 versie %2$s. Auteursrechten " "voorbehouden 2008-2010 Statusnet, Inc. en medewerkers." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Medewerkers" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4805,7 +4805,7 @@ msgstr "" "zoals gepubliceerd door de Free Software Foundation, versie 3 van de " "Licentie, of (naar uw keuze) elke latere versie. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4817,7 +4817,7 @@ msgstr "" "GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Affero General Public License " "voor meer details. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4826,20 +4826,20 @@ msgstr "" "Samen met dit programma hoort u een kopie van de GNU Affero General Public " "License te hebben ontvangen. Zo niet, zie dan %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Plug-ins" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Versie" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Auteur(s)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4848,13 +4848,13 @@ msgstr "" "Bestanden mogen niet groter zijn dan %d bytes, en uw bestand was %d bytes. " "Probeer een kleinere versie te uploaden." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Een bestand van deze grootte overschijdt uw gebruikersquota van %d bytes." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4894,31 +4894,31 @@ msgid "Could not update message with new URI." msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "" "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te " "lang." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "" "Er was een probleem bij het opslaan van de mededeling. De gebruiker is " "onbekend." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer " "het over enige tijd weer." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4926,16 +4926,16 @@ msgstr "" "Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en " "plaats over een aantal minuten pas weer een bericht." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "" "Er is een probleem opgetreden bij het opslaan van het Postvak IN van de " @@ -4943,7 +4943,7 @@ msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5406,7 +5406,7 @@ msgid "Snapshots configuration" msgstr "Snapshotinstellingen" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen " @@ -5539,11 +5539,11 @@ msgstr "Mededelingen die deze bijlage bevatten" msgid "Tags for this attachment" msgstr "Labels voor deze bijlage" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Wachtwoord wijzigen is mislukt" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Wachtwoord wijzigen is niet toegestaan" @@ -6194,6 +6194,8 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Als u denkt dat deze gebruiker wordt misbruikt, dan kunt u deze voor uw " +"abonnees blokkeren en als spam rapporteren naar de websitebeheerders op %s." #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 4d4c85c3a8..6ebf7f8085 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:11+0000\n" +"POT-Creation-Date: 2010-05-27 22:55+0000\n" +"PO-Revision-Date: 2010-05-27 22:57:45+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r66982); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -89,24 +89,24 @@ msgid "Save" msgstr "Zapisz" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Nie ma takiej strony." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -119,7 +119,7 @@ msgid "No such user." msgstr "Brak takiego użytkownika." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s i przyjaciele, strona %2$d" @@ -127,33 +127,33 @@ msgstr "%1$s i przyjaciele, strona %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "Użytkownik %s i przyjaciele" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Kanał dla znajomych użytkownika %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -161,7 +161,7 @@ msgstr "" "To jest oś czasu użytkownika %s i przyjaciół, ale nikt jeszcze nic nie " "wysłał." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -171,7 +171,7 @@ msgstr "" "wysłać coś samemu." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -181,7 +181,7 @@ msgstr "" "[wysłać coś wymagającego jego uwagi](%%%%action.newnotice%%%%?" "status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -191,14 +191,14 @@ msgstr "" "szturchniesz użytkownika %s lub wyślesz wpis wymagającego jego uwagi." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Ty i przyjaciele" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualizacje z %1$s i przyjaciół na %2$s." @@ -209,22 +209,22 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s." #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "Nie odnaleziono metody API." @@ -234,11 +234,11 @@ msgstr "Nie odnaleziono metody API." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Ta metoda wymaga POST." @@ -269,7 +269,7 @@ msgstr "Nie można zapisać profilu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -347,24 +347,24 @@ msgstr "" "Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są " "twoimi przyjaciółmi." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Nie odnaleziono stanów z tym identyfikatorem." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Ten stan jest już ulubiony." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Nie można utworzyć ulubionego wpisu." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Ten stan nie jest ulubiony." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Nie można usunąć ulubionego wpisu." @@ -398,119 +398,119 @@ msgstr "Nie można określić użytkownika źródłowego." msgid "Could not find target user." msgstr "Nie można odnaleźć użytkownika docelowego." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Pseudonim jest już używany. Spróbuj innego." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "To nie jest prawidłowy pseudonim." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Strona domowa nie jest prawidłowym adresem URL." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Opis jest za długi (maksymalnie %d znaków)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Położenie jest za długie (maksymalnie 255 znaków)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Za dużo aliasów. Maksymalnie %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Nieprawidłowy alias: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Alias \"%s\" jest już używany. Spróbuj innego." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Alias nie może być taki sam jak pseudonim." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Nie odnaleziono grupy." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Jesteś już członkiem tej grupy." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Zostałeś zablokowany w tej grupie przez administratora." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Nie jesteś członkiem tej grupy." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Grupy użytkownika %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "%2$s jest członkiem grup %1$s." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Grupy %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "grupy na %s" @@ -525,7 +525,7 @@ msgstr "Nieprawidłowy token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -628,11 +628,11 @@ msgstr "Zezwól" msgid "Allow or deny access to your account information." msgstr "Zezwól lub odmów dostęp do informacji konta." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Ta metoda wymaga POST lub DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Nie można usuwać stanów innych użytkowników." @@ -649,25 +649,25 @@ msgstr "Nie można powtórzyć własnego wpisu." msgid "Already repeated that notice." msgstr "Już powtórzono ten wpis." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Usunięto stan." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Nie odnaleziono stanów z tym identyfikatorem." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Nie odnaleziono." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika." @@ -676,32 +676,32 @@ msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika msgid "Unsupported format." msgstr "Nieobsługiwany format." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s/ulubione wpisy od %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s/aktualizacje wspominające %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Publiczna oś czasu użytkownika %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Użytkownik %s aktualizuje od każdego." @@ -716,12 +716,12 @@ msgstr "Powtórzone dla %s" msgid "Repeats of %s" msgstr "Powtórzenia %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Wpisy ze znacznikiem %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aktualizacje ze znacznikiem %1$s na %2$s." @@ -1846,7 +1846,7 @@ msgstr "Uczyń tego użytkownika administratorem" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Oś czasu użytkownika %s" @@ -2524,30 +2524,30 @@ msgstr "Nie upoważniono żadnych aplikacji do używania konta." msgid "Developers can edit the registration settings for their applications " msgstr "Programiści mogą zmodyfikować ustawienia rejestracji swoich aplikacji " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Wpis nie posiada profilu." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Stan użytkownika %1$s na %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Typ zawartości %s jest nieobsługiwany." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -3530,7 +3530,7 @@ msgstr "Nie można unieważnić rol użytkowników na tej witrynie." msgid "User doesn't have this role." msgstr "Użytkownik nie ma tej roli." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3587,7 +3587,7 @@ msgid "Icon" msgstr "Ikona" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Nazwa" @@ -3598,7 +3598,7 @@ msgid "Organization" msgstr "Organizacja" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Opis" @@ -4577,7 +4577,7 @@ msgstr "" "wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, " "naciśnij \"Odrzuć\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licencja" @@ -4703,18 +4703,18 @@ msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Aktualizacje z %1$s na %2$s." -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4723,11 +4723,11 @@ msgstr "" "Ta witryna korzysta z oprogramowania %1$s w wersji %2$s, Copyright 2008-2010 " "StatusNet, Inc. i współtwórcy." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Współtwórcy" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4739,7 +4739,7 @@ msgstr "" "wydanej przez Fundację Wolnego Oprogramowania (Free Software Foundation) - " "według wersji trzeciej tej Licencji lub którejś z późniejszych wersji. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4752,7 +4752,7 @@ msgstr "" "bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną " "Affero GNU. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4762,20 +4762,20 @@ msgstr "" "Powszechnej Licencji Publicznej Affero GNU (GNU Affero General Public " "License); jeśli nie - proszę odwiedzić stronę internetową %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Wtyczki" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Wersja" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Autorzy" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4784,13 +4784,13 @@ msgstr "" "Żaden plik nie może być większy niż %d bajty, a wysłany plik miał %d bajty. " "Spróbuj wysłać mniejszą wersję." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Plik tej wielkości przekroczyłby przydział użytkownika wynoszący %d bajty." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4831,27 +4831,27 @@ msgid "Could not update message with new URI." msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Problem podczas zapisywania wpisu. Za długi." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za " "kilka minut." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4859,21 +4859,21 @@ msgstr "" "Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i " "wyślij ponownie za kilka minut." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Zabroniono ci wysyłania wpisów na tej witrynie." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problem podczas zapisywania wpisu." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5336,7 +5336,7 @@ msgid "Snapshots configuration" msgstr "Konfiguracja migawek" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko " @@ -5469,11 +5469,11 @@ msgstr "Powiadamia, kiedy pojawia się ten załącznik" msgid "Tags for this attachment" msgstr "Znaczniki dla tego załącznika" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Zmiana hasła nie powiodła się" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Zmiana hasła nie jest dozwolona" @@ -6120,6 +6120,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Jeśli użytkownik uważa, że to konto jest używane w złośliwych celach, może " +"zablokować je z listy subskrybentów i zgłosić je jako spam do " +"administratorów witryny na %s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 5763c7b954..056aee1e42 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" +"POT-Creation-Date: 2010-05-27 22:55+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,24 +81,24 @@ msgid "Save" msgstr "" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -111,7 +111,7 @@ msgid "No such user." msgstr "" #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "" @@ -119,39 +119,39 @@ msgstr "" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -159,14 +159,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -174,14 +174,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -192,22 +192,22 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "" @@ -217,11 +217,11 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "" @@ -251,7 +251,7 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -325,24 +325,24 @@ msgstr "" msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "" @@ -375,119 +375,119 @@ msgstr "" msgid "Could not find target user." msgstr "" -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "" -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "" -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "" -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "" -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "" -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "" @@ -502,7 +502,7 @@ msgstr "" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -601,11 +601,11 @@ msgstr "" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "" @@ -622,25 +622,25 @@ msgstr "" msgid "Already repeated that notice." msgstr "" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "" -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "" -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -649,32 +649,32 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -689,12 +689,12 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -1795,7 +1795,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "" @@ -2404,30 +2404,30 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "" @@ -3349,7 +3349,7 @@ msgstr "" msgid "User doesn't have this role." msgstr "" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "" @@ -3406,7 +3406,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "" @@ -3417,7 +3417,7 @@ msgid "Organization" msgstr "" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "" @@ -4329,7 +4329,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "" @@ -4450,29 +4450,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4480,7 +4480,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4488,39 +4488,39 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4559,45 +4559,45 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5049,7 +5049,7 @@ msgid "Snapshots configuration" msgstr "" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5179,11 +5179,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index d980cbc7db..d66ccb6134 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:35+0000\n" +"POT-Creation-Date: 2010-05-27 22:55+0000\n" +"PO-Revision-Date: 2010-05-27 22:58:13+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r66982); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -89,24 +89,24 @@ msgid "Save" msgstr "Зберегти" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Немає такої сторінки." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -119,7 +119,7 @@ msgid "No such user." msgstr "Такого користувача немає." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s та друзі, сторінка %2$d" @@ -127,39 +127,39 @@ msgstr "%1$s та друзі, сторінка %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s з друзями" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Стрічка дописів для друзів %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Стрічка дописів для друзів %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Стрічка дописів для друзів %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "Це стрічка дописів %s і друзів, але вона поки що порожня." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -169,7 +169,7 @@ msgstr "" "або напишіть щось самі." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -178,7 +178,7 @@ msgstr "" "Ви можете [«розштовхати» %1$s](../%2$s) зі сторінки його профілю або [щось " "йому написати](%%%%action.newnotice%%%%?status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -188,14 +188,14 @@ msgstr "" "«розштовхати» %s або щось йому написати." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Ви з друзями" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Оновлення від %1$s та друзів на %2$s!" @@ -206,22 +206,22 @@ msgstr "Оновлення від %1$s та друзів на %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "API метод не знайдено." @@ -231,11 +231,11 @@ msgstr "API метод не знайдено." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Цей метод потребує POST." @@ -266,7 +266,7 @@ msgstr "Не вдалося зберегти профіль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -343,24 +343,24 @@ msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Не можна надіслати пряме повідомлення користувачеві, який не є Вашим другом." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Жодних статусів з таким ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Цей статус вже є обраним." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Не можна позначити як обране." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Цей статус не є обраним." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Не можна видалити зі списку обраних." @@ -393,7 +393,7 @@ msgstr "Не вдалось встановити джерело користув msgid "Could not find target user." msgstr "Не вдалося знайти цільового користувача." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -401,113 +401,113 @@ msgstr "" "Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких " "інтервалів." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Це ім’я вже використовується. Спробуйте інше." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Це недійсне ім’я користувача." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Веб-сторінка має недійсну URL-адресу." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Повне ім’я задовге (255 знаків максимум)" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Опис надто довгий (%d знаків максимум)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Розташування надто довге (255 знаків максимум)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Забагато додаткових імен! Максимум становить %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Помилкове додаткове ім’я: «%s»." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Додаткове ім’я \"%s\" вже використовується. Спробуйте інше." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Додаткове ім’я не може бути таким самим що й основне." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Групу не знайдено." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Ви вже є учасником цієї групи." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Адмін цієї групи заблокував Вашу присутність в ній." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Не вдалось долучити користувача %1$s до групи %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Ви не є учасником цієї групи." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Не вдалось видалити користувача %1$s з групи %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "%s групи" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "%1$s групи, в яких %2$s бере участь." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s групи" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "групи на %s" @@ -522,7 +522,7 @@ msgstr "Невірний токен." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -628,11 +628,11 @@ msgstr "Дозволити" msgid "Allow or deny access to your account information." msgstr "Дозволити або заборонити доступ до Вашого облікового запису." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Цей метод потребує або НАПИСАТИ, або ВИДАЛИТИ." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Ви не можете видалити статус іншого користувача." @@ -649,25 +649,25 @@ msgstr "Не можу повторити Ваш власний допис." msgid "Already repeated that notice." msgstr "Цей допис вже повторено." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Статус видалено." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Не знайдено жодних статусів з таким ID." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Надто довго. Максимальний розмір допису — %d знаків." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Не знайдено." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -678,32 +678,32 @@ msgstr "" msgid "Unsupported format." msgstr "Формат не підтримується." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Обрані від %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s оновлення обраних від %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Оновленні відповіді %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s загальна стрічка" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s оновлення від усіх!" @@ -718,12 +718,12 @@ msgstr "Повторено для %s" msgid "Repeats of %s" msgstr "Повторення %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Дописи позначені з %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Оновлення позначені з %1$s на %2$s!" @@ -1850,7 +1850,7 @@ msgstr "Надати цьому користувачеві права адмін #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s стрічка" @@ -2533,30 +2533,30 @@ msgstr "Ви не дозволили жодним додаткам викори msgid "Developers can edit the registration settings for their applications " msgstr "Розробники можуть змінити налаштування реєстрації для їхніх додатків " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Допис не має профілю." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s має статус на %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Тип змісту %s не підтримується." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "URL-адреса %s лише в простому HTTP, будь ласка." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -3539,7 +3539,7 @@ msgstr "Ви не можете позбавляти користувачів р msgid "User doesn't have this role." msgstr "Користувач не має цієї ролі." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3596,7 +3596,7 @@ msgid "Icon" msgstr "Іконка" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Ім’я" @@ -3607,7 +3607,7 @@ msgid "Organization" msgstr "Організація" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Опис" @@ -4581,7 +4581,7 @@ msgstr "" "підписатись на дописи цього користувача. Якщо Ви не збирались підписуватись " "ні на чиї дописи, просто натисніть «Відмінити»." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Ліцензія" @@ -4711,18 +4711,18 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Оновлення від %1$s на %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4731,11 +4731,11 @@ msgstr "" "Цей сайт працює на %1$s, версія %2$s. Авторські права 2008-2010 StatusNet, " "Inc. і розробники." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Розробники" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4747,7 +4747,7 @@ msgstr "" "їх було опубліковано Free Software Foundation, 3-тя версія ліцензії або (на " "Ваш розсуд) будь-яка подальша версія. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4759,7 +4759,7 @@ msgstr "" "ПРИДАТНОСТІ ДЛЯ ДОСЯГНЕННЯ ПЕВНОЇ МЕТИ. Щодо більш детальних роз’яснень, " "ознайомтесь з умовами GNU Affero General Public License. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4768,20 +4768,20 @@ msgstr "" "Разом з програмою Ви маєте отримати копію ліцензійних умов GNU Affero " "General Public License. Якщо ні, перейдіть на %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Додатки" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Версія" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Автор(и)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4790,12 +4790,12 @@ msgstr "" "Ні, файл не може бути більшим за %d байтів, а те, що Ви хочете надіслати, " "важить %d байтів. Спробуйте меншу версію." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Розміри цього файлу перевищують Вашу квоту на %d байтів." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Розміри цього файлу перевищують Вашу місячну квоту на %d байтів." @@ -4834,27 +4834,27 @@ msgid "Could not update message with new URI." msgstr "Не можна оновити повідомлення з новим URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Помилка бази даних при додаванні хеш-теґу: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Проблема при збереженні допису. Надто довге." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Проблема при збереженні допису. Невідомий користувач." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Дуже багато дописів за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4862,21 +4862,21 @@ msgstr "" "Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Вам заборонено надсилати дописи до цього сайту." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Проблема при збереженні допису." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Проблема при збереженні вхідних дописів для групи." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5335,7 +5335,7 @@ msgid "Snapshots configuration" msgstr "Конфігурація знімків" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-ресурс вимагає дозвіл типу «читання-запис», але у вас є лише доступ для " @@ -5468,11 +5468,11 @@ msgstr "Дописи, до яких прикріплено це вкладенн msgid "Tags for this attachment" msgstr "Теґи для цього вкладення" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Не вдалося змінити пароль" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Змінювати пароль не дозволено" @@ -6113,6 +6113,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Якщо Ви вважаєте, що цей акаунт використовується неправомірно, Ви можете " +"заблокувати його у списку своїх підписчиків і повідомити адміністраторів " +"сайту про факт спаму на %s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 From cef302cacdf86d1c82f7937d2901f9254c88bf8a Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 28 May 2010 06:22:12 +0000 Subject: [PATCH 186/730] Bugfix: api/statuses/destroy.:format was outputting deleted notice twice, causing parsers to fail. --- actions/apistatusesdestroy.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php index f7d52f0208..0bfcdd060e 100644 --- a/actions/apistatusesdestroy.php +++ b/actions/apistatusesdestroy.php @@ -57,7 +57,7 @@ require_once INSTALLDIR . '/lib/apiauth.php'; class ApiStatusesDestroyAction extends ApiAuthAction { - var $status = null; + var $status = null; /** * Take arguments for running @@ -120,18 +120,11 @@ class ApiStatusesDestroyAction extends ApiAuthAction $replies->get('notice_id', $this->notice_id); $replies->delete(); $this->notice->delete(); - - if ($this->format == 'xml') { - $this->showSingleXmlStatus($this->notice); - } elseif ($this->format == 'json') { - $this->show_single_json_status($this->notice); - } + $this->showNotice(); } else { $this->clientError(_('You may not delete another user\'s status.'), 403, $this->format); } - - $this->showNotice(); } /** From f4539b52ad2c25a87e906c68d955ef921678e18c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 28 May 2010 16:03:09 -0700 Subject: [PATCH 187/730] Ticket 2329 followup: my clever 'let it use the default' was foiled by PHP gettext module not quite exposing a compatible interface as the backend gettext library. (Most funcs squash null domain parameter into '' empty string, which isn't interpreted as 'use the current default'.) --- lib/language.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/language.php b/lib/language.php index 3846b8f358..cb12cca692 100644 --- a/lib/language.php +++ b/lib/language.php @@ -61,7 +61,7 @@ if (!function_exists('dpgettext')) { * Not currently exposed in PHP's gettext module; implemented to be compat * with gettext.h's macros. * - * @param string $domain domain identifier, or null for default domain + * @param string $domain domain identifier * @param string $context context identifier, should be some key like "menu|file" * @param string $msgid English source text * @return string original or translated message @@ -106,7 +106,7 @@ if (!function_exists('dnpgettext')) { * Not currently exposed in PHP's gettext module; implemented to be compat * with gettext.h's macros. * - * @param string $domain domain identifier, or null for default domain + * @param string $domain domain identifier * @param string $context context identifier, should be some key like "menu|file" * @param string $msg singular English source text * @param string $plural plural English source text @@ -180,7 +180,11 @@ function _m($msg/*, ...*/) } /** - * Looks for which plugin we've been called from to set the gettext domain. + * Looks for which plugin we've been called from to set the gettext domain; + * if not in a plugin subdirectory, we'll use the default 'statusnet'. + * + * Note: we can't return null for default domain since most of the PHP gettext + * wrapper functions turn null into "" before passing to the backend library. * * @param array $backtrace debug_backtrace() output * @return string @@ -207,8 +211,8 @@ function _mdomain($backtrace) } $plug = strpos($path, '/plugins/'); if ($plug === false) { - // We're not in a plugin; return null for the default domain. - return null; + // We're not in a plugin; return default domain. + return 'statusnet'; } else { $cut = $plug + 9; $cut2 = strpos($path, '/', $cut); @@ -217,7 +221,7 @@ function _mdomain($backtrace) } else { // We might be running directly from the plugins dir? // If so, there's no place to store locale info. - return null; + return 'statusnet'; } } } From 58fe1a597c76dd6737abbe44e7cb7111d3ae3375 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 28 May 2010 16:52:17 -0700 Subject: [PATCH 188/730] OpenID: add option to enable asking for a username to append to the trusted provider's base URL. Good for hooking up with sites like WikiHow, where usernames are appended to a base URL to get a profile URL which is used as the provider. $config['openid']['append_username'] = true; or check 'Append a username to base URL' in OpenID admin panel. --- plugins/OpenID/openid.php | 2 ++ plugins/OpenID/openidadminpanel.php | 10 ++++++++++ plugins/OpenID/openidlogin.php | 20 +++++++++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 574ecca72b..8be02e031c 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -144,8 +144,10 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) // Handle failure status return values. if (!$auth_request) { + common_log(LOG_ERR, __METHOD__ . ": mystery fail contacting $openid_url"); return _m('Not a valid OpenID.'); } else if (Auth_OpenID::isFailure($auth_request)) { + common_log(LOG_ERR, __METHOD__ . ": OpenID fail to $openid_url: $auth_request->message"); return sprintf(_m('OpenID failure: %s'), $auth_request->message); } diff --git a/plugins/OpenID/openidadminpanel.php b/plugins/OpenID/openidadminpanel.php index 0633063662..ce4806cc89 100644 --- a/plugins/OpenID/openidadminpanel.php +++ b/plugins/OpenID/openidadminpanel.php @@ -91,6 +91,7 @@ class OpenidadminpanelAction extends AdminPanelAction ); static $booleans = array( + 'openid' => array('append_username'), 'site' => array('openidonly') ); @@ -222,6 +223,15 @@ class OpenIDAdminPanelForm extends AdminForm ); $this->unli(); + $this->li(); + $this->out->checkbox( + 'append_username', _m('Append a username to base URL'), + (bool) $this->value('append_username', 'openid'), + _m('Login form will show the base URL and prompt for a username to add at the end. Use when OpenID provider URL should be the profile page for individual users.'), + 'true' + ); + $this->unli(); + $this->li(); $this->input( 'required_team', diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php index 8c559c9346..ffedc64810 100644 --- a/plugins/OpenID/openidlogin.php +++ b/plugins/OpenID/openidlogin.php @@ -32,6 +32,9 @@ class OpenidloginAction extends Action $provider = common_config('openid', 'trusted_provider'); if ($provider) { $openid_url = $provider; + if (common_config('openid', 'append_username')) { + $openid_url .= $this->trimmed('openid_username'); + } } else { $openid_url = $this->trimmed('openid_url'); } @@ -94,7 +97,15 @@ class OpenidloginAction extends Action function showScripts() { parent::showScripts(); - $this->autofocus('openid_url'); + if (common_config('openid', 'trusted_provider')) { + if (common_config('openid', 'append_username')) { + $this->autofocus('openid_username'); + } else { + $this->autofocus('rememberme'); + } + } else { + $this->autofocus('openid_url'); + } } function title() @@ -122,10 +133,17 @@ class OpenidloginAction extends Action $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $provider = common_config('openid', 'trusted_provider'); + $appendUsername = common_config('openid', 'append_username'); if ($provider) { $this->element('label', array(), _m('OpenID provider')); $this->element('span', array(), $provider); + if ($appendUsername) { + $this->element('input', array('id' => 'openid_username', + 'name' => 'openid_username', + 'style' => 'float: none')); + } $this->element('p', 'form_guide', + ($appendUsername ? _m('Enter your username.') . ' ' : '') . _m('You will be sent to the provider\'s site for authentication.')); $this->hidden('openid_url', $provider); } else { From 83b976f7eafb74e2ef675262b427be43039428b9 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 31 May 2010 15:48:24 -0700 Subject: [PATCH 189/730] Added DarterosStatus to notice sources --- db/notice_source.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/notice_source.sql b/db/notice_source.sql index fbcdd6568e..5d86646315 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -9,6 +9,7 @@ VALUES ('bti','bti','http://gregkh.github.com/bti/', now()), ('choqok', 'Choqok', 'http://choqok.gnufolks.org/', now()), ('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()), + ('DarterosStatus', 'Darteros Status', 'http://www.darteros.com/doc/Darteros_Status', now()), ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()), ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()), ('drupal','Drupal','http://drupal.org/', now()), From b0c589de9aa7bfd41bd59e12ff16d0791009fb18 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 1 Jun 2010 18:29:01 +0000 Subject: [PATCH 190/730] Ticket #2330: fix Google Maps provider for Mapstraction plugin --- plugins/Mapstraction/MapstractionPlugin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index 868933fd43..e7240a6449 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -125,8 +125,8 @@ class MapstractionPlugin extends Plugin $action->script('http://tile.cloudmade.com/wml/0.2/web-maps-lite.js'); break; case 'google': - $action->script(sprintf('http://maps.google.com/maps?file=api&v=2&sensor=false&key=%s', - $this->apikey)); + $action->script(sprintf('http://maps.google.com/maps?file=api&v=2&sensor=false&key=%s', + urlencode($this->apikey))); break; case 'microsoft': $action->script('http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6'); @@ -137,7 +137,7 @@ class MapstractionPlugin extends Plugin break; case 'yahoo': $action->script(sprintf('http://api.maps.yahoo.com/ajaxymap?v=3.8&appid=%s', - $this->apikey)); + urlencode($this->apikey))); break; case 'geocommons': // don't support this yet default: From 634752f0d262b4fb02456889250378fca084cd2e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 1 Jun 2010 18:41:17 +0000 Subject: [PATCH 191/730] Mapstraction plugin fix: set icon dimensions (24x24 px); Google Maps provider otherwise defaults to stretching them to a funny shape instead of showing square avatars. --- plugins/Mapstraction/usermap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js index 4b7a6c26b4..53cfe6bb0c 100644 --- a/plugins/Mapstraction/usermap.js +++ b/plugins/Mapstraction/usermap.js @@ -104,7 +104,7 @@ function showMapstraction(element, notices) { pt = new mxn.LatLonPoint(lat, lon); mkr = new mxn.Marker(pt); - mkr.setIcon(n['user']['profile_image_url']); + mkr.setIcon(n['user']['profile_image_url'], [24, 24]); mkr.setInfoBubble('' + n['user']['screen_name'] + '' + ' ' + n['html'] + '
'+ n['created_at'] + ''); From ce0e6cb50d88c593db62edd8375c4414e8a8ebf8 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 22 Mar 2010 00:25:49 -0400 Subject: [PATCH 192/730] user sitemap --- plugins/Sitemap/SitemapPlugin.php | 111 ++++++++++++++++++++++++++++++ plugins/Sitemap/sitemapaction.php | 90 ++++++++++++++++++++++++ plugins/Sitemap/usersitemap.php | 79 +++++++++++++++++++++ 3 files changed, 280 insertions(+) create mode 100644 plugins/Sitemap/SitemapPlugin.php create mode 100644 plugins/Sitemap/sitemapaction.php create mode 100644 plugins/Sitemap/usersitemap.php diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php new file mode 100644 index 0000000000..42ea1dbe62 --- /dev/null +++ b/plugins/Sitemap/SitemapPlugin.php @@ -0,0 +1,111 @@ +. + * + * @category Sample + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Sitemap plugin + * + * @category Sample + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +class SitemapPlugin extends Plugin +{ + /** + * Load related modules when needed + * + * Most non-trivial plugins will require extra modules to do their work. Typically + * these include data classes, action classes, widget classes, or external libraries. + * + * This method receives a class name and loads the PHP file related to that class. By + * tradition, action classes typically have files named for the action, all lower-case. + * Data classes are in files with the data class name, initial letter capitalized. + * + * Note that this method will be called for *all* overloaded classes, not just ones + * in this plugin! So, make sure to return true by default to let other plugins, and + * the core code, get a chance. + * + * @param string $cls Name of the class to be loaded + * + * @return boolean hook value; true means continue processing, false means stop. + */ + + function onAutoload($cls) + { + $dir = dirname(__FILE__); + + switch ($cls) + { + case 'SitemapindexAction': + case 'NoticesitemapAction': + case 'UsersitemapAction': + require_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; + return false; + case 'SitemapAction': + require_once $dir . '/' . strtolower($cls) . '.php'; + default: + return true; + } + } + + /** + * Map URLs to actions + * + * @param Net_URL_Mapper $m path-to-action mapper + * + * @return boolean hook value; true means continue processing, false means stop. + */ + + function onRouterInitialized($m) + { + $m->connect('sitemapindex.xml', + array('action' => 'sitemapindex')); + $m->connect('/sitemaps/notice/:year/:month/:day.xml', + array('action' => 'noticesitemap'), + array('year' => '[0-9]{4}', + 'month' => '[1]?[0-9]', + 'day' => '[123]?[0-9]')); + $m->connect('/sitemaps/user/:index.xml', + array('action' => 'usersitemap'), + array('index' => '[0-9]+', + 'month' => '[1]?[0-9]', + 'day' => '[123]?[0-9]')); + return true; + } +} diff --git a/plugins/Sitemap/sitemapaction.php b/plugins/Sitemap/sitemapaction.php new file mode 100644 index 0000000000..ab80b85eaa --- /dev/null +++ b/plugins/Sitemap/sitemapaction.php @@ -0,0 +1,90 @@ +. + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * superclass for sitemap actions + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class SitemapAction extends Action +{ + /** + * handle the action + * + * @param array $args unused. + * + * @return void + */ + + function handle($args) + { + header('Content-Type: text/xml; charset=UTF-8'); + $this->startXML(); + + $this->elementStart('sitemap'); + + while (list($url, $lm, $cf, $p) = $this->nextUrl()) { + $this->showUrl($url, $lm, $cf, $p); + } + + $this->elementEnd('sitemap'); + + $this->endXML(); + } + + function showUrl($url, $lastMod=null, $changeFreq=null, $priority=null) + { + $this->elementStart('url'); + $this->element('loc', null, $url); + if (!is_null($lastMod)) { + $this->element('lastmod', null, $lastMod); + } + if (!is_null($changeFreq)) { + $this->element('changefreq', null, $changeFreq); + } + if (!is_null($priority)) { + $this->element('priority', null, $priority); + } + $this->elementEnd('url'); + } + + function nextUrl() + { + return null; + } +} diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php new file mode 100644 index 0000000000..582a13b664 --- /dev/null +++ b/plugins/Sitemap/usersitemap.php @@ -0,0 +1,79 @@ +. + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * sitemap for users + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class UsersitemapAction extends SitemapAction +{ + const USERS_PER_MAP = 25000; + + var $user = null; + + function prepare($args) + { + parent::prepare($args); + + $i = $this->trimmed('index'); + + $i += 0; + + $offset = ($i-1) * self::USERS_PER_MAP; + $limit = self::USERS_PER_MAP; + + $this->user = new User(); + + $this->user->orderBy('id'); + $this->user->limit($offset, $limit); + + $this->user->find(); + + return true; + } + + function nextUrl() + { + if ($this->user->fetch()) { + return array(common_profile_url($this->user->nickname), null, null, null); + } else { + return null; + } + } +} From 524cd9df936bd27d5b64fbf08b219b56cb071122 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 22 Mar 2010 08:09:15 -0400 Subject: [PATCH 193/730] Add a Notice sitemap --- plugins/Sitemap/SitemapPlugin.php | 6 +- plugins/Sitemap/noticesitemap.php | 94 +++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 plugins/Sitemap/noticesitemap.php diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 42ea1dbe62..8889c89306 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -96,11 +96,13 @@ class SitemapPlugin extends Plugin { $m->connect('sitemapindex.xml', array('action' => 'sitemapindex')); - $m->connect('/sitemaps/notice/:year/:month/:day.xml', + $m->connect('/sitemaps/notice/:year/:month/:day/:index.xml', array('action' => 'noticesitemap'), array('year' => '[0-9]{4}', 'month' => '[1]?[0-9]', - 'day' => '[123]?[0-9]')); + 'day' => '[123]?[0-9]', + 'index' => '[0-9]+')); + $m->connect('/sitemaps/user/:index.xml', array('action' => 'usersitemap'), array('index' => '[0-9]+', diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php new file mode 100644 index 0000000000..7eec886363 --- /dev/null +++ b/plugins/Sitemap/noticesitemap.php @@ -0,0 +1,94 @@ +. + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * sitemap for users + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class NoticesitemapAction extends SitemapAction +{ + const NOTICES_PER_MAP = 25000; + + var $notice = null; + + function prepare($args) + { + parent::prepare($args); + + $y = $this->trimmed('year'); + + $m = $this->trimmed('month'); + $d = $this->trimmed('day'); + + $i = $this->trimmed('index'); + + $y += 0; + $m += 0; + $d += 0; + $i += 0; + + $offset = ($i-1) * self::NOTICES_PER_MAP; + $limit = self::NOTICES_PER_MAP; + + $this->notice = new Notice(); + + $this->notice->whereAdd("created > '$y-$m-$d 00:00:00'"); + $this->notice->whereAdd("created <= '$y-$m-$d 11:59:59'"); + $this->notice->whereAdd('is_local = 1'); + + $this->notice->orderBy('id'); + $this->notice->limit($offset, $limit); + + $this->notice->find(); + + return true; + } + + function nextUrl() + { + if ($this->notice->fetch()) { + return array(common_local_url('shownotice', array('notice' => $this->notice->id)), + common_date_w3dtf($this->notice->created), + null, + null); + } else { + return null; + } + } +} From 0a04f9d49db4f28ace3f3d94ec0763a926296b44 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 25 Mar 2010 23:56:09 -0400 Subject: [PATCH 194/730] better query for notices by date --- plugins/Sitemap/SitemapPlugin.php | 17 +++-------------- plugins/Sitemap/noticesitemap.php | 9 ++++++--- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 8889c89306..bb404cd25e 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -50,17 +50,6 @@ class SitemapPlugin extends Plugin /** * Load related modules when needed * - * Most non-trivial plugins will require extra modules to do their work. Typically - * these include data classes, action classes, widget classes, or external libraries. - * - * This method receives a class name and loads the PHP file related to that class. By - * tradition, action classes typically have files named for the action, all lower-case. - * Data classes are in files with the data class name, initial letter capitalized. - * - * Note that this method will be called for *all* overloaded classes, not just ones - * in this plugin! So, make sure to return true by default to let other plugins, and - * the core code, get a chance. - * * @param string $cls Name of the class to be loaded * * @return boolean hook value; true means continue processing, false means stop. @@ -99,9 +88,9 @@ class SitemapPlugin extends Plugin $m->connect('/sitemaps/notice/:year/:month/:day/:index.xml', array('action' => 'noticesitemap'), array('year' => '[0-9]{4}', - 'month' => '[1]?[0-9]', - 'day' => '[123]?[0-9]', - 'index' => '[0-9]+')); + 'month' => '[01][0-9]', + 'day' => '[0123][0-9]', + 'index' => '[1-9][0-9]*')); $m->connect('/sitemaps/user/:index.xml', array('action' => 'usersitemap'), diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index 7eec886363..0024084863 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -68,9 +68,12 @@ class NoticesitemapAction extends SitemapAction $this->notice = new Notice(); - $this->notice->whereAdd("created > '$y-$m-$d 00:00:00'"); - $this->notice->whereAdd("created <= '$y-$m-$d 11:59:59'"); - $this->notice->whereAdd('is_local = 1'); + $dt = sprintf('%04d-%02d-%02d', $y, $m, $d); + + $this->notice->whereAdd("created > '$dt 00:00:00'"); + $this->notice->whereAdd("created <= '$dt 23:59:59'"); + + $this->notice->whereAdd('is_local != 0'); $this->notice->orderBy('id'); $this->notice->limit($offset, $limit); From d65a65756b88347b208b10f6abd2573d7703b6d5 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Apr 2010 10:03:37 -0400 Subject: [PATCH 195/730] correct element name and namespace for sitemapactions --- plugins/Sitemap/sitemapaction.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Sitemap/sitemapaction.php b/plugins/Sitemap/sitemapaction.php index ab80b85eaa..bab04ed9d2 100644 --- a/plugins/Sitemap/sitemapaction.php +++ b/plugins/Sitemap/sitemapaction.php @@ -56,13 +56,13 @@ class SitemapAction extends Action header('Content-Type: text/xml; charset=UTF-8'); $this->startXML(); - $this->elementStart('sitemap'); + $this->elementStart('urlset', array('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9')); while (list($url, $lm, $cf, $p) = $this->nextUrl()) { $this->showUrl($url, $lm, $cf, $p); } - $this->elementEnd('sitemap'); + $this->elementEnd('urlset'); $this->endXML(); } From 9e592baa39dfab0c1e09c4356fb8d434379797c3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Apr 2010 10:03:57 -0400 Subject: [PATCH 196/730] move USERS_PER_MAP to plugin --- plugins/Sitemap/SitemapPlugin.php | 3 +++ plugins/Sitemap/usersitemap.php | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index bb404cd25e..40263aaeef 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -47,6 +47,8 @@ if (!defined('STATUSNET')) { class SitemapPlugin extends Plugin { + const USERS_PER_MAP = 25000; + /** * Load related modules when needed * @@ -85,6 +87,7 @@ class SitemapPlugin extends Plugin { $m->connect('sitemapindex.xml', array('action' => 'sitemapindex')); + $m->connect('/sitemaps/notice/:year/:month/:day/:index.xml', array('action' => 'noticesitemap'), array('year' => '[0-9]{4}', diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php index 582a13b664..b7cc939a9f 100644 --- a/plugins/Sitemap/usersitemap.php +++ b/plugins/Sitemap/usersitemap.php @@ -43,8 +43,6 @@ if (!defined('STATUSNET')) { class UsersitemapAction extends SitemapAction { - const USERS_PER_MAP = 25000; - var $user = null; function prepare($args) @@ -55,8 +53,8 @@ class UsersitemapAction extends SitemapAction $i += 0; - $offset = ($i-1) * self::USERS_PER_MAP; - $limit = self::USERS_PER_MAP; + $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP; + $limit = SitemapPlugin::USERS_PER_MAP; $this->user = new User(); From 63c4eef64322da6a360c9ef3d7e1a20de9ca9cdd Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Apr 2010 10:21:19 -0400 Subject: [PATCH 197/730] change URLs for user sitemap --- plugins/Sitemap/SitemapPlugin.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 40263aaeef..5b2af48795 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -95,11 +95,12 @@ class SitemapPlugin extends Plugin 'day' => '[0123][0-9]', 'index' => '[1-9][0-9]*')); - $m->connect('/sitemaps/user/:index.xml', + $m->connect('/sitemaps/user/:year/:month/:day/:index.xml', array('action' => 'usersitemap'), - array('index' => '[0-9]+', - 'month' => '[1]?[0-9]', - 'day' => '[123]?[0-9]')); + array('year' => '[0-9]{4}', + 'month' => '[01][0-9]', + 'day' => '[0123][0-9]', + 'index' => '[1-9][0-9]*')); return true; } } From 35272f638c0f162f43c951e1ffcef55c8f54787e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 10 Apr 2010 10:24:58 -0400 Subject: [PATCH 198/730] Start of an action for sitemap index --- plugins/Sitemap/sitemapindex.php | 75 ++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 plugins/Sitemap/sitemapindex.php diff --git a/plugins/Sitemap/sitemapindex.php b/plugins/Sitemap/sitemapindex.php new file mode 100644 index 0000000000..09aebe0d8f --- /dev/null +++ b/plugins/Sitemap/sitemapindex.php @@ -0,0 +1,75 @@ +. + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Show the sitemap index + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class SitemapAction extends Action +{ + /** + * handle the action + * + * @param array $args unused. + * + * @return void + */ + + function handle($args) + { + header('Content-Type: text/xml; charset=UTF-8'); + $this->startXML(); + + $this->elementStart('sitemapindex', array('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9')); + + $this->showUserSitemaps(); + $this->showNoticeSitemaps(); + + $this->elementEnd('sitemapindex'); + + $this->endXML(); + } + + function showUserSitemaps() + { + $user = new User(); + $cnt = $user->count(); + + } +} From 9fdafaf07e0ef90e378c6a3e81dbcf60e31c2cac Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 10:11:18 -0400 Subject: [PATCH 199/730] better calculation for end date in notice sitemaps --- plugins/Sitemap/noticesitemap.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index 0024084863..12a22dbb22 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -68,14 +68,21 @@ class NoticesitemapAction extends SitemapAction $this->notice = new Notice(); - $dt = sprintf('%04d-%02d-%02d', $y, $m, $d); + $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); - $this->notice->whereAdd("created > '$dt 00:00:00'"); - $this->notice->whereAdd("created <= '$dt 23:59:59'"); + // XXX: estimates 1d == 24h, which screws up days + // with leap seconds (1d == 24h + 1s). Thankfully they're + // few and far between. + + $enddt = common_sql_date(strtotime($begindt) + (24 * 60 * 60)); + + $this->notice->whereAdd("created >= '$begindt'"); + $this->notice->whereAdd("created < '$enddt'"); $this->notice->whereAdd('is_local != 0'); - $this->notice->orderBy('id'); + $this->notice->orderBy('created'); + $this->notice->limit($offset, $limit); $this->notice->find(); From 144cdb559dc345016d087409c57554dd1fb03911 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 10:11:45 -0400 Subject: [PATCH 200/730] bundle users by reg date --- plugins/Sitemap/usersitemap.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php index b7cc939a9f..42cadaca7d 100644 --- a/plugins/Sitemap/usersitemap.php +++ b/plugins/Sitemap/usersitemap.php @@ -49,8 +49,16 @@ class UsersitemapAction extends SitemapAction { parent::prepare($args); + $y = $this->trimmed('year'); + + $m = $this->trimmed('month'); + $d = $this->trimmed('day'); + $i = $this->trimmed('index'); + $y += 0; + $m += 0; + $d += 0; $i += 0; $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP; @@ -58,7 +66,19 @@ class UsersitemapAction extends SitemapAction $this->user = new User(); - $this->user->orderBy('id'); + $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); + + // XXX: estimates 1d == 24h, which screws up days + // with leap seconds (1d == 24h + 1s). Thankfully they're + // few and far between. + + $enddt = common_sql_date(strtotime($begindt) + (24 * 60 * 60)); + + $this->user->whereAdd("created >= '$begindt'"); + $this->user->whereAdd("created < '$enddt'"); + + $this->user->orderBy('created'); + $this->user->limit($offset, $limit); $this->user->find(); From b73c8ff441008a4fa09eef66871f2cfebc0569b5 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 10:23:32 -0400 Subject: [PATCH 201/730] Move NOTICES_PER_MAP to SitemapPlugin --- plugins/Sitemap/SitemapPlugin.php | 3 ++- plugins/Sitemap/noticesitemap.php | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 5b2af48795..fa9c9a76d0 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -47,7 +47,8 @@ if (!defined('STATUSNET')) { class SitemapPlugin extends Plugin { - const USERS_PER_MAP = 25000; + const USERS_PER_MAP = 25000; + const NOTICES_PER_MAP = 25000; /** * Load related modules when needed diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index 12a22dbb22..c8db24efee 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -43,8 +43,6 @@ if (!defined('STATUSNET')) { class NoticesitemapAction extends SitemapAction { - const NOTICES_PER_MAP = 25000; - var $notice = null; function prepare($args) @@ -63,8 +61,8 @@ class NoticesitemapAction extends SitemapAction $d += 0; $i += 0; - $offset = ($i-1) * self::NOTICES_PER_MAP; - $limit = self::NOTICES_PER_MAP; + $offset = ($i-1) * SitemapPlugin::NOTICES_PER_MAP; + $limit = SitemapPlugin::NOTICES_PER_MAP; $this->notice = new Notice(); From 4b321f96fc9b45ae3000088b8cfd856f9ffe1529 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 11:04:56 -0400 Subject: [PATCH 202/730] show sitemapindex with user and notice sitemaps --- plugins/Sitemap/sitemapindex.php | 95 +++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 3 deletions(-) diff --git a/plugins/Sitemap/sitemapindex.php b/plugins/Sitemap/sitemapindex.php index 09aebe0d8f..7942bc3bd0 100644 --- a/plugins/Sitemap/sitemapindex.php +++ b/plugins/Sitemap/sitemapindex.php @@ -41,7 +41,7 @@ if (!defined('STATUSNET')) { * @link http://status.net/ */ -class SitemapAction extends Action +class SitemapindexAction extends Action { /** * handle the action @@ -68,8 +68,97 @@ class SitemapAction extends Action function showUserSitemaps() { - $user = new User(); - $cnt = $user->count(); + $userCounts = $this->getUserCounts(); + foreach ($userCounts as $dt => $cnt) { + $cnt = $cnt+0; + assert($cnt != 0); + $n = (int)$cnt / (int)SitemapPlugin::USERS_PER_MAP; + if (($cnt % SitemapPlugin::USERS_PER_MAP) != 0) { + $n++; + } + for ($i = 1; $i <= $n; $i++) { + $this->showSitemap('user', $dt, $i); + } + } + } + + function showNoticeSitemaps() + { + $noticeCounts = $this->getNoticeCounts(); + + foreach ($noticeCounts as $dt => $cnt) { + assert($cnt != 0); + $n = $cnt / SitemapPlugin::NOTICES_PER_MAP; + if ($cnt % SitemapPlugin::NOTICES_PER_MAP) { + $n++; + } + for ($i = 1; $i <= $n; $i++) { + $this->showSitemap('notice', $dt, $i); + } + } + } + + function getUserCounts() + { + // XXX: cachemeplease + + $user = new User(); + + $user->selectAdd(); + $user->selectAdd('date(created) as regdate, count(*) as regcount'); + $user->groupBy('regdate'); + + $user->find(); + + $userCounts = array(); + + while ($user->fetch()) { + $userCounts[$user->regdate] = $user->regcount; + } + + return $userCounts; + } + + function getNoticeCounts() + { + // XXX: cachemeplease + + $notice = new Notice(); + + $notice->selectAdd(); + $notice->selectAdd('date(created) as postdate, count(*) as postcount'); + $notice->groupBy('postdate'); + + $notice->find(); + + $noticeCounts = array(); + + while ($notice->fetch()) { + $noticeCounts[$notice->postdate] = $notice->postcount; + } + + return $noticeCounts; + } + + function showSitemap($prefix, $dt, $i) + { + list($y, $m, $d) = explode('-', $dt); + + $this->elementStart('sitemap'); + $this->element('loc', null, common_local_url($prefix.'sitemap', + array('year' => $y, + 'month' => $m, + 'day' => $d, + 'index' => $i))); + + $begdate = strtotime("$y-$m-$d 00:00:00"); + $enddate = $begdate + (24 * 60 * 60); + + if ($enddate < time()) { + $this->element('lastmod', null, date(DATE_W3C, $enddate)); + } + + $this->elementEnd('sitemap'); } } From 8b9ce731f4707f6939497d139521acee56596dea Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 11:05:19 -0400 Subject: [PATCH 203/730] max users, notices per sitemap = 50K --- plugins/Sitemap/SitemapPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index fa9c9a76d0..29c32a6242 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -47,8 +47,8 @@ if (!defined('STATUSNET')) { class SitemapPlugin extends Plugin { - const USERS_PER_MAP = 25000; - const NOTICES_PER_MAP = 25000; + const USERS_PER_MAP = 50000; + const NOTICES_PER_MAP = 50000; /** * Load related modules when needed From 610d8021d8653822dbc52f0790eee41e4db38c17 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 11:28:41 -0400 Subject: [PATCH 204/730] use an array for notice sitemap --- plugins/Sitemap/noticesitemap.php | 58 +++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index c8db24efee..6cf2b3d01f 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -43,7 +43,8 @@ if (!defined('STATUSNET')) { class NoticesitemapAction extends SitemapAction { - var $notice = null; + var $notices = null; + var $j = 0; function prepare($args) { @@ -61,10 +62,32 @@ class NoticesitemapAction extends SitemapAction $d += 0; $i += 0; + $this->notices = $this->getNotices($y, $m, $d, $i); + $this->j = 0; + + return true; + } + + function nextUrl() + { + if ($this->j < count($this->notices)) { + $n = $this->notices[$this->j]; + $this->j++; + return array(common_local_url('shownotice', array('notice' => $n[0])), + common_date_w3dtf($n[1]), + null, + null); + } else { + return null; + } + } + + function getNotices($y, $m, $d, $i) + { $offset = ($i-1) * SitemapPlugin::NOTICES_PER_MAP; $limit = SitemapPlugin::NOTICES_PER_MAP; - $this->notice = new Notice(); + $notice = new Notice(); $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); @@ -74,29 +97,26 @@ class NoticesitemapAction extends SitemapAction $enddt = common_sql_date(strtotime($begindt) + (24 * 60 * 60)); - $this->notice->whereAdd("created >= '$begindt'"); - $this->notice->whereAdd("created < '$enddt'"); + $notice->selectAdd(); + $notice->selectAdd('id, created'); - $this->notice->whereAdd('is_local != 0'); + $notice->whereAdd("created >= '$begindt'"); + $notice->whereAdd("created < '$enddt'"); - $this->notice->orderBy('created'); + $notice->whereAdd('is_local != 0'); - $this->notice->limit($offset, $limit); + $notice->orderBy('created'); - $this->notice->find(); + $notice->limit($offset, $limit); - return true; - } + $notice->find(); - function nextUrl() - { - if ($this->notice->fetch()) { - return array(common_local_url('shownotice', array('notice' => $this->notice->id)), - common_date_w3dtf($this->notice->created), - null, - null); - } else { - return null; + $n = array(); + + while ($notice->fetch()) { + $n[] = array($notice->id, $notice->created); } + + return $n; } } From 946cd15e8bc12bece4a14a07c6e109c3d8904a66 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 11:52:19 -0400 Subject: [PATCH 205/730] cache results of notice sitemap query --- plugins/Sitemap/noticesitemap.php | 53 ++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index 6cf2b3d01f..bc8a7bfd65 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -84,37 +84,52 @@ class NoticesitemapAction extends SitemapAction function getNotices($y, $m, $d, $i) { - $offset = ($i-1) * SitemapPlugin::NOTICES_PER_MAP; - $limit = SitemapPlugin::NOTICES_PER_MAP; + $n = Notice::cacheGet("sitemap:notice:$y:$m:$d:$i"); - $notice = new Notice(); + if ($n === false) { - $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); + $notice = new Notice(); - // XXX: estimates 1d == 24h, which screws up days - // with leap seconds (1d == 24h + 1s). Thankfully they're - // few and far between. + $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); - $enddt = common_sql_date(strtotime($begindt) + (24 * 60 * 60)); + // XXX: estimates 1d == 24h, which screws up days + // with leap seconds (1d == 24h + 1s). Thankfully they're + // few and far between. - $notice->selectAdd(); - $notice->selectAdd('id, created'); + $theend = strtotime($begindt) + (24 * 60 * 60); + $enddt = common_sql_date($theend); - $notice->whereAdd("created >= '$begindt'"); - $notice->whereAdd("created < '$enddt'"); + $notice->selectAdd(); + $notice->selectAdd('id, created'); - $notice->whereAdd('is_local != 0'); + $notice->whereAdd("created >= '$begindt'"); + $notice->whereAdd("created < '$enddt'"); - $notice->orderBy('created'); + $notice->whereAdd('is_local != 0'); - $notice->limit($offset, $limit); + $notice->orderBy('created'); - $notice->find(); + $offset = ($i-1) * SitemapPlugin::NOTICES_PER_MAP; + $limit = SitemapPlugin::NOTICES_PER_MAP; - $n = array(); + $notice->limit($offset, $limit); - while ($notice->fetch()) { - $n[] = array($notice->id, $notice->created); + $notice->find(); + + $n = array(); + + while ($notice->fetch()) { + $n[] = array($notice->id, $notice->created); + } + + $c = Cache::instance(); + + if (!empty($c)) { + $c->set(Cache::key("sitemap:notice:$y:$m:$d:$i"), + $n, + Cache::COMPRESSED, + ((time() > $theend) ? (time() + 90 * 24 * 60 * 60) : (time() + 5 * 60))); + } } return $n; From 3e8172585d7146cacb44ee4543ea619f6a196561 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 12:00:15 -0400 Subject: [PATCH 206/730] cache user data for user sitemap --- plugins/Sitemap/usersitemap.php | 81 +++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 25 deletions(-) diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php index 42cadaca7d..3e5ac46525 100644 --- a/plugins/Sitemap/usersitemap.php +++ b/plugins/Sitemap/usersitemap.php @@ -43,7 +43,8 @@ if (!defined('STATUSNET')) { class UsersitemapAction extends SitemapAction { - var $user = null; + var $users = null; + var $j = 0; function prepare($args) { @@ -61,37 +62,67 @@ class UsersitemapAction extends SitemapAction $d += 0; $i += 0; - $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP; - $limit = SitemapPlugin::USERS_PER_MAP; - - $this->user = new User(); - - $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); - - // XXX: estimates 1d == 24h, which screws up days - // with leap seconds (1d == 24h + 1s). Thankfully they're - // few and far between. - - $enddt = common_sql_date(strtotime($begindt) + (24 * 60 * 60)); - - $this->user->whereAdd("created >= '$begindt'"); - $this->user->whereAdd("created < '$enddt'"); - - $this->user->orderBy('created'); - - $this->user->limit($offset, $limit); - - $this->user->find(); - + $this->users = $this->getUsers($y, $m, $d, $i); + $this->j = 0; return true; } function nextUrl() { - if ($this->user->fetch()) { - return array(common_profile_url($this->user->nickname), null, null, null); + if ($this->j < count($this->users)) { + $nickname = $this->users[$this->j]; + $this->j++; + return array(common_profile_url($nickname), null, null, null); } else { return null; } } + + function getUsers($y, $m, $d, $i) + { + $u = User::cacheGet("sitemap:user:$y:$m:$d:$i"); + + if ($u === false) { + + $user = new User(); + + $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d); + + // XXX: estimates 1d == 24h, which screws up days + // with leap seconds (1d == 24h + 1s). Thankfully they're + // few and far between. + + $theend = strtotime($begindt) + (24 * 60 * 60); + $enddt = common_sql_date($theend); + + $user->selectAdd(); + $user->selectAdd('nickname'); + $user->whereAdd("created >= '$begindt'"); + $user->whereAdd("created < '$enddt'"); + + $user->orderBy('created'); + + $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP; + $limit = SitemapPlugin::USERS_PER_MAP; + + $user->limit($offset, $limit); + + $user->find(); + + while ($user->fetch()) { + $u[] = $user->nickname; + } + + $c = Cache::instance(); + + if (!empty($c)) { + $c->set(Cache::key("sitemap:user:$y:$m:$d:$i"), + $u, + Cache::COMPRESSED, + ((time() > $theend) ? (time() + 90 * 24 * 60 * 60) : (time() + 5 * 60))); + } + } + + return $u; + } } From 5ff9c0242b2ad1df22af5630a7ebfdcce8177212 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 12:06:08 -0400 Subject: [PATCH 207/730] make sure notice and user sitemap are 'in' top level directory --- plugins/Sitemap/SitemapPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 29c32a6242..ed876d94f8 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -89,14 +89,14 @@ class SitemapPlugin extends Plugin $m->connect('sitemapindex.xml', array('action' => 'sitemapindex')); - $m->connect('/sitemaps/notice/:year/:month/:day/:index.xml', + $m->connect('/notice-sitemap-:year-:month-:day-:index.xml', array('action' => 'noticesitemap'), array('year' => '[0-9]{4}', 'month' => '[01][0-9]', 'day' => '[0123][0-9]', 'index' => '[1-9][0-9]*')); - $m->connect('/sitemaps/user/:year/:month/:day/:index.xml', + $m->connect('/user-sitemap-:year-:month-:day-:index.xml', array('action' => 'usersitemap'), array('year' => '[0-9]{4}', 'month' => '[01][0-9]', From e363b724b96d0509e56edabcb7fb199698e158b7 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 12:13:48 -0400 Subject: [PATCH 208/730] cache notice and user counts in sitemap index --- plugins/Sitemap/sitemapindex.php | 46 +++++++++++++++++++------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/plugins/Sitemap/sitemapindex.php b/plugins/Sitemap/sitemapindex.php index 7942bc3bd0..2055dd7f06 100644 --- a/plugins/Sitemap/sitemapindex.php +++ b/plugins/Sitemap/sitemapindex.php @@ -101,20 +101,25 @@ class SitemapindexAction extends Action function getUserCounts() { - // XXX: cachemeplease + $userCounts = User::cacheGet('sitemap:user:counts'); - $user = new User(); + if ($userCounts === false) { - $user->selectAdd(); - $user->selectAdd('date(created) as regdate, count(*) as regcount'); - $user->groupBy('regdate'); + $user = new User(); - $user->find(); + $user->selectAdd(); + $user->selectAdd('date(created) as regdate, count(*) as regcount'); + $user->groupBy('regdate'); - $userCounts = array(); + $user->find(); - while ($user->fetch()) { - $userCounts[$user->regdate] = $user->regcount; + $userCounts = array(); + + while ($user->fetch()) { + $userCounts[$user->regdate] = $user->regcount; + } + + User::cacheSet('sitemap:user:counts', $userCounts); } return $userCounts; @@ -122,20 +127,25 @@ class SitemapindexAction extends Action function getNoticeCounts() { - // XXX: cachemeplease + $noticeCounts = Notice::cacheGet('sitemap:notice:counts'); - $notice = new Notice(); + if ($noticeCounts === false) { - $notice->selectAdd(); - $notice->selectAdd('date(created) as postdate, count(*) as postcount'); - $notice->groupBy('postdate'); + $notice = new Notice(); - $notice->find(); + $notice->selectAdd(); + $notice->selectAdd('date(created) as postdate, count(*) as postcount'); + $notice->groupBy('postdate'); - $noticeCounts = array(); + $notice->find(); - while ($notice->fetch()) { - $noticeCounts[$notice->postdate] = $notice->postcount; + $noticeCounts = array(); + + while ($notice->fetch()) { + $noticeCounts[$notice->postdate] = $notice->postcount; + } + + Notice::cacheSet('sitemap:notice:counts', $noticeCounts); } return $noticeCounts; From 1c858e17eaf0e9509b7e165ea1b0d45f7e923361 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 14:32:01 -0400 Subject: [PATCH 209/730] add sitemap statement to robots.txt --- plugins/Sitemap/SitemapPlugin.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index ed876d94f8..6fc7021049 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -76,6 +76,23 @@ class SitemapPlugin extends Plugin } } + /** + * Add sitemap-related information at the end of robots.txt + * + * @param Action $action Action being run + * + * @return boolean hook value. + */ + + function onEndRobotsTxt($action) + { + $url = common_local_url('sitemapindex'); + + print "\nSitemap: $url\n"; + + return true; + } + /** * Map URLs to actions * From 45e6e537cacc23aedabb1c0b0518766de1041768 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 12 Apr 2010 14:34:22 -0400 Subject: [PATCH 210/730] note that sitemap actions are readonly --- plugins/Sitemap/sitemapaction.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/Sitemap/sitemapaction.php b/plugins/Sitemap/sitemapaction.php index bab04ed9d2..45edfccc51 100644 --- a/plugins/Sitemap/sitemapaction.php +++ b/plugins/Sitemap/sitemapaction.php @@ -87,4 +87,9 @@ class SitemapAction extends Action { return null; } + + function isReadOnly() + { + return true; + } } From 40618b49e1d7bde1b348f3675b12e3f582884515 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 3 May 2010 11:23:01 -0400 Subject: [PATCH 211/730] mark notice pages as being archived --- plugins/Sitemap/noticesitemap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index bc8a7bfd65..9f323f72aa 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -75,7 +75,7 @@ class NoticesitemapAction extends SitemapAction $this->j++; return array(common_local_url('shownotice', array('notice' => $n[0])), common_date_w3dtf($n[1]), - null, + 'never', null); } else { return null; From 3e349a71cad00f2f99ecccb73dce3805b4fcb41c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 3 May 2010 11:23:18 -0400 Subject: [PATCH 212/730] mark user pages as being high priority --- plugins/Sitemap/usersitemap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php index 3e5ac46525..de12007157 100644 --- a/plugins/Sitemap/usersitemap.php +++ b/plugins/Sitemap/usersitemap.php @@ -72,7 +72,7 @@ class UsersitemapAction extends SitemapAction if ($this->j < count($this->users)) { $nickname = $this->users[$this->j]; $this->j++; - return array(common_profile_url($nickname), null, null, null); + return array(common_profile_url($nickname), null, null, '1.0'); } else { return null; } From 7d85b79814e7e91a88f23d7c7e752a0bcfc83ff4 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 3 May 2010 14:00:12 -0400 Subject: [PATCH 213/730] Database tables to cache expensive query data We need to bundle counts of notices and users by date. This can be expensive for large sites. So, new tables are added to cache the results of these queries, which don't change after the date is over. --- plugins/Sitemap/SitemapPlugin.php | 36 +++++++ plugins/Sitemap/Sitemap_notice_count.php | 125 +++++++++++++++++++++++ plugins/Sitemap/Sitemap_user_count.php | 121 ++++++++++++++++++++++ 3 files changed, 282 insertions(+) create mode 100644 plugins/Sitemap/Sitemap_notice_count.php create mode 100644 plugins/Sitemap/Sitemap_user_count.php diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 6fc7021049..831694efc6 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -121,4 +121,40 @@ class SitemapPlugin extends Plugin 'index' => '[1-9][0-9]*')); return true; } + + /** + * Database schema setup + * + * We cache some data persistently to avoid overlong queries. + * + * @see Sitemap_user_count + * @see Sitemap_notice_count + * + * @return boolean hook value; true means continue processing, false means stop. + */ + + function onCheckSchema() + { + $schema = Schema::get(); + + // For storing user-submitted flags on profiles + + $schema->ensureTable('sitemap_user_count', + array(new ColumnDef('registration_date', 'date', null, + true, 'PRI'), + new ColumnDef('user_count', 'integer'), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp'))); + + $schema->ensureTable('sitemap_notice_count', + array(new ColumnDef('notice_date', 'date', null, + true, 'PRI'), + new ColumnDef('notice_count', 'integer'), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp'))); + + return true; + } } diff --git a/plugins/Sitemap/Sitemap_notice_count.php b/plugins/Sitemap/Sitemap_notice_count.php new file mode 100644 index 0000000000..72bb2b9d41 --- /dev/null +++ b/plugins/Sitemap/Sitemap_notice_count.php @@ -0,0 +1,125 @@ + + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2010, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; + +/** + * Data class for counting notices by date + * + * We make a separate sitemap for each notice posted by date. + * To save ourselves some (not inconsiderable) processing effort, + * we cache this data in the sitemap_notice_count table. Each + * row represents a day since the site has been started, with a count + * of notices posted on that day. Since, after the end of the day, + * this number doesn't change, it's a good candidate for persistent caching. + * + * @category Data + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * @see DB_DataObject + */ + +class Sitemap_notice_count extends Memcached_DataObject +{ + public $__table = 'sitemap_notice_count'; // table name + + public $notice_date; // date primary_key not_null + public $notice_count; // int(4) + public $created; + public $modified; + + /** + * Get an instance by key + * + * This is a utility method to get a single instance with a given key value. + * + * @param string $k Key to use to lookup (usually 'notice_id' for this class) + * @param mixed $v Value to lookup + * + * @return Sitemap_notice_count object found, or null for no hits + * + */ + + function staticGet($k, $v=null) + { + return Memcached_DataObject::staticGet('Sitemap_notice_count', $k, $v); + } + + /** + * return table definition for DB_DataObject + * + * DB_DataObject needs to know something about the table to manipulate + * instances. This method provides all the DB_DataObject needs to know. + * + * @return array array of column definitions + */ + + function table() + { + return array('notice_date' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_NOTNULL, + 'notice_count' => DB_DATAOBJECT_INT, + 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL, + 'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL); + } + + /** + * return key definitions for DB_DataObject + * + * DB_DataObject needs to know about keys that the table has; this function + * defines them. + * + * @return array key definitions + */ + + function keys() + { + return array('notice_date' => 'K'); + } + + /** + * return key definitions for Memcached_DataObject + * + * Our caching system uses the same key definitions, but uses a different + * method to get them. + * + * @return array key definitions + */ + + function keyTypes() + { + return $this->keys(); + } +} diff --git a/plugins/Sitemap/Sitemap_user_count.php b/plugins/Sitemap/Sitemap_user_count.php new file mode 100644 index 0000000000..1a7a6577d5 --- /dev/null +++ b/plugins/Sitemap/Sitemap_user_count.php @@ -0,0 +1,121 @@ + + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2010, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; + +/** + * Data class for counting users by date + * + * We make a separate sitemap for each user registered by date. + * To save ourselves some processing effort, we cache this data + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * @see DB_DataObject + */ + +class Sitemap_user_count extends Memcached_DataObject +{ + public $__table = 'sitemap_user_count'; // table name + + public $registration_date; // date primary_key not_null + public $user_count; // int(4) + public $created; + public $modified; + + /** + * Get an instance by key + * + * This is a utility method to get a single instance with a given key value. + * + * @param string $k Key to use to lookup (usually 'user_id' for this class) + * @param mixed $v Value to lookup + * + * @return Sitemap_user_count object found, or null for no hits + * + */ + + function staticGet($k, $v=null) + { + return Memcached_DataObject::staticGet('Sitemap_user_count', $k, $v); + } + + /** + * return table definition for DB_DataObject + * + * DB_DataObject needs to know something about the table to manipulate + * instances. This method provides all the DB_DataObject needs to know. + * + * @return array array of column definitions + */ + + function table() + { + return array('registration_date' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_NOTNULL, + 'user_count' => DB_DATAOBJECT_INT, + 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL, + 'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL); + } + + /** + * return key definitions for DB_DataObject + * + * DB_DataObject needs to know about keys that the table has; this function + * defines them. + * + * @return array key definitions + */ + + function keys() + { + return array('registration_date' => 'K'); + } + + /** + * return key definitions for Memcached_DataObject + * + * Our caching system uses the same key definitions, but uses a different + * method to get them. + * + * @return array key definitions + */ + + function keyTypes() + { + return $this->keys(); + } +} From 416161c94366292a623aecf8fe79b0d73c337e98 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 21 May 2010 16:47:30 -0400 Subject: [PATCH 214/730] make user counts use the database table --- plugins/Sitemap/SitemapPlugin.php | 4 + plugins/Sitemap/Sitemap_user_count.php | 166 +++++++++++++++++++++++++ plugins/Sitemap/sitemapindex.php | 35 ++---- 3 files changed, 180 insertions(+), 25 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 831694efc6..82c007d66f 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -64,6 +64,9 @@ class SitemapPlugin extends Plugin switch ($cls) { + case 'Sitemap_user_count': + require_once $dir . '/' . $cls . '.php'; + return false; case 'SitemapindexAction': case 'NoticesitemapAction': case 'UsersitemapAction': @@ -71,6 +74,7 @@ class SitemapPlugin extends Plugin return false; case 'SitemapAction': require_once $dir . '/' . strtolower($cls) . '.php'; + return false; default: return true; } diff --git a/plugins/Sitemap/Sitemap_user_count.php b/plugins/Sitemap/Sitemap_user_count.php index 1a7a6577d5..7743b05326 100644 --- a/plugins/Sitemap/Sitemap_user_count.php +++ b/plugins/Sitemap/Sitemap_user_count.php @@ -105,6 +105,11 @@ class Sitemap_user_count extends Memcached_DataObject return array('registration_date' => 'K'); } + function sequenceKey() + { + return array(false, false, false); + } + /** * return key definitions for Memcached_DataObject * @@ -118,4 +123,165 @@ class Sitemap_user_count extends Memcached_DataObject { return $this->keys(); } + + static function getAll() + { + $userCounts = self::cacheGet('sitemap:user:counts'); + + if ($userCounts === false) { + + $suc = new Sitemap_user_count(); + $suc->orderBy('registration_date DESC'); + + // Fetch the first one to check up-to-date-itude + + $n = $suc->find(true); + + $today = self::today(); + $userCounts = array(); + + if (!$n) { // No counts saved yet + $userCounts = self::initializeCounts(); + } else if ($suc->registration_date < $today) { // There are counts but not up to today + $userCounts = self::fillInCounts($suc->registration_date); + } else if ($suc->registration_date == $today) { // Refresh today's + $userCounts[$today] = self::updateToday(); + } + + // starts with second-to-last date + + while ($suc->fetch()) { + $userCounts[$suc->registration_date] = $suc->user_count; + } + + self::cacheSet('sitemap:user:counts', $userCounts); + } + + return $userCounts; + } + + static function initializeCounts() + { + $firstDate = self::getFirstDate(); // awww + $today = self::today(); + + $counts = array(); + + for ($d = $firstDate; $d <= $today; $d = self::incrementDay($d)) { + common_debug("Date = '$d'"); + $n = self::getCount($d); + self::insertCount($d, $n); + $counts[$d] = $n; + } + + return $counts; + } + + static function fillInCounts($lastDate) + { + $today = self::today(); + + $counts = array(); + + $n = self::getCount($lastDate); + self::updateCount($lastDate, $n); + + $counts[$lastDate] = $n; + + for ($d = self::incrementDay($lastDate); $d <= $today; $d = self::incrementDay($d)) { + $n = self::getCount($d); + self::insertCount($d, $n); + } + + return $counts; + } + + static function updateToday() + { + $today = self::today(); + + $n = self::getCount($today); + self::updateCount($today, $n); + + return $n; + } + + static function getCount($d) + { + $user = new User(); + $user->whereAdd('created BETWEEN "'.$d.' 00:00:00" AND "'.self::incrementDay($d).' 00:00:00"'); + $n = $user->count(); + + return $n; + } + + static function insertCount($d, $n) + { + common_debug("Inserting count '$n' for '$d'"); + + $suc = new Sitemap_user_count(); + + $suc->registration_date = DB_DataObject_Cast::date($d); + $suc->user_count = $n; + $suc->created = common_sql_now(); + $suc->modified = $suc->created; + + if (!$suc->insert()) { + common_log(LOG_WARNING, "Could not save user counts for '$d'"); + } + } + + static function updateCount($d, $n) + { + $suc = Sitemap_user_count::staticGet('registration_date', DB_DataObject_Cast::date($d)); + + if (empty($suc)) { + throw new Exception("No such registration date: $d"); + } + + $orig = clone($suc); + + $suc->registration_date = DB_DataObject_Cast::date($d); + $suc->user_count = $n; + $suc->created = common_sql_now(); + $suc->modified = $suc->created; + + if (!$suc->update($orig)) { + common_log(LOG_WARNING, "Could not save user counts for '$d'"); + } + } + + static function incrementDay($d) + { + $dt = self::dateStrToInt($d); + return self::dateIntToStr($dt + 24 * 60 * 60); + } + + static function dateStrToInt($d) + { + return strtotime($d.' 00:00:00'); + } + + static function dateIntToStr($dt) + { + return date('Y-m-d', $dt); + } + + static function getFirstDate() + { + $u = new User(); + $u->selectAdd(); + $u->selectAdd('date(min(created)) as first_date'); + if ($u->find(true)) { + return $u->first_date; + } else { + // Is this right? + return self::dateIntToStr(time()); + } + } + + static function today() + { + return self::dateIntToStr(time()); + } } diff --git a/plugins/Sitemap/sitemapindex.php b/plugins/Sitemap/sitemapindex.php index 2055dd7f06..a3328340fe 100644 --- a/plugins/Sitemap/sitemapindex.php +++ b/plugins/Sitemap/sitemapindex.php @@ -68,11 +68,15 @@ class SitemapindexAction extends Action function showUserSitemaps() { - $userCounts = $this->getUserCounts(); + $userCounts = Sitemap_user_count::getAll(); foreach ($userCounts as $dt => $cnt) { $cnt = $cnt+0; - assert($cnt != 0); + + if ($cnt == 0) { + continue; + } + $n = (int)$cnt / (int)SitemapPlugin::USERS_PER_MAP; if (($cnt % SitemapPlugin::USERS_PER_MAP) != 0) { $n++; @@ -88,7 +92,9 @@ class SitemapindexAction extends Action $noticeCounts = $this->getNoticeCounts(); foreach ($noticeCounts as $dt => $cnt) { - assert($cnt != 0); + if ($cnt == 0) { + continue; + } $n = $cnt / SitemapPlugin::NOTICES_PER_MAP; if ($cnt % SitemapPlugin::NOTICES_PER_MAP) { $n++; @@ -101,28 +107,7 @@ class SitemapindexAction extends Action function getUserCounts() { - $userCounts = User::cacheGet('sitemap:user:counts'); - - if ($userCounts === false) { - - $user = new User(); - - $user->selectAdd(); - $user->selectAdd('date(created) as regdate, count(*) as regcount'); - $user->groupBy('regdate'); - - $user->find(); - - $userCounts = array(); - - while ($user->fetch()) { - $userCounts[$user->regdate] = $user->regcount; - } - - User::cacheSet('sitemap:user:counts', $userCounts); - } - - return $userCounts; + return Sitemap_user_count::getAll(); } function getNoticeCounts() From 271d7dd8509537aee7e10fd6c8f493e62e6c75b2 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 31 May 2010 07:48:14 -0700 Subject: [PATCH 215/730] load Sitemap_notice_count --- plugins/Sitemap/SitemapPlugin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 82c007d66f..7ef5f1aa9b 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -65,6 +65,7 @@ class SitemapPlugin extends Plugin switch ($cls) { case 'Sitemap_user_count': + case 'Sitemap_notice_count': require_once $dir . '/' . $cls . '.php'; return false; case 'SitemapindexAction': @@ -141,8 +142,6 @@ class SitemapPlugin extends Plugin { $schema = Schema::get(); - // For storing user-submitted flags on profiles - $schema->ensureTable('sitemap_user_count', array(new ColumnDef('registration_date', 'date', null, true, 'PRI'), From d78dfd627e558804c1ce79c69f586db29fa6c0fa Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 31 May 2010 07:50:10 -0700 Subject: [PATCH 216/730] cache notice counts in utility table --- plugins/Sitemap/Sitemap_notice_count.php | 162 +++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/plugins/Sitemap/Sitemap_notice_count.php b/plugins/Sitemap/Sitemap_notice_count.php index 72bb2b9d41..673417b788 100644 --- a/plugins/Sitemap/Sitemap_notice_count.php +++ b/plugins/Sitemap/Sitemap_notice_count.php @@ -122,4 +122,166 @@ class Sitemap_notice_count extends Memcached_DataObject { return $this->keys(); } + + static function getAll() + { + $noticeCounts = self::cacheGet('sitemap:notice:counts'); + + if ($noticeCounts === false) { + + $snc = new Sitemap_notice_count(); + $snc->orderBy('notice_date DESC'); + + // Fetch the first one to check up-to-date-itude + + $n = $snc->find(true); + + $today = self::today(); + $noticeCounts = array(); + + if (!$n) { // No counts saved yet + $noticeCounts = self::initializeCounts(); + } else if ($snc->notice_date < $today) { // There are counts but not up to today + $noticeCounts = self::fillInCounts($snc->notice_date); + } else if ($snc->notice_date == $today) { // Refresh today's + $noticeCounts[$today] = self::updateToday(); + } + + // starts with second-to-last date + + while ($snc->fetch()) { + $noticeCounts[$snc->notice_date] = $snc->notice_count; + } + + self::cacheSet('sitemap:notice:counts', $noticeCounts); + } + + return $noticeCounts; + } + + static function initializeCounts() + { + $firstDate = self::getFirstDate(); // awww + $today = self::today(); + + $counts = array(); + + for ($d = $firstDate; $d <= $today; $d = self::incrementDay($d)) { + $n = self::getCount($d); + self::insertCount($d, $n); + $counts[$d] = $n; + } + + return $counts; + } + + static function fillInCounts($lastDate) + { + $today = self::today(); + + $counts = array(); + + $n = self::getCount($lastDate); + self::updateCount($lastDate, $n); + + $counts[$lastDate] = $n; + + for ($d = self::incrementDay($lastDate); $d <= $today; $d = self::incrementDay($d)) { + $n = self::getCount($d); + self::insertCount($d, $n); + } + + return $counts; + } + + static function updateToday() + { + $today = self::today(); + + $n = self::getCount($today); + self::updateCount($today, $n); + + return $n; + } + + static function getCount($d) + { + $notice = new Notice(); + $notice->whereAdd('created BETWEEN "'.$d.' 00:00:00" AND "'.self::incrementDay($d).' 00:00:00"'); + $n = $notice->count(); + + return $n; + } + + static function insertCount($d, $n) + { + $snc = new Sitemap_notice_count(); + + $snc->notice_date = DB_DataObject_Cast::date($d); + + $snc->notice_count = $n; + $snc->created = common_sql_now(); + $snc->modified = $snc->created; + + if (!$snc->insert()) { + common_log(LOG_WARNING, "Could not save user counts for '$d'"); + } + } + + static function updateCount($d, $n) + { + $snc = Sitemap_notice_count::staticGet('notice_date', DB_DataObject_Cast::date($d)); + + if (empty($snc)) { + throw new Exception("No such registration date: $d"); + } + + $orig = clone($snc); + + $snc->notice_date = DB_DataObject_Cast::date($d); + + $snc->notice_count = $n; + $snc->created = common_sql_now(); + $snc->modified = $snc->created; + + if (!$snc->update($orig)) { + common_log(LOG_WARNING, "Could not save user counts for '$d'"); + } + } + + static function incrementDay($d) + { + $dt = self::dateStrToInt($d); + return self::dateIntToStr($dt + 24 * 60 * 60); + } + + static function dateStrToInt($d) + { + return strtotime($d.' 00:00:00'); + } + + static function dateIntToStr($dt) + { + return date('Y-m-d', $dt); + } + + static function getFirstDate() + { + $n = new Notice(); + + $n->selectAdd(); + $n->selectAdd('date(min(created)) as first_date'); + + if ($n->find(true)) { + return $n->first_date; + } else { + // Is this right? + return self::dateIntToStr(time()); + } + } + + static function today() + { + return self::dateIntToStr(time()); + } } From 1066b264247811ec9371ff2f473f5d7f2a6dd98a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 31 May 2010 07:50:27 -0700 Subject: [PATCH 217/730] use sitemap_notice_count in sitemap index --- plugins/Sitemap/sitemapindex.php | 37 ++++---------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/plugins/Sitemap/sitemapindex.php b/plugins/Sitemap/sitemapindex.php index a3328340fe..5150b1aeb8 100644 --- a/plugins/Sitemap/sitemapindex.php +++ b/plugins/Sitemap/sitemapindex.php @@ -58,8 +58,8 @@ class SitemapindexAction extends Action $this->elementStart('sitemapindex', array('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9')); - $this->showUserSitemaps(); $this->showNoticeSitemaps(); + $this->showUserSitemaps(); $this->elementEnd('sitemapindex'); @@ -89,7 +89,9 @@ class SitemapindexAction extends Action function showNoticeSitemaps() { - $noticeCounts = $this->getNoticeCounts(); + $noticeCounts = Sitemap_notice_count::getAll(); + + common_debug(sprintf("Got %d notice counts", count($noticeCounts))); foreach ($noticeCounts as $dt => $cnt) { if ($cnt == 0) { @@ -105,37 +107,6 @@ class SitemapindexAction extends Action } } - function getUserCounts() - { - return Sitemap_user_count::getAll(); - } - - function getNoticeCounts() - { - $noticeCounts = Notice::cacheGet('sitemap:notice:counts'); - - if ($noticeCounts === false) { - - $notice = new Notice(); - - $notice->selectAdd(); - $notice->selectAdd('date(created) as postdate, count(*) as postcount'); - $notice->groupBy('postdate'); - - $notice->find(); - - $noticeCounts = array(); - - while ($notice->fetch()) { - $noticeCounts[$notice->postdate] = $notice->postcount; - } - - Notice::cacheSet('sitemap:notice:counts', $noticeCounts); - } - - return $noticeCounts; - } - function showSitemap($prefix, $dt, $i) { list($y, $m, $d) = explode('-', $dt); From 17ab15a3d02c335f2d9d333ac3773c037e796cf5 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 1 Jun 2010 13:53:44 -0700 Subject: [PATCH 218/730] Fix memory leak in Inbox::addToInbox() (usage of raw DB_DataObject::staticGet, which leaks memory into a process-global cache). On my test setup, this fixes inbox delivery to 10,000 local recipients from background queuedaemon running with a 32mb memory limit, completes the job within a minute from start. --- classes/Inbox.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/classes/Inbox.php b/classes/Inbox.php index 2533210b73..430419ba5e 100644 --- a/classes/Inbox.php +++ b/classes/Inbox.php @@ -115,9 +115,12 @@ class Inbox extends Memcached_DataObject */ static function insertNotice($user_id, $notice_id) { - $inbox = DB_DataObject::staticGet('inbox', 'user_id', $user_id); - - if (empty($inbox)) { + // Going straight to the DB rather than trusting our caching + // during an update. Note: not using DB_DataObject::staticGet, + // which is unsafe to use directly (in-process caching causes + // memory leaks, which accumulate in queue processes). + $inbox = new Inbox(); + if (!$inbox->get('user_id', $user_id)) { $inbox = Inbox::initialize($user_id); } From 9bb48c36eab5e6856b7768c273d382a825f22ff0 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 3 Jun 2010 10:13:28 -0700 Subject: [PATCH 219/730] Installer tweak to aid with IIS setup: if config.php exists, but is both empty and writable, let the installer proceed and overwrite it. --- lib/installer.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/installer.php b/lib/installer.php index 58ffbfef7e..7936d5d5d1 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -81,9 +81,12 @@ abstract class Installer { $pass = true; - if (file_exists(INSTALLDIR.'/config.php')) { - $this->warning('Config file "config.php" already exists.'); - $pass = false; + $config = INSTALLDIR.'/config.php'; + if (file_exists($config)) { + if (!is_writable($config) || filesize($config) > 0) { + $this->warning('Config file "config.php" already exists.'); + $pass = false; + } } if (version_compare(PHP_VERSION, '5.2.3', '<')) { From 4bbb259baf93780556db398f50a22b6f245071e4 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 3 Jun 2010 10:52:16 -0700 Subject: [PATCH 220/730] - Fix bad argument being passed (error code) when invalid format specified - Reformat whitespace --- actions/apistatusesdestroy.php | 55 ++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php index 0bfcdd060e..749f72e68d 100644 --- a/actions/apistatusesdestroy.php +++ b/actions/apistatusesdestroy.php @@ -99,32 +99,43 @@ class ApiStatusesDestroyAction extends ApiAuthAction parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found.'), $code = 404); - return; + $this->clientError( + _('API method not found.'), + 404 + ); + return; } - if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) { - $this->clientError(_('This method requires a POST or DELETE.'), - 400, $this->format); - return; - } + if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) { + $this->clientError( + _('This method requires a POST or DELETE.'), + 400, + $this->format + ); + return; + } - if (empty($this->notice)) { - $this->clientError(_('No status found with that ID.'), - 404, $this->format); - return; - } + if (empty($this->notice)) { + $this->clientError( + _('No status found with that ID.'), + 404, $this->format + ); + return; + } - if ($this->user->id == $this->notice->profile_id) { - $replies = new Reply; - $replies->get('notice_id', $this->notice_id); - $replies->delete(); - $this->notice->delete(); - $this->showNotice(); - } else { - $this->clientError(_('You may not delete another user\'s status.'), - 403, $this->format); - } + if ($this->user->id == $this->notice->profile_id) { + $replies = new Reply; + $replies->get('notice_id', $this->notice_id); + $replies->delete(); + $this->notice->delete(); + $this->showNotice(); + } else { + $this->clientError( + _('You may not delete another user\'s status.'), + 403, + $this->format + ); + } } /** From 1100831bc0271574552e9757aff09d8a9c916038 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 3 Jun 2010 15:19:46 -0400 Subject: [PATCH 221/730] remove debug statements from Sitemap plugin --- plugins/Sitemap/Sitemap_user_count.php | 3 --- plugins/Sitemap/sitemapindex.php | 2 -- 2 files changed, 5 deletions(-) diff --git a/plugins/Sitemap/Sitemap_user_count.php b/plugins/Sitemap/Sitemap_user_count.php index 7743b05326..64b4c34428 100644 --- a/plugins/Sitemap/Sitemap_user_count.php +++ b/plugins/Sitemap/Sitemap_user_count.php @@ -168,7 +168,6 @@ class Sitemap_user_count extends Memcached_DataObject $counts = array(); for ($d = $firstDate; $d <= $today; $d = self::incrementDay($d)) { - common_debug("Date = '$d'"); $n = self::getCount($d); self::insertCount($d, $n); $counts[$d] = $n; @@ -217,8 +216,6 @@ class Sitemap_user_count extends Memcached_DataObject static function insertCount($d, $n) { - common_debug("Inserting count '$n' for '$d'"); - $suc = new Sitemap_user_count(); $suc->registration_date = DB_DataObject_Cast::date($d); diff --git a/plugins/Sitemap/sitemapindex.php b/plugins/Sitemap/sitemapindex.php index 5150b1aeb8..169e3031ce 100644 --- a/plugins/Sitemap/sitemapindex.php +++ b/plugins/Sitemap/sitemapindex.php @@ -91,8 +91,6 @@ class SitemapindexAction extends Action { $noticeCounts = Sitemap_notice_count::getAll(); - common_debug(sprintf("Got %d notice counts", count($noticeCounts))); - foreach ($noticeCounts as $dt => $cnt) { if ($cnt == 0) { continue; From 1a44d4272f5439b99ac34084e7fcb16a5c4b3f2f Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 3 Jun 2010 22:24:55 +0000 Subject: [PATCH 222/730] Add repeated attr to Atom notices_info element --- classes/Notice.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/Notice.php b/classes/Notice.php index 3d7d21533b..0838ca2a2c 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1252,6 +1252,8 @@ class Notice extends Memcached_DataObject if (!empty($cur)) { $noticeInfoAttr['favorite'] = ($cur->hasFave($this)) ? "true" : "false"; + $profile = $cur->getProfile(); + $noticeInfoAttr['repeated'] = ($profile->hasRepeated($this->id)) ? "true" : "false"; } if (!empty($this->repeat_of)) { From a7e33ac89df9f05b7497bfb34c6e69b3329a87e5 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 4 Jun 2010 01:06:25 +0200 Subject: [PATCH 223/730] Localisation updates from http://translatewiki.net --- locale/af/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/ar/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/arz/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/bg/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/br/LC_MESSAGES/statusnet.po | 251 ++++++++------- locale/ca/LC_MESSAGES/statusnet.po | 4 +- locale/cs/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/de/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/el/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/en_GB/LC_MESSAGES/statusnet.po | 256 +++++++-------- locale/es/LC_MESSAGES/statusnet.po | 251 +++++++-------- locale/fa/LC_MESSAGES/statusnet.po | 254 +++++++-------- locale/fi/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/fr/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/ga/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/gl/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/he/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/hsb/LC_MESSAGES/statusnet.po | 434 +++++++++++++------------- locale/ia/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/is/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/it/LC_MESSAGES/statusnet.po | 251 +++++++-------- locale/ja/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/ko/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/mk/LC_MESSAGES/statusnet.po | 332 ++++++++++---------- locale/nb/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/nl/LC_MESSAGES/statusnet.po | 4 +- locale/nn/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/pl/LC_MESSAGES/statusnet.po | 4 +- locale/pt/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/pt_BR/LC_MESSAGES/statusnet.po | 293 +++++++++-------- locale/ru/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/statusnet.pot | 2 +- locale/sv/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/te/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/tr/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/uk/LC_MESSAGES/statusnet.po | 15 +- locale/vi/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/zh_CN/LC_MESSAGES/statusnet.po | 248 +++++++-------- locale/zh_TW/LC_MESSAGES/statusnet.po | 248 +++++++-------- 39 files changed, 4425 insertions(+), 4374 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index 79e5e7cd8e..4e190e45ab 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:36:28+0000\n" +"PO-Revision-Date: 2010-06-03 23:00:28+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -83,25 +83,25 @@ msgid "Save" msgstr "Stoor" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "Hierdie bladsy bestaan nie" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -114,7 +114,7 @@ msgid "No such user." msgstr "Onbekende gebruiker." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s en vriende, bladsy %2$d" @@ -122,33 +122,33 @@ msgstr "%1$s en vriende, bladsy %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s en vriende" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Voer vir vriende van %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Voer vir vriende van %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Voer vir vriende van %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -156,7 +156,7 @@ msgstr "" "Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos " "nie." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -164,14 +164,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -179,14 +179,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "U en vriende" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Opdaterings van %1$s en vriende op %2$s." @@ -197,22 +197,22 @@ msgstr "Opdaterings van %1$s en vriende op %2$s." #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "Die API-funksie is nie gevind nie." @@ -222,11 +222,11 @@ msgstr "Die API-funksie is nie gevind nie." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Hierdie metode benodig 'n POST." @@ -256,7 +256,7 @@ msgstr "Kon nie die profiel stoor nie." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -332,24 +332,24 @@ msgstr "" "U kan nie direkte boodskappe aan gebruikers wat nie op u viendelys is stuur " "nie." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Geen status met die ID gevind nie." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Hierdie status is reeds 'n gunsteling." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Dit was nie moontlik om 'n gunsteling te skep nie." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Hierdie status is nie 'n gunsteling nie." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "" "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie." @@ -385,7 +385,7 @@ msgstr "" msgid "Could not find target user." msgstr "" -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -393,114 +393,114 @@ msgstr "" "Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen " "spasies bevat nie." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Nie 'n geldige gebruikersnaam nie." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Tuisblad is nie 'n geldige URL nie." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Volledige naam is te lang (maksimum 255 karakters)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Die beskrywing is te lank (die maksimum is %d karakters)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Ligging is te lank is (maksimum 255 karakters)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Te veel aliasse! Die maksimum aantal is %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "Ongeldige alias: \"%s\"" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Die alias kan nie dieselfde as die gebruikersnaam wees nie." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "Groep nie gevind nie!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "U is reeds 'n lid van die groep." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "%s se groepe" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "Groepe op %1$s waar %2$s lid van is." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s groepe" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "groepe op %s" @@ -515,7 +515,7 @@ msgstr "Ongeldige token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -614,11 +614,11 @@ msgstr "Toestaan" msgid "Allow or deny access to your account information." msgstr "Laat toegang tot u gebruikersinligting toe of weier dit." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Hierdie metode vereis 'n POST of DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "U mag nie 'n ander gebruiker se status verwyder nie." @@ -635,25 +635,25 @@ msgstr "U kan nie u eie kennisgewings herhaal nie." msgid "Already repeated that notice." msgstr "U het reeds die kennisgewing herhaal." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Die status is verwyder." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Geen status met die ID gevind nie." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Nie gevind nie." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -662,32 +662,32 @@ msgstr "" msgid "Unsupported format." msgstr "Nie-ondersteunde formaat." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Gunstelinge van %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -702,12 +702,12 @@ msgstr "Na %s herhaal" msgid "Repeats of %s" msgstr "Herhalings van %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -1820,7 +1820,7 @@ msgstr "Maak hierdie gebruiker 'n administrateur" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s tydlyn" @@ -2436,31 +2436,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "Hierdie gebruiker het nie 'n profiel nie." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Status van %1$s op %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "" @@ -3383,7 +3383,7 @@ msgstr "" msgid "User doesn't have this role." msgstr "" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3440,7 +3440,7 @@ msgid "Icon" msgstr "Ikoon" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Naam" @@ -3451,7 +3451,7 @@ msgid "Organization" msgstr "Organisasie" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beskrywing" @@ -4370,7 +4370,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Lisensie" @@ -4491,29 +4491,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Opdaterings van %1$s op %2$s." -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Medewerkers" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4521,7 +4521,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4529,39 +4529,39 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Weergawe" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Outeur(s)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4600,45 +4600,45 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5090,7 +5090,7 @@ msgid "Snapshots configuration" msgstr "" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5223,11 +5223,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "Etikette vir hierdie aanhangsel" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Wagwoord wysiging het misluk" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Wagwoord verandering word nie toegelaat nie" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 81269626b7..7c2aed1fb0 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:36:31+0000\n" +"PO-Revision-Date: 2010-06-03 23:00:33+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -85,24 +85,24 @@ msgid "Save" msgstr "احفظ" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "لا صفحة كهذه." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -115,7 +115,7 @@ msgid "No such user." msgstr "لا مستخدم كهذا." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s والأصدقاء, الصفحة %2$d" @@ -123,39 +123,39 @@ msgstr "%1$s والأصدقاء, الصفحة %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s والأصدقاء" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -163,14 +163,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -178,14 +178,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "أنت والأصدقاء" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -196,22 +196,22 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "لم يتم العثور على وسيلة API." @@ -221,11 +221,11 @@ msgstr "لم يتم العثور على وسيلة API." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقة POST." @@ -255,7 +255,7 @@ msgstr "لم يمكن حفظ الملف." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -329,24 +329,24 @@ msgstr "لم يُعثر على المستخدم المستلم." msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "هذه الحالة مفضلة بالفعل." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "تعذّر إنشاء مفضلة." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "تلك الحالة ليست مفضلة." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "تعذّر حذف المفضلة." @@ -379,119 +379,119 @@ msgstr "تعذّر تحديد المستخدم المصدر." msgid "Could not find target user." msgstr "تعذّر إيجاد المستخدم الهدف." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "ليس اسمًا مستعارًا صحيحًا." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "الصفحة الرئيسية ليست عنونًا صالحًا." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "" -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "كنيات كيرة! العدد الأقصى هو %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "كنية غير صالحة: \"%s\"" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "" -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "المجموعة غير موجودة." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "لست عضوًا في هذه المجموعة" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "مجموعات %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "المجموعات التي %s عضو فيها" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "مجموعات %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "مجموعات %s" @@ -507,7 +507,7 @@ msgstr "حجم غير صالح." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -608,11 +608,11 @@ msgstr "اسمح" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "" @@ -629,25 +629,25 @@ msgstr "لا يمكنك تكرار ملحوظتك الخاصة." msgid "Already repeated that notice." msgstr "كرر بالفعل هذه الملاحظة." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "حُذِفت الحالة." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "لا حالة وُجدت بهذه الهوية." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "لم يوجد." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -656,32 +656,32 @@ msgstr "" msgid "Unsupported format." msgstr "نسق غير مدعوم." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "مسار %s الزمني العام" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -696,12 +696,12 @@ msgstr "كرر إلى %s" msgid "Repeats of %s" msgstr "تكرارات %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "الإشعارات الموسومة ب%s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -1806,7 +1806,7 @@ msgstr "اجعل هذا المستخدم إداريًا" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "مسار %s الزمني" @@ -2426,31 +2426,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "ليس للمستخدم ملف شخصي." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "حالة %1$s في يوم %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "نوع المحتوى " #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -3383,7 +3383,7 @@ msgstr "لا يمكنك إسكات المستخدمين على هذا الموق msgid "User doesn't have this role." msgstr "المستخدم بدون ملف مطابق." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "ستاتس نت" @@ -3440,7 +3440,7 @@ msgid "Icon" msgstr "أيقونة" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "الاسم" @@ -3451,7 +3451,7 @@ msgid "Organization" msgstr "المنظمة" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "الوصف" @@ -4386,7 +4386,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "الرخصة" @@ -4507,18 +4507,18 @@ msgstr "جرّب [البحث عن مجموعات](%%action.groupsearch%%) وال #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "ستاتس نت %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4527,11 +4527,11 @@ msgstr "" "هذا الموقع يشغله %1$s النسخة %2$s، حقوق النشر 2008-2010 StatusNet, Inc " "ومساهموها." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "المساهمون" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4539,7 +4539,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4547,39 +4547,39 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "الملحقات" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "النسخة" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "المؤلف(ون)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4618,46 +4618,46 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "خطأ قاعدة البيانات أثناء إدخال المستخدم OAuth app" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "مشكلة في حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "مشكلة أثناء حفظ الإشعار." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "مشكلة أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" @@ -5119,7 +5119,7 @@ msgid "Snapshots configuration" msgstr "ضبط المسارات" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5250,11 +5250,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "وسوم هذا المرفق" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "تغيير كلمة السر فشل" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "تغيير كلمة السر غير مسموح به" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index e6155391f5..1f6b207878 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:36:34+0000\n" +"PO-Revision-Date: 2010-06-03 23:00:49+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -91,25 +91,25 @@ msgid "Save" msgstr "أرسل" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "لا صفحه كهذه" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -122,7 +122,7 @@ msgid "No such user." msgstr "لا مستخدم كهذا." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s و الصحاب, صفحه %2$d" @@ -130,39 +130,39 @@ msgstr "%1$s و الصحاب, صفحه %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s والأصدقاء" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -170,14 +170,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -185,14 +185,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "أنت والأصدقاء" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -203,22 +203,22 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "الـ API method مش موجوده." @@ -228,11 +228,11 @@ msgstr "الـ API method مش موجوده." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقه POST." @@ -262,7 +262,7 @@ msgstr "لم يمكن حفظ الملف." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -336,24 +336,24 @@ msgstr "لم يُعثر على المستخدم المستلم." msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "الحاله دى موجوده فعلا فى التفضيلات." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "تعذّر إنشاء مفضله." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "الحاله دى مش محطوطه فى التفضيلات." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "تعذّر حذف المفضله." @@ -386,120 +386,120 @@ msgstr "" msgid "Could not find target user." msgstr "تعذّر إيجاد المستخدم الهدف." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "" -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "ليس اسمًا مستعارًا صحيحًا." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "" -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "كنيه غير صالحة: \"%s\"" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "" -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "لم توجد المجموعة!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "ما نفعش يضم %1$s للجروپ %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "ما نفعش يتشال اليوزر %1$s من الجروپ %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "مجموعات %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "المجموعات التى %s عضو فيها" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "مجموعات %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "مجموعات %s" @@ -515,7 +515,7 @@ msgstr "حجم غير صالح." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -616,11 +616,11 @@ msgstr "اسمح" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "" @@ -637,25 +637,25 @@ msgstr "مش نافعه تتكرر الملاحظتك بتاعتك." msgid "Already repeated that notice." msgstr "الملاحظه اتكررت فعلا." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "حُذِفت الحاله." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "لم يوجد." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -664,32 +664,32 @@ msgstr "" msgid "Unsupported format." msgstr "نسق غير مدعوم." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "مسار %s الزمنى العام" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -704,12 +704,12 @@ msgstr "كرر إلى %s" msgid "Repeats of %s" msgstr "تكرارات %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "الإشعارات الموسومه ب%s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -1832,7 +1832,7 @@ msgstr "اجعل هذا المستخدم إداريًا" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "مسار %s الزمني" @@ -2450,31 +2450,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "ليس للمستخدم ملف شخصى." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "نوع المحتوى " #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr " مش نظام بيانات مدعوم." @@ -3405,7 +3405,7 @@ msgstr "لا يمكنك إسكات المستخدمين على هذا الموق msgid "User doesn't have this role." msgstr "يوزر من-غير پروفايل زيّه." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3463,7 +3463,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "الاسم" @@ -3474,7 +3474,7 @@ msgid "Organization" msgstr "المنظمه" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "الوصف" @@ -4410,7 +4410,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "الرخصة" @@ -4531,29 +4531,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4561,7 +4561,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4569,39 +4569,39 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "النسخه" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "المؤلف/ين" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4641,46 +4641,46 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "مشكله فى حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "مشكله أثناء حفظ الإشعار." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "مشكله أثناء حفظ الإشعار." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" @@ -5164,7 +5164,7 @@ msgid "Snapshots configuration" msgstr "ضبط المسارات" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5295,11 +5295,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "وسوم هذا المرفق" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "تغيير الپاسوورد فشل" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "تغيير الپاسوورد مش مسموح" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 517719b491..d39b54718d 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:36:38+0000\n" +"PO-Revision-Date: 2010-06-03 23:00:53+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -85,25 +85,25 @@ msgid "Save" msgstr "Запазване" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "Няма такака страница." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -116,7 +116,7 @@ msgid "No such user." msgstr "Няма такъв потребител" #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s и приятели, страница %2$d" @@ -124,39 +124,39 @@ msgstr "%1$s и приятели, страница %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s и приятели" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Емисия с приятелите на %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Емисия с приятелите на %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Емисия с приятелите на %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -164,14 +164,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -179,14 +179,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Вие и приятелите" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Бележки от %1$s и приятели в %2$s." @@ -197,22 +197,22 @@ msgstr "Бележки от %1$s и приятели в %2$s." #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "Не е открит методът в API." @@ -222,11 +222,11 @@ msgstr "Не е открит методът в API." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Този метод изисква заявка POST." @@ -256,7 +256,7 @@ msgstr "Грешка при запазване на профила." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -334,24 +334,24 @@ msgstr "" "Не може да изпращате преки съобщения до хора, които не са в списъка ви с " "приятели." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Не е открита бележка с такъв идентификатор." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Тази бележка вече е отбелязана като любима." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Грешка при отбелязване като любима." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Тази бележка не е отбелязана като любима." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Грешка при изтриване на любима бележка." @@ -385,7 +385,7 @@ msgstr "Грешка при изтегляне на общия поток" msgid "Could not find target user." msgstr "Целевият потребител не беше открит." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -393,113 +393,113 @@ msgstr "" "Псевдонимът може да съдържа само малки букви, числа и никакво разстояние " "между тях." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Опитайте друг псевдоним, този вече е зает." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Неправилен псевдоним." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Адресът на личната страница не е правилен URL." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Пълното име е твърде дълго (макс. 255 знака)" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Описанието е твърде дълго (до %d символа)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Името на местоположението е твърде дълго (макс. 255 знака)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "Неправилен псевдоним: \"%s\"" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Псевдонимът \"%s\" вече е зает. Опитайте друг." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Групата не е открита." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Вече членувате в тази група." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Грешка при проследяване — потребителят не е намерен." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Не членувате в тази група." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Грешка при проследяване — потребителят не е намерен." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Групи на %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "Групи, в които участва %s" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Групи на %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "групи в %s" @@ -515,7 +515,7 @@ msgstr "Неправилен размер." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -617,11 +617,11 @@ msgstr "Всички" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Този метод изисква заявка POST или DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Не може да изтривате бележки на друг потребител." @@ -638,25 +638,25 @@ msgstr "Не можете да повтаряте собствени бележ msgid "Already repeated that notice." msgstr "Вече сте повторили тази бележка." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Бележката е изтрита." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Не е открита бележка с такъв идентификатор." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Твърде дълга бележка. Трябва да е най-много 140 знака." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Не е открито." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -665,32 +665,32 @@ msgstr "" msgid "Unsupported format." msgstr "Неподдържан формат." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Отбелязани като любими от %s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s бележки отбелязани като любими от %s / %s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Реплики на %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s реплики на съобщения от %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Общ поток на %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -705,12 +705,12 @@ msgstr "Повторено за %s" msgid "Repeats of %s" msgstr "Повторения на %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Бележки с етикет %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." @@ -1858,7 +1858,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Поток на %s" @@ -2535,31 +2535,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "Бележката няма профил" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Бележка на %1$s от %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "вид съдържание " #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -3524,7 +3524,7 @@ msgstr "Не можете да заглушавате потребители н msgid "User doesn't have this role." msgstr "Потребител без съответстващ профил" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3584,7 +3584,7 @@ msgid "Icon" msgstr "Икона" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Име" @@ -3595,7 +3595,7 @@ msgid "Organization" msgstr "Организация" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Описание" @@ -4550,7 +4550,7 @@ msgstr "" "Проверете тези детайли и се уверете, че искате да се абонирате за бележките " "на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Лиценз" @@ -4679,29 +4679,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4709,7 +4709,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4717,39 +4717,39 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Приставки" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Версия" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Автор(и)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4793,28 +4793,28 @@ msgid "Could not update message with new URI." msgstr "Грешка при обновяване на бележката с нов URL-адрес." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "Грешка в базата от данни — отговор при вмъкването: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Грешка при записване на бележката. Непознат потребител." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:260 +#: classes/Notice.php:266 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4823,22 +4823,22 @@ msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Забранено ви е да публикувате бележки в този сайт." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "Проблем при записване на бележката." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5320,7 +5320,7 @@ msgid "Snapshots configuration" msgstr "Настройка на пътищата" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5455,12 +5455,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "Паролата е записана." -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "Паролата е записана." diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index fb28431ff1..5b121ceb35 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:36:41+0000\n" +"PO-Revision-Date: 2010-06-03 23:00:57+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -84,24 +84,24 @@ msgid "Save" msgstr "Enrollañ" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "N'eus ket eus ar bajenn-se." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -114,7 +114,7 @@ msgid "No such user." msgstr "N'eus ket eus an implijer-se." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s hag e vignoned, pajenn %2$d" @@ -122,39 +122,39 @@ msgstr "%1$s hag e vignoned, pajenn %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s hag e vignoned" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Gwazh evit mignoned %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Gwazh evit mignoned %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Gwazh evit mignoned %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -162,14 +162,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -177,14 +177,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "C'hwi hag o mignoned" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Hizivadennoù %1$s ha mignoned e %2$s!" @@ -195,22 +195,22 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "N'eo ket bet kavet an hentenn API !" @@ -220,11 +220,11 @@ msgstr "N'eo ket bet kavet an hentenn API !" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Ezhomm en deus an argerzh-mañ eus ur POST." @@ -254,7 +254,7 @@ msgstr "Diposubl eo enrollañ ar profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -330,24 +330,24 @@ msgstr "" "Ne c'helloc'h ket kas kemennadennoù personel d'an implijerien n'int ket ho " "mignoned." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "N'eo bet kavet statud ebet gant an ID-mañ." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Ur pennroll eo dija an ali-mañ." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Diposupl eo krouiñ ar pennroll-mañ." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "N'eo ket ar statud-mañ ur pennroll." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Diposupl eo dilemel ar pennroll-mañ." @@ -381,119 +381,119 @@ msgstr "Diposubl eo termeniñ an implijer mammenn." msgid "Could not find target user." msgstr "Diposubl eo kavout an implijer pal." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Implijet eo dija al lesanv-se. Klaskit unan all." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "N'eo ket ul lesanv mat." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Re a aliasoù ! %d d'ar muiañ." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Alias fall : \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Implijet e vez an alias \"%s\" dija. Klaskit gant unan all." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "N'eo ket bet kavet ar strollad." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Un ezel eus ar strollad-mañ eo dija." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "N'oc'h ket ezel eus ar strollad-mañ." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Strollad %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "Strolladoù %1s m'eo ezel %2s." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Strolladoù %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "strolladoù war %s" @@ -508,7 +508,7 @@ msgstr "Fichenn direizh." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -607,11 +607,11 @@ msgstr "Aotreañ" msgid "Allow or deny access to your account information." msgstr "Aotreañ pe nac'hañ ar moned da ditouroù ho kont." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Ezhomm en deus an argerzh-mañ ur POST pe un DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Ne c'helloc'h ket dilemel statud un implijer all." @@ -628,25 +628,25 @@ msgstr "Ne c'helloc'h ket adlavar ho alioù." msgid "Already repeated that notice." msgstr "Adlavaret o peus dija an ali-mañ." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Statud diverket." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "N'eo ket bet kavet a statud evit an ID-mañ" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "N'eo ket bet kavet." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -655,32 +655,32 @@ msgstr "" msgid "Unsupported format." msgstr "Diembreget eo ar furmad-se." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Pennroll %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s statud pennroll da %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Hizivadennoù a veneg %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Oberezhioù publik %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s statud an holl !" @@ -695,12 +695,12 @@ msgstr "Adkemeret evit %s" msgid "Repeats of %s" msgstr "Adkemeret eus %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Alioù merket gant %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Hizivadennoù merket gant %1$s e %2$s !" @@ -1633,9 +1633,8 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "" #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." -msgstr "Diposubl eo enrollañ ar profil." +msgstr "Fazi en ur hizivaat ar profil a-bell." #: actions/getfile.php:79 msgid "No such file." @@ -1803,7 +1802,7 @@ msgstr "Lakaat an implijer-mañ da verour" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Oberezhioù %s" @@ -2428,30 +2427,30 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "N'en deus ket an ali a profil." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Statud %1$s war %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "seurt an danvez " #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "" @@ -3399,7 +3398,7 @@ msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ." msgid "User doesn't have this role." msgstr "n'en deus ket an implijer-mañ ar rol-se." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3456,7 +3455,7 @@ msgid "Icon" msgstr "Arlun" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Anv" @@ -3467,7 +3466,7 @@ msgid "Organization" msgstr "Aozadur" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Deskrivadur" @@ -4390,7 +4389,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Aotre implijout" @@ -4511,29 +4510,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Hizivadennoù eus %1$s e %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Aozerien" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4541,7 +4540,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4549,39 +4548,39 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Pluginoù" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Stumm" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Aozer(ien)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4620,45 +4619,45 @@ msgid "Could not update message with new URI." msgstr "Dibosupl eo hizivaat ar gemennadenn gant un URI nevez." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Ur gudenn 'zo bet pa veze enrollet an ali." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5111,7 +5110,7 @@ msgid "Snapshots configuration" msgstr "Kefluniadur ar primoù" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5242,11 +5241,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "N'eo ket aet betek penn kemmañ ar ger-tremen" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "N'eo ket aotreet kemmañ ar ger-tremen" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index a278da72a5..e5de380b4e 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-27 22:55+0000\n" -"PO-Revision-Date: 2010-05-27 22:56:26+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:01+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66982); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 3bf855f72b..3777168030 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:36:48+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:05+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -91,25 +91,25 @@ msgid "Save" msgstr "Uložit" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "Žádné takové oznámení." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -122,7 +122,7 @@ msgid "No such user." msgstr "Žádný takový uživatel." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, fuzzy, php-format msgid "%1$s and friends, page %2$d" msgstr "%s a přátelé" @@ -130,39 +130,39 @@ msgstr "%s a přátelé" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s a přátelé" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Feed přítel uživatele: %s" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Feed přítel uživatele: %s" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, fuzzy, php-format msgid "Feed for friends of %s (Atom)" msgstr "Feed přítel uživatele: %s" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -170,14 +170,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -185,15 +185,15 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 #, fuzzy msgid "You and friends" msgstr "%s a přátelé" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -204,22 +204,22 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Potvrzující kód nebyl nalezen" @@ -230,11 +230,11 @@ msgstr "Potvrzující kód nebyl nalezen" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "" @@ -266,7 +266,7 @@ msgstr "Nelze uložit profil" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -342,25 +342,25 @@ msgstr "" msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 #, fuzzy msgid "This status is already a favorite." msgstr "Toto je již vaše Jabber" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Nelze smazat oblíbenou položku." @@ -397,122 +397,122 @@ msgstr "Nelze aktualizovat uživatele" msgid "Could not find target user." msgstr "Nelze aktualizovat uživatele" -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Přezdívka může obsahovat pouze malá písmena a čísla bez mezer" -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Přezdívku již někdo používá. Zkuste jinou" -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Není platnou přezdívkou." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Stránka není platnou URL." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Umístění příliš dlouhé (maximálně 255 znaků)" -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "Neplatná adresa '%s'" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, fuzzy, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Přezdívku již někdo používá. Zkuste jinou" -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "Žádný požadavek nebyl nalezen!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 #, fuzzy msgid "You are already a member of that group." msgstr "Již jste přihlášen" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Nelze přesměrovat na server: %s" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 #, fuzzy msgid "You are not a member of this group." msgstr "Neodeslal jste nám profil" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Nelze vytvořit OpenID z: %s" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, fuzzy, php-format msgid "%s's groups" msgstr "Profil" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "Neodeslal jste nám profil" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "" @@ -528,7 +528,7 @@ msgstr "Neplatná velikost" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -632,11 +632,11 @@ msgstr "" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "" @@ -655,27 +655,27 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." msgid "Already repeated that notice." msgstr "Odstranit toto oznámení" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 #, fuzzy msgid "Status deleted." msgstr "Obrázek nahrán" -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "Žádný požadavek nebyl nalezen!" -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -685,32 +685,32 @@ msgstr "" msgid "Unsupported format." msgstr "Nepodporovaný formát obrázku." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1 statusů na %2" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Mikroblog od %s" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1 statusů na %2" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -725,12 +725,12 @@ msgstr "Odpovědi na %s" msgid "Repeats of %s" msgstr "Odpovědi na %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mikroblog od %s" @@ -1906,7 +1906,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "" @@ -2552,31 +2552,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "Sdělení nemá profil" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1 statusů na %2" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "Připojit" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "" @@ -3547,7 +3547,7 @@ msgstr "Neodeslal jste nám profil" msgid "User doesn't have this role." msgstr "Uživatel nemá profil." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "Obrázek nahrán" @@ -3609,7 +3609,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3622,7 +3622,7 @@ msgid "Organization" msgstr "Umístění" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" @@ -4582,7 +4582,7 @@ msgstr "" "sdělení tohoto uživatele. Pokud ne, ask to subscribe to somone's notices, " "klikněte na \"Zrušit\"" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licence" @@ -4713,29 +4713,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "Statistiky" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4743,7 +4743,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4751,40 +4751,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Osobní" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4827,48 +4827,48 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "Chyba v DB při vkládání odpovědi: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:249 +#: classes/Notice.php:255 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "Problém při ukládání sdělení" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5363,7 +5363,7 @@ msgid "Snapshots configuration" msgstr "Potvrzení emailové adresy" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5498,12 +5498,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "Heslo uloženo" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "Heslo uloženo" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 6a6a5cbfa2..9f66162dcd 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -17,11 +17,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:36:51+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:09+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -92,24 +92,24 @@ msgid "Save" msgstr "Speichern" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Seite nicht vorhanden" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -122,7 +122,7 @@ msgid "No such user." msgstr "Unbekannter Benutzer." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s und Freunde, Seite% 2$d" @@ -130,33 +130,33 @@ msgstr "%1$s und Freunde, Seite% 2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s und Freunde" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Feed der Freunde von %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Feed der Freunde von %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Feed der Freunde von %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -164,7 +164,7 @@ msgstr "" "Dies ist die Zeitleiste für %s und Freunde aber bisher hat niemand etwas " "gepostet." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -174,7 +174,7 @@ msgstr "" "poste selber etwas." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -184,7 +184,7 @@ msgstr "" "posten](%%%%action.newnotice%%%%?status_textarea=%s) um seine Aufmerksamkeit " "zu erregen." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -195,14 +195,14 @@ msgstr "" "erregen?" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Du und Freunde" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" @@ -213,22 +213,22 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-Methode nicht gefunden." @@ -238,11 +238,11 @@ msgstr "API-Methode nicht gefunden." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Diese Methode benötigt ein POST." @@ -274,7 +274,7 @@ msgstr "Konnte Profil nicht speichern." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -353,24 +353,24 @@ msgstr "" "Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen " "du nicht befreundet bist." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Keine Nachricht mit dieser ID gefunden." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Diese Nachricht ist bereits ein Favorit!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Konnte keinen Favoriten erstellen." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Diese Nachricht ist kein Favorit!" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Konnte Favoriten nicht löschen." @@ -403,7 +403,7 @@ msgstr "Konnte öffentlichen Stream nicht abrufen." msgid "Could not find target user." msgstr "Konnte keine Statusmeldungen finden." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -411,19 +411,19 @@ msgstr "" "Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. " "Leerzeichen sind nicht erlaubt." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Ungültiger Nutzername." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 @@ -431,94 +431,94 @@ msgid "Homepage is not a valid URL." msgstr "" "Homepage ist keine gültige URL. URL’s müssen ein Präfix wie http enthalten." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Ungültiges Alias: „%s“" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Nutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Alias kann nicht das gleiche wie der Spitznamen sein." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Gruppe nicht gefunden!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Du bist bereits Mitglied dieser Gruppe" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Der Admin dieser Gruppe hat dich gesperrt." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Du bist kein Mitglied dieser Gruppe." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "%s’s Gruppen" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "%1$s Gruppen in denen %2$s Mitglied ist" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s Gruppen" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "Gruppen von %s" @@ -533,7 +533,7 @@ msgstr "Ungültiges Token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -637,11 +637,11 @@ msgstr "Erlauben" msgid "Allow or deny access to your account information." msgstr "Zugang zu deinem Konto erlauben oder ablehnen" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Diese Methode benötigt ein POST oder DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Du kannst den Status eines anderen Benutzers nicht löschen." @@ -658,26 +658,26 @@ msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen." msgid "Already repeated that notice." msgstr "Nachricht bereits wiederholt" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Status gelöscht." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Keine Nachricht mit dieser ID gefunden." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Nicht gefunden." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -688,32 +688,32 @@ msgstr "" msgid "Unsupported format." msgstr "Bildformat wird nicht unterstützt." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoriten von %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s Aktualisierung in den Favoriten von %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Aktualisierungen erwähnen %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s öffentliche Zeitleiste" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s Nachrichten von allen!" @@ -728,12 +728,12 @@ msgstr "Antworten an %s" msgid "Repeats of %s" msgstr "Antworten von %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Nachrichten, die mit %s getagt sind" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aktualisierungen mit %1$s getagt auf %2$s!" @@ -1871,7 +1871,7 @@ msgstr "Diesen Benutzer zu einem Admin ernennen" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s Zeitleiste" @@ -2560,30 +2560,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" "Entwickler können die Registrierungseinstellungen ihrer Programme ändern " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Nachricht hat kein Profil" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s Status auf %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Content-Typ %s wird nicht untersützt." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Bitte nur %s URLs über einfaches HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -3576,7 +3576,7 @@ msgstr "Du kannst die Rollen von Nutzern dieser Seite nicht widerrufen." msgid "User doesn't have this role." msgstr "Benutzer verfügt nicht über diese Rolle." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3633,7 +3633,7 @@ msgid "Icon" msgstr "Symbol" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Name" @@ -3644,7 +3644,7 @@ msgid "Organization" msgstr "Organisation" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beschreibung" @@ -4623,7 +4623,7 @@ msgstr "" "dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf " "„Abbrechen“." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Lizenz" @@ -4753,18 +4753,18 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Aktualisierungen von %1$s auf %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4773,11 +4773,11 @@ msgstr "" "Die Seite wird mit %1$s Version %2$s betrieben. Copyright 2008-2010 " "StatusNet, Inc. und Mitarbeiter" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Mitarbeiter" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4789,7 +4789,7 @@ msgstr "" "wie veröffentlicht durch die Free Software Foundation, entweder Version 3 " "der Lizenz, oder jede höhere Version." -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4801,7 +4801,7 @@ msgstr "" "MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. Lesen Sie die GNU " "Affero General Public License für weitere Details. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4810,20 +4810,20 @@ msgstr "" "Du hast eine Kopie der GNU Affero General Public License zusammen mit diesem " "Programm erhalten. Wenn nicht, siehe %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Erweiterungen" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Version" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Autor(en)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4832,12 +4832,12 @@ msgstr "" "Keine Datei darf größer als %d Bytes sein und die Datei die du verschicken " "wolltest ist %d Bytes groß. Bitte eine kleinere Datei hoch laden." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Eine Datei dieser Größe überschreitet deine User Quota von %d Byte." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4878,27 +4878,27 @@ msgid "Could not update message with new URI." msgstr "Konnte Nachricht nicht mit neuer URI versehen." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4906,22 +4906,22 @@ msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Problem bei Speichern der Nachricht." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5383,7 +5383,7 @@ msgid "Snapshots configuration" msgstr "Snapshot Konfiguration" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte." @@ -5515,11 +5515,11 @@ msgstr "Nachrichten in denen dieser Anhang erscheint" msgid "Tags for this attachment" msgstr "Stichworte für diesen Anhang" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Passwort konnte nicht geändert werden" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Passwort kann nicht geändert werden" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 6bf33f0858..c76caba54d 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:36:54+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:19+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -86,25 +86,25 @@ msgid "Save" msgstr "Αποθήκευση" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "Δεν υπάρχει τέτοια σελίδα" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -117,7 +117,7 @@ msgid "No such user." msgstr "Κανένας τέτοιος χρήστης." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s και φίλοι, σελίδα 2%$d" @@ -125,33 +125,33 @@ msgstr "%1$s και φίλοι, σελίδα 2%$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s και οι φίλοι του/της" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Ροή φίλων του/της %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Ροή φίλων του/της %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Ροή φίλων του/της %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -159,7 +159,7 @@ msgstr "" "Αυτό είναι το χρονοδιάγραμμα για %s και φίλους, αλλά κανείς δεν έχει κάνει " "καμία αποστολή ακόμα." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -169,14 +169,14 @@ msgstr "" "(%%action.groups%%) ή αποστείλετε κάτι ο ίδιος." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -184,14 +184,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Εσείς και οι φίλοι σας" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -202,22 +202,22 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" @@ -228,11 +228,11 @@ msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "" @@ -264,7 +264,7 @@ msgstr "Απέτυχε η αποθήκευση του προφίλ." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -339,24 +339,24 @@ msgstr "" msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "" @@ -394,120 +394,120 @@ msgstr "Απέτυχε η ενημέρωση του χρήστη." msgid "Could not find target user." msgstr "Απέτυχε η εύρεση οποιασδήποτε κατάστασης." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "" -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Η περιγραφή είναι πολύ μεγάλη (μέγιστο %d χαρακτ.)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "Μήνυμα" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, fuzzy, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "Η ομάδα δεν βρέθηκε!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Αδύνατη η αποθήκευση του προφίλ." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "ομάδες των χρηστών %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "Δεν είστε μέλος καμίας ομάδας." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "ομάδες του χρήστη %s" @@ -523,7 +523,7 @@ msgstr "Μήνυμα" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -624,11 +624,11 @@ msgstr "Να επιτραπεί" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "" @@ -647,25 +647,25 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος msgid "Already repeated that notice." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Η κατάσταση διεγράφη." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "" -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -674,32 +674,32 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -714,12 +714,12 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -1876,7 +1876,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "χρονοδιάγραμμα του χρήστη %s" @@ -2508,31 +2508,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "Σύνδεση" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "" @@ -3504,7 +3504,7 @@ msgstr "Απέτυχε η ενημέρωση του χρήστη." msgid "User doesn't have this role." msgstr "" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "Η κατάσταση διαγράφεται." @@ -3563,7 +3563,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3576,7 +3576,7 @@ msgid "Organization" msgstr "Προσκλήσεις" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Περιγραφή" @@ -4517,7 +4517,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "" @@ -4639,29 +4639,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4669,7 +4669,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4677,40 +4677,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Προσωπικά" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4753,45 +4753,45 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5273,7 +5273,7 @@ msgid "Snapshots configuration" msgstr "Επιβεβαίωση διεύθυνσης email" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5404,12 +5404,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "Ο κωδικός αποθηκεύτηκε." -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "Ο κωδικός αποθηκεύτηκε." diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index fe597b75c3..83e88c3533 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:36:58+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:23+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -86,24 +86,24 @@ msgid "Save" msgstr "Save" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "No such page." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -116,7 +116,7 @@ msgid "No such user." msgstr "No such user." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s and friends, page %2$d" @@ -124,40 +124,40 @@ msgstr "%1$s and friends, page %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s and friends" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Feed for friends of %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Feed for friends of %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Feed for friends of %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" "This is the timeline for %s and friends but no one has posted anything yet." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -167,7 +167,7 @@ msgstr "" "something yourself." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -176,7 +176,7 @@ msgstr "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -186,14 +186,14 @@ msgstr "" "post a notice to his or her attention." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "You and friends" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates from %1$s and friends on %2$s!" @@ -204,22 +204,22 @@ msgstr "Updates from %1$s and friends on %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "API method not found." @@ -229,11 +229,11 @@ msgstr "API method not found." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "This method requires a POST." @@ -267,7 +267,7 @@ msgstr "Couldn't save profile." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -343,24 +343,24 @@ msgstr "Recipient user not found." msgid "Can't send direct messages to users who aren't your friend." msgstr "Can't send direct messages to users who aren't your friend." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "No status found with that ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "This status is already a favourite." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Could not create favourite." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "That status is not a favourite." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Could not delete favourite." @@ -393,119 +393,119 @@ msgstr "Could not determine source user." msgid "Could not find target user." msgstr "Could not find target user." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Nickname must have only lowercase letters and numbers, and no spaces." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Nickname already in use. Try another one." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Not a valid nickname." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Homepage is not a valid URL." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Full name is too long (max 255 chars)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Description is too long (max %d chars)" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Location is too long (max 255 chars)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Too many aliases! Maximum %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Invalid alias: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Alias \"%s\" already in use. Try another one." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Alias can't be the same as nickname." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Group not found." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "You are already a member of that group." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "You have been blocked from that group by the admin." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Could not join user %1$s to group %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "You are not a member of this group." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Could not remove user %1$s to group %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "%s's groups" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "%1$s groups %2$s is a member of." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s groups" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "groups on %s" @@ -520,7 +520,7 @@ msgstr "Invalid token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -624,11 +624,11 @@ msgstr "Allow" msgid "Allow or deny access to your account information." msgstr "Allow or deny access to your account information." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "This method requires a POST or DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "You may not delete another user's status." @@ -645,25 +645,25 @@ msgstr "Cannot repeat your own notice." msgid "Already repeated that notice." msgstr "Already repeated that notice." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Status deleted." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "No status with that ID found." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "That's too long. Max notice size is %d chars." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Not found." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Max notice size is %d chars, including attachment URL." @@ -672,32 +672,32 @@ msgstr "Max notice size is %d chars, including attachment URL." msgid "Unsupported format." msgstr "Unsupported format." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favourites from %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s updates favourited by %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Updates mentioning %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s updates that reply to updates from %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s public timeline" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s updates from everyone!" @@ -712,12 +712,12 @@ msgstr "Repeated to %s" msgid "Repeats of %s" msgstr "Repeats of %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notices tagged with %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Updates tagged with %1$s on %2$s!" @@ -1845,7 +1845,7 @@ msgstr "Make this user an admin" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s timeline" @@ -2515,30 +2515,30 @@ msgstr "You have not authorised any applications to use your account." msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Notice has no profile." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s's status on %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Content type %s not supported." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -3501,7 +3501,7 @@ msgstr "You cannot revoke user roles on this site." msgid "User doesn't have this role." msgstr "User doesn't have this role." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3558,7 +3558,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Name" @@ -3569,7 +3569,7 @@ msgid "Organization" msgstr "Organization" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Description" @@ -4517,7 +4517,7 @@ msgstr "" "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " "click “Reject”." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "License" @@ -4646,29 +4646,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Updates from %1$s on %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4680,7 +4680,7 @@ msgstr "" "Software Foundation, either version 3 of the Licence, or (at your option) " "any later version. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4692,7 +4692,7 @@ msgstr "" "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public Licence " "for more details. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4701,32 +4701,32 @@ msgstr "" "You should have received a copy of the GNU Affero General Public Licence " "along with this program. If not, see %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Version" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4765,48 +4765,48 @@ msgid "Could not update message with new URI." msgstr "Could not update message with new URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Database error inserting hashtag: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Problem saving notice. Too long." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Problem saving notice. Unknown user." -#: classes/Notice.php:254 -msgid "" -"Too many notices too fast; take a breather and post again in a few minutes." -msgstr "" -"Too many notices too fast; take a breather and post again in a few minutes." - #: classes/Notice.php:260 msgid "" +"Too many notices too fast; take a breather and post again in a few minutes." +msgstr "" +"Too many notices too fast; take a breather and post again in a few minutes." + +#: classes/Notice.php:266 +msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "You are banned from posting notices on this site." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problem saving notice." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Problem saving group inbox." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5264,7 +5264,7 @@ msgid "Snapshots configuration" msgstr "Snapshots configuration" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5394,11 +5394,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Password changing failed" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Password changing is not allowed" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index fce4f361ca..79d8a9e087 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -15,11 +15,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:02+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:27+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -89,24 +89,24 @@ msgid "Save" msgstr "Guardar" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "No existe tal página." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -119,7 +119,7 @@ msgid "No such user." msgstr "No existe ese usuario." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s y sus amistades, página %2$d" @@ -127,33 +127,33 @@ msgstr "%1$s y sus amistades, página %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s y sus amistades" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Feed de los amigos de %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Feed de los amigos de %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Feed de los amigos de %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -161,7 +161,7 @@ msgstr "" "Esta es la línea temporal de %s y amistades, pero nadie ha publicado nada " "todavía." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -171,7 +171,7 @@ msgstr "" "todavía." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -180,7 +180,7 @@ msgstr "" "Puedes intentar [darle un toque a %1$s](../%2$s) desde su perfil o [publicar " "algo a su atención](%%%%action.newnotice%%%%?status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -190,14 +190,14 @@ msgstr "" "toque a %s o publicar algo a su atención?" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Tú y tus amistades" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!" @@ -208,22 +208,22 @@ msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "Método de API no encontrado." @@ -233,11 +233,11 @@ msgstr "Método de API no encontrado." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Este método requiere un POST." @@ -269,7 +269,7 @@ msgstr "No se pudo guardar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -345,24 +345,24 @@ msgstr "No se encuentra usuario receptor." msgid "Can't send direct messages to users who aren't your friend." msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "No se encontró estado para ese ID" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Este status ya está en favoritos." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "No se pudo crear favorito." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Este status no es un favorito." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "No se pudo borrar favorito." @@ -395,7 +395,7 @@ msgstr "No se pudo determinar el usuario fuente." msgid "Could not find target user." msgstr "No se pudo encontrar ningún usuario de destino." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -403,113 +403,113 @@ msgstr "" "El usuario debe tener solamente letras minúsculas y números y no puede tener " "espacios." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "El usuario ya existe. Prueba con otro." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Usuario inválido" -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "La página de inicio no es un URL válido." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Tu nombre es demasiado largo (max. 255 carac.)" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "La descripción es demasiado larga (máx. %d caracteres)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "La ubicación es demasiado larga (máx. 255 caracteres)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "¡Muchos seudónimos! El máximo es %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Alias inválido: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "El alias \"%s\" ya está en uso. Intenta usar otro." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "El alias no puede ser el mismo que el usuario." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Grupo no encontrado." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Ya eres miembro de ese grupo" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Has sido bloqueado de ese grupo por el administrador." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "No se pudo unir el usuario %s al grupo %s" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "No eres miembro de este grupo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Grupos de %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "%1$s grupos %2$s es un miembro de." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Grupos %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "Grupos en %s" @@ -524,7 +524,7 @@ msgstr "Token inválido." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -631,11 +631,11 @@ msgstr "Permitir" msgid "Allow or deny access to your account information." msgstr "Permitir o denegar el acceso a la información de tu cuenta." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Este método requiere un PUBLICAR O ELIMINAR" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "No puedes borrar el estado de otro usuario." @@ -652,25 +652,25 @@ msgstr "No puedes repetir tus propias notificaciones." msgid "Already repeated that notice." msgstr "Esta notificación ya se ha repetido." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Status borrado." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "No hay estado para ese ID" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "La entrada es muy larga. El tamaño máximo es de %d caracteres." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "No encontrado." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -681,32 +681,32 @@ msgstr "" msgid "Unsupported format." msgstr "Formato no soportado." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritos de %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualizaciones favoritas de %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualizaciones que mencionan %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "línea temporal pública de %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "¡Actualizaciones de todos en %s!" @@ -721,12 +721,12 @@ msgstr "Repetido a %s" msgid "Repeats of %s" msgstr "Repeticiones de %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Avisos etiquetados con %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizaciones etiquetadas con %1$s en %2$s!" @@ -1863,7 +1863,7 @@ msgstr "Convertir a este usuario en administrador" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "línea temporal de %s" @@ -2545,30 +2545,30 @@ msgstr "" "Los desarrolladores pueden editar la configuración de registro de sus " "aplicaciones " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Aviso no tiene perfil." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "estado de %1$s en %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Tipo de contenido %s no soportado." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Solamente %s URLs sobre HTTP simples por favor." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -3565,7 +3565,7 @@ msgstr "No puedes revocar funciones de usuario en este sitio." msgid "User doesn't have this role." msgstr "El usuario no tiene esta función." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3622,7 +3622,7 @@ msgid "Icon" msgstr "Icono" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Nombre" @@ -3633,7 +3633,7 @@ msgid "Organization" msgstr "Organización" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descripción" @@ -4612,7 +4612,7 @@ msgstr "" "avisos de este usuario. Si no pediste suscribirte a los avisos de alguien, " "haz clic en \"Cancelar\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licencia" @@ -4741,18 +4741,18 @@ msgstr "Intenta [buscar gupos](%%action.groupsearch%%) y unirte a ellos." #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "¡Actualizaciones de %1$s en %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "%s StatusNet" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4761,11 +4761,11 @@ msgstr "" "Este sitio ha sido desarrollado con %1$s, versión %2$s, Derechos Reservados " "2008-2010 StatusNet, Inc. y sus colaboradores." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Colaboradores" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4777,7 +4777,7 @@ msgstr "" "publicado por la Fundación del Software Libre, bien por la versión 3 de la " "Licencia, o cualquier versión posterior (la de tu elección). " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4789,7 +4789,7 @@ msgstr "" "IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la Licencia Pública General " "de Affero AGPL para más detalles. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4798,20 +4798,20 @@ msgstr "" "Debes haber recibido una copia de la Licencia Pública General de Affero GNU " "con este programa. Si no la recibiste, visita %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Complementos" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Versión" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Autor(es)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4820,13 +4820,13 @@ msgstr "" "No puede haber un archivo de tamaño mayor a %d bytes y el archivo subido es " "de %d bytes. Por favor, intenta subir una versión más ligera." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Un archivo tan grande podría sobrepasar tu cuota de usuario de %d bytes." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Un archivo tan grande podría sobrepasar tu cuota mensual de %d bytes." @@ -4865,27 +4865,27 @@ msgid "Could not update message with new URI." msgstr "No se pudo actualizar mensaje con nuevo URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Error de la BD al insertar la etiqueta clave: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Ha habido un problema al guardar el mensaje. Es muy largo." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4893,21 +4893,21 @@ msgstr "" "Muchos mensajes, enviados muy rápido; espera un poco e intenta publicar " "pasados unos minutos." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Tienes prohibido publicar avisos en este sitio." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Hubo un problema al guarda la bandeja de entrada del grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5372,7 +5372,7 @@ msgid "Snapshots configuration" msgstr "Configuración de instantáneas" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API requiere acceso de lectura y escritura, pero sólo tienes acceso de " @@ -5505,11 +5505,11 @@ msgstr "Mensajes donde aparece este adjunto" msgid "Tags for this attachment" msgstr "Etiquetas de este archivo adjunto" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "El cambio de contraseña ha fallado" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "No está permitido cambiar la contraseña" @@ -6154,6 +6154,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Si crees que esta cuenta está siendo utilizada de forma abusiva, puedes " +"bloquearla de tu lista de suscriptores y reportar la como cuenta no deseada " +"a los administradores de sitios en %s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index f7d5d4c792..b9a01991b6 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -2,6 +2,7 @@ # # Author@translatewiki.net: ArianHT # Author@translatewiki.net: Everplays +# Author@translatewiki.net: Huji # Author@translatewiki.net: Narcissus # -- # This file is distributed under the same license as the StatusNet package. @@ -11,7 +12,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:10+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:34+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +21,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -87,25 +88,25 @@ msgid "Save" msgstr "ذخیره" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "چنین صفحه‌ای وجود ندارد" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -118,7 +119,7 @@ msgid "No such user." msgstr "چنین کاربری وجود ندارد." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, fuzzy, php-format msgid "%1$s and friends, page %2$d" msgstr "%s کاربران مسدود شده، صفحه‌ی %d" @@ -126,39 +127,39 @@ msgstr "%s کاربران مسدود شده، صفحه‌ی %d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s و دوستان" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "خوراک دوستان %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "خوراک دوستان %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "خوراک دوستان %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "این خط‌زمانی %s و دوستانش است، اما هیچ‌یک تاکنون چیزی پست نکرده‌اند." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -168,7 +169,7 @@ msgstr "" "چیزی را ارسال کنید." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -177,7 +178,7 @@ msgstr "" "می‌توانید از صفحه‌ی شخصی‌اش به او [سقلمه](../%2$s) بزنید یا [چیزی بنویسید](%%%%" "action.newnotice%%%%?status_textarea=%3$s) تا توجه او را جذب کنید." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -187,14 +188,14 @@ msgstr "" "را جلب کنید." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "شما و دوستان" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "به روز رسانی از %1$ و دوستان در %2$" @@ -205,22 +206,22 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "رابط مورد نظر پیدا نشد." @@ -230,11 +231,11 @@ msgstr "رابط مورد نظر پیدا نشد." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "برای استفاده از این روش باید اطلاعات را به صورت پست بفرستید" @@ -265,7 +266,7 @@ msgstr "نمی‌توان شناس‌نامه را ذخیره کرد." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -340,24 +341,24 @@ msgstr "کاربر گیرنده یافت نشد." msgid "Can't send direct messages to users who aren't your friend." msgstr "نمی‌توان پیام مستقیم را به کاربرانی که دوست شما نیستند، فرستاد." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "هیچ وضعیتی با آن شناسه پیدا نشد." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "این پیغام را پیش‌تر به علایق خود اضافه کرده‌اید" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "نمی‌توان وضعیت را موردعلاقه کرد." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "این پیغام جزو علایق شما نیست" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "نمی‌توان وضعیت موردعلاقه را حذف کرد." @@ -390,120 +391,120 @@ msgstr "نمی‌توان کاربر منبع را تعیین کرد." msgid "Could not find target user." msgstr "نمی‌توان کاربر هدف را پیدا کرد." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "لقب باید شامل حروف کوچک و اعداد و بدون فاصله باشد." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "لقب نا معتبر." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "برگهٔ آغازین یک نشانی معتبر نیست." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "نام کامل طولانی است (۲۵۵ حرف در حالت بیشینه(." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "توصیف بسیار زیاد است (حداکثر %d حرف)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "مکان طولانی است (حداکثر ۲۵۵ حرف)" -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "نام‌های مستعار بسیار زیاد هستند! حداکثر %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "نام‌مستعار غیر مجاز: «%s»" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "نام‌مستعار «%s» ازپیش گرفته‌شده‌است. یکی دیگر را امتحان کنید." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "نام و نام مستعار شما نمی تواند یکی باشد ." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "گروه یافت نشد!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "شما از پیش یک عضو این گروه هستید." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "عضویت %s در گروه %s نا موفق بود." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "شما یک عضو این گروه نیستید." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "خارج شدن %s از گروه %s نا موفق بود" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "گروه‌های %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "هست عضو %s گروه" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s گروه" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "گروه‌ها در %s" @@ -519,7 +520,7 @@ msgstr "اندازه‌ی نادرست" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -621,11 +622,11 @@ msgstr "همه" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "این روش نیازمند POST یا DELETE است." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "شما توانایی حذف وضعیت کاربر دیگری را ندارید." @@ -642,25 +643,25 @@ msgstr "نمی توانید خبر خود را تکرار کنید." msgid "Already repeated that notice." msgstr "ابن خبر قبلا فرستاده شده" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "وضعیت حذف شد." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "هیچ وضعیتی با آن شناسه یافت نشد." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "خیلی طولانی است. حداکثر طول مجاز پیام %d حرف است." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "یافت نشد." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "حداکثر طول پیام %d حرف است که شامل ضمیمه نیز می‌باشد" @@ -669,32 +670,32 @@ msgstr "حداکثر طول پیام %d حرف است که شامل ضمیمه msgid "Unsupported format." msgstr "قالب پشتیبانی نشده." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / دوست داشتنی از %s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s به روز رسانی های دوست داشتنی %s / %s" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%$1s / به روز رسانی های شامل %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s خط‌زمانی عمومی" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s به روز رسانی های عموم" @@ -709,12 +710,12 @@ msgstr "" msgid "Repeats of %s" msgstr "تکرار %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "پیام‌هایی که با %s نشانه گزاری شده اند." -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "پیام‌های نشانه گزاری شده با %1$s در %2$s" @@ -1395,10 +1396,9 @@ msgstr "" #. TRANS: Button label #: actions/emailsettings.php:127 actions/imsettings.php:131 #: actions/smssettings.php:137 lib/applicationeditform.php:357 -#, fuzzy msgctxt "BUTTON" msgid "Cancel" -msgstr "انصراف" +msgstr "لغو" #. TRANS: Instructions for e-mail address input form. #: actions/emailsettings.php:135 @@ -1872,7 +1872,7 @@ msgstr "این کاربر یک مدیر شود" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "خط زمانی %s" @@ -2531,31 +2531,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "ابن خبر ذخیره ای ندارد ." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "وضعیت %1$s در %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "نوع محتوا " #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست." @@ -3502,7 +3502,7 @@ msgstr "شما نمی توانید کاربری را در این سایت ساک msgid "User doesn't have this role." msgstr "کاربر بدون مشخصات" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "وضعیت حذف شد." @@ -3563,7 +3563,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3576,7 +3576,7 @@ msgid "Organization" msgstr "صفحه بندى" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "" @@ -4520,7 +4520,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "لیسانس" @@ -4641,29 +4641,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "به روز رسانی‌های %1$s در %2$s" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "آمار" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4671,7 +4671,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4679,41 +4679,41 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "شخصی" -#: actions/version.php:197 +#: actions/version.php:199 #, fuzzy msgid "Author(s)" msgstr "مؤلف" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4754,27 +4754,27 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "تعداد خیلی زیاد آگهی و بسیار سریع؛ استراحت کنید و مجددا دقایقی دیگر ارسال " "کنید." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4782,22 +4782,22 @@ msgstr "" "تعداد زیاد پیام های دو نسخه ای و بسرعت؛ استراحت کنید و دقایقی دیگر مجددا " "ارسال کنید." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "شما از فرستادن پست در این سایت مردود شدید ." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "مشکل در ذخیره کردن آگهی." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "مشکل در ذخیره کردن آگهی." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5276,7 +5276,7 @@ msgid "Snapshots configuration" msgstr "پیکره بندی اصلی سایت" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5360,7 +5360,7 @@ msgstr "" #. TRANS: Submit button title #: lib/applicationeditform.php:359 msgid "Cancel" -msgstr "انصراف" +msgstr "لغو" #. TRANS: Application access type #: lib/applicationlist.php:136 @@ -5408,12 +5408,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "تغییر گذرواژه" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "تغییر گذرواژه" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 4e7b510e27..058a0816da 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:07+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:30+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -93,25 +93,25 @@ msgid "Save" msgstr "Tallenna" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "Sivua ei ole." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -124,7 +124,7 @@ msgid "No such user." msgstr "Käyttäjää ei ole." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, fuzzy, php-format msgid "%1$s and friends, page %2$d" msgstr "%s ja kaverit, sivu %d" @@ -132,33 +132,33 @@ msgstr "%s ja kaverit, sivu %d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s ja kaverit" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Käyttäjän %s kavereiden syöte (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Käyttäjän %s kavereiden syöte (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Käyttäjän %s kavereiden syöte (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -166,7 +166,7 @@ msgstr "" "Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt " "vielä mitään." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -176,7 +176,7 @@ msgstr "" "tai lähetä päivitys itse." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, fuzzy, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -185,7 +185,7 @@ msgstr "" "Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action." "newnotice%%%%?status_textarea=%s)!" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -193,14 +193,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Sinä ja kaverit" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" @@ -211,22 +211,22 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API-metodia ei löytynyt!" @@ -237,11 +237,11 @@ msgstr "API-metodia ei löytynyt!" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Tämä metodi edellyttää POST sanoman." @@ -273,7 +273,7 @@ msgstr "Ei voitu tallentaa profiilia." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -351,26 +351,26 @@ msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 #, fuzzy msgid "This status is already a favorite." msgstr "Tämä päivitys on jo suosikki!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Ei voitu lisätä suosikiksi." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 #, fuzzy msgid "That status is not a favorite." msgstr "Tämä päivitys ei ole suosikki!" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Ei voitu poistaa suosikkia." @@ -406,7 +406,7 @@ msgstr "Julkista päivitysvirtaa ei saatu." msgid "Could not find target user." msgstr "Ei löytynyt yhtään päivitystä." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -414,114 +414,114 @@ msgstr "" "Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman " "välilyöntiä." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Tunnus on jo käytössä. Yritä toista tunnusta." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Tuo ei ole kelvollinen tunnus." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Kotisivun verkko-osoite ei ole toimiva." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Koko nimi on liian pitkä (max 255 merkkiä)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "kuvaus on liian pitkä (max 140 merkkiä)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Liikaa aliaksia. Maksimimäärä on %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "Virheellinen alias: \"%s\"" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Alias ei voi olla sama kuin ryhmätunnus." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "Ryhmää ei löytynyt!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Sinä kuulut jo tähän ryhmään." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Sinä et kuulu tähän ryhmään." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Käyttäjän %s ryhmät" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "Ryhmät, joiden jäsen %s on" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Käyttäjän %s ryhmät" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, fuzzy, php-format msgid "groups on %s" msgstr "Ryhmän toiminnot" @@ -537,7 +537,7 @@ msgstr "Koko ei kelpaa." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -643,11 +643,11 @@ msgstr "Kaikki" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Et voi poistaa toisen käyttäjän päivitystä." @@ -666,25 +666,25 @@ msgstr "Ilmoituksia ei voi pistää päälle." msgid "Already repeated that notice." msgstr "Poista tämä päivitys" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Päivitys poistettu." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Ei löytynyt." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." @@ -693,33 +693,33 @@ msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." msgid "Unsupported format." msgstr "Formaattia ei ole tuettu." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Käyttäjän %s suosikit" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Vastaukset päivitykseen %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" "%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s julkinen aikajana" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s päivitykset kaikilta!" @@ -734,12 +734,12 @@ msgstr "Vastaukset käyttäjälle %s" msgid "Repeats of %s" msgstr "Vastaukset käyttäjälle %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Päivitykset joilla on tagi %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" @@ -1910,7 +1910,7 @@ msgstr "Tee tästä käyttäjästä ylläpitäjä" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s aikajana" @@ -2599,31 +2599,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "Päivitykselle ei ole profiilia" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Käyttäjän %1$s päivitys %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "Yhdistä" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -3628,7 +3628,7 @@ msgstr "Et voi lähettää viestiä tälle käyttäjälle." msgid "User doesn't have this role." msgstr "Käyttäjälle ei löydy profiilia" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "Päivitys poistettu." @@ -3692,7 +3692,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3705,7 +3705,7 @@ msgid "Organization" msgstr "Sivutus" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Kuvaus" @@ -4682,7 +4682,7 @@ msgstr "" "päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, " "paina \"Peruuta\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Lisenssi" @@ -4812,29 +4812,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "Tilastot" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4842,7 +4842,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4850,40 +4850,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Omat" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4927,28 +4927,28 @@ msgid "Could not update message with new URI." msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "Tietokantavirhe tallennettaessa risutagiä: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4956,22 +4956,22 @@ msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Päivityksesi tähän palveluun on estetty." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "Ongelma päivityksen tallentamisessa." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5469,7 +5469,7 @@ msgid "Snapshots configuration" msgstr "SMS vahvistus" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5605,12 +5605,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "Salasanan vaihto" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "Salasanan vaihto" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index d28c3721e0..cc2f510ea3 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:14+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:38+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -90,24 +90,24 @@ msgid "Save" msgstr "Enregistrer" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Page non trouvée." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -120,7 +120,7 @@ msgid "No such user." msgstr "Utilisateur non trouvé." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s et ses amis, page %2$d" @@ -128,33 +128,33 @@ msgstr "%1$s et ses amis, page %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s et ses amis" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Flux pour les amis de %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Flux pour les amis de %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Flux pour les amis de %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -162,7 +162,7 @@ msgstr "" "Ceci est le flux pour %s et ses amis mais personne n’a rien posté pour le " "moment." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -172,7 +172,7 @@ msgstr "" "(%%action.groups%%) ou de poster quelque chose vous-même." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -182,7 +182,7 @@ msgstr "" "profil ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?" "status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -192,14 +192,14 @@ msgstr "" "un clin d’œil à %s ou poster un avis à son intention." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Vous et vos amis" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Statuts de %1$s et ses amis dans %2$s!" @@ -210,22 +210,22 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "Méthode API non trouvée !" @@ -235,11 +235,11 @@ msgstr "Méthode API non trouvée !" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Ce processus requiert un POST." @@ -271,7 +271,7 @@ msgstr "Impossible d’enregistrer le profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -349,24 +349,24 @@ msgstr "" "Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits " "comme amis." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Aucun statut trouvé avec cet identifiant. " -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Cet avis est déjà un favori." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Impossible de créer le favori." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Cet avis n’est pas un favori." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Impossible de supprimer le favori." @@ -399,7 +399,7 @@ msgstr "Impossible de déterminer l’utilisateur source." msgid "Could not find target user." msgstr "Impossible de trouver l’utilisateur cible." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -407,113 +407,113 @@ msgstr "" "Les pseudos ne peuvent contenir que des caractères minuscules et des " "chiffres, sans espaces." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Pseudo déjà utilisé. Essayez-en un autre." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Pseudo invalide." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "L’adresse du site personnel n’est pas un URL valide. " -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Nom complet trop long (maximum de 255 caractères)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "La description est trop longue (%d caractères maximum)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Emplacement trop long (maximum de 255 caractères)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Trop d’alias ! Maximum %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Alias invalide : « %s »." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Alias « %s » déjà utilisé. Essayez-en un autre." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "L’alias ne peut pas être le même que le pseudo." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Groupe non trouvé." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Vous êtes déjà membre de ce groupe." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Vous avez été bloqué de ce groupe par l’administrateur." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Vous n’êtes pas membre de ce groupe." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Groupes de %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "Groupes de %1$s dont %2$s est membre." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Groupes de %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "groupes sur %s" @@ -528,7 +528,7 @@ msgstr "Jeton incorrect." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -639,11 +639,11 @@ msgstr "Autoriser" msgid "Allow or deny access to your account information." msgstr "Autoriser ou refuser l’accès à votre compte." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Ce processus requiert un POST ou un DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur." @@ -660,25 +660,25 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis." msgid "Already repeated that notice." msgstr "Vous avez déjà repris cet avis." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Statut supprimé." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Aucun statut trouvé avec cet identifiant." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Non trouvé." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -689,32 +689,32 @@ msgstr "" msgid "Unsupported format." msgstr "Format non supporté." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoris de %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s statuts favoris de %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Mises à jour mentionnant %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Activité publique %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s statuts de tout le monde !" @@ -729,12 +729,12 @@ msgstr "Repris pour %s" msgid "Repeats of %s" msgstr "Reprises de %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Avis marqués avec %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mises à jour marquées avec %1$s dans %2$s !" @@ -1869,7 +1869,7 @@ msgstr "Faire de cet utilisateur un administrateur" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Activité de %s" @@ -2565,30 +2565,30 @@ msgstr "" "Les programmeurs peuvent modifier les paramètres d’enregistrement pour leurs " "applications " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "L’avis n’a pas de profil." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Statut de %1$s sur %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Type de contenu %s non supporté." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -3584,7 +3584,7 @@ msgstr "Vous ne pouvez pas révoquer les rôles des utilisateurs sur ce site." msgid "User doesn't have this role." msgstr "L'utilisateur ne possède pas ce rôle." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3642,7 +3642,7 @@ msgid "Icon" msgstr "Icône" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Nom" @@ -3653,7 +3653,7 @@ msgid "Organization" msgstr "Organisation" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Description" @@ -4640,7 +4640,7 @@ msgstr "" "abonner aux avis de cet utilisateur. Si vous n’avez pas demandé à vous " "abonner aux avis de quelqu’un, cliquez « Rejeter »." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licence" @@ -4772,18 +4772,18 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Statuts de %1$s dans %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4792,11 +4792,11 @@ msgstr "" "Ce site est propulsé par %1$s, version %2$s, Copyright 2008-2010 StatusNet, " "Inc. et ses contributeurs." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Contributeurs" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4808,7 +4808,7 @@ msgstr "" "GNU Affero telle qu’elle a été publiée par la Free Software Foundation, dans " "sa version 3 ou (comme vous le souhaitez) toute version plus récente. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4820,7 +4820,7 @@ msgstr "" "D’ADAPTATION À UN BUT PARTICULIER. Pour plus de détails, voir la Licence " "Publique Générale GNU Affero." -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4829,20 +4829,20 @@ msgstr "" "Vous avez dû recevoir une copie de la Licence Publique Générale GNU Affero " "avec ce programme. Si ce n’est pas le cas, consultez %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Extensions" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Version" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Auteur(s)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4851,12 +4851,12 @@ msgstr "" "Un fichier ne peut pas être plus gros que %d octets et le fichier que vous " "avez envoyé pesait %d octets. Essayez d’importer une version moins grosse." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets." @@ -4895,27 +4895,27 @@ msgid "Could not update message with new URI." msgstr "Impossible de mettre à jour le message avec un nouvel URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Problème lors de l’enregistrement de l’avis ; trop long." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques " "minutes." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4923,21 +4923,21 @@ msgstr "" "Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau " "dans quelques minutes." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Il vous est interdit de poster des avis sur ce site." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5399,7 +5399,7 @@ msgid "Snapshots configuration" msgstr "Configuration des instantanés" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "La ressource de l’API a besoin de l’accès en lecture et en écriture, mais " @@ -5533,11 +5533,11 @@ msgstr "Avis sur lesquels cette pièce jointe apparaît." msgid "Tags for this attachment" msgstr "Marques de cette pièce jointe" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "La modification du mot de passe a échoué" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "La modification du mot de passe n’est pas autorisée" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 5aaa495d74..0965203b5b 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:17+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:42+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -92,25 +92,25 @@ msgid "Save" msgstr "Gardar" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "Non existe a etiqueta." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -123,7 +123,7 @@ msgid "No such user." msgstr "Ningún usuario." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, fuzzy, php-format msgid "%1$s and friends, page %2$d" msgstr "%s e amigos" @@ -131,39 +131,39 @@ msgstr "%s e amigos" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amigos" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Fonte para os amigos de %s" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Fonte para os amigos de %s" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, fuzzy, php-format msgid "Feed for friends of %s (Atom)" msgstr "Fonte para os amigos de %s" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -171,14 +171,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -186,15 +186,15 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 #, fuzzy msgid "You and friends" msgstr "%s e amigos" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizacións dende %1$s e amigos en %2$s!" @@ -205,22 +205,22 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Método da API non atopado" @@ -231,11 +231,11 @@ msgstr "Método da API non atopado" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Este método require un POST." @@ -267,7 +267,7 @@ msgstr "Non se puido gardar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -346,26 +346,26 @@ msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Non se atopou un estado con ese ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 #, fuzzy msgid "This status is already a favorite." msgstr "Este chío xa é un favorito!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Non se puido crear o favorito." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 #, fuzzy msgid "That status is not a favorite." msgstr "Este chío non é un favorito!" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Non se puido eliminar o favorito." @@ -404,120 +404,120 @@ msgstr "Non se pudo recuperar a liña de tempo publica." msgid "Could not find target user." msgstr "Non se puido atopar ningún estado" -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Non é un alcume válido." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "A páxina persoal semella que non é unha URL válida." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "O nome completo é demasiado longo (max 255 car)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "O teu Bio é demasiado longo (max 140 car.)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "A localización é demasiado longa (max 255 car.)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "Etiqueta inválida: '%s'" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, fuzzy, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "Método da API non atopado" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Xa estas suscrito a estes usuarios:" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Non estás suscrito a ese perfil" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, fuzzy, php-format msgid "%s's groups" msgstr "Usuarios" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "%1s non é unha orixe fiable." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, fuzzy, php-format msgid "groups on %s" msgstr "Outras opcions" @@ -533,7 +533,7 @@ msgstr "Tamaño inválido." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -637,11 +637,11 @@ msgstr "Todos" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Este método require un POST ou DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Non deberías eliminar o estado de outro usuario" @@ -660,27 +660,27 @@ msgstr "Non se pode activar a notificación." msgid "Already repeated that notice." msgstr "Eliminar chío" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 #, fuzzy msgid "Status deleted." msgstr "Avatar actualizado." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Non existe ningún estado con esa ID atopada." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Non atopado" -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -690,32 +690,32 @@ msgstr "" msgid "Unsupported format." msgstr "Formato de ficheiro de imaxe non soportado." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Favoritos dende %s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s updates favorited by %s / %s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Chíos que respostan a %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Liña de tempo pública de %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s chíos de calquera!" @@ -730,12 +730,12 @@ msgstr "Replies to %s" msgid "Repeats of %s" msgstr "Replies to %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Chíos tagueados con %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" @@ -1942,7 +1942,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Liña de tempo de %s" @@ -2628,31 +2628,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "O chío non ten perfil" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Estado de %1$s en %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "Conectar" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -3663,7 +3663,7 @@ msgstr "Non podes enviar mensaxes a este usurio." msgid "User doesn't have this role." msgstr "Usuario sen un perfil que coincida." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "Avatar actualizado." @@ -3726,7 +3726,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3739,7 +3739,7 @@ msgid "Organization" msgstr "Invitación(s) enviada(s)." #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" @@ -4734,7 +4734,7 @@ msgstr "" "user's notices. If you didn't just ask to subscribe to someone's notices, " "click \"Cancel\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "" @@ -4866,29 +4866,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "Estatísticas" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4896,7 +4896,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4904,40 +4904,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Persoal" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4981,28 +4981,28 @@ msgid "Could not update message with new URI." msgstr "Non se puido actualizar a mensaxe coa nova URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "Erro ó inserir o hashtag na BD: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:260 +#: classes/Notice.php:266 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -5011,22 +5011,22 @@ msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Tes restrinxido o envio de chíos neste sitio." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "Aconteceu un erro ó gardar o chío." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5528,7 +5528,7 @@ msgid "Snapshots configuration" msgstr "Confirmación de SMS" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5664,12 +5664,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "Contrasinal gardada." -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "Contrasinal gardada." diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index 59aafd22da..8ec9859f7f 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:21+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:46+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -84,24 +84,24 @@ msgid "Save" msgstr "Gardar" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Esa páxina non existe." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -114,7 +114,7 @@ msgid "No such user." msgstr "Non existe tal usuario." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s e amigos, páxina %2$d" @@ -122,40 +122,40 @@ msgstr "%1$s e amigos, páxina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amigos" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Fonte de novas dos amigos de %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Fonte de novas dos amigos de %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Fonte de novas dos amigos de %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" "Esta é a liña do tempo de %s e amigos pero ninguén publicou nada aínda." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -165,7 +165,7 @@ msgstr "" "publique algo." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -175,7 +175,7 @@ msgstr "" "[publicar algo dirixido a el ou ela](%%%%action.newnotice%%%%?" "status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -185,14 +185,14 @@ msgstr "" "un aceno a %s ou publicar unha nota dirixida a el ou ela?" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Vostede e mailos seus amigos" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizacións de %1$s e amigos en %2$s!" @@ -203,22 +203,22 @@ msgstr "Actualizacións de %1$s e amigos en %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "Non se atopou o método da API." @@ -228,11 +228,11 @@ msgstr "Non se atopou o método da API." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Este método require un POST." @@ -264,7 +264,7 @@ msgstr "Non se puido gardar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -342,24 +342,24 @@ msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Non pode enviar mensaxes directas a usuarios que non sexan amigos seus." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Non se atopou ningún estado con esa ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Este estado xa é dos favoritos." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Non se puido crear o favorito." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Ese estado non é un dos favoritos." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Non se puido eliminar o favorito." @@ -392,7 +392,7 @@ msgstr "Non se puido determinar o usuario de orixe." msgid "Could not find target user." msgstr "Non se puido atopar o usuario de destino." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -400,113 +400,113 @@ msgstr "" "O alcume debe ter só letras en minúscula e números, e non pode ter espazos " "en branco." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Ese alcume xa está en uso. Probe con outro." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "O formato do alcume non é correcto." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "O URL da páxina persoal non é correcto." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "A descrición é longa de máis (o máximo son %d caracteres)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "A localidade é longa de máis (o máximo son 255 caracteres)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Demasiados pseudónimos! O número máximo é %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Pseudónimo incorrecto: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "O pseudónimo \"%s\" xa se está a usar. Proba con outro." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "O pseudónimo non pode coincidir co alcume." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Non se atopou o grupo." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Xa forma parte dese grupo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "O administrador bloqueouno nese grupo." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "O usuario %1$s non se puido engadir ao grupo %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Vostede non pertence a este grupo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "O usuario %1$s non se puido eliminar do grupo %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Os grupos de %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "Grupos de %1$s aos que pertence %2$s." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "grupos %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "grupos en %s" @@ -521,7 +521,7 @@ msgstr "Pase incorrecto." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -627,11 +627,11 @@ msgstr "Permitir" msgid "Allow or deny access to your account information." msgstr "Permitir ou denegar o acceso á información da súa conta." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Este método require un POST ou un DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Non pode borrar o estado doutro usuario." @@ -648,25 +648,25 @@ msgstr "Non pode repetir a súa propia nota." msgid "Already repeated that notice." msgstr "Xa repetiu esa nota." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Borrouse o estado." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Non se atopou ningún estado con esa ID." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Iso é longo de máis. A nota non pode exceder os %d caracteres." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Non se atopou." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -677,32 +677,32 @@ msgstr "" msgid "Unsupported format." msgstr "Formato non soportado." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritos de %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualizacións marcadas como favoritas por %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualizacións que mencionan %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Liña do tempo pública de %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s actualizacións de todos!" @@ -717,12 +717,12 @@ msgstr "Repetiu a %s" msgid "Repeats of %s" msgstr "Repeticións de %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notas etiquetadas con %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizacións etiquetadas con %1$s en %2$s!" @@ -1860,7 +1860,7 @@ msgstr "Converter a este usuario en administrador" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Liña do tempo de %s" @@ -2541,30 +2541,30 @@ msgstr "" "Os desenvolvedores poden editar a configuración de rexistro das súas " "aplicacións " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Non hai perfil para a nota." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Estado de %1$s en %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Non se soporta o tipo de contido %s." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Só %s enderezos URL sobre HTTP simple." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Non se soporta ese formato de datos." @@ -3563,7 +3563,7 @@ msgstr "Non pode revogar os roles dos usuarios neste sitio." msgid "User doesn't have this role." msgstr "O usuario non ten este rol." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3620,7 +3620,7 @@ msgid "Icon" msgstr "Icona" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Nome" @@ -3631,7 +3631,7 @@ msgid "Organization" msgstr "Organización" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descrición" @@ -4612,7 +4612,7 @@ msgstr "" "deste usuario. Se non pediu a subscrición ás notas de alguén, prema en " "\"Rexeitar\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licenza" @@ -4741,18 +4741,18 @@ msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse a eles." #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualizacións de %1$s en %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "%s de StatusNet" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4761,11 +4761,11 @@ msgstr "" "Este sitio foi desenvolvido sobre a versión %2$s de %1$s, propiedade de " "StatusNet, Inc. e colaboradores, 2008-2010." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Colaboradores" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4777,7 +4777,7 @@ msgstr "" "Software Foundation, versión 3 ou calquera versión posterior (a elección do " "usuario) da licenza. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4789,7 +4789,7 @@ msgstr "" "ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Lea a Licenza Pública Xeral " "Affero de GNU para máis información. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4798,20 +4798,20 @@ msgstr "" "Debeu recibir unha copia da Licenza Pública Xeral Affero de GNU xunto co " "programa. En caso contrario, vexa %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Complementos" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Versión" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Autores" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4820,13 +4820,13 @@ msgstr "" "Ningún ficheiro pode superar os %d bytes e o que enviou ocupaba %d. Probe a " "subir un ficheiro máis pequeno." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Un ficheiro deste tamaño excedería a súa cota de usuario, que é de %d bytes." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes." @@ -4865,27 +4865,27 @@ msgid "Could not update message with new URI." msgstr "Non se puido actualizar a mensaxe co novo URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Houbo un problema ao gardar a nota. É longa de máis." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Houbo un problema ao gardar a nota. Descoñécese o usuario." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Escribiu demasiadas notas en moi pouco tempo. Tómese un respiro e volva " "publicar nuns minutos." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4893,21 +4893,21 @@ msgstr "" "Repetiu demasiadas mensaxes en moi pouco tempo. Tómese un respiro e volva " "publicar nuns minutos." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Prohibíuselle publicar notas neste sitio de momento." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Houbo un problema ao gardar a nota." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Houbo un problema ao gardar a caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "♻ @%1$s %2$s" @@ -5370,7 +5370,7 @@ msgid "Snapshots configuration" msgstr "Configuración das instantáneas" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "O recurso API precisa permisos de lectura e escritura, pero só dispón de " @@ -5503,11 +5503,11 @@ msgstr "Notas nas que se anexou este ficheiro" msgid "Tags for this attachment" msgstr "Etiquetas para este ficheiro" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Non se puido cambiar o contrasinal" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Non se permite cambiar o contrasinal" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 09b597d2e2..97e33ea6b5 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:29+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:49+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -89,25 +89,25 @@ msgid "Save" msgstr "שמור" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "אין הודעה כזו." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -120,7 +120,7 @@ msgid "No such user." msgstr "אין משתמש כזה." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, fuzzy, php-format msgid "%1$s and friends, page %2$d" msgstr "%s וחברים" @@ -128,39 +128,39 @@ msgstr "%s וחברים" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s וחברים" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "הזנות החברים של %s" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "הזנות החברים של %s" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, fuzzy, php-format msgid "Feed for friends of %s (Atom)" msgstr "הזנות החברים של %s" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -168,14 +168,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -183,15 +183,15 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 #, fuzzy msgid "You and friends" msgstr "%s וחברים" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -202,22 +202,22 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "קוד האישור לא נמצא." @@ -228,11 +228,11 @@ msgstr "קוד האישור לא נמצא." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "" @@ -264,7 +264,7 @@ msgstr "שמירת הפרופיל נכשלה." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -340,25 +340,25 @@ msgstr "" msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 #, fuzzy msgid "This status is already a favorite." msgstr "זהו כבר זיהוי ה-Jabber שלך." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "" @@ -395,122 +395,122 @@ msgstr "עידכון המשתמש נכשל." msgid "Could not find target user." msgstr "עידכון המשתמש נכשל." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "כינוי יכול להכיל רק אותיות אנגליות קטנות ומספרים, וללא רווחים." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "כינוי זה כבר תפוס. נסה כינוי אחר." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "שם משתמש לא חוקי." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "לאתר הבית יש כתובת לא חוקית." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "השם המלא ארוך מידי (מותרות 255 אותיות בלבד)" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "כתובת אתר הבית '%s' אינה חוקית" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, fuzzy, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "כינוי זה כבר תפוס. נסה כינוי אחר." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "לא נמצא" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 #, fuzzy msgid "You are already a member of that group." msgstr "כבר נכנסת למערכת!" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "נכשלה ההפניה לשרת: %s" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 #, fuzzy msgid "You are not a member of this group." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "נכשלה יצירת OpenID מתוך: %s" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, fuzzy, php-format msgid "%s's groups" msgstr "פרופיל" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "לא שלחנו אלינו את הפרופיל הזה" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "" @@ -526,7 +526,7 @@ msgstr "גודל לא חוקי." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -629,11 +629,11 @@ msgstr "" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "" @@ -652,27 +652,27 @@ msgstr "לא ניתן להירשם ללא הסכמה לרשיון" msgid "Already repeated that notice." msgstr "כבר נכנסת למערכת!" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 #, fuzzy msgid "Status deleted." msgstr "התמונה עודכנה." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "לא נמצא" -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -682,32 +682,32 @@ msgstr "" msgid "Unsupported format." msgstr "פורמט התמונה אינו נתמך." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "הסטטוס של %1$s ב-%2$s " -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "מיקרובלוג מאת %s" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "הסטטוס של %1$s ב-%2$s " -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -722,12 +722,12 @@ msgstr "תגובת עבור %s" msgid "Repeats of %s" msgstr "תגובת עבור %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "מיקרובלוג מאת %s" @@ -1914,7 +1914,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "" @@ -2560,31 +2560,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "להודעה אין פרופיל" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "הסטטוס של %1$s ב-%2$s " #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "התחבר" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "" @@ -3551,7 +3551,7 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" msgid "User doesn't have this role." msgstr "למשתמש אין פרופיל." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "התמונה עודכנה." @@ -3613,7 +3613,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3626,7 +3626,7 @@ msgid "Organization" msgstr "מיקום" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" @@ -4586,7 +4586,7 @@ msgstr "" "בדוק את הפרטים כדי לוודא שברצונך להירשם כמנוי להודעות משתמש זה. אם אינך רוצה " "להירשם, לחץ \"בטל\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "" @@ -4716,29 +4716,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "סטטיסטיקה" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4746,7 +4746,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4754,40 +4754,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "אישי" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4830,48 +4830,48 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:249 +#: classes/Notice.php:255 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "בעיה בשמירת ההודעה." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5365,7 +5365,7 @@ msgid "Snapshots configuration" msgstr "הרשמות" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5501,12 +5501,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "הסיסמה נשמרה." -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "הסיסמה נשמרה." diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index defca6e333..d487b60858 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:32+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:55+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -85,24 +85,24 @@ msgid "Save" msgstr "Składować" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Strona njeeksistuje." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -115,7 +115,7 @@ msgid "No such user." msgstr "Wužiwar njeeksistuje" #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s a přećeljo, strona %2$d" @@ -123,39 +123,39 @@ msgstr "%1$s a přećeljo, strona %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s a přećeljo" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Kanal za přećelow wužiwarja %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Kanal za přećelow wužiwarja %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Kanal za přećelow wužiwarja %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -163,14 +163,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -178,17 +178,17 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Ty a přećeljo" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" -msgstr "" +msgstr "Aktualizacije wot %1$s a přećelow na %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 @@ -196,22 +196,22 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-metoda njenamakana." @@ -221,11 +221,11 @@ msgstr "API-metoda njenamakana." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Tuta metoda wužaduje sej POST." @@ -255,7 +255,7 @@ msgstr "Profil njeje so składować dał." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -286,11 +286,11 @@ msgstr "Njemóžeš so samoho blokować." #: actions/apiblockcreate.php:126 msgid "Block user failed." -msgstr "" +msgstr "Blokowanje wužiwarja je so njeporadźiło." #: actions/apiblockdestroy.php:114 msgid "Unblock user failed." -msgstr "" +msgstr "Wotblokowanje wužiwarja je so njeporadźiło." #: actions/apidirectmessage.php:89 #, php-format @@ -329,24 +329,24 @@ msgstr "Přijimowar njenamakany." msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Status z tym ID njenamakany." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Tutón status je hižo faworit." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Tón status faworit njeje." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "" @@ -373,125 +373,125 @@ msgstr "" #: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." -msgstr "" +msgstr "Žórłowy wužiwar njeda so postajić." #: actions/apifriendshipsshow.php:142 msgid "Could not find target user." -msgstr "" +msgstr "Cilowy wužiwar njeda so namakać." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Přimjeno so hižo wužiwa. Spytaj druhe." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Žane płaćiwe přimjeno." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Startowa strona njeje płaćiwy URL." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Wopisanje je předołho (maks. %d znamješkow)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Městno je předołho (maks. 255 znamješkow)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Přewjele aliasow! Maksimum: %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Njepłaćiwy alias: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Alias \"%s\" so hižo wužiwa. Spytaj druhi." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Alias njemóže samsny kaž přimjeno być." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Skupina njenamakana." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Sy hižo čłon teje skupiny." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." -msgstr "" +msgstr "Administratora tuteje skupiny je će zablokował." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Njejsy čłon tuteje skupiny." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" -msgstr "" +msgstr "Skupiny wužiwarja %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." -msgstr "" +msgstr "Skupiny na %1$s, w kotrychž wužiwar %2$s je čłon." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s skupinow" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "skupiny na %s" @@ -506,7 +506,7 @@ msgstr "Njepłaćiwy token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -560,11 +560,11 @@ msgstr "" #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" -msgstr "" +msgstr "Aplikacija chce so z twojom kontom zwjazać" #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" -msgstr "" +msgstr "Přistup dowolić abo wotpokazać" #: actions/apioauthauthorize.php:292 #, php-format @@ -603,13 +603,13 @@ msgstr "Dowolić" #: actions/apioauthauthorize.php:351 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "Přistup ke kontowym informacijam dowolić abo wotpokazać." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Tuta metoda wužaduje sej POST abo DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Njemóžeš status druheho wužiwarja zničić." @@ -626,25 +626,25 @@ msgstr "Njemóžno twoju zdźělenku wospjetować." msgid "Already repeated that notice." msgstr "Tuta zdźělenka bu hižo wospjetowana." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Status zničeny." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Žadyn status z tym ID namakany." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Njenamakany." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -653,35 +653,35 @@ msgstr "" msgid "Unsupported format." msgstr "Njepodpěrany format." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" -msgstr "" +msgstr "%s aktualizacijow wote wšěch!" #: actions/apitimelineretweetedtome.php:111 #, php-format @@ -693,12 +693,12 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -778,7 +778,7 @@ msgstr "" #: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." -msgstr "" +msgstr "Naše datajowe daty su so zhubili." #: actions/avatarsettings.php:370 msgid "Avatar updated." @@ -786,7 +786,7 @@ msgstr "Awatar zaktualizowany." #: actions/avatarsettings.php:373 msgid "Failed updating avatar." -msgstr "" +msgstr "Aktualizowanje awatara je so njeporadźiło." #: actions/avatarsettings.php:397 msgid "Avatar deleted." @@ -863,7 +863,7 @@ msgstr "Skupina njeeksistuje." #: actions/blockedfromgroup.php:97 #, php-format msgid "%s blocked profiles" -msgstr "" +msgstr "%s je profile zablokował" #: actions/blockedfromgroup.php:100 #, php-format @@ -876,15 +876,15 @@ msgstr "" #: actions/blockedfromgroup.php:288 msgid "Unblock user from group" -msgstr "" +msgstr "Wužiwarja za skupinu wotblokować" #: actions/blockedfromgroup.php:320 lib/unblockform.php:69 msgid "Unblock" -msgstr "" +msgstr "Wotblokować" #: actions/blockedfromgroup.php:320 lib/unblockform.php:80 msgid "Unblock this user" -msgstr "" +msgstr "Tutoho wužiwarja wotblokować" #. TRANS: Title for mini-posting window loaded from bookmarklet. #: actions/bookmarklet.php:51 @@ -927,14 +927,14 @@ msgstr "Tuta adresa bu hižo wobkrućena." #: actions/profilesettings.php:283 actions/smssettings.php:308 #: actions/smssettings.php:464 msgid "Couldn't update user." -msgstr "" +msgstr "Wužiwar njeda aktualizować." #. TRANS: Server error thrown on database error canceling e-mail address confirmation. #. TRANS: Server error thrown on database error canceling SMS phone number confirmation. #: actions/confirmaddress.php:128 actions/emailsettings.php:433 #: actions/smssettings.php:422 msgid "Couldn't delete email confirmation." -msgstr "" +msgstr "E-mejlowe wobkrućenje njeda so zhašeć." #: actions/confirmaddress.php:146 msgid "Confirm address" @@ -1234,7 +1234,7 @@ msgstr "URL žórła płaćiwy njeje." #: actions/editapplication.php:203 actions/newapplication.php:188 msgid "Organization is required." -msgstr "" +msgstr "Organizacija je trěbna." #: actions/editapplication.php:206 actions/newapplication.php:191 msgid "Organization is too long (max 255 chars)." @@ -1242,7 +1242,7 @@ msgstr "Mjeno organizacije je předołho (maks. 255 znamješkow)." #: actions/editapplication.php:209 actions/newapplication.php:194 msgid "Organization homepage is required." -msgstr "" +msgstr "Startowa strona organizacije je trěbna." #: actions/editapplication.php:218 actions/newapplication.php:206 msgid "Callback is too long." @@ -1259,7 +1259,7 @@ msgstr "Aplikacija njeda so aktualizować." #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" -msgstr "" +msgstr "Skupinu %s wobdźěłać" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." @@ -1613,11 +1613,11 @@ msgstr "" #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" -msgstr "" +msgstr "Móžeš lokalny abonement wužiwać!" #: actions/finishremotesubscribe.php:99 msgid "That user has blocked you from subscribing." -msgstr "" +msgstr "Tutón wužiwar ći abonowanje njedowoli." #: actions/finishremotesubscribe.php:110 msgid "You are not authorized." @@ -1803,7 +1803,7 @@ msgstr "Tutoho wužiwarja k administratorej činić" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "" @@ -1812,7 +1812,7 @@ msgstr "" #: actions/grouprss.php:142 #, php-format msgid "Updates from members of %1$s on %2$s!" -msgstr "" +msgstr "Aktualizacije wot %1$s na %2$s!" #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 @@ -1870,7 +1870,7 @@ msgstr "" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Jenož administrator móže skupinskich čłonow wotblokować." #: actions/groupunblock.php:95 msgid "User is not blocked from group." @@ -1878,7 +1878,7 @@ msgstr "Wužiwar njeje zablokowany za skupinu." #: actions/groupunblock.php:128 actions/unblock.php:86 msgid "Error removing the block." -msgstr "" +msgstr "Zmylk při wotstronjenju blokowanja." #. TRANS: Title for instance messaging settings. #: actions/imsettings.php:60 @@ -2021,16 +2021,17 @@ msgstr "IM-adresa bu wotstronjena." #: actions/inbox.php:59 #, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "" +msgstr "Dochadny póst za %1$s - strona %2$d" #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" -msgstr "" +msgstr "Dochadny póst za %s" #: actions/inbox.php:115 msgid "This is your inbox, which lists your incoming private messages." msgstr "" +"To je twój dochadny póst, kotryž twoje priwatne dochadne powěsće nalistuje." #: actions/invite.php:39 msgid "Invites have been disabled." @@ -2070,11 +2071,11 @@ msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" "These people are already users and you were automatically subscribed to them:" -msgstr "" +msgstr "Tući ludźo su hižo wužiwarjo a ty sy jich awtomatisce abonował:" #: actions/invite.php:144 msgid "Invitation(s) sent to the following people:" -msgstr "" +msgstr "Přeprošenja, kotrež buchu na slědowacych ludźi pósłane:" #: actions/invite.php:150 msgid "" @@ -2162,7 +2163,7 @@ msgstr "Žane přimjeno abo žadyn ID." #: actions/joingroup.php:141 lib/command.php:346 #, php-format msgid "%1$s joined group %2$s" -msgstr "" +msgstr "%1$s je do %2$s zastupił" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -2177,7 +2178,7 @@ msgstr "Njejsy čłon teje skupiny." #: actions/leavegroup.php:137 lib/command.php:392 #, php-format msgid "%1$s left group %2$s" -msgstr "" +msgstr "%1$s je skupinu %2$s wopušćił" #: actions/login.php:102 actions/otp.php:62 actions/register.php:144 msgid "Already logged in." @@ -2335,7 +2336,7 @@ msgstr "Tekstowe pytanje" #: actions/noticesearch.php:91 #, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "" +msgstr "Pytanske wuslědki za \"%1$s\" na %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2384,12 +2385,12 @@ msgstr "Aplikacije OAuth" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "Aplikacije, za kotrež sy zregistrował" #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "Hišće njejsy aplikacije zregistrował." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" @@ -2416,30 +2417,30 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Zdźělenka nima profil." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Wobsahowy typ %s so njepodpěruje." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -2506,12 +2507,12 @@ msgstr "Přizjewjenske znamješko spadnjene." #: actions/outbox.php:58 #, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "" +msgstr "Wuchadny póst za %1$s - strona %2$d" #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" -msgstr "" +msgstr "Wuchadny póst za %s" #: actions/outbox.php:116 msgid "This is your outbox, which lists private messages you have sent." @@ -2548,7 +2549,7 @@ msgstr "Wobkrućić" #: actions/passwordsettings.php:113 actions/recoverpassword.php:240 msgid "Same as password above" -msgstr "" +msgstr "Samsne hesło kaž horjeka" #: actions/passwordsettings.php:117 msgid "Change" @@ -2769,6 +2770,8 @@ msgstr "Profilowe nastajenja" msgid "" "You can update your personal profile info here so people know more about you." msgstr "" +"Móžeš swoje wosobinske profilowe informacije aktualizować, zo bychu ludźo " +"wjace wo tebi zhonili." #: actions/profilesettings.php:99 msgid "Profile information" @@ -2797,11 +2800,11 @@ msgstr "" #: actions/profilesettings.php:122 actions/register.php:468 #, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "" +msgstr "Wopisaj sebje a swoje zajimy z %d znamješkami" #: actions/profilesettings.php:125 actions/register.php:471 msgid "Describe yourself and your interests" -msgstr "" +msgstr "Wopisaj sebje a swoje zajimy" #: actions/profilesettings.php:127 actions/register.php:473 msgid "Bio" @@ -3004,11 +3007,11 @@ msgstr "" #: actions/recoverpassword.php:86 msgid "Error with confirmation code." -msgstr "" +msgstr "Zmylk z wobkrućenskim kodom." #: actions/recoverpassword.php:97 msgid "This confirmation code is too old. Please start again." -msgstr "" +msgstr "Tutón wobkrućenski kod je přestary. Prošu započń hišće raz." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." @@ -3030,7 +3033,7 @@ msgstr "" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Přimjeno abo e-mejlowa adresa" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -3080,7 +3083,7 @@ msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu." #: actions/recoverpassword.php:313 msgid "Error saving address confirmation." -msgstr "" +msgstr "Zmylk při składowanju adresoweho wobkrućenja." #: actions/recoverpassword.php:338 msgid "" @@ -3098,15 +3101,15 @@ msgstr "Hesło dyrbi 6 znamješkow abo wjace měć." #: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." -msgstr "" +msgstr "Hesło a jeho wobkrućenje so njekryjetej." #: actions/recoverpassword.php:388 actions/register.php:255 msgid "Error setting user." -msgstr "" +msgstr "Zmylk při nastajenju wužiwarja." #: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." -msgstr "" +msgstr "Nowe hesło bu wuspěšnje składowane. Sy nětko přizjewjeny." #: actions/register.php:92 actions/register.php:196 actions/register.php:412 msgid "Sorry, only invited people can register." @@ -3130,7 +3133,7 @@ msgstr "Registracija njedowolena." #: actions/register.php:205 msgid "You can't register if you don't agree to the license." -msgstr "" +msgstr "Njemóžeš so registrować, jeli njepřizwoleš do licency." #: actions/register.php:219 msgid "Email address already exists." @@ -3191,7 +3194,7 @@ msgstr "" #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. #: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Wšě prawa wuměnjenjene." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. #: actions/register.php:540 @@ -3236,11 +3239,11 @@ msgstr "" #: actions/remotesubscribe.php:112 msgid "Remote subscribe" -msgstr "" +msgstr "Zdaleny abonement" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "" +msgstr "Zdaleneho wužiwarja abonować" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -3273,7 +3276,7 @@ msgstr "" #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "To je lokalny profil! Přizjew so, zo by abonował." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." @@ -3363,7 +3366,7 @@ msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać." msgid "User doesn't have this role." msgstr "Wužiwar nima tutu rólu." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3417,10 +3420,10 @@ msgstr "Aplikaciski profil" #. TRANS: Form input field label for application icon. #: actions/showapplication.php:159 lib/applicationeditform.php:182 msgid "Icon" -msgstr "" +msgstr "Symbol" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Mjeno" @@ -3431,7 +3434,7 @@ msgid "Organization" msgstr "Organizacija" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Wopisanje" @@ -3448,7 +3451,7 @@ msgstr "" #: actions/showapplication.php:213 msgid "Application actions" -msgstr "" +msgstr "Aplikaciske akcije" #: actions/showapplication.php:236 msgid "Reset key & secret" @@ -3456,7 +3459,7 @@ msgstr "" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Aplikaciske informacije" #: actions/showapplication.php:263 msgid "Consumer key" @@ -3895,7 +3898,7 @@ msgstr "" #. TRANS: Field label for SMS address input in SMS settings form. #: actions/smssettings.php:142 msgid "Confirmation code" -msgstr "" +msgstr "Wobkrućenski kod" #. TRANS: Form field instructions in SMS settings form. #: actions/smssettings.php:144 @@ -4117,7 +4120,7 @@ msgstr "" #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" -msgstr "" +msgstr "%s abonentow nima. Chceš prěni być?" #: actions/subscribers.php:114 #, php-format @@ -4334,7 +4337,7 @@ msgstr "" #: actions/userauthorization.php:105 msgid "Authorize subscription" -msgstr "" +msgstr "Abonement awtorizować" #: actions/userauthorization.php:110 msgid "" @@ -4343,7 +4346,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licenca" @@ -4423,7 +4426,7 @@ msgstr "" #: actions/userauthorization.php:355 #, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "" +msgstr "Wopačny wobrazowy typ za awatarowy URL '%s'." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4447,12 +4450,12 @@ msgstr "%1$s skupinow, strona %2$d" #: actions/usergroups.php:132 msgid "Search for more groups" -msgstr "" +msgstr "Dalše skupiny pytać" #: actions/usergroups.php:159 #, php-format msgid "%s is not a member of any group." -msgstr "" +msgstr "%s čłon w žanej skupinje njeje." #: actions/usergroups.php:164 #, php-format @@ -4464,29 +4467,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" -msgstr "" +msgstr "Aktualizacije wot %1$s na %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" -msgstr "" +msgstr "Sobuskutkowarjo" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4494,7 +4497,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4502,39 +4505,39 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" -msgstr "" +msgstr "Tykače" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Wersija" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Awtorojo" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4573,45 +4576,45 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Zmylk datoweje banki při zasunjenju hašeje taflički: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5063,19 +5066,19 @@ msgid "Snapshots configuration" msgstr "Konfiguracija wobrazowkowych fotow" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" #. TRANS: Form legend. #: lib/applicationeditform.php:137 msgid "Edit application" -msgstr "" +msgstr "Aplikaciju wobdźěłać" #. TRANS: Form guide. #: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Symbol za tutu aplikaciju" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:209 @@ -5121,7 +5124,7 @@ msgstr "Wobhladowak" #. TRANS: Radio button label for application type #: lib/applicationeditform.php:295 msgid "Desktop" -msgstr "" +msgstr "Desktop" #. TRANS: Form guide. #: lib/applicationeditform.php:297 @@ -5173,7 +5176,7 @@ msgstr "Wotwołać" #. TRANS: DT element label in attachment list. #: lib/attachmentlist.php:88 msgid "Attachments" -msgstr "" +msgstr "Přiwěški" #. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:265 @@ -5183,7 +5186,7 @@ msgstr "Awtor" #. TRANS: DT element label in attachment list item. #: lib/attachmentlist.php:279 msgid "Provider" -msgstr "" +msgstr "Poskićowar" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" @@ -5193,17 +5196,17 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Změnjenje hesła je so njeporadźiło" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Změnjenje hesła njeje dowolene" #: lib/channel.php:157 lib/channel.php:177 msgid "Command results" -msgstr "" +msgstr "Přikazowe wuslědki" #: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" @@ -5211,7 +5214,7 @@ msgstr "" #: lib/channel.php:240 msgid "Command failed" -msgstr "" +msgstr "Přikaz je so njeporadźił" #: lib/command.php:83 lib/command.php:105 msgid "Notice with that id does not exist" @@ -5298,7 +5301,7 @@ msgstr "Městno: %s" #: lib/command.php:426 lib/mail.php:271 #, php-format msgid "Homepage: %s" -msgstr "" +msgstr "Startowa strona: %s" #. TRANS: Whois output. %s is the bio information of the queried user. #: lib/command.php:430 @@ -5319,6 +5322,7 @@ msgstr "" #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "" +"Powěsć předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d pósłał" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -5329,7 +5333,7 @@ msgstr "Direktna powěsć do %s pósłana" #: lib/command.php:494 msgid "Error sending direct message." -msgstr "" +msgstr "Zmylk při słanju direktneje powěsće," #: lib/command.php:514 msgid "Cannot repeat your own notice" @@ -5388,7 +5392,7 @@ msgstr "" #: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." -msgstr "" +msgstr "Přikaz hišće njeimplementowany." #: lib/command.php:685 msgid "Notification off." @@ -5446,7 +5450,7 @@ msgstr[3] "Tute wosoby su će abonowali:" #: lib/command.php:822 msgid "You are not a member of any groups." -msgstr "" +msgstr "Njejsy čłon w žanej skupinje." #: lib/command.php:824 msgid "You are a member of this group:" @@ -5520,11 +5524,11 @@ msgstr "IM" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "" +msgstr "Aktualizacije přez Instant Messenger (IM)" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "" +msgstr "Aktualizacije přez SMS" #: lib/connectsettingsaction.php:120 msgid "Connections" @@ -5546,6 +5550,8 @@ msgstr "Dataju nahrać" msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "" +"Móžeš swój wosobinski pozadkowy wobraz nahrać. Maksimalna datajowa wulkosć " +"je 2 MB." #: lib/designsettings.php:418 msgid "Design defaults restored." @@ -5687,12 +5693,12 @@ msgstr "" #: lib/imagefile.php:72 msgid "Unsupported image file format." -msgstr "" +msgstr "Njepodpěrowany wobrazowy format." #: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "" +msgstr "Tuta dataja je přewulka. Maksimalna datajowa wulkosć je %s." #: lib/imagefile.php:93 msgid "Partial upload." @@ -5700,11 +5706,11 @@ msgstr "Dźělne nahraće." #: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." -msgstr "" +msgstr "Systemowy zmylk při nahrawanju dataje." #: lib/imagefile.php:109 msgid "Not an image or corrupt file." -msgstr "" +msgstr "Žady wobraz abo žana wobškodźena dataja." #: lib/imagefile.php:122 msgid "Lost our file." @@ -6073,7 +6079,7 @@ msgstr "Zdźělenku pósłać" #: lib/noticeform.php:173 #, php-format msgid "What's up, %s?" -msgstr "" +msgstr "Što je, %s?" #: lib/noticeform.php:192 msgid "Attach" @@ -6128,7 +6134,7 @@ msgstr "" #: lib/noticelist.php:559 msgid "in context" -msgstr "" +msgstr "w konteksće" #: lib/noticelist.php:594 msgid "Repeated by" @@ -6196,7 +6202,7 @@ msgstr "Fawority" #: lib/personalgroupnav.php:125 msgid "Inbox" -msgstr "" +msgstr "Dochadny póst" #: lib/personalgroupnav.php:126 msgid "Your incoming messages" @@ -6204,7 +6210,7 @@ msgstr "Twoje dochadźace powěsće" #: lib/personalgroupnav.php:130 msgid "Outbox" -msgstr "" +msgstr "Wuchadny póst" #: lib/personalgroupnav.php:131 msgid "Your sent messages" @@ -6246,7 +6252,7 @@ msgstr "Čłon wot" #. TRANS: Average count of posts made per day since account registration #: lib/profileaction.php:235 msgid "Daily average" -msgstr "" +msgstr "Dnjowy přerězk" #: lib/profileaction.php:264 msgid "All groups" @@ -6254,7 +6260,7 @@ msgstr "Wšě skupiny" #: lib/profileformaction.php:123 msgid "Unimplemented method." -msgstr "" +msgstr "Njeimplementowana metoda." #: lib/publicgroupnav.php:78 msgid "Public" @@ -6544,3 +6550,5 @@ msgstr "" #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" +"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d " +"pósłał." diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 409b38ab96..77b7e0dd40 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:36+0000\n" +"PO-Revision-Date: 2010-06-03 23:01:59+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -83,24 +83,24 @@ msgid "Save" msgstr "Salveguardar" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Pagina non existe." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -113,7 +113,7 @@ msgid "No such user." msgstr "Usator non existe." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s e amicos, pagina %2$d" @@ -121,33 +121,33 @@ msgstr "%1$s e amicos, pagina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amicos" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Syndication pro le amicos de %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Syndication pro le amicos de %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Syndication pro le amicos de %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -155,7 +155,7 @@ msgstr "" "Isto es le chronologia pro %s e su amicos, ma necuno ha ancora publicate " "alique." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -165,7 +165,7 @@ msgstr "" "action.groups%%) o publica alique tu mesme." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -174,7 +174,7 @@ msgstr "" "Tu pote tentar [dar un pulsata a %1$s](../%2$s) in su profilo o [publicar un " "message a su attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -184,14 +184,14 @@ msgstr "" "pulsata a %s o publicar un message a su attention." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Tu e amicos" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualisationes de %1$s e su amicos in %2$s!" @@ -202,22 +202,22 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "Methodo API non trovate." @@ -227,11 +227,11 @@ msgstr "Methodo API non trovate." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Iste methodo require un POST." @@ -263,7 +263,7 @@ msgstr "Non poteva salveguardar le profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -339,24 +339,24 @@ msgstr "Usator destinatario non trovate." msgid "Can't send direct messages to users who aren't your friend." msgstr "Non pote inviar messages directe a usatores que non es tu amicos." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Nulle stato trovate con iste ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Iste stato es ja favorite." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Non poteva crear le favorite." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Iste stato non es favorite." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Non poteva deler le favorite." @@ -389,119 +389,119 @@ msgstr "Non poteva determinar le usator de origine." msgid "Could not find target user." msgstr "Non poteva trovar le usator de destination." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Pseudonymo ja in uso. Proba un altere." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Non un pseudonymo valide." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Le pagina personal non es un URL valide." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Le nomine complete es troppo longe (max. 255 characteres)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Description es troppo longe (max %d charachteres)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Loco es troppo longe (max. 255 characteres)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Troppo de aliases! Maximo: %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Alias invalide: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Le alias \"%s\" es ja in uso. Proba un altere." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Le alias non pote esser identic al pseudonymo." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Gruppo non trovate." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Tu es ja membro de iste gruppo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Le administrator te ha blocate de iste gruppo." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Tu non es membro de iste gruppo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Non poteva remover le usator %1$s del gruppo %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Gruppos de %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "Gruppos de %1$s del quales %2$s es membro." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Gruppos de %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "gruppos in %s" @@ -516,7 +516,7 @@ msgstr "Indicio invalide." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -623,11 +623,11 @@ msgstr "Permitter" msgid "Allow or deny access to your account information." msgstr "Permitter o refusar accesso al informationes de tu conto." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Iste methodo require un commando POST o DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Tu non pote deler le stato de un altere usator." @@ -644,26 +644,26 @@ msgstr "Non pote repeter tu proprie nota." msgid "Already repeated that notice." msgstr "Iste nota ha ja essite repetite." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Stato delite." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Nulle stato trovate con iste ID." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Isto es troppo longe. Le longitude maximal del notas es %d characteres." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Non trovate." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -674,33 +674,33 @@ msgstr "" msgid "Unsupported format." msgstr "Formato non supportate." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favorites de %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualisationes favoritisate per %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualisationes que mentiona %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" "Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Chronologia public de %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Actualisationes de totes in %s!" @@ -715,12 +715,12 @@ msgstr "Repetite a %s" msgid "Repeats of %s" msgstr "Repetitiones de %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notas con etiquetta %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualisationes con etiquetta %1$s in %2$s!" @@ -1852,7 +1852,7 @@ msgstr "Facer iste usator administrator" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Chronologia de %s" @@ -2535,30 +2535,30 @@ msgstr "" "Le programmatores pote modificar le parametros de registration pro lor " "applicationes " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Le nota ha nulle profilo." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Le stato de %1$s in %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Le typo de contento %s non es supportate." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Solmente le URLs %s es permittite super HTTP simple." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Formato de datos non supportate." @@ -3542,7 +3542,7 @@ msgstr "Tu non pote revocar rolos de usatores in iste sito." msgid "User doesn't have this role." msgstr "Le usator non ha iste rolo." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3599,7 +3599,7 @@ msgid "Icon" msgstr "Icone" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Nomine" @@ -3610,7 +3610,7 @@ msgid "Organization" msgstr "Organisation" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Description" @@ -4585,7 +4585,7 @@ msgstr "" "Per favor verifica iste detalios pro assecurar te que tu vole subscriber te " "al notas de iste usator. Si tu non ha requestate isto, clicca \"Rejectar\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licentia" @@ -4715,18 +4715,18 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualisationes de %1$s in %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4735,11 +4735,11 @@ msgstr "" "Iste sito es realisate per %1$s version %2$s, copyright 2008-2010 StatusNet, " "Inc. e contributores." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Contributores" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4751,7 +4751,7 @@ msgstr "" "Free Software Foundation, o version 3 de iste licentia, o (a vostre " "election) omne version plus recente. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4763,7 +4763,7 @@ msgstr "" "USABILITATE PRO UN PARTICULAR SCOPO. Vide le GNU Affero General Public " "License pro ulterior detalios. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4772,20 +4772,20 @@ msgstr "" "Un copia del GNU Affero General Public License deberea esser disponibile " "insimul con iste programma. Si non, vide %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Plug-ins" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Version" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Autor(es)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4794,12 +4794,12 @@ msgstr "" "Nulle file pote esser plus grande que %d bytes e le file que tu inviava ha %" "d bytes. Tenta incargar un version minus grande." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Un file de iste dimension excederea tu quota de usator de %d bytes." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Un file de iste dimension excederea tu quota mensual de %d bytes." @@ -4838,27 +4838,27 @@ msgid "Could not update message with new URI." msgstr "Non poteva actualisar message con nove URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Error in base de datos durante insertion del marca (hashtag): %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Problema salveguardar nota. Troppo longe." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Problema salveguardar nota. Usator incognite." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Troppo de notas troppo rapidemente; face un pausa e publica de novo post " "alcun minutas." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4866,21 +4866,21 @@ msgstr "" "Troppo de messages duplicate troppo rapidemente; face un pausa e publica de " "novo post alcun minutas." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Il te es prohibite publicar notas in iste sito." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problema salveguardar nota." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Problema salveguardar le cassa de entrata del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5340,7 +5340,7 @@ msgid "Snapshots configuration" msgstr "Configuration del instantaneos" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Le ressource de API require accesso pro lectura e scriptura, ma tu ha " @@ -5474,11 +5474,11 @@ msgstr "Notas ubi iste annexo appare" msgid "Tags for this attachment" msgstr "Etiquettas pro iste annexo" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Cambio del contrasigno fallite" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Cambio del contrasigno non permittite" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 4160147146..29c4ae34b8 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:39+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:03+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -92,25 +92,25 @@ msgid "Save" msgstr "Vista" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "Ekkert þannig merki." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -123,7 +123,7 @@ msgid "No such user." msgstr "Enginn svoleiðis notandi." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, fuzzy, php-format msgid "%1$s and friends, page %2$d" msgstr "%s og vinirnir, síða %d" @@ -131,39 +131,39 @@ msgstr "%s og vinirnir, síða %d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s og vinirnir" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -171,14 +171,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -186,14 +186,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Færslur frá %1$s og vinum á %2$s!" @@ -204,22 +204,22 @@ msgstr "Færslur frá %1$s og vinum á %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Aðferð í forritsskilum fannst ekki!" @@ -230,11 +230,11 @@ msgstr "Aðferð í forritsskilum fannst ekki!" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Þessi aðferð krefst POST." @@ -266,7 +266,7 @@ msgstr "Gat ekki vistað persónulega síðu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -342,26 +342,26 @@ msgstr "Móttakandi fannst ekki." msgid "Can't send direct messages to users who aren't your friend." msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Engin staða fundin með þessu kenni." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 #, fuzzy msgid "This status is already a favorite." msgstr "Þetta babl er nú þegar í uppáhaldi!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Gat ekki búið til uppáhald." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 #, fuzzy msgid "That status is not a favorite." msgstr "Þetta babl er ekki í uppáhaldi!" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Gat ekki eytt uppáhaldi." @@ -397,122 +397,122 @@ msgstr "" msgid "Could not find target user." msgstr "" -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Ekki tækt stuttnefni." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Heimasíða er ekki gild vefslóð." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "Lýsing er of löng (í mesta lagi 140 tákn)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "Ógilt merki: \"%s\"" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "" -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "Aðferð í forritsskilum fannst ekki!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 #, fuzzy msgid "You are already a member of that group." msgstr "Þú ert nú þegar meðlimur í þessum hópi" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Gat ekki bætt notandanum %s í hópinn %s" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 #, fuzzy msgid "You are not a member of this group." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, fuzzy, php-format msgid "%s's groups" msgstr "Hópar %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "Hópar sem %s er meðlimur í" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Hópar %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, fuzzy, php-format msgid "groups on %s" msgstr "Hópsaðgerðir" @@ -528,7 +528,7 @@ msgstr "Ótæk stærð." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -631,11 +631,11 @@ msgstr "Allt" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Þessi aðferð krefst POST eða DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Þú getur ekki eytt stöðu annars notanda." @@ -654,25 +654,25 @@ msgstr "Get ekki kveikt á tilkynningum." msgid "Already repeated that notice." msgstr "Eyða þessu babli" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "" -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Engin staða með þessu kenni fannst." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Fannst ekki." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -682,32 +682,32 @@ msgstr "" msgid "Unsupported format." msgstr "Skráarsnið myndar ekki stutt." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Uppáhaldsbabl frá %s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Almenningsrás %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s færslur frá öllum!" @@ -722,12 +722,12 @@ msgstr "Svör við %s" msgid "Repeats of %s" msgstr "Svör við %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Babl merkt með %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -1895,7 +1895,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Rás %s" @@ -2580,31 +2580,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "Babl hefur enga persónulega síðu" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Staða %1$s á %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -3596,7 +3596,7 @@ msgstr "Þú getur ekki sent þessum notanda skilaboð." msgid "User doesn't have this role." msgstr "Notandi með enga persónulega síðu sem passar við" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "Tölfræði" @@ -3658,7 +3658,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3671,7 +3671,7 @@ msgid "Organization" msgstr "Uppröðun" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Lýsing" @@ -4637,7 +4637,7 @@ msgstr "" "gerast áskrifandi að babli þessa notanda. Ef þú baðst ekki um að gerast " "áskrifandi að babli, smelltu þá á \"Hætta við\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "" @@ -4765,29 +4765,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Færslur frá %1$s á %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "Tölfræði" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4795,7 +4795,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4803,40 +4803,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Persónulegt" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4880,48 +4880,48 @@ msgid "Could not update message with new URI." msgstr "Gat ekki uppfært skilaboð með nýju veffangi." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Gat ekki vistað babl. Óþekktur notandi." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar " "mínútur." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "Vandamál komu upp við að vista babl." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5418,7 +5418,7 @@ msgid "Snapshots configuration" msgstr "SMS staðfesting" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5553,12 +5553,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "Lykilorðabreyting" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "Lykilorðabreyting" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index c5eb4957ab..07197dd651 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:43+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:06+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -86,24 +86,24 @@ msgid "Save" msgstr "Salva" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Pagina inesistente." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -116,7 +116,7 @@ msgid "No such user." msgstr "Utente inesistente." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s e amici, pagina %2$d" @@ -124,33 +124,33 @@ msgstr "%1$s e amici, pagina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amici" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Feed degli amici di %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Feed degli amici di %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Feed degli amici di %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -158,7 +158,7 @@ msgstr "" "Questa è l'attività di %s e i suoi amici, ma nessuno ha ancora scritto " "qualche cosa." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -168,7 +168,7 @@ msgstr "" "scrivi un messaggio." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -178,7 +178,7 @@ msgstr "" "qualche cosa alla sua attenzione](%%%%action.newnotice%%%%?status_textarea=%3" "$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -188,14 +188,14 @@ msgstr "" "un messaggio alla sua attenzione." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Tu e i tuoi amici" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Messaggi da %1$s e amici su %2$s!" @@ -206,22 +206,22 @@ msgstr "Messaggi da %1$s e amici su %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "Metodo delle API non trovato." @@ -231,11 +231,11 @@ msgstr "Metodo delle API non trovato." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Questo metodo richiede POST." @@ -267,7 +267,7 @@ msgstr "Impossibile salvare il profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -343,24 +343,24 @@ msgstr "Destinatario non trovato." msgid "Can't send direct messages to users who aren't your friend." msgstr "Non puoi inviare messaggi diretti a utenti che non sono tuoi amici." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Nessuno messaggio trovato con quel ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Questo messaggio è già un preferito." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Impossibile creare un preferito." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Questo messaggio non è un preferito." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Impossibile eliminare un preferito." @@ -393,7 +393,7 @@ msgstr "Impossibile determinare l'utente sorgente." msgid "Could not find target user." msgstr "Impossibile trovare l'utente destinazione." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -401,113 +401,113 @@ msgstr "" "Il soprannome deve essere composto solo da lettere minuscole e numeri, senza " "spazi." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Soprannome già in uso. Prova con un altro." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Non è un soprannome valido." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "L'indirizzo della pagina web non è valido." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Nome troppo lungo (max 255 caratteri)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "La descrizione è troppo lunga (max %d caratteri)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Ubicazione troppo lunga (max 255 caratteri)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Troppi alias! Massimo %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Alias non valido: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "L'alias \"%s\" è già in uso. Prova con un altro." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "L'alias non può essere lo stesso del soprannome." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Gruppo non trovato." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Fai già parte di quel gruppo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Non fai parte di questo gruppo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Gruppi di %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "Gruppi del sito %1$s a cui %2$s è iscritto." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Gruppi di %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "Gruppi su %s" @@ -522,7 +522,7 @@ msgstr "Token non valido." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -627,11 +627,11 @@ msgstr "Consenti" msgid "Allow or deny access to your account information." msgstr "Consenti o nega l'accesso alle informazioni del tuo account." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Questo metodo richiede POST o DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Non puoi eliminare il messaggio di un altro utente." @@ -648,25 +648,25 @@ msgstr "Non puoi ripetere un tuo messaggio." msgid "Already repeated that notice." msgstr "Hai già ripetuto quel messaggio." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Messaggio eliminato." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Nessuno stato trovato con quel ID." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Troppo lungo. Lunghezza massima %d caratteri." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Non trovato." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -676,32 +676,32 @@ msgstr "" msgid "Unsupported format." msgstr "Formato non supportato." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Preferiti da %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Messaggi che citano %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Attività pubblica di %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Aggiornamenti di %s da tutti!" @@ -716,12 +716,12 @@ msgstr "Ripetuto a %s" msgid "Repeats of %s" msgstr "Ripetizioni di %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Messaggi etichettati con %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Messaggi etichettati con %1$s su %2$s!" @@ -1856,7 +1856,7 @@ msgstr "Rende questo utente un amministratore" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Attività di %s" @@ -2533,30 +2533,30 @@ msgstr "" "Gli sviluppatori possono modificare le impostazioni di registrazione per le " "loro applicazioni " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Il messaggio non ha un profilo." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Stato di %1$s su %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Tipo di contenuto %s non supportato." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Solo URL %s attraverso HTTP semplice." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -3542,7 +3542,7 @@ msgstr "Non puoi revocare i ruoli degli utenti su questo sito." msgid "User doesn't have this role." msgstr "L'utente non ricopre questo ruolo." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3599,7 +3599,7 @@ msgid "Icon" msgstr "Icona" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Nome" @@ -3610,7 +3610,7 @@ msgid "Organization" msgstr "Organizzazione" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descrizione" @@ -4584,7 +4584,7 @@ msgstr "" "Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai " "messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Rifiuta\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licenza" @@ -4713,18 +4713,18 @@ msgstr "Prova a [cercare dei gruppi](%%action.groupsearch%%) e iscriviti." #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Messaggi da %1$s su %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4733,11 +4733,11 @@ msgstr "" "Questo sito esegue il software %1$s versione %2$s, Copyright 2008-2010 " "StatusNet, Inc. e collaboratori." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Collaboratori" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4749,7 +4749,7 @@ msgstr "" "Software Foundation, versione 3 o (a scelta) una qualsiasi versione " "successiva. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4761,7 +4761,7 @@ msgstr "" "o di UTILIZZABILITÀ PER UN PARTICOLARE SCOPO. Per maggiori informazioni " "consultare la GNU Affero General Public License. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4770,20 +4770,20 @@ msgstr "" "Una copia della GNU Affero General Plublic License dovrebbe essere " "disponibile assieme a questo programma. Se così non fosse, consultare %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Plugin" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Versione" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Autori" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4792,13 +4792,13 @@ msgstr "" "Nessun file può superare %d byte e il file inviato era di %d byte. Prova a " "caricarne una versione più piccola." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Un file di questa dimensione supererebbe la tua quota utente di %d byte." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4838,27 +4838,27 @@ msgid "Could not update message with new URI." msgstr "Impossibile aggiornare il messaggio con il nuovo URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Errore del database nell'inserire un hashtag: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Problema nel salvare il messaggio. Troppo lungo." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Problema nel salvare il messaggio. Utente sconosciuto." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " "qualche minuto." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4866,21 +4866,21 @@ msgstr "" "Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di " "nuovo tra qualche minuto." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Ti è proibito inviare messaggi su questo sito." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Problema nel salvare la casella della posta del gruppo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5342,7 +5342,7 @@ msgid "Snapshots configuration" msgstr "Configurazione snapshot" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo " @@ -5475,11 +5475,11 @@ msgstr "Messaggi in cui appare questo allegato" msgid "Tags for this attachment" msgstr "Etichette per questo allegato" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Modifica della password non riuscita" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "La modifica della password non è permessa" @@ -6124,6 +6124,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Se credi che questo account non sia usato correttamente, puoi bloccarlo " +"dall'elenco dei tuoi abbonati e segnalarlo come spam all'amministratore del " +"sito presso %s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 1348e0ad90..7d56146aed 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:46+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:10+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -87,25 +87,25 @@ msgid "Save" msgstr "保存" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "そのようなページはありません。" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -118,7 +118,7 @@ msgid "No such user." msgstr "そのようなユーザはいません。" #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s と友人、ページ %2$d" @@ -126,39 +126,39 @@ msgstr "%1$s と友人、ページ %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s と友人" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "%s の友人のフィード (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "%s の友人のフィード (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "%s の友人のフィード (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "これは %s と友人のタイムラインです。まだ誰も投稿していません。" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -168,7 +168,7 @@ msgstr "" "してみたり、何か投稿してみましょう。" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -177,7 +177,7 @@ msgstr "" "プロフィールから [%1$s さんに合図](../%2$s) したり、[知らせたいことについて投" "稿](%%%%action.newnotice%%%%?status_textarea=%3$s) したりできます。" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -187,14 +187,14 @@ msgstr "" "せを送ってみませんか。" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "あなたと友人" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "%2$s に %1$s と友人からの更新があります！" @@ -205,22 +205,22 @@ msgstr "%2$s に %1$s と友人からの更新があります！" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "API メソッドが見つかりません。" @@ -230,11 +230,11 @@ msgstr "API メソッドが見つかりません。" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "このメソッドには POST が必要です。" @@ -267,7 +267,7 @@ msgstr "プロフィールを保存できませんでした。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -343,24 +343,24 @@ msgstr "受け取り手のユーザが見つかりません。" msgid "Can't send direct messages to users who aren't your friend." msgstr "友人でないユーザにダイレクトメッセージを送ることはできません。" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "そのＩＤのステータスが見つかりません。" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "このステータスはすでにお気に入りです。" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "お気に入りを作成できません。" -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "そのステータスはお気に入りではありません。" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "お気に入りを取り消すことができません。" @@ -394,7 +394,7 @@ msgstr "ソースユーザーを決定できません。" msgid "Could not find target user." msgstr "ターゲットユーザーを見つけられません。" -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -402,114 +402,114 @@ msgstr "" "ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用" "できません。" -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。" -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "有効なニックネームではありません。" -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "ホームページのURLが不適切です。" -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "フルネームが長すぎます。（255字まで）" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "記述が長すぎます。（最長140字）" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "場所が長すぎます。（255字まで）" -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "別名が多すぎます! 最大 %d。" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "不正な別名: \"%s\"" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "別名 \"%s\" は既に使用されています。他のものを試してみて下さい。" -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "別名はニックネームと同じではいけません。" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "グループが見つかりません!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "すでにこのグループのメンバーです。" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "管理者によってこのグループからブロックされています。" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "ユーザ %1$s はグループ %2$s に参加できません。" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "このグループのメンバーではありません。" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "ユーザ %1$s をグループ %2$s から削除できません。" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "%s のグループ" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "グループ %s はメンバー" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s グループ" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "%s 上のグループ" @@ -524,7 +524,7 @@ msgstr "不正なトークン。" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -625,11 +625,11 @@ msgstr "許可" msgid "Allow or deny access to your account information." msgstr "アカウント情報へのアクセスを許可するか、または拒絶してください。" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "このメソッドには POST か DELETE が必要です。" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "他のユーザのステータスを消すことはできません。" @@ -646,25 +646,25 @@ msgstr "あなたのつぶやきを繰り返せません。" msgid "Already repeated that notice." msgstr "すでにつぶやきを繰り返しています。" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "ステータスを削除しました。" -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "そのＩＤでのステータスはありません。" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "長すぎます。つぶやきは最大 140 字までです。" -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "見つかりません。" -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "つぶやきは URL を含めて最大 %d 字までです。" @@ -673,32 +673,32 @@ msgstr "つぶやきは URL を含めて最大 %d 字までです。" msgid "Unsupported format." msgstr "サポート外の形式です。" -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / %2$s からのお気に入り" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / %2$s について更新" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%2$s からアップデートに答える %1$s アップデート" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s のパブリックタイムライン" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "皆からの %s アップデート!" @@ -713,12 +713,12 @@ msgstr "%s への返信" msgid "Repeats of %s" msgstr "%s の返信" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "%s とタグ付けされたつぶやき" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s に %1$s による更新があります！" @@ -1869,7 +1869,7 @@ msgstr "このユーザを管理者にする" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s のタイムライン" @@ -2553,31 +2553,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "開発者は彼らのアプリケーションのために登録設定を編集できます " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "つぶやきにはプロファイルはありません。" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%2$s における %1$ のステータス" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "内容種別 " #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "サポートされていないデータ形式。" @@ -3561,7 +3561,7 @@ msgstr "あなたはこのサイトでユーザを黙らせることができま msgid "User doesn't have this role." msgstr "合っているプロフィールのないユーザ" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3618,7 +3618,7 @@ msgid "Icon" msgstr "アイコン" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "名前" @@ -3629,7 +3629,7 @@ msgid "Organization" msgstr "組織" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "概要" @@ -4624,7 +4624,7 @@ msgstr "" "ユーザのつぶやきをフォローするには詳細を確認して下さい。だれかのつぶやきを" "フォローするために尋ねない場合は、\"Reject\" をクリックして下さい。" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "ライセンス" @@ -4754,18 +4754,18 @@ msgstr "[グループを探して](%%action.groupsearch%%)それに加入して #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "%1$s から %2$s 上の更新をしました!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4774,11 +4774,11 @@ msgstr "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "コントリビュータ" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4786,7 +4786,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4794,27 +4794,27 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "プラグイン" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "バージョン" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "作者" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4824,13 +4824,13 @@ msgstr "" "ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして" "ください。" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4871,26 +4871,26 @@ msgid "Could not update message with new URI." msgstr "新しいURIでメッセージをアップデートできませんでした。" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "ハッシュタグ追加 ＤＢ エラー: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。" -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。" -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4898,21 +4898,21 @@ msgstr "" "多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ" "い。" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "つぶやきを保存する際に問題が発生しました。" -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "グループ受信箱を保存する際に問題が発生しました。" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5393,7 +5393,7 @@ msgid "Snapshots configuration" msgstr "パス設定" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って" @@ -5530,11 +5530,11 @@ msgstr "この添付が現れるつぶやき" msgid "Tags for this attachment" msgstr "この添付のタグ" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "パスワード変更に失敗しました" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "パスワード変更は許可されていません" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 6d74052fd5..4e447f5933 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:49+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:13+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -83,24 +83,24 @@ msgid "Save" msgstr "저장" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "해당하는 페이지 없음" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -113,7 +113,7 @@ msgid "No such user." msgstr "해당하는 이용자 없음" #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%s 및 친구들, %d 페이지" @@ -121,39 +121,39 @@ msgstr "%s 및 친구들, %d 페이지" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s 및 친구들" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "%s의 친구들에 대한 피드 (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "%s의 친구들에 대한 피드 (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "%s의 친구들에 대한 피드 (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "%s 및 친구들의 타임라인이지만, 아직 아무도 글을 작성하지 않았습니다." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -163,14 +163,14 @@ msgstr "" "가 글을 써보세요." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -178,14 +178,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "당신 및 친구들" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!" @@ -196,22 +196,22 @@ msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "API 메서드 발견 안 됨." @@ -221,11 +221,11 @@ msgstr "API 메서드 발견 안 됨." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "이 메서드는 POST를 요구합니다." @@ -255,7 +255,7 @@ msgstr "프로필을 저장 할 수 없습니다." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -331,24 +331,24 @@ msgstr "받는 사용자가 없습니다." msgid "Can't send direct messages to users who aren't your friend." msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "그 ID로 발견된 상태가 없습니다." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "이 소식은 이미 관심소식으로 등록되어 있습니다." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "관심소식을 생성할 수 없습니다." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "이 소식은 관심소식이 아닙니다." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "관심소식을 삭제할 수 없습니다." @@ -381,7 +381,7 @@ msgstr "소스 이용자를 확인할 수 없습니다." msgid "Could not find target user." msgstr "타겟 이용자를 찾을 수 없습니다." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -389,114 +389,114 @@ msgstr "" "별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니" "다." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "유효한 별명이 아닙니다" -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "홈페이지 주소형식이 올바르지 않습니다." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "실명이 너무 깁니다. (최대 255글자)" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "설명이 너무 깁니다. (최대 %d 글자)" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "위치가 너무 깁니다. (최대 255글자)" -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "사용할 수 없는 별명 : \"%s\"" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "별명 \"%s\" 이 이미 사용중 입니다. 다른 별명을 시도해 보십시오." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "그룹을 찾을 수 없습니다." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "당신은 이미 이 그룹의 멤버입니다." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "%s의 그룹들" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "%s 그룹들은 의 멤버입니다." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s 그룹" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "%s 상의 그룹들" @@ -512,7 +512,7 @@ msgstr "옳지 않은 크기" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -615,11 +615,11 @@ msgstr "허용" msgid "Allow or deny access to your account information." msgstr "계정 정보에 대한 접근을 허용 또는 거부합니다." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "이 메서드는 POST 또는 DELETE를 요구합니다." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다." @@ -636,25 +636,25 @@ msgstr "자기 자신의 소식은 재전송할 수 없습니다." msgid "Already repeated that notice." msgstr "이미 재전송된 소식입니다." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "삭제된 소식입니다." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "발견된 ID의 상태가 없습니다." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "너무 깁니다. 통지의 최대 길이는 %d 글자 입니다." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "찾을 수가 없습니다." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "소식의 최대 길이는 첨부 URL을 포함하여 %d 글자입니다." @@ -663,32 +663,32 @@ msgstr "소식의 최대 길이는 첨부 URL을 포함하여 %d 글자입니다 msgid "Unsupported format." msgstr "지원하지 않는 형식입니다." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / %s의 좋아하는 글들" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / %2$s에게 답신 업데이트" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s 공개 타임라인" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "모두로부터의 업데이트 %s개!" @@ -703,12 +703,12 @@ msgstr "%s에 답신" msgid "Repeats of %s" msgstr "%s에 답신" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "%s 태그된 통지" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" @@ -1878,7 +1878,7 @@ msgstr "이 이용자를 관리자로 만듦" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s 타임라인" @@ -2549,31 +2549,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "통지에 프로필이 없습니다." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s의 상태 (%2$s에서)" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "연결" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -3559,7 +3559,7 @@ msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다." msgid "User doesn't have this role." msgstr "프로필 매칭이 없는 사용자" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "아바타가 업데이트 되었습니다." @@ -3621,7 +3621,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3634,7 +3634,7 @@ msgid "Organization" msgstr "페이지수" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "설명" @@ -4604,7 +4604,7 @@ msgstr "" "사용자의 통지를 구독하려면 상세를 확인해 주세요. 구독하지 않는 경우는, \"취소" "\"를 클릭해 주세요." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 #, fuzzy msgid "License" msgstr "라이선스" @@ -4735,29 +4735,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "통계" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4765,7 +4765,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4773,39 +4773,39 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "버젼" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4848,28 +4848,28 @@ msgid "Could not update message with new URI." msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "게시글 저장문제. 알려지지않은 회원" -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:260 +#: classes/Notice.php:266 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4878,22 +4878,22 @@ msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "통지를 저장하는데 문제가 발생했습니다." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5389,7 +5389,7 @@ msgid "Snapshots configuration" msgstr "SMS 인증" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5525,12 +5525,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "비밀번호 변경" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "비밀번호 변경" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 88a8eb4ac3..89fb424da9 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:53+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:17+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -86,24 +86,24 @@ msgid "Save" msgstr "Зачувај" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Нема таква страница." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -116,7 +116,7 @@ msgid "No such user." msgstr "Нема таков корисник." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s и пријателите, стр. %2$d" @@ -124,40 +124,40 @@ msgstr "%1$s и пријателите, стр. %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s и пријатели" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Канал со пријатели на %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Канал со пријатели на %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Канал за пријатели на %S (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" "Ова е историјата за %s и пријателите, но досега никој нема објавено ништо." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -167,7 +167,7 @@ msgstr "" "groups%%) или објавете нешто самите." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -177,7 +177,7 @@ msgstr "" "на корисникот или да [објавите нешто што сакате тој да го прочита](%%%%" "action.newnotice%%%%?status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -188,14 +188,14 @@ msgstr "" "прочита." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Вие и пријателите" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Подновувања од %1$s и пријатели на %2$s!" @@ -206,22 +206,22 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "API методот не е пронајден." @@ -231,11 +231,11 @@ msgstr "API методот не е пронајден." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Овој метод бара POST." @@ -267,7 +267,7 @@ msgstr "Не може да се зачува профил." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -276,8 +276,8 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" -"Серверот не можеше да обработи толку многу POST-податоци (%s бајти) заради " -"неговата тековна конфигурација." +"Опслужувачот не можеше да обработи толку многу POST-податоци (%s бајти) " +"заради неговата тековна поставеност." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 @@ -344,24 +344,24 @@ msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Неможете да испраќате директни пораки на корисници што не ви се пријатели." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Нема пронајдено статус со таков ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Овој статус веќе Ви е омилен." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Не можам да создадам омилина забелешка." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Тој статус не Ви е омилен." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Не можам да ја избришам омилената забелешка." @@ -372,7 +372,7 @@ msgstr "Не можам да го следам корисникот: Корис #: actions/apifriendshipscreate.php:118 #, php-format msgid "Could not follow user: %s is already on your list." -msgstr "Не можам да го следам корисникот: %s веќе е на Вашата листа." +msgstr "Не можам да го следам корисникот: %s веќе е на Вашиот список." #: actions/apifriendshipsdestroy.php:109 msgid "Could not unfollow user: User not found." @@ -396,119 +396,119 @@ msgstr "Не можев да го утврдам целниот корисник msgid "Could not find target user." msgstr "Не можев да го пронајдам целниот корисник." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Тој прекар е во употреба. Одберете друг." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Неправилен прекар." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Главната страница не е важечка URL-адреса." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." -msgstr "Целото име е предолго (максимум 255 знаци)" +msgstr "Целото име е предолго (највеќе 255 знаци)" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Описот е предолг (дозволено е највеќе %d знаци)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Локацијата е предолга (максимумот е 255 знаци)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Премногу алијаси! Дозволено е највеќе %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Неважечки алијас: „%s“." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Алијасот „%s“ е зафатен. Одберете друг." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Алијасот не може да биде ист како прекарот." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Групата не е пронајдена." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Веќе членувате во таа група." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Блокирани сте од таа група од администраторот." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Не можам да го зачленам корисникот %1$s во групата 2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Не членувате во оваа група." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Не можев да го отстранам корисникот %1$s од групата %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "%s групи" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "%1$s групи кадешто членува %2$s." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s групи" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "групи на %s" @@ -523,7 +523,7 @@ msgstr "Погрешен жетон." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -627,11 +627,11 @@ msgstr "Дозволи" msgid "Allow or deny access to your account information." msgstr "Дозволете или одбијте пристап до податоците за Вашата сметка." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Методот бара POST или DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Не можете да избришете статус на друг корисник." @@ -648,25 +648,25 @@ msgstr "Не можете да ја повторувате сопственат msgid "Already repeated that notice." msgstr "Забелешката е веќе повторена." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Статусот е избришан." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Нема пронајдено статус со тој ID." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ова е предолго. Максималната дозволена должина изнесува %d знаци." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Не е пронајдено." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -677,32 +677,32 @@ msgstr "" msgid "Unsupported format." msgstr "Неподдржан формат." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Омилени од %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Подновувања на %1$s омилени на %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Подновувања кои споменуваат %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Јавна историја на %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s подновуввања од сите!" @@ -717,12 +717,12 @@ msgstr "Повторено за %s" msgid "Repeats of %s" msgstr "Повторувања на %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Забелешки означени со %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Подновувањата се означени со %1$s на %2$s!" @@ -1251,7 +1251,7 @@ msgstr "Треба име." #: actions/editapplication.php:180 actions/newapplication.php:165 msgid "Name is too long (max 255 chars)." -msgstr "Името е предолго (максимум 255 знаци)." +msgstr "Името е предолго (највеќе 255 знаци)." #: actions/editapplication.php:183 actions/newapplication.php:162 msgid "Name already in use. Try another one." @@ -1314,7 +1314,7 @@ msgstr "ОБразецов служи за уредување на групат #: actions/editgroup.php:205 actions/newgroup.php:145 #, php-format msgid "description is too long (max %d chars)." -msgstr "описот е предолг (максимум %d знаци)" +msgstr "описот е предолг (највеќе %d знаци)" #: actions/editgroup.php:228 actions/newgroup.php:168 #, php-format @@ -1835,7 +1835,7 @@ msgstr "Членови на групата %1$s, стр. %2$d" #: actions/groupmembers.php:118 msgid "A list of the users in this group." -msgstr "Листа на корисниците на овааг група." +msgstr "Список на корисниците на оваа група." #: actions/groupmembers.php:182 lib/groupnav.php:107 msgid "Admin" @@ -1861,7 +1861,7 @@ msgstr "Направи го корисникот администратор" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Историја на %s" @@ -1991,7 +1991,7 @@ msgid "" "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" "Чекам потврда за оваа адреса. Проверете ја Вашата Jabber/GTalk сметка за " -"порака со понатамошни инструкции. (Дали го додадовте %s на Вашата листа со " +"порака со понатамошни инструкции. (Дали го додадовте %s на Вашиот список со " "пријатели?)" #. TRANS: IM address input field instructions in IM settings form. @@ -2002,8 +2002,8 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Jabber или GTalk адреса како „ime@example.org“. Но прво додајте го %s во " -"Вашата контакт листа во Вашиот IM клиент или GTalk." +"Jabber или GTalk адреса како „KorisnickoIme@example.org“. Но прво додајте го " +"%s во Вашиот контактен список во Вашиот IM клиент или GTalk." #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 @@ -2543,30 +2543,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" "Развивачите можат да ги нагодат регистрациските поставки за нивните програми " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Забелешката нема профил." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s статус на %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Содржините од типот %s не се поддржани." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Ве молиме користете само %s URL-адреси врз прост HTTP-код." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Ова не е поддржан формат на податотека." @@ -2714,7 +2714,7 @@ msgstr "Патеки" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." -msgstr "Нагодувања за патеки и сервери за оваа StatusNet веб-страница." +msgstr "Нагодувања за патеки и опслужувачи за оваа StatusNet мрежно место." #: actions/pathsadminpanel.php:157 #, php-format @@ -2738,7 +2738,7 @@ msgstr "Директориумот на локалите е нечитлив: %s #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." -msgstr "Неважечки SSL-сервер. Дозволени се најмногу 255 знаци" +msgstr "Неважечки SSL-опслужувач. Дозволени се најмногу до 255 знаци" #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 msgid "Site" @@ -2750,7 +2750,7 @@ msgstr "Опслужувач" #: actions/pathsadminpanel.php:238 msgid "Site's server hostname." -msgstr "Име на домаќинот на серверот на веб-страницата" +msgstr "Назив на домаќинот на опслужувачот на мрежното место" #: actions/pathsadminpanel.php:242 msgid "Path" @@ -2782,7 +2782,7 @@ msgstr "Тема" #: actions/pathsadminpanel.php:264 msgid "Theme server" -msgstr "Сервер на темата" +msgstr "Oпслужувач на темата" #: actions/pathsadminpanel.php:268 msgid "Theme path" @@ -2798,7 +2798,7 @@ msgstr "Аватари" #: actions/pathsadminpanel.php:284 msgid "Avatar server" -msgstr "Сервер на аватарот" +msgstr "Опслужувач на аватарот" #: actions/pathsadminpanel.php:288 msgid "Avatar path" @@ -2814,7 +2814,7 @@ msgstr "Позадини" #: actions/pathsadminpanel.php:305 msgid "Background server" -msgstr "Сервер на позаднината" +msgstr "Oпслужувач на позаднината" #: actions/pathsadminpanel.php:309 msgid "Background path" @@ -2850,11 +2850,11 @@ msgstr "Кога се користи SSL" #: actions/pathsadminpanel.php:335 msgid "SSL server" -msgstr "SSL-сервер" +msgstr "SSL-опслужувач" #: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" -msgstr "Сервер, кому ќе му се испраќаат SSL-барања" +msgstr "Oпслужувач, кому ќе му се испраќаат SSL-барања" #: actions/pathsadminpanel.php:352 msgid "Save paths" @@ -3190,7 +3190,7 @@ msgstr "Прекар или е-поштенска адреса" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." msgstr "" -"Вашиот прекар на овој сервер или адресата за е-пошта со која се " +"Вашиот прекар на овој опслужувач или адресата за е-пошта со која се " "регистриравте." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 @@ -3557,7 +3557,7 @@ msgstr "На оваа веб-страница не можете да одзем msgid "User doesn't have this role." msgstr "Корисникот ја нема оваа улога." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3614,7 +3614,7 @@ msgid "Icon" msgstr "Икона" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Име" @@ -3625,7 +3625,7 @@ msgid "Organization" msgstr "Организација" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Опис" @@ -4042,7 +4042,9 @@ msgstr "Основен јазик" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" -msgstr "Јазик на веб-страницата ако прелистувачот не може да го препознае сам" +msgstr "" +"Јазик на мрежното место (веб-страницата) ако прелистувачот не може да го " +"препознае сам" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -4286,7 +4288,8 @@ msgstr "Снимки од податоци" #: actions/snapshotadminpanel.php:208 msgid "When to send statistical data to status.net servers" -msgstr "Кога да им се испраќаат статистички податоци на status.net серверите" +msgstr "" +"Кога да им се испраќаат статистички податоци на status.net опслужувачите" #: actions/snapshotadminpanel.php:217 msgid "Frequency" @@ -4605,7 +4608,7 @@ msgstr "" "за забелешките на овој корисник. Ако не сакате да се претплатите, едноставно " "кликнете на „Одбиј“" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Лиценца" @@ -4736,18 +4739,18 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Подновувања од %1$s на %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4756,23 +4759,23 @@ msgstr "" "Оваа веб-страница работи на %1$s верзија %2$s, Авторски права 2008-2010 " "StatusNet, Inc. и учесници." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Учесници" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " "Software Foundation, either version 3 of the License, or (at your option) " "any later version. " msgstr "" -"StatusNet е слободен софтверски програм: можете да го редистрибуирате и/или " -"менувате под условите на Општата јавна лиценца ГНУ Аферо според одредбите на " -"Фондацијата за слободен софтвер, верзија 3 на лиценцата, или (по Ваш избор) " -"било која подоцнежна верзија. " +"StatusNet е слободен програм: можете да го редистрибуирате и/или менувате " +"под условите на Општата јавна лиценца ГНУ Аферо според одредбите на " +"Фондацијата за слободна програмска опрема, верзија 3 на лиценцата, или (по " +"Ваш избор) било која подоцнежна верзија. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4784,7 +4787,7 @@ msgstr "" "или ПОГОДНОСТ ЗА ОПРЕДЕЛЕНА ЦЕЛ. Погледајте ја Општата јавна лиценца ГНУ " "Аферо за повеќе подробности. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4793,20 +4796,20 @@ msgstr "" "Треба да имате добиено примерок од Општата јавна лиценца ГНУ Аферо заедно со " "овој програм. Ако ја немате, погледајте %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Приклучоци" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Верзија" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Автор(и)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4815,13 +4818,13 @@ msgstr "" "Ниедна податотека не смее да биде поголема од %d бајти, а подаотеката што ја " "испративте содржи %d бајти. Подигнете помала верзија." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Волку голема податотека ќе ја надмине Вашата корисничка квота од %d бајти." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "ВОлку голема податотека ќе ја надмине Вашата месечна квота од %d бајти" @@ -4860,27 +4863,27 @@ msgid "Could not update message with new URI." msgstr "Не можев да ја подновам пораката со нов URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознаката: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Проблем со зачувувањето на белешката. Премногу долго." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Проблем со зачувувањето на белешката. Непознат корисник." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Премногу забелњшки за прекратко време; здивнете малку и продолжете за " "неколку минути." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4888,21 +4891,21 @@ msgstr "" "Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за " "неколку минути." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Забрането Ви е да објавувате забелешки на оваа веб-страница." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Проблем во зачувувањето на белешката." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Проблем при зачувувањето на групното приемно сандаче." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5208,9 +5211,9 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" -"Работи на [StatusNet](http://status.net/) софтверот за микроблогирање, " -"верзија %s, достапен пд [GNU Affero General Public License](http://www.fsf." -"org/licensing/licenses/agpl-3.0.html)." +"Работи на [StatusNet](http://status.net/) - програмска опрема за " +"микроблогирање, верзија %s, достапна под [GNU Affero General Public License]" +"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." #. TRANS: DT element for StatusNet site content license. #: lib/action.php:840 @@ -5320,7 +5323,7 @@ msgstr "Веб-страница" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:357 msgid "Design configuration" -msgstr "Конфигурација на изгледот" +msgstr "Поставки на изгледот" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:359 @@ -5364,7 +5367,7 @@ msgid "Snapshots configuration" msgstr "Поставки за снимки" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-ресурсот бара да може и да чита и да запишува, а вие можете само да " @@ -5497,11 +5500,11 @@ msgstr "Забелешки кадешто се јавува овој прило msgid "Tags for this attachment" msgstr "Ознаки за овој прилог" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Менувањето на лозинката не успеа" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Менувањето на лозинка не е дозволено" @@ -5620,7 +5623,7 @@ msgid "" "same server." msgstr "" "%s е далечински профил; можете да праќате директни пораки само до корисници " -"на истиот сервер." +"на истиот опслужувач." #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. @@ -5808,9 +5811,9 @@ msgstr "" "off - исклучи известувања\n" "help - прикажи ја оваа помош\n" "follow - претплати се на корисник\n" -"groups - листа на групи кадешто членувате\n" -"subscriptions - листа на луѓе кои ги следите\n" -"subscribers - листа на луѓе кои ве следат\n" +"groups - список на групи кадешто членувате\n" +"subscriptions - список на луѓе кои ги следите\n" +"subscribers - список на луѓе кои ве следат\n" "leave - откажи претплата на корисник\n" "d - директна порака за корисник\n" "get - прикажи последна забелешка на корисник\n" @@ -5822,7 +5825,7 @@ msgstr "" "reply # - одговори на забелешка со даден id\n" "reply - одговори на последна забелешка на корисник\n" "join - зачлени се во група\n" -"login - Дај врска за најавување на веб-интерфејсот\n" +"login - Дај врска за најавување на посредникот\n" "drop - напушти група\n" "stats - прикажи мои статистики\n" "stop - исто што и 'off'\n" @@ -5946,7 +5949,7 @@ msgstr "Ознака" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" -msgstr "Одберете ознака за да ја уточните листата" +msgstr "Одберете ознака за да го ограничите списокот" #: lib/galleryaction.php:143 msgid "Go" @@ -6143,6 +6146,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Доколку сметате дека сметкава се злоупотребува, тогаш можете да ја блокирате " +"од списокот на претплатници и да ја пријавите како спам кај администраторите " +"на %s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 @@ -6334,7 +6340,7 @@ msgstr "" "\n" "%4$s\n" "\n" -"Погледнете листа на омилените забелешки на %1$s тука:\n" +"Погледнете список на омилените забелешки на %1$s тука:\n" "\n" "%5$s\n" "\n" @@ -6400,7 +6406,7 @@ msgstr "" "\n" "%6$s\n" "\n" -"Еве листа за сите @-одговори за вас:\n" +"Еве список на сите @-одговори за вас:\n" "\n" "%7$s\n" "\n" @@ -6503,7 +6509,7 @@ msgstr " Обидете се со друг формат на %s." #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported file type on this server." -msgstr "%s не е поддржан тип на податотека на овој сервер." +msgstr "%s не е поддржан тип на податотека на овој опслужувач." #: lib/messageform.php:120 msgid "Send a direct notice" @@ -6968,7 +6974,7 @@ msgstr "пред еден ден" #: lib/util.php:1121 #, php-format msgid "about %d days ago" -msgstr "пред %d денови" +msgstr "пред %d дена" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1124 diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index c53a641691..1dca16e2bb 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:56+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:20+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -84,24 +84,24 @@ msgid "Save" msgstr "Lagre" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Ingen slik side." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -114,7 +114,7 @@ msgid "No such user." msgstr "Ingen slik bruker" #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s og venner, side %2$d" @@ -122,39 +122,39 @@ msgstr "%1$s og venner, side %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s og venner" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Mating for venner av %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Mating for venner av %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Mating for venner av %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -164,7 +164,7 @@ msgstr "" "eller post noe selv." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -174,7 +174,7 @@ msgstr "" "å få hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?" "status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -184,14 +184,14 @@ msgstr "" "eller post en notis for å få hans eller hennes oppmerksomhet." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Du og venner" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Oppdateringer fra %1$s og venner på %2$s!" @@ -202,22 +202,22 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API-metode ikke funnet!" @@ -228,11 +228,11 @@ msgstr "API-metode ikke funnet!" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Denne metoden krever en POST." @@ -264,7 +264,7 @@ msgstr "Klarte ikke å lagre profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -341,24 +341,24 @@ msgstr "Fant ikke mottakeren." msgid "Can't send direct messages to users who aren't your friend." msgstr "Kan ikke sende direktemeldinger til brukere du ikke er venn med." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Fant ingen status med den ID-en." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Denne statusen er allerede en favoritt." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Kunne ikke opprette favoritt." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Den statusen er ikke en favoritt." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Kunne ikke slette favoritt." @@ -391,119 +391,119 @@ msgstr "Kunne ikke bestemme kildebruker." msgid "Could not find target user." msgstr "Kunne ikke finne målbruker." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Det nicket er allerede i bruk. Prøv et annet." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Ugyldig nick." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Hjemmesiden er ikke en gyldig URL." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Beklager, navnet er for langt (max 250 tegn)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Beskrivelsen er for lang (maks %d tegn)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Plassering er for lang (maks 255 tegn)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "For mange alias! Maksimum %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Ugyldig alias: «%s»." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Aliaset «%s» er allerede i bruk. Prøv et annet." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Alias kan ikke være det samme som kallenavn." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Gruppe ikke funnet." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Du er allerede medlem av den gruppen." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Du har blitt blokkert fra den gruppen av administratoren." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Du er ikke et medlem av denne gruppen." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "%s sine grupper" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "%1$s grupper %2$s er et medlem av." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s grupper" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "grupper på %s" @@ -518,7 +518,7 @@ msgstr "Ugyldig symbol." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -620,11 +620,11 @@ msgstr "Tillat" msgid "Allow or deny access to your account information." msgstr "Tillat eller nekt tilgang til din kontoinformasjon." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Denne metoden krever en POST eller DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Du kan ikke slette statusen til en annen bruker." @@ -641,25 +641,25 @@ msgstr "Kan ikke gjenta din egen notis." msgid "Already repeated that notice." msgstr "Allerede gjentatt den notisen." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Status slettet." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Ingen status med den ID-en funnet." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt. Maks notisstørrelse er %d tegn." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Ikke funnet." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL." @@ -668,32 +668,32 @@ msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL." msgid "Unsupported format." msgstr "Formatet støttes ikke." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritter fra %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Oppdateringer som nevner %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s offentlig tidslinje" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s oppdateringer fra alle sammen!" @@ -708,12 +708,12 @@ msgstr "Gjentatt til %s" msgid "Repeats of %s" msgstr "Repetisjoner av %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notiser merket med %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Oppdateringer merket med %1$s på %2$s!" @@ -1840,7 +1840,7 @@ msgstr "Gjør denne brukeren til administrator" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s tidslinje" @@ -2509,30 +2509,30 @@ msgstr "Du har ikke tillatt noen programmer å bruke din konto." msgid "Developers can edit the registration settings for their applications " msgstr "Utviklere kan redigere registreringsinnstillingene for sine program " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Notisen har ingen profil." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s sin status på %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Innholdstypen %s støttes ikke." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Bare %s-nettadresser over vanlig HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Ikke et støttet dataformat." @@ -3514,7 +3514,7 @@ msgstr "Du kan ikke trekke tilbake brukerroller på dette nettstedet." msgid "User doesn't have this role." msgstr "Brukeren har ikke denne rollen." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3571,7 +3571,7 @@ msgid "Icon" msgstr "Ikon" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Navn" @@ -3582,7 +3582,7 @@ msgid "Organization" msgstr "Organisasjon" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beskrivelse" @@ -4539,7 +4539,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Lisens" @@ -4661,18 +4661,18 @@ msgstr "Prøv å [søke etter grupper](%%action.groupsearch%%) og bli med i dem. #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Oppdateringar fra %1$s på %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4681,11 +4681,11 @@ msgstr "" "Dette nettstedet drives av %1$s versjon %2$s, Copyright 2008-2010 StatusNet, " "Inc. og andre bidragsytere." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Bidragsytere" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4693,7 +4693,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4701,39 +4701,39 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Programtillegg" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Versjon" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Forfatter(e)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4776,45 +4776,45 @@ msgid "Could not update message with new URI." msgstr "Kunne ikke oppdatere melding med ny nettadresse." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "Databasefeil ved innsetting av bruker i programmet OAuth." -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Problem ved lagring av notis. For lang." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Problem ved lagring av notis. Ukjent bruker." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problem ved lagring av notis." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Problem ved lagring av gruppeinnboks." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5272,7 +5272,7 @@ msgid "Snapshots configuration" msgstr "" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5404,11 +5404,11 @@ msgstr "Notiser hvor dette vedlegget forekommer" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Endring av passord mislyktes" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Endring av passord er ikke tillatt" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index cec30f745b..c0e9cc411c 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-27 22:55+0000\n" -"PO-Revision-Date: 2010-05-27 22:57:42+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:27+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66982); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index d955b36987..16cb56b4b8 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:37:59+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:24+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -91,25 +91,25 @@ msgid "Save" msgstr "Lagra" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "Dette emneord finst ikkje." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -122,7 +122,7 @@ msgid "No such user." msgstr "Brukaren finst ikkje." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, fuzzy, php-format msgid "%1$s and friends, page %2$d" msgstr "%s med vener, side %d" @@ -130,39 +130,39 @@ msgstr "%s med vener, side %d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s med vener" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Straum for vener av %s" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Straum for vener av %s" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, fuzzy, php-format msgid "Feed for friends of %s (Atom)" msgstr "Straum for vener av %s" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -170,14 +170,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -185,15 +185,15 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 #, fuzzy msgid "You and friends" msgstr "%s med vener" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Oppdateringar frå %1$s og vener på %2$s!" @@ -204,22 +204,22 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Fann ikkje API-metode." @@ -230,11 +230,11 @@ msgstr "Fann ikkje API-metode." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Dette krev ein POST." @@ -266,7 +266,7 @@ msgstr "Kan ikkje lagra profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -343,26 +343,26 @@ msgstr "Kunne ikkje finne mottakar." msgid "Can't send direct messages to users who aren't your friend." msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Fann ingen status med den ID-en." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 #, fuzzy msgid "This status is already a favorite." msgstr "Denne notisen er alt ein favoritt!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Kunne ikkje lagre favoritt." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 #, fuzzy msgid "That status is not a favorite." msgstr "Denne notisen er ikkje ein favoritt!" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Kunne ikkje slette favoritt." @@ -399,122 +399,122 @@ msgstr "Kan ikkje hente offentleg straum." msgid "Could not find target user." msgstr "Kan ikkje finna einkvan status." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Kallenamnet er allereie i bruk. Prøv eit anna." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Ikkje eit gyldig brukarnamn." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Heimesida er ikkje ei gyldig internettadresse." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "skildringa er for lang (maks 140 teikn)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Plassering er for lang (maksimalt 255 teikn)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "Ugyldig merkelapp: %s" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, fuzzy, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Kallenamnet er allereie i bruk. Prøv eit anna." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "Fann ikkje API-metode." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 #, fuzzy msgid "You are already a member of that group." msgstr "Du er allereie medlem av den gruppa" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 #, fuzzy msgid "You are not a member of this group." msgstr "Du er ikkje medlem av den gruppa." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Kunne ikkje fjerne %s fra %s gruppa " #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, fuzzy, php-format msgid "%s's groups" msgstr "%s grupper" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "Grupper %s er medlem av" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s grupper" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, fuzzy, php-format msgid "groups on %s" msgstr "Gruppe handlingar" @@ -530,7 +530,7 @@ msgstr "Ugyldig storleik." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -633,11 +633,11 @@ msgstr "Alle" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Dette krev anten ein POST eller DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Du kan ikkje sletta statusen til ein annan brukar." @@ -656,26 +656,26 @@ msgstr "Kan ikkje slå på notifikasjon." msgid "Already repeated that notice." msgstr "Slett denne notisen" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 #, fuzzy msgid "Status deleted." msgstr "Lasta opp brukarbilete." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Fann ingen status med den ID-en." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Finst ikkje." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -685,32 +685,32 @@ msgstr "" msgid "Unsupported format." msgstr "Støttar ikkje bileteformatet." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Favorittar frå %s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s oppdateringar favorisert av %s / %s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Oppdateringar som svarar til %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s offentleg tidsline" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s oppdateringar frå alle saman!" @@ -725,12 +725,12 @@ msgstr "Svar til %s" msgid "Repeats of %s" msgstr "Svar til %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notisar merka med %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" @@ -1924,7 +1924,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s tidsline" @@ -2602,31 +2602,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "Notisen har ingen profil" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s sin status på %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "Kopla til" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -3621,7 +3621,7 @@ msgstr "Du kan ikkje sende melding til denne brukaren." msgid "User doesn't have this role." msgstr "Kan ikkje finne brukar" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "Lasta opp brukarbilete." @@ -3684,7 +3684,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3697,7 +3697,7 @@ msgid "Organization" msgstr "Paginering" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beskriving" @@ -4670,7 +4670,7 @@ msgstr "" "Sjekk desse detaljane og forsikre deg om at du vil abonnere på denne " "brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\"" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 #, fuzzy msgid "License" msgstr "lisens." @@ -4802,29 +4802,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "Statistikk" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4832,7 +4832,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4840,40 +4840,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Personleg" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4917,27 +4917,27 @@ msgid "Could not update message with new URI." msgstr "Kunne ikkje oppdatere melding med ny URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Feil ved lagring av notis. Ukjend brukar." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:260 +#: classes/Notice.php:266 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4945,22 +4945,22 @@ msgid "" msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Du kan ikkje lengre legge inn notisar på denne sida." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "Eit problem oppstod ved lagring av notis." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5458,7 +5458,7 @@ msgid "Snapshots configuration" msgstr "SMS bekreftelse" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5594,12 +5594,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "Endra passord" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "Endra passord" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 6ebf7f8085..fb05a19a41 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-27 22:55+0000\n" -"PO-Revision-Date: 2010-05-27 22:57:45+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:33+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r66982); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 4f40435bd2..70e3788d8e 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:15+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:37+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -85,24 +85,24 @@ msgid "Save" msgstr "Gravar" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Página não foi encontrada." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -115,7 +115,7 @@ msgid "No such user." msgstr "Utilizador não foi encontrado." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s e amigos, página %2$d" @@ -123,40 +123,40 @@ msgstr "%1$s e amigos, página %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amigos" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Fonte para os amigos de %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Fonte para os amigos de %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Fonte para os amigos de %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" "Estas são as notas de %s e dos amigos, mas ainda não publicaram nenhuma." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -166,7 +166,7 @@ msgstr "" "publicar qualquer coisa." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -175,7 +175,7 @@ msgstr "" "Pode tentar [dar um toque em %1$s](../%2$s) a partir do perfil ou [publicar " "qualquer coisa à sua atenção](%%%%action.newnotice%%%%?status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -185,14 +185,14 @@ msgstr "" "publicar uma nota à sua atenção." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Você e seus amigos" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizações de %1$s e amigos no %2$s!" @@ -203,22 +203,22 @@ msgstr "Actualizações de %1$s e amigos no %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "Método da API não encontrado." @@ -228,11 +228,11 @@ msgstr "Método da API não encontrado." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -263,7 +263,7 @@ msgstr "Não foi possível gravar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -340,24 +340,24 @@ msgid "Can't send direct messages to users who aren't your friend." msgstr "" "Não pode enviar mensagens directas a utilizadores que não sejam amigos." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Nenhum estado encontrado com esse ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Este estado já é um favorito." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Não foi possível criar o favorito." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Esse estado não é um favorito." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Não foi possível eliminar o favorito." @@ -391,119 +391,119 @@ msgstr "Não foi possível determinar o utilizador de origem." msgid "Could not find target user." msgstr "Não foi possível encontrar o utilizador de destino." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Utilizador já é usado. Tente outro." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Utilizador não é válido." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Página de ínicio não é uma URL válida." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Nome completo demasiado longo (máx. 255 caracteres)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Descrição demasiado longa (máx. 140 caracteres)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Localidade demasiado longa (máx. 255 caracteres)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Demasiados nomes alternativos! Máx. %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Nome alternativo inválido: \"%s\"" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Nome alternativo \"%s\" já em uso. Tente outro." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Um nome alternativo não pode ser igual ao nome do utilizador." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Grupo não foi encontrado." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Já é membro desse grupo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Foi bloqueado desse grupo pelo gestor." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Não foi possível adicionar %1$s ao grupo %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Não é membro deste grupo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Não foi possível remover %1$s do grupo %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Grupos de %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "Grupos de %1$s de que %2$s é membro." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Grupos de %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "Grupos em %s" @@ -518,7 +518,7 @@ msgstr "Chave inválida." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -620,11 +620,11 @@ msgstr "Permitir" msgid "Allow or deny access to your account information." msgstr "Permitir ou negar acesso à informação da sua conta." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Este método requer um POST ou DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Não pode apagar o estado de outro utilizador." @@ -641,25 +641,25 @@ msgstr "Não pode repetir a sua própria nota." msgid "Already repeated that notice." msgstr "Já repetiu essa nota." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Estado apagado." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Não foi encontrado um estado com esse ID." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Não encontrado." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo." @@ -668,32 +668,32 @@ msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo." msgid "Unsupported format." msgstr "Formato não suportado." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritas de %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualizações preferidas por %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualizações que mencionam %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Notas públicas de %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s actualizações de todos!" @@ -708,12 +708,12 @@ msgstr "Repetida para %s" msgid "Repeats of %s" msgstr "Repetições de %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notas categorizadas com %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizações categorizadas com %1$s em %2$s!" @@ -1848,7 +1848,7 @@ msgstr "Tornar este utilizador um gestor" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Notas de %s" @@ -2524,30 +2524,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" "Programadores podem editar as configurações de inscrição das suas aplicações " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Nota não tem perfil." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Estado de %1$s em %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "O tipo de conteúdo %s não é suportado." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Só URLs %s sobre HTTP simples, por favor." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -3537,7 +3537,7 @@ msgstr "Não pode retirar funções aos utilizadores neste site." msgid "User doesn't have this role." msgstr "O utilizador não tem esta função." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3594,7 +3594,7 @@ msgid "Icon" msgstr "Ícone" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Nome" @@ -3605,7 +3605,7 @@ msgid "Organization" msgstr "Organização" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descrição" @@ -4581,7 +4581,7 @@ msgstr "" "subscrever as notas deste utilizador. Se não fez um pedido para subscrever " "as notas de alguém, simplesmente clique \"Rejeitar\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licença" @@ -4710,18 +4710,18 @@ msgstr "Tente [pesquisar grupos](%%action.groupsearch%%) e juntar-se a eles." #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualizações de %1#s a %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4730,11 +4730,11 @@ msgstr "" "Este site utiliza o %1$s versão %2$s, (c) 2008-2010 StatusNet, Inc. e " "colaboradores." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Colaboradores" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4746,7 +4746,7 @@ msgstr "" "Software Foundation, que na versão 3 da Licença, quer (por sua opção) " "qualquer versão posterior. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4757,7 +4757,7 @@ msgstr "" "QUALQUER GARANTIA. Consulte a GNU Affero General Public License para mais " "informações. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4766,20 +4766,20 @@ msgstr "" "Juntamente com este programa deve ter recebido uma cópia da GNU Affero " "General Public License. Se não a tiver recebido, consulte %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Plugins" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Versão" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Autores" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4788,13 +4788,13 @@ msgstr "" "Nenhum ficheiro pode ter mais de %d bytes e o que enviou tinha %d bytes. " "Tente carregar uma versão menor." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Um ficheiro desta dimensão excederia a sua quota de utilizador de %d bytes." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Um ficheiro desta dimensão excederia a sua quota mensal de %d bytes." @@ -4833,27 +4833,27 @@ msgid "Could not update message with new URI." msgstr "Não foi possível actualizar a mensagem com a nova URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Erro na base de dados ao inserir a marca: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Problema na gravação da nota. Demasiado longa." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Problema na gravação da nota. Utilizador desconhecido." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a " "alguns minutos." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4861,21 +4861,21 @@ msgstr "" "Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a " "publicar daqui a alguns minutos." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Está proibido de publicar notas neste site." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problema na gravação da nota." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Problema na gravação da caixa de entrada do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5340,7 +5340,7 @@ msgid "Snapshots configuration" msgstr "Configuração dos instântaneos" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura." @@ -5470,11 +5470,11 @@ msgstr "Notas em que este anexo aparece" msgid "Tags for this attachment" msgstr "Categorias para este anexo" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Não foi possível mudar a palavra-chave" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Não é permitido mudar a palavra-chave" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 250df50dbb..56bdb97a0a 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:18+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:40+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -87,24 +87,24 @@ msgid "Save" msgstr "Salvar" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Esta página não existe." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -117,7 +117,7 @@ msgid "No such user." msgstr "Este usuário não existe." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s e amigos, pág. %2$d" @@ -125,33 +125,33 @@ msgstr "%1$s e amigos, pág. %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amigos" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Fonte de mensagens dos amigos de %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Fonte de mensagens dos amigos de %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Fonte de mensagens dos amigos de %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -159,7 +159,7 @@ msgstr "" "Esse é o fluxo de mensagens de %s e seus amigos, mas ninguém publicou nada " "ainda." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -169,7 +169,7 @@ msgstr "" "publicar algo." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -179,7 +179,7 @@ msgstr "" "[publicar alguma coisa que desperte seu interesse](%%%%action.newnotice%%%%?" "status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -189,14 +189,14 @@ msgstr "" "atenção de %s ou publicar uma mensagem para sua atenção." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Você e amigos" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Atualizações de %1$s e amigos no %2$s!" @@ -207,22 +207,22 @@ msgstr "Atualizações de %1$s e amigos no %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "O método da API não foi encontrado!" @@ -232,11 +232,11 @@ msgstr "O método da API não foi encontrado!" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -268,7 +268,7 @@ msgstr "Não foi possível salvar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -346,24 +346,24 @@ msgstr "" "Não é possível enviar mensagens diretas para usuários que não sejam seus " "amigos." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Não foi encontrado nenhum status com esse ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Esta mensagem já é favorita!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Não foi possível criar a favorita." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Essa mensagem não é favorita!" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Não foi possível excluir a favorita." @@ -396,7 +396,7 @@ msgstr "Não foi possível determinar o usuário de origem." msgid "Could not find target user." msgstr "Não foi possível encontrar usuário de destino." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -404,113 +404,113 @@ msgstr "" "A identificação deve conter apenas letras minúsculas e números e não pode " "ter e espaços." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Esta identificação já está em uso. Tente outro." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Não é uma identificação válida." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "A URL informada não é válida." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Nome completo muito extenso (máx. 255 caracteres)" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Descrição muito extensa (máximo %d caracteres)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Localização muito extensa (máx. 255 caracteres)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Muitos apelidos! O máximo são %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Apelido inválido: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "O apelido \"%s\" já está em uso. Tente outro." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "O apelido não pode ser igual à identificação." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "O grupo não foi encontrado." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Você já é membro desse grupo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "O administrador desse grupo bloqueou sua inscrição." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Você não é membro deste grupo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Não foi possível remover o usuário %1$s do grupo %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Grupos de %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "Grupos de %1$s nos quais %2$s é membro." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Grupos de %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "grupos no %s" @@ -525,7 +525,7 @@ msgstr "Token inválido." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -633,11 +633,11 @@ msgstr "Permitir" msgid "Allow or deny access to your account information." msgstr "Permitir ou negar o acesso às informações da sua conta." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Esse método requer um POST ou DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Você não pode excluir uma mensagem de outro usuário." @@ -654,25 +654,25 @@ msgstr "Você não pode repetir a sua própria mensagem." msgid "Already repeated that notice." msgstr "Você já repetiu essa mensagem." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "A mensagem foi excluída." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Não foi encontrada nenhuma mensagem com esse ID." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Está muito extenso. O tamanho máximo é de %s caracteres." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Não encontrado." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "O tamanho máximo da mensagem é de %s caracteres" @@ -681,32 +681,32 @@ msgstr "O tamanho máximo da mensagem é de %s caracteres" msgid "Unsupported format." msgstr "Formato não suportado." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritas de %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s marcadas como favoritas por %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Mensagens mencionando %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Mensagens públicas de %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s mensagens de todo mundo!" @@ -721,12 +721,12 @@ msgstr "Repetida para %s" msgid "Repeats of %s" msgstr "Repetições de %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Mensagens etiquetadas como %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mensagens etiquetadas como %1$s no %2$s!" @@ -1865,7 +1865,7 @@ msgstr "Torna este usuário um administrador" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Mensagens de %s" @@ -2551,30 +2551,30 @@ msgstr "" "Os desenvolvedores podem editar as configurações de registro para suas " "aplicações " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "A mensagem não está associada a nenhum perfil." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Mensagem de %1$s no %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "O tipo de conteúdo %s não é suportado." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Por favor, somente URLs %s sobre HTTP puro." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Não é um formato de dados suportado." @@ -3362,7 +3362,7 @@ msgstr "Meus textos e arquivos permanecem sob meus próprios direitos autorais." #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. #: actions/register.php:535 msgid "All rights reserved." -msgstr "" +msgstr "Todos os direitos reservados." #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. #: actions/register.php:540 @@ -3565,7 +3565,7 @@ msgstr "Não é possível revogar os papéis dos usuários neste site." msgid "User doesn't have this role." msgstr "O usuário não possui este papel." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3622,7 +3622,7 @@ msgid "Icon" msgstr "Ícone" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Nome" @@ -3633,7 +3633,7 @@ msgid "Organization" msgstr "Organização" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Descrição" @@ -4609,7 +4609,7 @@ msgstr "" "as mensagens deste usuário. Se você não solicitou assinar as mensagens de " "alguém, clique em \"Recusar\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licença" @@ -4740,18 +4740,18 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Mensagens de %1$s no %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4760,11 +4760,11 @@ msgstr "" "Este site funciona sobre %1$s versão %2$s, Copyright 2008-2010 StatusNet, " "Inc. e colaboradores." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Colaboradores" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4776,7 +4776,7 @@ msgstr "" "Software Foundation, na versão 3 desta licença ou (caso deseje) qualquer " "versão posterior. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4788,7 +4788,7 @@ msgstr "" "ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. Verifique a GNU Affero General " "Public License para mais detalhes. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4797,20 +4797,20 @@ msgstr "" "Você deve ter recebido uma cópia da GNU Affero General Public License com " "este programa. Caso contrário, veja %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Plugins" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Versão" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Autor(es)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4819,12 +4819,12 @@ msgstr "" "Nenhum arquivo pode ser maior que %d bytes e o arquivo que você enviou " "possui %d bytes. Experimente enviar uma versão menor." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Um arquivo deste tamanho excederá a sua conta de %d bytes." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes." @@ -4863,27 +4863,27 @@ msgid "Could not update message with new URI." msgstr "Não foi possível atualizar a mensagem com a nova URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Erro no banco de dados durante a inserção da hashtag: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Problema no salvamento da mensagem. Ela é muito extensa." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Problema no salvamento da mensagem. Usuário desconhecido." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4891,21 +4891,21 @@ msgstr "" "Muitas mensagens duplicadas em um período curto de tempo; dê uma respirada e " "publique novamente daqui a alguns minutos." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Você está proibido de publicar mensagens neste site." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problema no salvamento da mensagem." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Problema no salvamento das mensagens recebidas do grupo." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5366,7 +5366,7 @@ msgid "Snapshots configuration" msgstr "Configurações das estatísticas" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "Os recursos de API exigem acesso de leitura e escrita, mas você possui " @@ -5499,11 +5499,11 @@ msgstr "Mensagens onde este anexo aparece" msgid "Tags for this attachment" msgstr "Etiquetas para este anexo" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Não foi possível alterar a senha" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Não é permitido alterar a senha" @@ -5585,9 +5585,9 @@ msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s." #. TRANS: Message given having failed to remove a user from a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. #: lib/command.php:385 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "Não foi possível remover o usuário %1$s do grupo %2$s." +msgstr "Não foi possível remover o usuário %1$s do grupo %2$s" #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -5627,10 +5627,10 @@ msgstr "" #. TRANS: Message given if content is too long. #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters. #: lib/command.php:472 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d" msgstr "" -"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d." +"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -6147,6 +6147,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Se você acredita que esse usuário está se comportando de forma abusiva, você " +"pode bloqueá-lo da sua lista de assinantes e reportá-lo como spammer ao " +"administrador do site em %s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 @@ -6221,9 +6224,11 @@ msgstr "Confirmação de SMS" #. TRANS: Main body heading for SMS-by-email address confirmation message #: lib/mail.php:463 -#, fuzzy, php-format +#, php-format msgid "%s: confirm you own this phone number with this code:" -msgstr "Aguardando a confirmação deste número de telefone." +msgstr "" +"%s: confirme que você é o proprietário desse número de telefone com esse " +"código:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:484 @@ -6351,6 +6356,9 @@ msgid "" "\n" "\t%s" msgstr "" +"A conversa inteira pode ser lida aqui:\n" +"\n" +"%s" #: lib/mail.php:657 #, php-format @@ -6384,6 +6392,29 @@ msgid "" "\n" "P.S. You can turn off these email notifications here: %8$s\n" msgstr "" +"%1$s (@%9$s) acabou de enviar uma mensagem citando você (do tipo '@usuário') " +"em %2$s.\n" +"\n" +"A mensagem está aqui:\n" +"\n" +"%3$s\n" +"\n" +"Nela está escrito:\n" +"\n" +"%4$s\n" +"\n" +"%5$s Pode respondê-la aqui:\n" +"\n" +"%6$s\n" +"\n" +"A lista de todas as citações a você está aqui:\n" +"\n" +"%7$s\n" +"\n" +"Atenciosamente,\n" +"%2$s\n" +"\n" +"P.S.: Você pode cancelar a notificações por e-mail aqui: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 02fcda7d94..81cfe0aad1 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:21+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:43+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -89,24 +89,24 @@ msgid "Save" msgstr "Сохранить" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Нет такой страницы." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -119,7 +119,7 @@ msgid "No such user." msgstr "Нет такого пользователя." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s и друзья, страница %2$d" @@ -127,39 +127,39 @@ msgstr "%1$s и друзья, страница %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s и друзья" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Лента друзей %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Лента друзей %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Лента друзей %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "Это лента %s и друзей, однако пока никто ничего не отправил." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -169,7 +169,7 @@ msgstr "" "action.groups%%) или отправьте что-нибудь сами." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -179,7 +179,7 @@ msgstr "" "что-нибудь для привлечения его или её внимания](%%%%action.newnotice%%%%?" "status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -189,14 +189,14 @@ msgstr "" "s или отправить запись для привлечения его или её внимания?" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Вы и друзья" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Обновлено от %1$s и его друзей на %2$s!" @@ -207,22 +207,22 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "Метод API не найден." @@ -232,11 +232,11 @@ msgstr "Метод API не найден." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Этот метод требует POST." @@ -268,7 +268,7 @@ msgstr "Не удаётся сохранить профиль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -346,24 +346,24 @@ msgstr "" "Не удаётся посылать прямые сообщения пользователям, которые не являются " "Вашими друзьями." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Нет статуса с таким ID." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Этот статус уже входит в число любимых." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Не удаётся создать любимую запись." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Этот статус не входит в число ваших любимых." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Не удаётся удалить любимую запись." @@ -400,120 +400,120 @@ msgstr "Не удаётся определить исходного пользо msgid "Could not find target user." msgstr "Не удаётся найти целевого пользователя." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Имя должно состоять только из прописных букв и цифр и не иметь пробелов." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Неверное имя." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "URL Главной страницы неверен." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Полное имя слишком длинное (не больше 255 знаков)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Слишком длинное описание (максимум %d символов)" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Слишком длинное месторасположение (максимум 255 знаков)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "Слишком много алиасов! Максимальное число — %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Ошибочный псевдоним: «%s»." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Алиас «%s» уже используется. Попробуйте какой-нибудь другой." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Алиас не может совпадать с именем." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Группа не найдена." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Вы уже являетесь членом этой группы." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Вы заблокированы из этой группы администратором." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Вы не являетесь членом этой группы." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Не удаётся удалить пользователя %1$s из группы %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "Группы %s" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "Группы %1$s, в которых состоит %2$s." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "Группы %s" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "группы на %s" @@ -528,7 +528,7 @@ msgstr "Неправильный токен" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -632,11 +632,11 @@ msgstr "Разрешить" msgid "Allow or deny access to your account information." msgstr "Разрешить или запретить доступ к информации вашей учётной записи." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Этот метод требует POST или DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Вы не можете удалять статус других пользователей." @@ -653,25 +653,25 @@ msgstr "Невозможно повторить собственную запи msgid "Already repeated that notice." msgstr "Запись уже повторена." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Статус удалён." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Не найдено статуса с таким ID." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Слишком длинная запись. Максимальная длина — %d знаков." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Не найдено." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Максимальная длина записи — %d символов, включая URL вложения." @@ -680,32 +680,32 @@ msgstr "Максимальная длина записи — %d символов msgid "Unsupported format." msgstr "Неподдерживаемый формат." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Любимое от %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Обновления %1$s, отмеченные как любимые %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Обновления, упоминающие %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Общая лента %s" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Обновления %s от всех!" @@ -720,12 +720,12 @@ msgstr "Повторено для %s" msgid "Repeats of %s" msgstr "Повторы за %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Записи с тегом %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Обновления с тегом %1$s на %2$s!" @@ -1867,7 +1867,7 @@ msgstr "Сделать этого пользователя администра #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "Лента %s" @@ -2545,30 +2545,30 @@ msgstr "Вы не разрешили приложениям использова msgid "Developers can edit the registration settings for their applications " msgstr "Разработчики могут изменять настройки регистрации своих приложений " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Уведомление не имеет профиля." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Статус %1$s на %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Тип содержимого %s не поддерживается." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Только %s URL в простом HTTP, пожалуйста." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -3549,7 +3549,7 @@ msgstr "Вы не можете снимать роли пользователе msgid "User doesn't have this role." msgstr "Пользователь не имеет этой роли." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3607,7 +3607,7 @@ msgid "Icon" msgstr "Иконка" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Имя" @@ -3618,7 +3618,7 @@ msgid "Organization" msgstr "Организация" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Описание" @@ -4600,7 +4600,7 @@ msgstr "" "подписаться на записи этого пользователя. Если Вы этого не хотите делать, " "нажмите «Отказ»." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Лицензия" @@ -4728,18 +4728,18 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Обновлено от %1$s на %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4748,11 +4748,11 @@ msgstr "" "Этот сайт создан на основе %1$s версии %2$s, Copyright 2008-2010 StatusNet, " "Inc. и участники." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Разработчики" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4764,7 +4764,7 @@ msgstr "" "License, опубликованной Free Software Foundation, либо под версией 3, либо " "(на выбор) под любой более поздней версией. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4776,7 +4776,7 @@ msgstr "" "или ПРИГОДНОСТИ ДЛЯ ЧАСТНОГО ИСПОЛЬЗОВАНИЯ. См. GNU Affero General Public " "License для более подробной информации. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4785,20 +4785,20 @@ msgstr "" "Вы должны были получить копию GNU Affero General Public License вместе с " "этой программой. Если нет, см. %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Плагины" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Версия" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Автор(ы)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4807,12 +4807,12 @@ msgstr "" "Файл не может быть больше %d байт, тогда как отправленный вами файл содержал " "%d байт. Попробуйте загрузить меньшую версию." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Файл такого размера превысит вашу пользовательскую квоту в %d байта." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Файл такого размера превысит вашу месячную квоту в %d байта." @@ -4851,27 +4851,27 @@ msgid "Could not update message with new URI." msgstr "Не удаётся обновить сообщение с новым URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Ошибка баз данных при вставке хеш-тегов: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Проблемы с сохранением записи. Слишком длинно." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Проблема при сохранении записи. Неизвестный пользователь." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Слишком много записей за столь короткий срок; передохните немного и " "попробуйте вновь через пару минут." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4879,21 +4879,21 @@ msgstr "" "Слишком много одинаковых записей за столь короткий срок; передохните немного " "и попробуйте вновь через пару минут." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Вам запрещено поститься на этом сайте (бан)" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Проблемы с сохранением записи." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Проблемы с сохранением входящих сообщений группы." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5354,7 +5354,7 @@ msgid "Snapshots configuration" msgstr "Конфигурация снимков" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API ресурса требует доступ для чтения и записи, но у вас есть только доступ " @@ -5487,11 +5487,11 @@ msgstr "Сообщает, где появляется это вложение" msgid "Tags for this attachment" msgstr "Теги для этого вложения" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Изменение пароля не удалось" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Смена пароля не разрешена" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 056aee1e42..789e4bc869 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-27 22:55+0000\n" +"POT-Creation-Date: 2010-06-03 23:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index bd24ccc003..4f0a069454 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:25+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:47+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -85,24 +85,24 @@ msgid "Save" msgstr "Spara" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Ingen sådan sida" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -115,7 +115,7 @@ msgid "No such user." msgstr "Ingen sådan användare." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s och vänner, sida %2$d" @@ -123,39 +123,39 @@ msgstr "%1$s och vänner, sida %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s och vänner" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Flöden för %ss vänner (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Flöden för %ss vänner (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Flöden för %ss vänner (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "Detta är tidslinjen för %s och vänner, men ingen har skrivit något än." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -165,7 +165,7 @@ msgstr "" "%) eller skriv något själv." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -175,7 +175,7 @@ msgstr "" "någonting för hans eller hennes uppmärksamhet](%%%%action.newnotice%%%%?" "status_textarea=%3$s)." -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -185,14 +185,14 @@ msgstr "" "%s eller skriva en notis för hans eller hennes uppmärksamhet." #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "Du och vänner" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Uppdateringar från %1$s och vänner på %2$s!" @@ -203,22 +203,22 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-metod hittades inte." @@ -228,11 +228,11 @@ msgstr "API-metod hittades inte." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Denna metod kräver en POST." @@ -262,7 +262,7 @@ msgstr "Kunde inte spara profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -338,24 +338,24 @@ msgstr "Mottagare hittades inte." msgid "Can't send direct messages to users who aren't your friend." msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Ingen status hittad med det ID:t." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "Denna status är redan en favorit." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Kunde inte skapa favorit." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "Denna status är inte en favorit." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "Kunde inte ta bort favoriten." @@ -388,120 +388,120 @@ msgstr "Kunde inte fastställa användare hos källan." msgid "Could not find target user." msgstr "Kunde inte hitta målanvändare." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Smeknamnet används redan. Försök med ett annat." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Inte ett giltigt smeknamn." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Hemsida är inte en giltig webbadress." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Fullständigt namn är för långt (max 255 tecken)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "Beskrivning är för lång (max 140 tecken)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Beskrivning av plats är för lång (max 255 tecken)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "För många alias! Maximum %d." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "Ogiltigt alias: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Alias \"%s\" används redan. Försök med ett annat." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "Alias kan inte vara samma som smeknamn." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "Grupp hittades inte." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "Du är redan en medlem i denna grupp." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "Du har blivit blockerad från denna grupp av administratören." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Kunde inte ansluta användare %1$s till grupp %2$s." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "Du är inte en medlem i denna grupp." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Kunde inte ta bort användare %1$s från grupp %2$s." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "%ss grupper" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "%1$s grupper %2$s är en medlem i." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s grupper" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "grupper på %s" @@ -516,7 +516,7 @@ msgstr "Ogiltig token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -618,11 +618,11 @@ msgstr "Tillåt" msgid "Allow or deny access to your account information." msgstr "Tillåt eller neka åtkomst till din kontoinformation." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Denna metod kräver en POST eller en DELETE." -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Du kan inte ta bort en annan användares status." @@ -639,25 +639,25 @@ msgstr "Kan inte upprepa din egen notis." msgid "Already repeated that notice." msgstr "Redan upprepat denna notis." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "Status borttagen." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Ingen status med det ID:t hittades." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det är för långt. Maximal notisstorlek är %d tecken." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "Hittades inte." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga." @@ -666,32 +666,32 @@ msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga." msgid "Unsupported format." msgstr "Format som inte stödjs." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoriter från %2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s." -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Uppdateringar som nämner %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s." -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s publika tidslinje" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s uppdateringar från alla!" @@ -706,12 +706,12 @@ msgstr "Upprepat till %s" msgid "Repeats of %s" msgstr "Upprepningar av %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notiser taggade med %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Uppdateringar taggade med %1$s på %2$s!" @@ -1844,7 +1844,7 @@ msgstr "Gör denna användare till administratör" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s tidslinje" @@ -2523,30 +2523,30 @@ msgid "Developers can edit the registration settings for their applications " msgstr "" "Utvecklare kan redigera registreringsinställningarna för sina applikationer " -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "Notisen har ingen profil." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$ss status den %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, php-format msgid "Content type %s not supported." msgstr "Innehållstyp %s stödjs inte." #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "Endast %s-webbadresser över vanlig HTTP." #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -3532,7 +3532,7 @@ msgstr "Du kan inte återkalla användarroller på denna webbplats." msgid "User doesn't have this role." msgstr "Användare har inte denna roll." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "StatusNet" @@ -3589,7 +3589,7 @@ msgid "Icon" msgstr "Ikon" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "Namn" @@ -3600,7 +3600,7 @@ msgid "Organization" msgstr "Organisation" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Beskrivning" @@ -4575,7 +4575,7 @@ msgstr "" "prenumerera på den här användarens notiser. Om du inte bett att prenumerera " "på någons meddelanden, klicka på \"Avvisa\"." -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "Licens" @@ -4704,18 +4704,18 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Uppdateringar från %1$s på %2$s!" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "StatusNet %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " @@ -4724,11 +4724,11 @@ msgstr "" "Denna webbplats drivs med %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. och medarbetare." -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "Medarbetare" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4740,7 +4740,7 @@ msgstr "" "Foundation, antingen version 3 av licensen, eller (utifrån ditt val) någon " "senare version. " -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4752,7 +4752,7 @@ msgstr "" "LÄMPLIGHET FÖR ETT SÄRSKILT ÄNDAMÅL. Se GNU Affero General Public License " "för mer information. " -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -4761,20 +4761,20 @@ msgstr "" "Du bör ha fått en kopia av GNU Affero General Public License tillsammans med " "detta program. Om inte, se %s." -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "Insticksmoduler" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "Version" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "Författare" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4783,12 +4783,12 @@ msgstr "" "Inga filer får vara större än %d byte och filen du skickade var %d byte. " "Prova att ladda upp en mindre version." -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "En så här stor fil skulle överskrida din användarkvot på %d byte." -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "En sådan här stor fil skulle överskrida din månatliga kvot på %d byte." @@ -4827,27 +4827,27 @@ msgid "Could not update message with new URI." msgstr "Kunde inte uppdatera meddelande med ny URI." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, php-format msgid "Database error inserting hashtag: %s" msgstr "Databasfel vid infogning av hashtag: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "Problem vid sparande av notis. För långt." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "Problem vid sparande av notis. Okänd användare." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "För många notiser för snabbt; ta en vilopaus och posta igen om ett par " "minuter." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4855,21 +4855,21 @@ msgstr "" "För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen " "om ett par minuter." -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "Du är utestängd från att posta notiser på denna webbplats." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Problem med att spara notis." -#: classes/Notice.php:967 +#: classes/Notice.php:973 msgid "Problem saving group inbox." msgstr "Problem med att spara gruppinkorg." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5327,7 +5327,7 @@ msgid "Snapshots configuration" msgstr "Konfiguration av ögonblicksbilder" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet." @@ -5459,11 +5459,11 @@ msgstr "Notiser där denna bilaga förekommer" msgid "Tags for this attachment" msgstr "Taggar för denna billaga" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "Byte av lösenord misslyckades" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "Byte av lösenord är inte tillåtet" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index ac611ff536..aef7a14b1a 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:28+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:51+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -84,24 +84,24 @@ msgid "Save" msgstr "భద్రపరచు" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "అటువంటి పేజీ లేదు." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -114,7 +114,7 @@ msgid "No such user." msgstr "అటువంటి వాడుకరి లేరు." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d" @@ -122,39 +122,39 @@ msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s మరియు మిత్రులు" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "%s యొక్క మిత్రుల ఫీడు (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "%s యొక్క మిత్రుల ఫీడు (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "%s యొక్క మిత్రుల ఫీడు (ఆటమ్)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ కానీ ఇంకా ఎవరూ ఏమీ రాయలేదు." -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -162,14 +162,14 @@ msgid "" msgstr "ఇతరులకి చందా చేరండి, [ఏదైనా గుంపులో చేరండి](%%action.groups%%) లేదా మీరే ఏదైనా వ్రాయండి." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -177,14 +177,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "మీరు మరియు మీ స్నేహితులు" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!" @@ -195,22 +195,22 @@ msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండ #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "నిర్ధారణ సంకేతం కనబడలేదు." @@ -221,11 +221,11 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "" @@ -257,7 +257,7 @@ msgstr "ప్రొఫైలుని భద్రపరచలేకున్ #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -332,24 +332,24 @@ msgstr "అందుకోవాల్సిన వాడుకరి కనబ msgid "Can't send direct messages to users who aren't your friend." msgstr "మీ స్నేహితులు కాని వాడుకరులకి నేరు సందేశాలు పంపించలేరు." -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "ఆ IDతో ఏ నోటీసూ కనబడలేదు." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "ఆ నోటీసు ఇష్టాంశం కాదు." -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం." @@ -384,119 +384,119 @@ msgstr "వాడుకరిని తాజాకరించలేకున msgid "Could not find target user." msgstr "లక్ష్యిత వాడుకరిని కనుగొనలేకపోయాం." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "సరైన పేరు కాదు." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "హోమ్ పేజీ URL సరైనది కాదు." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం." -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, php-format msgid "Invalid alias: \"%s\"." msgstr "తప్పుడు మారుపేరు: \"%s\"." -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటికే వాడుతున్నారు. మరొకటి ప్రయత్నించండి." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు." -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 msgid "Group not found." msgstr "గుంపు దొరకలేదు." -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు." -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్చలేకపోయాం" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 msgid "You are not a member of this group." msgstr "మీరు ఈ గుంపులో సభ్యులు కాదు." -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "వాడుకరి %1$sని %2$s గుంపు నుండి తొలగించలేకపోయాం." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, php-format msgid "%s's groups" msgstr "%s యొక్క గుంపులు" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, php-format msgid "%1$s groups %2$s is a member of." msgstr "%2$s సభ్యులుగా ఉన్న %2$s గుంపులు." #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s గుంపులు" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "%s పై గుంపులు" @@ -512,7 +512,7 @@ msgstr "తప్పుడు పరిమాణం." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -613,11 +613,11 @@ msgstr "అనుమతించు" msgid "Allow or deny access to your account information." msgstr "మీ ఖాతా సమాచారాన్ని సంప్రాపించడానికి అనుమతించండి లేదా నిరాకరించండి." -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "ఇతర వాడుకరుల స్థితిని మీరు తొలగించలేరు." @@ -634,25 +634,25 @@ msgstr "మీ నోటీసుని మీరే పునరావృతి msgid "Already repeated that notice." msgstr "ఇప్పటికే ఆ నోటీసుని పునరావృతించారు." -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 msgid "Status deleted." msgstr "స్థితిని తొలగించాం." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "ఆ IDతో ఏ నోటీసు కనబడలేదు." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "అది చాలా పొడవుంది. గరిష్ఠ నోటీసు పరిమాణం %d అక్షరాలు." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 msgid "Not found." msgstr "కనబడలేదు." -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షరాలు, జోడింపు URLని కలుపుకుని." @@ -661,32 +661,32 @@ msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షర msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s యొక్క మైక్రోబ్లాగు" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / %2$sని పేర్కొన్న నోటీసులు" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s బహిరంగ కాలరేఖ" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "అందరి నుండి %s తాజాకరణలు!" @@ -701,12 +701,12 @@ msgstr "%sకి స్పందనలు" msgid "Repeats of %s" msgstr "%s యొక్క పునరావృతాలు" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!" @@ -1826,7 +1826,7 @@ msgstr "ఈ వాడుకరిని నిర్వాహకున్ని #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s కాలరేఖ" @@ -2478,30 +2478,30 @@ msgstr "మీ ఖాతాని ఉపయోగించుకోడాని msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 msgid "Notice has no profile." msgstr "నోటీసుకి ప్రొఫైలు లేదు." -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%2$sలో %1$s యొక్క స్థితి" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "విషయ రకం " #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "" @@ -3470,7 +3470,7 @@ msgstr "మీరు ఇప్పటికే లోనికి ప్రవే msgid "User doesn't have this role." msgstr "వాడుకరికి ఈ పాత్ర లేదు." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 msgid "StatusNet" msgstr "స్టేటస్‌నెట్" @@ -3530,7 +3530,7 @@ msgid "Icon" msgstr "ప్రతీకం" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 msgid "Name" msgstr "పేరు" @@ -3541,7 +3541,7 @@ msgid "Organization" msgstr "సంస్ధ" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "వివరణ" @@ -4483,7 +4483,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "లైసెన్సు" @@ -4604,29 +4604,29 @@ msgstr "[గుంపులని వెతికి](%%action.groupsearch%%) #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "స్టేటస్‌నెట్ %s" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4634,7 +4634,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4642,39 +4642,39 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "ప్లగిన్లు" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 msgid "Version" msgstr "సంచిక" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "రచయిత(లు)" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4713,46 +4713,46 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు" -#: classes/Notice.php:245 +#: classes/Notice.php:251 msgid "Problem saving notice. Too long." msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు. చాలా పొడవుగా ఉంది." -#: classes/Notice.php:249 +#: classes/Notice.php:255 msgid "Problem saving notice. Unknown user." msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు. గుర్తుతెలియని వాడుకరి." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "చాలా ఎక్కువ నోటీసులు అంత వేగంగా; కాస్త ఊపిరి తీసుకుని మళ్ళీ కొన్ని నిమిషాల తర్వాత వ్రాయండి." -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు." -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5222,7 +5222,7 @@ msgid "Snapshots configuration" msgstr "SMS నిర్ధారణ" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5356,12 +5356,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "సంకేతపదం మార్పు" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "సంకేతపదం మార్పు" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 6247728edd..16cde8b082 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:32+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:54+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -91,25 +91,25 @@ msgid "Save" msgstr "Kaydet" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "Böyle bir durum mesajı yok." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -122,7 +122,7 @@ msgid "No such user." msgstr "Böyle bir kullanıcı yok." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, fuzzy, php-format msgid "%1$s and friends, page %2$d" msgstr "%s ve arkadaşları" @@ -130,39 +130,39 @@ msgstr "%s ve arkadaşları" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s ve arkadaşları" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "%s için arkadaş güncellemeleri RSS beslemesi" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "%s için arkadaş güncellemeleri RSS beslemesi" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, fuzzy, php-format msgid "Feed for friends of %s (Atom)" msgstr "%s için arkadaş güncellemeleri RSS beslemesi" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -170,14 +170,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -185,15 +185,15 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 #, fuzzy msgid "You and friends" msgstr "%s ve arkadaşları" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -204,22 +204,22 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Onay kodu bulunamadı." @@ -230,11 +230,11 @@ msgstr "Onay kodu bulunamadı." #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "" @@ -266,7 +266,7 @@ msgstr "Profil kaydedilemedi." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -343,25 +343,25 @@ msgstr "" msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 #, fuzzy msgid "This status is already a favorite." msgstr "Bu zaten sizin Jabber ID'niz." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "" @@ -398,7 +398,7 @@ msgstr "Kullanıcı güncellenemedi." msgid "Could not find target user." msgstr "Kullanıcı güncellenemedi." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." @@ -406,116 +406,116 @@ msgstr "" "Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk " "kullanılamaz. " -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Takma ad kullanımda. Başka bir tane deneyin." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Geçersiz bir takma ad." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Başlangıç sayfası adresi geçerli bir URL değil." -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Tam isim çok uzun (azm: 255 karakter)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "Hakkında bölümü çok uzun (azm 140 karakter)." -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Yer bilgisi çok uzun (azm: 255 karakter)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "%s Geçersiz başlangıç sayfası" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, fuzzy, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Takma ad kullanımda. Başka bir tane deneyin." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "İstek bulunamadı!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 #, fuzzy msgid "You are already a member of that group." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Sunucuya yönlendirme yapılamadı: %s" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 #, fuzzy msgid "You are not a member of this group." msgstr "Bize o profili yollamadınız" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "OpenID formu yaratılamadı: %s" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, fuzzy, php-format msgid "%s's groups" msgstr "Profil" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "Bize o profili yollamadınız" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "" @@ -531,7 +531,7 @@ msgstr "Geçersiz büyüklük." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -634,11 +634,11 @@ msgstr "" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "" @@ -657,28 +657,28 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." msgid "Already repeated that notice." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 #, fuzzy msgid "Status deleted." msgstr "Avatar güncellendi." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "İstek bulunamadı!" -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -688,32 +688,32 @@ msgstr "" msgid "Unsupported format." msgstr "Desteklenmeyen görüntü dosyası biçemi." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s adli kullanicinin durum mesajlari" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -728,12 +728,12 @@ msgstr "%s için cevaplar" msgid "Repeats of %s" msgstr "%s için cevaplar" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%s adli kullanicinin durum mesajlari" @@ -1913,7 +1913,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "" @@ -2564,31 +2564,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "Bağlan" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "" @@ -3560,7 +3560,7 @@ msgstr "Bize o profili yollamadınız" msgid "User doesn't have this role." msgstr "Kullanıcının profili yok." -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "Avatar güncellendi." @@ -3622,7 +3622,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3635,7 +3635,7 @@ msgid "Organization" msgstr "Yer" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" @@ -4595,7 +4595,7 @@ msgstr "" "detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde " "bulunmadıysanız \"İptal\" tuşuna basın. " -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "" @@ -4719,29 +4719,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "İstatistikler" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4749,7 +4749,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4757,40 +4757,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Kişisel" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4833,48 +4833,48 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "Cevap eklenirken veritabanı hatası: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:249 +#: classes/Notice.php:255 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "Durum mesajını kaydederken hata oluştu." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5369,7 +5369,7 @@ msgid "Snapshots configuration" msgstr "Eposta adresi onayı" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5507,12 +5507,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "Parola kaydedildi." -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "Parola kaydedildi." diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index d66ccb6134..dbf7fc836a 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-27 22:55+0000\n" -"PO-Revision-Date: 2010-05-27 22:58:13+0000\n" +"PO-Revision-Date: 2010-06-03 23:02:57+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66982); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -3805,8 +3805,9 @@ msgstr "" "**%s** це група на %%%%site.name%%%% — сервісі [мікроблоґів](http://uk." "wikipedia.org/wiki/Мікроблоггінг), який працює на вільному програмному " "забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблять " -"короткі дописи про своє життя та інтереси. [Приєднуйтесь](%%action.register%" -"%) зараз і долучіться до спілкування! ([Дізнатися більше](%%doc.help%%))" +"короткі дописи про своє життя та інтереси. [Приєднуйтесь](%%%%action.register" +"%%%%) зараз і долучіться до спілкування! ([Дізнатися більше](%%%%doc.help%%%" +"%))" #: actions/showgroup.php:469 #, php-format @@ -3914,9 +3915,9 @@ msgid "" msgstr "" "**%s** користується %%%%site.name%%%% — сервісом [мікроблоґів](http://uk." "wikipedia.org/wiki/Мікроблоґ), який працює на вільному програмному " -"забезпеченні [StatusNet](http://status.net/). [Приєднуйтесь](%%action." -"register%%) зараз і слідкуйте за дописами **%s**, також на Вас чекає багато " -"іншого! ([Дізнатися більше](%%doc.help%%))" +"забезпеченні [StatusNet](http://status.net/). [Приєднуйтесь](%%%%action." +"register%%%%) зараз і слідкуйте за дописами **%s**, також на Вас чекає " +"багато іншого! ([Дізнатися більше](%%%%doc.help%%%%))" #: actions/showstream.php:248 #, php-format diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 074f4b78fa..38c8a7d1ac 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:38+0000\n" +"PO-Revision-Date: 2010-06-03 23:03:01+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -90,25 +90,25 @@ msgid "Save" msgstr "Lưu" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "Không có tin nhắn nào." -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -121,7 +121,7 @@ msgid "No such user." msgstr "Không có user nào." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, fuzzy, php-format msgid "%1$s and friends, page %2$d" msgstr "%s và bạn bè" @@ -129,39 +129,39 @@ msgstr "%s và bạn bè" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s và bạn bè" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Chọn những người bạn của %s" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Chọn những người bạn của %s" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, fuzzy, php-format msgid "Feed for friends of %s (Atom)" msgstr "Chọn những người bạn của %s" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -169,14 +169,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -184,15 +184,15 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 #, fuzzy msgid "You and friends" msgstr "%s và bạn bè" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -203,22 +203,22 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Phương thức API không tìm thấy!" @@ -229,11 +229,11 @@ msgstr "Phương thức API không tìm thấy!" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "Phương thức này yêu cầu là POST." @@ -265,7 +265,7 @@ msgstr "Không thể lưu hồ sơ cá nhân." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -344,26 +344,26 @@ msgstr "Không tìm thấy user." msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 #, fuzzy msgid "This status is already a favorite." msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "Không thể tạo favorite." -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 #, fuzzy msgid "That status is not a favorite." msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 #, fuzzy msgid "Could not delete favorite." msgstr "Không thể tạo favorite." @@ -402,122 +402,122 @@ msgstr "Không thể lấy lại các tin nhắn ưa thích" msgid "Could not find target user." msgstr "Không tìm thấy bất kỳ trạng thái nào." -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "Biệt hiệu phải là chữ viết thường hoặc số và không có khoảng trắng." -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác." -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "Biệt hiệu không hợp lệ." -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "Trang chủ không phải là URL" -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)." -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "Lý lịch quá dài (không quá 140 ký tự)" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "Tên khu vực quá dài (không quá 255 ký tự)." -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "Trang chủ '%s' không hợp lệ" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, fuzzy, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác." -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "Phương thức API không tìm thấy!" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 #, fuzzy msgid "You are already a member of that group." msgstr "Bạn đã theo những người này:" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 #, fuzzy msgid "You are not a member of this group." msgstr "Bạn chưa cập nhật thông tin riêng" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, fuzzy, php-format msgid "%s's groups" msgstr "%s và nhóm" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "Bạn chưa cập nhật thông tin riêng" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, fuzzy, php-format msgid "%s groups" msgstr "%s và nhóm" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, fuzzy, php-format msgid "groups on %s" msgstr "Mã nhóm" @@ -533,7 +533,7 @@ msgstr "Kích thước không hợp lệ." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -636,11 +636,11 @@ msgstr "" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "Phương thức này yêu cầu là POST hoặc DELETE" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "Bạn đã không xóa trạng thái của những người khác." @@ -659,27 +659,27 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các điều kho msgid "Already repeated that notice." msgstr "Xóa tin nhắn" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 #, fuzzy msgid "Status deleted." msgstr "Hình đại diện đã được cập nhật." -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Quá dài. Tối đa là 140 ký tự." -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "Không tìm thấy" -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -689,32 +689,32 @@ msgstr "" msgid "Unsupported format." msgstr "Không hỗ trợ kiểu file ảnh này." -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "Tìm kiếm các tin nhắn ưa thích của %s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Tất cả các cập nhật của %s" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Các cập nhật đang trả lời tới %2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, fuzzy, php-format msgid "%s public timeline" msgstr "Dòng tin công cộng" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s cập nhật từ tất cả mọi người!" @@ -729,12 +729,12 @@ msgstr "Trả lời cho %s" msgid "Repeats of %s" msgstr "Trả lời cho %s" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Thông báo được gắn thẻ %s" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Dòng tin nhắn cho %s" @@ -1959,7 +1959,7 @@ msgstr "Kênh mà bạn tham gia" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, fuzzy, php-format msgid "%s timeline" msgstr "Dòng tin nhắn của %s" @@ -2654,31 +2654,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "Tin nhắn không có hồ sơ cá nhân" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "Trạng thái của %1$s vào %2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "Kết nối" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -3680,7 +3680,7 @@ msgstr "Bạn đã theo những người này:" msgid "User doesn't have this role." msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "Hình đại diện đã được cập nhật." @@ -3743,7 +3743,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3756,7 +3756,7 @@ msgid "Organization" msgstr "Thư mời đã gửi" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 msgid "Description" msgstr "Mô tả" @@ -4739,7 +4739,7 @@ msgstr "" "nhắn của các thành viên này. Nếu bạn không yêu cầu đăng nhận xem tin nhắn " "của họ, hãy nhấn \"Hủy bỏ\"" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "" @@ -4870,29 +4870,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "Số liệu thống kê" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4900,7 +4900,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4908,40 +4908,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "Cá nhân" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4987,48 +4987,48 @@ msgid "Could not update message with new URI." msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận." #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:249 +#: classes/Notice.php:255 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "Có lỗi xảy ra khi lưu tin nhắn." #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" @@ -5530,7 +5530,7 @@ msgid "Snapshots configuration" msgstr "Xác nhận SMS" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5666,12 +5666,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "Đã lưu mật khẩu." -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "Đã lưu mật khẩu." diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index c19106ce16..9a03f8ada8 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:42+0000\n" +"PO-Revision-Date: 2010-06-03 23:03:04+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -93,25 +93,25 @@ msgid "Save" msgstr "保存" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "没有该页面" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -124,7 +124,7 @@ msgid "No such user." msgstr "没有这个用户。" #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s 和好友，第%2$d页" @@ -132,39 +132,39 @@ msgstr "%1$s 和好友，第%2$d页" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s 及好友" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "%s 好友的聚合(RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "%s 好友的聚合(RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "%s 好友的聚合(Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "这是 %s 和好友的时间线，但是没有任何人发布内容。" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -172,14 +172,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -187,14 +187,14 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 msgid "You and friends" msgstr "你和好友" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "来自%2$s 上 %1$s 和好友的更新！" @@ -205,22 +205,22 @@ msgstr "来自%2$s 上 %1$s 和好友的更新！" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API 方法未实现！" @@ -231,11 +231,11 @@ msgstr "API 方法未实现！" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "此方法接受POST请求。" @@ -267,7 +267,7 @@ msgstr "无法保存个人信息。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -344,26 +344,26 @@ msgstr "未找到收件人。" msgid "Can't send direct messages to users who aren't your friend." msgstr "无法向并非好友的用户发送直接消息。" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "没有找到此ID的信息。" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 #, fuzzy msgid "This status is already a favorite." msgstr "已收藏此通告！" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "无法创建收藏。" -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 #, fuzzy msgid "That status is not a favorite." msgstr "此通告未被收藏！" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "无法删除收藏。" @@ -400,122 +400,122 @@ msgstr "无法获取收藏的通告。" msgid "Could not find target user." msgstr "找不到任何信息。" -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "昵称只能使用小写字母和数字，不包含空格。" -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "昵称已被使用，换一个吧。" -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "不是有效的昵称。" -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "主页的URL不正确。" -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "全名过长(不能超过 255 个字符)。" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "描述过长(不能超过140字符)。" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "位置过长(不能超过255个字符)。" -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "主页'%s'不正确" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, fuzzy, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "昵称已被使用，换一个吧。" -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "API 方法未实现！" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 #, fuzzy msgid "You are already a member of that group." msgstr "您已经是该组成员" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "无法把 %s 用户添加到 %s 组" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 #, fuzzy msgid "You are not a member of this group." msgstr "您未告知此个人信息" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "无法订阅用户：未找到。" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, fuzzy, php-format msgid "%s's groups" msgstr "%s 群组" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "%s 组是成员组成了" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "%s 群组" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, fuzzy, php-format msgid "groups on %s" msgstr "组动作" @@ -531,7 +531,7 @@ msgstr "大小不正确。" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -634,11 +634,11 @@ msgstr "全部" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "此方法接受POST或DELETE请求。" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "您不能删除其他用户的状态。" @@ -657,27 +657,27 @@ msgstr "无法开启通告。" msgid "Already repeated that notice." msgstr "删除通告" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 #, fuzzy msgid "Status deleted." msgstr "头像已更新。" -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "没有找到此ID的信息。" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "超出长度限制。不能超过 140 个字符。" -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "未找到" -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -687,32 +687,32 @@ msgstr "" msgid "Unsupported format." msgstr "不支持这种图像格式。" -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s 的收藏 / %s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s 收藏了 %s 的 %s 通告。" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / 回复 %2$s 的消息" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "回复 %2$s / %3$s 的 %1$s 更新。" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s 公众时间表" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "来自所有人的 %s 消息！" @@ -727,12 +727,12 @@ msgstr "%s 的回复" msgid "Repeats of %s" msgstr "%s 的回复" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "带 %s 标签的通告" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" @@ -1938,7 +1938,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "%s 时间表" @@ -2606,31 +2606,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "通告没有关联个人信息" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s 的 %2$s 状态" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "连接" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -3616,7 +3616,7 @@ msgstr "无法向此用户发送消息。" msgid "User doesn't have this role." msgstr "找不到匹配的用户。" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "头像已更新。" @@ -3679,7 +3679,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3692,7 +3692,7 @@ msgid "Organization" msgstr "分页" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" @@ -4671,7 +4671,7 @@ msgstr "" "请检查详细信息，确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通" "告，请点击\"取消\"。" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 #, fuzzy msgid "License" msgstr "注册证" @@ -4800,29 +4800,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" -#: actions/version.php:73 +#: actions/version.php:75 #, fuzzy, php-format msgid "StatusNet %s" msgstr "统计" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4830,7 +4830,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4838,40 +4838,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "个人" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4915,49 +4915,49 @@ msgid "Could not update message with new URI." msgstr "无法添加新URI的信息。" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "添加标签时数据库出错：%s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "保存通告时出错。" -#: classes/Notice.php:249 +#: classes/Notice.php:255 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "保存通告时出错。" -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:260 +#: classes/Notice.php:266 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "在这个网站你被禁止发布消息。" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "保存通告时出错。" -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "保存通告时出错。" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5462,7 +5462,7 @@ msgid "Snapshots configuration" msgstr "SMS短信确认" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5598,12 +5598,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 #, fuzzy msgid "Password changing failed" msgstr "密码已保存。" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 #, fuzzy msgid "Password changing is not allowed" msgstr "密码已保存。" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index fff611bd7e..0ee3f2a05c 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-05-25 11:38:46+0000\n" +"PO-Revision-Date: 2010-06-03 23:03:11+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -87,25 +87,25 @@ msgid "Save" msgstr "" #. TRANS: Server error when page not found (404) -#: actions/all.php:64 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 #, fuzzy msgid "No such page." msgstr "無此通知" -#: actions/all.php:75 actions/allrss.php:68 +#: actions/all.php:76 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 -#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:112 -#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 -#: actions/apigroupleave.php:99 actions/apigrouplist.php:72 -#: actions/apistatusesupdate.php:227 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173 -#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 -#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113 +#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100 +#: actions/apigroupleave.php:100 actions/apigrouplist.php:73 +#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174 +#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80 +#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 #: actions/otp.php:76 actions/remotesubscribe.php:145 @@ -118,7 +118,7 @@ msgid "No such user." msgstr "無此使用者" #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:86 +#: actions/all.php:87 #, fuzzy, php-format msgid "%1$s and friends, page %2$d" msgstr "%s與好友" @@ -126,39 +126,39 @@ msgstr "%s與好友" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116 -#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115 +#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s與好友" #. TRANS: %1$s is user nickname -#: actions/all.php:103 +#: actions/all.php:104 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "發送給%s好友的訂閱" #. TRANS: %1$s is user nickname -#: actions/all.php:112 +#: actions/all.php:113 #, fuzzy, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "發送給%s好友的訂閱" #. TRANS: %1$s is user nickname -#: actions/all.php:121 +#: actions/all.php:122 #, fuzzy, php-format msgid "Feed for friends of %s (Atom)" msgstr "發送給%s好友的訂閱" #. TRANS: %1$s is user nickname -#: actions/all.php:134 +#: actions/all.php:135 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:139 +#: actions/all.php:140 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -166,14 +166,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:142 +#: actions/all.php:143 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -181,15 +181,15 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:178 +#: actions/all.php:179 #, fuzzy msgid "You and friends" msgstr "%s與好友" #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. -#: actions/allrss.php:121 actions/apitimelinefriends.php:215 -#: actions/apitimelinehome.php:121 +#: actions/allrss.php:121 actions/apitimelinefriends.php:216 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -200,22 +200,22 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 +#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplist.php:136 -#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139 +#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156 +#: actions/apigroupleave.php:142 actions/apigrouplist.php:137 +#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107 +#: actions/apigroupshow.php:116 actions/apihelptest.php:88 +#: actions/apistatusesdestroy.php:103 actions/apistatusesretweets.php:112 +#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270 -#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174 -#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240 +#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271 +#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175 +#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 -#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "確認碼遺失" @@ -226,11 +226,11 @@ msgstr "確認碼遺失" #: actions/apiaccountupdateprofilecolors.php:110 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109 -#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 -#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apimediaupload.php:67 -#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:197 +#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92 +#: actions/apigroupleave.php:92 actions/apimediaupload.php:67 +#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198 msgid "This method requires a POST." msgstr "" @@ -262,7 +262,7 @@ msgstr "無法儲存個人資料" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 -#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:257 +#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257 #: actions/designadminpanel.php:123 actions/editapplication.php:118 #: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 @@ -338,24 +338,24 @@ msgstr "" msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 -#: actions/apistatusesdestroy.php:113 +#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 +#: actions/apistatusesdestroy.php:114 msgid "No status found with that ID." msgstr "" -#: actions/apifavoritecreate.php:119 +#: actions/apifavoritecreate.php:120 msgid "This status is already a favorite." msgstr "" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285 +#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." msgstr "" -#: actions/apifavoritedestroy.php:122 +#: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." msgstr "" -#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "" @@ -392,121 +392,121 @@ msgstr "無法更新使用者" msgid "Could not find target user." msgstr "無法更新使用者" -#: actions/apigroupcreate.php:166 actions/editgroup.php:186 +#: actions/apigroupcreate.php:167 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:212 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "暱稱請用小寫字母或數字，勿加空格。" -#: actions/apigroupcreate.php:175 actions/editgroup.php:190 +#: actions/apigroupcreate.php:176 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:215 msgid "Nickname already in use. Try another one." msgstr "此暱稱已有人使用。再試試看別的吧。" -#: actions/apigroupcreate.php:182 actions/editgroup.php:193 +#: actions/apigroupcreate.php:183 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:217 msgid "Not a valid nickname." msgstr "" -#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/apigroupcreate.php:199 actions/editapplication.php:215 #: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:224 msgid "Homepage is not a valid URL." msgstr "個人首頁位址錯誤" -#: actions/apigroupcreate.php:207 actions/editgroup.php:202 +#: actions/apigroupcreate.php:208 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Full name is too long (max 255 chars)." msgstr "全名過長（最多255字元）" -#: actions/apigroupcreate.php:215 actions/editapplication.php:190 +#: actions/apigroupcreate.php:216 actions/editapplication.php:190 #: actions/newapplication.php:172 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "自我介紹過長(共140個字元)" -#: actions/apigroupcreate.php:226 actions/editgroup.php:208 +#: actions/apigroupcreate.php:227 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:234 msgid "Location is too long (max 255 chars)." msgstr "地點過長（共255個字）" -#: actions/apigroupcreate.php:245 actions/editgroup.php:219 +#: actions/apigroupcreate.php:246 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:266 +#: actions/apigroupcreate.php:267 #, fuzzy, php-format msgid "Invalid alias: \"%s\"." msgstr "個人首頁連結%s無效" -#: actions/apigroupcreate.php:275 actions/editgroup.php:232 +#: actions/apigroupcreate.php:276 actions/editgroup.php:232 #: actions/newgroup.php:172 #, fuzzy, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "此暱稱已有人使用。再試試看別的吧。" -#: actions/apigroupcreate.php:288 actions/editgroup.php:238 +#: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" -#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 -#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105 +#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92 +#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92 #, fuzzy msgid "Group not found." msgstr "目前無請求" -#: actions/apigroupjoin.php:110 actions/joingroup.php:100 +#: actions/apigroupjoin.php:111 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327 +#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:134 +#: actions/apigroupjoin.php:139 actions/joingroup.php:134 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "無法連結到伺服器:%s" -#: actions/apigroupleave.php:114 +#: actions/apigroupleave.php:115 #, fuzzy msgid "You are not a member of this group." msgstr "無法連結到伺服器:%s" -#: actions/apigroupleave.php:124 actions/leavegroup.php:129 +#: actions/apigroupleave.php:125 actions/leavegroup.php:129 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "無法從 %s 建立OpenID" #. TRANS: %s is a user name -#: actions/apigrouplist.php:97 +#: actions/apigrouplist.php:98 #, fuzzy, php-format msgid "%s's groups" msgstr "無此通知" #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s -#: actions/apigrouplist.php:107 +#: actions/apigrouplist.php:108 #, fuzzy, php-format msgid "%1$s groups %2$s is a member of." msgstr "無法連結到伺服器:%s" #. TRANS: Message is used as a title. %s is a site name. #. TRANS: Message is used as a page title. %s is a nick name. -#: actions/apigrouplistall.php:91 actions/usergroups.php:63 +#: actions/apigrouplistall.php:92 actions/usergroups.php:63 #, php-format msgid "%s groups" msgstr "" -#: actions/apigrouplistall.php:95 +#: actions/apigrouplistall.php:96 #, php-format msgid "groups on %s" msgstr "" @@ -522,7 +522,7 @@ msgstr "尺寸錯誤" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 -#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54 +#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55 #: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:227 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66 @@ -625,11 +625,11 @@ msgstr "" msgid "Allow or deny access to your account information." msgstr "" -#: actions/apistatusesdestroy.php:107 +#: actions/apistatusesdestroy.php:108 msgid "This method requires a POST or DELETE." msgstr "" -#: actions/apistatusesdestroy.php:130 +#: actions/apistatusesdestroy.php:131 msgid "You may not delete another user's status." msgstr "" @@ -648,27 +648,27 @@ msgstr "儲存使用者發生錯誤" msgid "Already repeated that notice." msgstr "無此使用者" -#: actions/apistatusesshow.php:138 +#: actions/apistatusesshow.php:139 #, fuzzy msgid "Status deleted." msgstr "更新個人圖像" -#: actions/apistatusesshow.php:144 +#: actions/apistatusesshow.php:145 msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:240 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:241 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:281 actions/apiusershow.php:96 +#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96 #, fuzzy msgid "Not found." msgstr "目前無請求" -#: actions/apistatusesupdate.php:304 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:305 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -677,32 +677,32 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:109 +#: actions/apitimelinefavorites.php:110 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s的狀態是%2$s" -#: actions/apitimelinefavorites.php:118 +#: actions/apitimelinefavorites.php:119 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "&s的微型部落格" -#: actions/apitimelinementions.php:117 +#: actions/apitimelinementions.php:118 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s的狀態是%2$s" -#: actions/apitimelinementions.php:130 +#: actions/apitimelinementions.php:131 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:196 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:197 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:201 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:202 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -717,12 +717,12 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tag.php:67 +#: actions/apitimelinetag.php:105 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:106 actions/tagrss.php:65 +#: actions/apitimelinetag.php:107 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "&s的微型部落格" @@ -1889,7 +1889,7 @@ msgstr "" #. TRANS: Title in atom group notice feed. %s is a group name. #. TRANS: Title in atom user notice feed. %s is a user name. #: actions/grouprss.php:139 actions/userrss.php:94 -#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68 +#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69 #, php-format msgid "%s timeline" msgstr "" @@ -2514,31 +2514,31 @@ msgstr "" msgid "Developers can edit the registration settings for their applications " msgstr "" -#: actions/oembed.php:79 actions/shownotice.php:100 +#: actions/oembed.php:80 actions/shownotice.php:100 #, fuzzy msgid "Notice has no profile." msgstr "無此通知" -#: actions/oembed.php:86 actions/shownotice.php:175 +#: actions/oembed.php:87 actions/shownotice.php:175 #, php-format msgid "%1$s's status on %2$s" msgstr "%1$s的狀態是%2$s" #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png') -#: actions/oembed.php:158 +#: actions/oembed.php:159 #, fuzzy, php-format msgid "Content type %s not supported." msgstr "連結" #. TRANS: Error message displaying attachments. %s is the site's base URL. -#: actions/oembed.php:162 +#: actions/oembed.php:163 #, php-format msgid "Only %s URLs over plain HTTP please." msgstr "" #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1156 -#: lib/apiaction.php:1185 lib/apiaction.php:1302 +#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157 +#: lib/apiaction.php:1186 lib/apiaction.php:1303 msgid "Not a supported data format." msgstr "" @@ -3486,7 +3486,7 @@ msgstr "無法連結到伺服器:%s" msgid "User doesn't have this role." msgstr "" -#: actions/rsd.php:146 actions/version.php:157 +#: actions/rsd.php:146 actions/version.php:159 #, fuzzy msgid "StatusNet" msgstr "更新個人圖像" @@ -3546,7 +3546,7 @@ msgid "Icon" msgstr "" #. TRANS: Form input field label for application name. -#: actions/showapplication.php:169 actions/version.php:195 +#: actions/showapplication.php:169 actions/version.php:197 #: lib/applicationeditform.php:199 #, fuzzy msgid "Name" @@ -3559,7 +3559,7 @@ msgid "Organization" msgstr "地點" #. TRANS: Form input field label. -#: actions/showapplication.php:187 actions/version.php:198 +#: actions/showapplication.php:187 actions/version.php:200 #: lib/applicationeditform.php:216 lib/groupeditform.php:172 #, fuzzy msgid "Description" @@ -4505,7 +4505,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:196 actions/version.php:165 +#: actions/userauthorization.php:196 actions/version.php:167 msgid "License" msgstr "" @@ -4627,29 +4627,29 @@ msgstr "" #. TRANS: %1$s is a group name, %2$s is a site name. #. TRANS: Message is used as a subtitle in atom user notice feed. #. TRANS: %1$s is a user name, %2$s is a site name. -#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69 -#: lib/atomusernoticefeed.php:75 +#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70 +#: lib/atomusernoticefeed.php:76 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/version.php:73 +#: actions/version.php:75 #, php-format msgid "StatusNet %s" msgstr "" -#: actions/version.php:153 +#: actions/version.php:155 #, php-format msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" -#: actions/version.php:161 +#: actions/version.php:163 msgid "Contributors" msgstr "" -#: actions/version.php:168 +#: actions/version.php:170 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -4657,7 +4657,7 @@ msgid "" "any later version. " msgstr "" -#: actions/version.php:174 +#: actions/version.php:176 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -4665,40 +4665,40 @@ msgid "" "for more details. " msgstr "" -#: actions/version.php:180 +#: actions/version.php:182 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" -#: actions/version.php:189 +#: actions/version.php:191 msgid "Plugins" msgstr "" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. -#: actions/version.php:196 lib/action.php:779 +#: actions/version.php:198 lib/action.php:779 #, fuzzy msgid "Version" msgstr "地點" -#: actions/version.php:197 +#: actions/version.php:199 msgid "Author(s)" msgstr "" -#: classes/File.php:169 +#: classes/File.php:185 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:179 +#: classes/File.php:195 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:186 +#: classes/File.php:202 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4741,48 +4741,48 @@ msgid "Could not update message with new URI." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:176 +#: classes/Notice.php:182 #, fuzzy, php-format msgid "Database error inserting hashtag: %s" msgstr "增加回覆時,資料庫發生錯誤: %s" -#: classes/Notice.php:245 +#: classes/Notice.php:251 #, fuzzy msgid "Problem saving notice. Too long." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:249 +#: classes/Notice.php:255 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:254 +#: classes/Notice.php:260 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:260 +#: classes/Notice.php:266 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:266 +#: classes/Notice.php:272 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:332 classes/Notice.php:358 +#: classes/Notice.php:338 classes/Notice.php:364 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:967 +#: classes/Notice.php:973 #, fuzzy msgid "Problem saving group inbox." msgstr "儲存使用者發生錯誤" #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. -#: classes/Notice.php:1552 +#: classes/Notice.php:1562 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5270,7 +5270,7 @@ msgid "Snapshots configuration" msgstr "確認信箱" #. TRANS: Client error 401. -#: lib/apiauth.php:112 +#: lib/apiauth.php:113 msgid "API resource requires read-write access, but you only have read access." msgstr "" @@ -5401,11 +5401,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 +#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226 msgid "Password changing failed" msgstr "" -#: lib/authenticationplugin.php:235 +#: lib/authenticationplugin.php:236 msgid "Password changing is not allowed" msgstr "" From 791b98046d2c81aecfa468c06d4b7fd1f06ea8fa Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 3 Jun 2010 16:09:47 -0700 Subject: [PATCH 224/730] Stomp blocking writes fix --- lib/liberalstomp.php | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/lib/liberalstomp.php b/lib/liberalstomp.php index 3d38953fd2..70c22c17e6 100644 --- a/lib/liberalstomp.php +++ b/lib/liberalstomp.php @@ -147,5 +147,30 @@ class LiberalStomp extends Stomp } return $frame; } -} + + /** + * Write frame to server + * + * @param StompFrame $stompFrame + */ + protected function _writeFrame (StompFrame $stompFrame) + { + if (!is_resource($this->_socket)) { + require_once 'Stomp/Exception.php'; + throw new StompException('Socket connection hasn\'t been established'); + } + + $data = $stompFrame->__toString(); + + // Make sure the socket's in a writable state; if not, wait a bit. + stream_set_blocking($this->_socket, 1); + + $r = fwrite($this->_socket, $data, strlen($data)); + stream_set_blocking($this->_socket, 0); + if ($r === false || $r == 0) { + $this->_reconnect(); + $this->_writeFrame($stompFrame); + } + } + } From 5f4c6ec626d3d641f0712b276deb32b218b7a330 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 3 Jun 2010 16:58:45 -0700 Subject: [PATCH 225/730] Skip enqueueing to outgoing bridges on incoming remote messages. Twitter, Facebook, RSSCloud, and OStatus checks were enqueued on these when they'd never do anything but churn the queue servers. Notice::isLocal() can replace a number of manual checks for $notice->is_local being LOCAL_PUBLIC or LOCAL_NONPUBLIC. --- classes/Notice.php | 12 ++++++++++++ lib/util.php | 5 ++--- plugins/Facebook/FacebookPlugin.php | 2 +- plugins/OStatus/OStatusPlugin.php | 6 ++++-- plugins/RSSCloud/RSSCloudPlugin.php | 18 +++--------------- plugins/TwitterBridge/TwitterBridgePlugin.php | 2 +- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 3d7d21533b..cda6328853 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1861,4 +1861,16 @@ class Notice extends Memcached_DataObject return $ns; } + /** + * Determine whether the notice was locally created + * + * @return boolean locality + */ + + public function isLocal() + { + return ($this->is_local == Notice::LOCAL_PUBLIC || + $this->is_local == Notice::LOCAL_NONPUBLIC); + } + } diff --git a/lib/util.php b/lib/util.php index 59d5132ec6..049001abaf 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1235,9 +1235,8 @@ function common_enqueue_notice($notice) $transports[] = 'jabber'; } - // @fixme move these checks into QueueManager and/or individual handlers - if ($notice->is_local == Notice::LOCAL_PUBLIC || - $notice->is_local == Notice::LOCAL_NONPUBLIC) { + // We can skip these for gatewayed notices. + if ($notice->isLocal()) { $transports = array_merge($transports, $localTransports); if ($xmpp) { $transports[] = 'public'; diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index 5dba73a5d8..19989a952e 100644 --- a/plugins/Facebook/FacebookPlugin.php +++ b/plugins/Facebook/FacebookPlugin.php @@ -585,7 +585,7 @@ class FacebookPlugin extends Plugin function onStartEnqueueNotice($notice, &$transports) { - if (self::hasKeys()) { + if (self::hasKeys() && $notice->isLocal()) { array_push($transports, 'facebook'); } return true; diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 5b153216ef..5a657c83d0 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -102,8 +102,10 @@ class OStatusPlugin extends Plugin */ function onStartEnqueueNotice($notice, &$transports) { - // put our transport first, in case there's any conflict (like OMB) - array_unshift($transports, 'ostatus'); + if ($notice->isLocal()) { + // put our transport first, in case there's any conflict (like OMB) + array_unshift($transports, 'ostatus'); + } return true; } diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php index 661c32141f..c1951cdbf8 100644 --- a/plugins/RSSCloud/RSSCloudPlugin.php +++ b/plugins/RSSCloud/RSSCloudPlugin.php @@ -192,24 +192,12 @@ class RSSCloudPlugin extends Plugin function onStartEnqueueNotice($notice, &$transports) { - array_push($transports, 'rsscloud'); + if ($notice->isLocal()) { + array_push($transports, 'rsscloud'); + } return true; } - /** - * Determine whether the notice was locally created - * - * @param Notice $notice the notice in question - * - * @return boolean locality - */ - - function _isLocal($notice) - { - return ($notice->is_local == Notice::LOCAL_PUBLIC || - $notice->is_local == Notice::LOCAL_NONPUBLIC); - } - /** * Create the rsscloud_subscription table if it's not * already in the DB diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index 1a0a69682a..65b3a6b38e 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -221,7 +221,7 @@ class TwitterBridgePlugin extends Plugin */ function onStartEnqueueNotice($notice, &$transports) { - if (self::hasKeys()) { + if (self::hasKeys() && $notice->isLocal()) { // Avoid a possible loop if ($notice->source != 'twitter') { array_push($transports, 'twitter'); From a75095fa1a3926d1fcc18c3d7285141fa3bef344 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 3 Jun 2010 17:41:26 -0700 Subject: [PATCH 226/730] Meteor realtime plugin: use persistent connections by default when pushing updates from our queue threads --- plugins/Meteor/MeteorPlugin.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index 5600d5fcc0..ec8c9e217c 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -50,6 +50,7 @@ class MeteorPlugin extends RealtimePlugin public $controlport = null; public $controlserver = null; public $channelbase = null; + public $persistent = true; protected $_socket = null; function __construct($webserver=null, $webport=4670, $controlport=4671, $controlserver=null, $channelbase='') @@ -102,8 +103,14 @@ class MeteorPlugin extends RealtimePlugin function _connect() { $controlserver = (empty($this->controlserver)) ? $this->webserver : $this->controlserver; + + $errno = $errstr = null; + $timeout = 5; + $flags = STREAM_CLIENT_CONNECT; + if ($this->persistent) $flags |= STREAM_CLIENT_PERSISTENT; + // May throw an exception. - $this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}"); + $this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}", $errno, $errstr, $timeout, $flags); if (!$this->_socket) { throw new Exception("Couldn't connect to {$controlserver} on {$this->controlport}"); } @@ -124,8 +131,10 @@ class MeteorPlugin extends RealtimePlugin function _disconnect() { - $cnt = fwrite($this->_socket, "QUIT\n"); - @fclose($this->_socket); + if (!$this->persistent) { + $cnt = fwrite($this->_socket, "QUIT\n"); + @fclose($this->_socket); + } } // Meteord flips out with default '/' separator From 8b9436e8ae1ebcc7ef10752bb9666939200e26aa Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 3 Jun 2010 17:49:20 -0700 Subject: [PATCH 227/730] Option to divert PuSH items directly to the target site's queue when local --- classes/Status_network.php | 29 +++++++++++++++++++--------- lib/stompqueuemanager.php | 9 +++++---- plugins/OStatus/classes/HubSub.php | 31 ++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/classes/Status_network.php b/classes/Status_network.php index a452c32ce0..4a1f2c3747 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -149,21 +149,15 @@ class Status_network extends Safe_DataObject $this->decache(); # while we still have the values! return parent::delete(); } - + /** * @param string $servername hostname - * @param string $pathname URL base path * @param string $wildcard hostname suffix to match wildcard config + * @return mixed Status_network or null */ - static function setupSite($servername, $pathname, $wildcard) + static function getFromHostname($servername, $wildcard) { - global $config; - $sn = null; - - // XXX I18N, probably not crucial for hostnames - // XXX This probably needs a tune up - if (0 == strncasecmp(strrev($wildcard), strrev($servername), strlen($wildcard))) { // special case for exact match if (0 == strcasecmp($servername, $wildcard)) { @@ -182,6 +176,23 @@ class Status_network extends Safe_DataObject } } } + return $sn; + } + + /** + * @param string $servername hostname + * @param string $pathname URL base path + * @param string $wildcard hostname suffix to match wildcard config + */ + static function setupSite($servername, $pathname, $wildcard) + { + global $config; + + $sn = null; + + // XXX I18N, probably not crucial for hostnames + // XXX This probably needs a tune up + $sn = self::getFromHostname($servername, $wildcard); if (!empty($sn)) { diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php index de4ba7f01f..91faa8c367 100644 --- a/lib/stompqueuemanager.php +++ b/lib/stompqueuemanager.php @@ -115,11 +115,12 @@ class StompQueueManager extends QueueManager * * @param mixed $object * @param string $queue + * @param string $siteNickname optional override to drop into another site's queue * * @return boolean true on success * @throws StompException on connection or send error */ - public function enqueue($object, $queue) + public function enqueue($object, $queue, $siteNickname=null) { $this->_connect(); if (common_config('queue', 'stomp_enqueue_on')) { @@ -134,7 +135,7 @@ class StompQueueManager extends QueueManager } else { $idx = $this->defaultIdx; } - return $this->_doEnqueue($object, $queue, $idx); + return $this->_doEnqueue($object, $queue, $idx, $siteNickname); } /** @@ -144,10 +145,10 @@ class StompQueueManager extends QueueManager * @return boolean true on success * @throws StompException on connection or send error */ - protected function _doEnqueue($object, $queue, $idx) + protected function _doEnqueue($object, $queue, $idx, $siteNickname=null) { $rep = $this->logrep($object); - $envelope = array('site' => common_config('site', 'nickname'), + $envelope = array('site' => $siteNickname ? $siteNickname : common_config('site', 'nickname'), 'handler' => $queue, 'payload' => $this->encode($object)); $msg = serialize($envelope); diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php index cdace3c1fc..9748b4a569 100644 --- a/plugins/OStatus/classes/HubSub.php +++ b/plugins/OStatus/classes/HubSub.php @@ -260,6 +260,37 @@ class HubSub extends Memcached_DataObject $retries = intval(common_config('ostatus', 'hub_retries')); } + if (common_config('ostatus', 'local_push_bypass')) { + // If target is a local site, bypass the web server and drop the + // item directly into the target's input queue. + $url = parse_url($this->callback); + $wildcard = common_config('ostatus', 'local_wildcard'); + $site = Status_network::getFromHostname($url['host'], $wildcard); + + if ($site) { + if ($this->secret) { + $hmac = 'sha1=' . hash_hmac('sha1', $atom, $this->secret); + } else { + $hmac = ''; + } + + // Hack: at the moment we stick the subscription ID in the callback + // URL so we don't have to look inside the Atom to route the subscription. + // For now this means we need to extract that from the target URL + // so we can include it in the data. + $parts = explode('/', $url['path']); + $subId = intval(array_pop($parts)); + + $data = array('feedsub_id' => $subId, + 'post' => $atom, + 'hmac' => $hmac); + common_log(LOG_DEBUG, "Cross-site PuSH bypass enqueueing straight to $site->nickname feed $subId"); + $qm = QueueManager::get(); + $qm->enqueue($data, 'pushin', $site->nickname); + return; + } + } + // We dare not clone() as when the clone is discarded it'll // destroy the result data for the parent query. // @fixme use clone() again when it's safe to copy an From f1ea678aae968c63e9f32adfe1b6da386adb3304 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 4 Jun 2010 12:52:05 -0400 Subject: [PATCH 228/730] memcache_dataobject supports some DB_DataObject_Cast objects as values --- classes/Memcached_DataObject.php | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 0836c2019f..bd9b528dba 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -128,12 +128,31 @@ class Memcached_DataObject extends Safe_DataObject } static function cacheKey($cls, $k, $v) { - if (is_object($cls) || is_object($k) || is_object($v)) { + if (is_object($cls) || is_object($k) || (is_object($v) && !($v instanceof DB_DataObject_Cast))) { $e = new Exception(); common_log(LOG_ERR, __METHOD__ . ' object in param: ' . str_replace("\n", " ", $e->getTraceAsString())); } - return common_cache_key(strtolower($cls).':'.$k.':'.$v); + if (is_object($v) && $v instanceof DB_DataObject_Cast) { + switch ($v->type) { + case 'date': + $vstr = $v->year . '-' . $v->month . '-' . $v->day; + break; + case 'blob': + case 'string': + case 'sql': + case 'datetime': + case 'time': + throw new ServerException("Unhandled DB_DataObject_Cast type passed as cacheKey value: '$v->type'"); + break; + default: + throw new ServerException("Unknown DB_DataObject_Cast type passed as cacheKey value: '$v->type'"); + break; + } + } else { + $vstr = $v; + } + return common_cache_key(strtolower($cls).':'.$k.':'.$vstr); } static function getcached($cls, $k, $v) { @@ -351,7 +370,7 @@ class Memcached_DataObject extends Safe_DataObject * low-level database function and add a comment to the * query string. This should then be visible in process lists * and slow query logs, to help identify problem areas. - * + * * Also marks whether this was a web GET/POST or which daemon * was running it. * From 6d39a7513787c6747fc9ff50a33a733eb3148682 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 4 Jun 2010 15:29:38 -0400 Subject: [PATCH 229/730] use DB_DataObject_Cast objects in a couple of different places in the code --- classes/Memcached_DataObject.php | 49 ++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index bd9b528dba..4579f64df8 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -133,25 +133,7 @@ class Memcached_DataObject extends Safe_DataObject common_log(LOG_ERR, __METHOD__ . ' object in param: ' . str_replace("\n", " ", $e->getTraceAsString())); } - if (is_object($v) && $v instanceof DB_DataObject_Cast) { - switch ($v->type) { - case 'date': - $vstr = $v->year . '-' . $v->month . '-' . $v->day; - break; - case 'blob': - case 'string': - case 'sql': - case 'datetime': - case 'time': - throw new ServerException("Unhandled DB_DataObject_Cast type passed as cacheKey value: '$v->type'"); - break; - default: - throw new ServerException("Unknown DB_DataObject_Cast type passed as cacheKey value: '$v->type'"); - break; - } - } else { - $vstr = $v; - } + $vstr = self::valueString($v); return common_cache_key(strtolower($cls).':'.$k.':'.$vstr); } @@ -248,10 +230,10 @@ class Memcached_DataObject extends Safe_DataObject if (empty($this->$key)) { continue; } - $ckeys[] = $this->cacheKey($this->tableName(), $key, $this->$key); + $ckeys[] = $this->cacheKey($this->tableName(), $key, self::valueString($this->$key)); } else if ($type == 'K' || $type == 'N') { $pkey[] = $key; - $pval[] = $this->$key; + $pval[] = self::valueString($this->$key); } else { throw new Exception("Unknown key type $key => $type for " . $this->tableName()); } @@ -623,5 +605,30 @@ class Memcached_DataObject extends Safe_DataObject return $c->set($cacheKey, $value); } + + static function valueString($v) + { + $vstr = null; + if (is_object($v) && $v instanceof DB_DataObject_Cast) { + switch ($v->type) { + case 'date': + $vstr = $v->year . '-' . $v->month . '-' . $v->day; + break; + case 'blob': + case 'string': + case 'sql': + case 'datetime': + case 'time': + throw new ServerException("Unhandled DB_DataObject_Cast type passed as cacheKey value: '$v->type'"); + break; + default: + throw new ServerException("Unknown DB_DataObject_Cast type passed as cacheKey value: '$v->type'"); + break; + } + } else { + $vstr = strval($v); + } + return $vstr; + } } From 3a34d7e4ea5cf126aad41d9699186026b3587654 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 4 Jun 2010 15:47:26 -0400 Subject: [PATCH 230/730] Only show local public notices in sitemap Only show local public notices in sitemap. Only do counts for them in the sitemap index, and only show them in the notice sitemap. --- plugins/Sitemap/Sitemap_notice_count.php | 1 + plugins/Sitemap/noticesitemap.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Sitemap/Sitemap_notice_count.php b/plugins/Sitemap/Sitemap_notice_count.php index 673417b788..2a375b3e48 100644 --- a/plugins/Sitemap/Sitemap_notice_count.php +++ b/plugins/Sitemap/Sitemap_notice_count.php @@ -208,6 +208,7 @@ class Sitemap_notice_count extends Memcached_DataObject { $notice = new Notice(); $notice->whereAdd('created BETWEEN "'.$d.' 00:00:00" AND "'.self::incrementDay($d).' 00:00:00"'); + $notice->whereAdd('is_local = ' . Notice::LOCAL_PUBLIC); $n = $notice->count(); return $n; diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php index 9f323f72aa..7d9d2e5d68 100644 --- a/plugins/Sitemap/noticesitemap.php +++ b/plugins/Sitemap/noticesitemap.php @@ -105,7 +105,7 @@ class NoticesitemapAction extends SitemapAction $notice->whereAdd("created >= '$begindt'"); $notice->whereAdd("created < '$enddt'"); - $notice->whereAdd('is_local != 0'); + $notice->whereAdd('is_local = ' . Notice::LOCAL_PUBLIC); $notice->orderBy('created'); From 02c68ff5230e505dcfbb1dbd764415db8b8379ee Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 4 Jun 2010 13:16:47 -0700 Subject: [PATCH 231/730] Add gNewBook to notice sources --- db/notice_source.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/notice_source.sql b/db/notice_source.sql index 5d86646315..f5db37f04e 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -18,6 +18,7 @@ VALUES ('Facebook','Facebook','http://apps.facebook.com/identica/', now()), ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()), ('get2gnow', 'get2gnow', 'http://uberchicgeekchick.com/?projects=get2gnow', now()), + ('gNewBook', 'gNewBook', 'http://www.gnewbook.org/', now()), ('gravity', 'Gravity', 'http://mobileways.de/gravity', now()), ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()), ('HelloTxt','HelloTxt','http://hellotxt.com/', now()), From 41e9dba7297d43b7de0cb7665901869910d1047a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 4 Jun 2010 11:48:54 -0700 Subject: [PATCH 232/730] OStatus plugin: Rolling batch queueing for PuSH output to >50 subscribing sites. Keeps latency down for other things enqueued while we work... --- plugins/OStatus/OStatusPlugin.php | 2 ++ plugins/OStatus/classes/HubSub.php | 20 +++++++++++++ plugins/OStatus/lib/ostatusqueuehandler.php | 31 ++++++++++++++++++++- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 5a657c83d0..c61e2cc5f3 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -87,6 +87,8 @@ class OStatusPlugin extends Plugin // Outgoing from our internal PuSH hub $qm->connect('hubconf', 'HubConfQueueHandler'); + $qm->connect('hubprep', 'HubPrepQueueHandler'); + $qm->connect('hubout', 'HubOutQueueHandler'); // Outgoing Salmon replies (when we don't need a return value) diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php index 9748b4a569..7db528a4e8 100644 --- a/plugins/OStatus/classes/HubSub.php +++ b/plugins/OStatus/classes/HubSub.php @@ -304,6 +304,26 @@ class HubSub extends Memcached_DataObject $qm->enqueue($data, 'hubout'); } + /** + * Queue up a large batch of pushes to multiple subscribers + * for this same topic update. + * + * If queues are disabled, this will run immediately. + * + * @param string $atom well-formed Atom feed + * @param array $pushCallbacks list of callback URLs + */ + function bulkDistribute($atom, $pushCallbacks) + { + $data = array('atom' => $atom, + 'topic' => $this->topic, + 'pushCallbacks' => $pushCallbacks); + common_log(LOG_INFO, "Queuing PuSH batch: $this->topic to " . + count($pushCallbacks) . " sites"); + $qm = QueueManager::get(); + $qm->enqueue($data, 'hubprep'); + } + /** * Send a 'fat ping' to the subscriber's callback endpoint * containing the given Atom feed chunk. diff --git a/plugins/OStatus/lib/ostatusqueuehandler.php b/plugins/OStatus/lib/ostatusqueuehandler.php index d1e58f1d68..8905d2e210 100644 --- a/plugins/OStatus/lib/ostatusqueuehandler.php +++ b/plugins/OStatus/lib/ostatusqueuehandler.php @@ -25,6 +25,18 @@ */ class OStatusQueueHandler extends QueueHandler { + // If we have more than this many subscribing sites on a single feed, + // break up the PuSH distribution into smaller batches which will be + // rolled into the queue progressively. This reduces disruption to + // other, shorter activities being enqueued while we work. + const MAX_UNBATCHED = 50; + + // Each batch (a 'hubprep' entry) will have this many items. + // Selected to provide a balance between queue packet size + // and number of batches that will end up getting processed. + // For 20,000 target sites, 1000 should work acceptably. + const BATCH_SIZE = 1000; + function transport() { return 'ostatus'; @@ -147,14 +159,31 @@ class OStatusQueueHandler extends QueueHandler /** * Queue up direct feed update pushes to subscribers on our internal hub. + * If there are a large number of subscriber sites, intermediate bulk + * distribution triggers may be queued. + * * @param string $atom update feed, containing only new/changed items * @param HubSub $sub open query of subscribers */ function pushFeedInternal($atom, $sub) { common_log(LOG_INFO, "Preparing $sub->N PuSH distribution(s) for $sub->topic"); + $n = 0; + $batch = array(); while ($sub->fetch()) { - $sub->distribute($atom); + $n++; + if ($n < self::MAX_UNBATCHED) { + $sub->distribute($atom); + } else { + $batch[] = $sub->callback; + if (count($batch) >= self::BATCH_SIZE) { + $sub->bulkDistribute($atom, $batch); + $batch = array(); + } + } + } + if (count($batch) >= 0) { + $sub->bulkDistribute($atom, $batch); } } From 8e33cdd36a27178ea98e95fdb9d17391eaec5838 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 21 Apr 2010 16:53:10 +0200 Subject: [PATCH 233/730] break up the giant form function in design admin panel into individual sections to make it a little more manageable --- actions/designadminpanel.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php index 41d917e3ca..0925880193 100644 --- a/actions/designadminpanel.php +++ b/actions/designadminpanel.php @@ -370,7 +370,14 @@ class DesignAdminPanelForm extends AdminForm function formData() { + $this->showLogo(); + $this->showTheme(); + $this->showBackground(); + $this->showColors(); + } + function showLogo() + { $this->out->elementStart('fieldset', array('id' => 'settings_design_logo')); $this->out->element('legend', null, _('Change logo')); @@ -383,6 +390,11 @@ class DesignAdminPanelForm extends AdminForm $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); + + } + + function showTheme() + { $this->out->elementStart('fieldset', array('id' => 'settings_design_theme')); $this->out->element('legend', null, _('Change theme')); @@ -409,7 +421,10 @@ class DesignAdminPanelForm extends AdminForm $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); + } + function showBackground() + { $design = $this->out->design; $this->out->elementStart('fieldset', array('id' => @@ -483,13 +498,17 @@ class DesignAdminPanelForm extends AdminForm $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); + } + function showColors() + { $this->out->elementStart('fieldset', array('id' => 'settings_design_color')); $this->out->element('legend', null, _('Change colours')); $this->out->elementStart('ul', 'form_data'); try { + // @fixme avoid loop unrolling in non-performance-critical contexts like this $bgcolor = new WebColor($design->backgroundcolor); @@ -557,6 +576,7 @@ class DesignAdminPanelForm extends AdminForm $this->unli(); } catch (WebColorException $e) { + // @fixme normalize them individually! common_log(LOG_ERR, 'Bad color values in site design: ' . $e->getMessage()); } From 09208f8d654336d710069c1b4843de7e0d8c5d20 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 21 Apr 2010 17:16:42 +0200 Subject: [PATCH 234/730] Basic custom CSS and theme uploading features. 'local' subdir can now be customized to a distinct directory and URL path to make it easier to separate custom themes for a multi-site farm running a common code base. Currently only one custom theme may be uploaded per site, saved with the name 'custom' and stored into the local/themes subdirectory. Administrators can upload a .ZIP archive containing a theme through the design admin panel; its contents are validated to ensure that only legit files are saved, and a 5M size quota is enforced. Theme upload requires the zip extension for PHP; if not present, theme uploading is disabled by default. Uploading and the custom CSS can be controlled via $config['theme_upload']['enabled'] and $config['custom_css']['enabled']. Configurable directory/path/server for 'local' subdirectory (currently only as used for themes; local plugins not yet switched over) Can set $config['local']['dir'] etc; not currently exposed in the admin panels. Per-site directories on a separate themes server could be set up such as: $config['local']['dir'] = '/path/to/themes/local/' . $_nickname; $config['local']['server'] = 'themes.example.com'; $config['local']['path'] = '/local/' . $_nickname; $config['local']['ssl'] = 'never'; --- actions/designadminpanel.php | 84 +++++++++- lib/action.php | 10 ++ lib/adminpanelaction.php | 3 +- lib/default.php | 10 ++ lib/theme.php | 104 +++++++----- lib/themeuploader.php | 311 +++++++++++++++++++++++++++++++++++ 6 files changed, 480 insertions(+), 42 deletions(-) create mode 100644 lib/themeuploader.php diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php index 0925880193..a3f2dd055d 100644 --- a/actions/designadminpanel.php +++ b/actions/designadminpanel.php @@ -125,9 +125,19 @@ class DesignadminpanelAction extends AdminPanelAction return; } - // check for an image upload + // check for file uploads $bgimage = $this->saveBackgroundImage(); + $customTheme = $this->saveCustomTheme(); + + $oldtheme = common_config('site', 'theme'); + if ($customTheme) { + // This feels pretty hacky :D + $this->args['theme'] = $customTheme; + $themeChanged = true; + } else { + $themeChanged = ($this->trimmed('theme') != $oldtheme); + } static $settings = array('theme', 'logo'); @@ -139,15 +149,13 @@ class DesignadminpanelAction extends AdminPanelAction $this->validate($values); - $oldtheme = common_config('site', 'theme'); - $config = new Config(); $config->query('BEGIN'); // Only update colors if the theme has not changed. - if ($oldtheme == $values['theme']) { + if (!$themeChanged) { $bgcolor = new WebColor($this->trimmed('design_background')); $ccolor = new WebColor($this->trimmed('design_content')); @@ -189,6 +197,13 @@ class DesignadminpanelAction extends AdminPanelAction Config::save('design', 'backgroundimage', $bgimage); } + if (common_config('custom_css', 'enabled')) { + $css = $this->arg('css'); + if ($css != common_config('custom_css', 'css')) { + Config::save('custom_css', 'css', $css); + } + } + $config->query('COMMIT'); } @@ -262,6 +277,33 @@ class DesignadminpanelAction extends AdminPanelAction } } + /** + * Save the custom theme if the user uploaded one. + * + * @return mixed custom theme name, if succesful, or null if no theme upload. + * @throws ClientException for invalid theme archives + * @throws ServerException if trouble saving the theme files + */ + + function saveCustomTheme() + { + if (common_config('theme_upload', 'enabled') && + $_FILES['design_upload_theme']['error'] == UPLOAD_ERR_OK) { + + $upload = ThemeUploader::fromUpload('design_upload_theme'); + $basedir = common_config('local', 'dir'); + if (empty($basedir)) { + $basedir = INSTALLDIR . '/local'; + } + $name = 'custom'; // @todo allow multiples, custom naming? + $outdir = $basedir . '/theme/' . $name; + $upload->extract($outdir); + return $name; + } else { + return null; + } + } + /** * Attempt to validate setting values * @@ -374,6 +416,7 @@ class DesignAdminPanelForm extends AdminForm $this->showTheme(); $this->showBackground(); $this->showColors(); + $this->showAdvanced(); } function showLogo() @@ -418,6 +461,16 @@ class DesignAdminPanelForm extends AdminForm false, $this->value('theme')); $this->unli(); + if (common_config('theme_upload', 'enabled')) { + $this->li(); + $this->out->element('label', array('for' => 'design_upload_theme'), _('Custom theme')); + $this->out->element('input', array('id' => 'design_upload_theme', + 'name' => 'design_upload_theme', + 'type' => 'file')); + $this->out->element('p', 'form_guide', _('You can upload a custom StatusNet theme as a .ZIP archive.')); + $this->unli(); + } + $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); @@ -502,6 +555,8 @@ class DesignAdminPanelForm extends AdminForm function showColors() { + $design = $this->out->design; + $this->out->elementStart('fieldset', array('id' => 'settings_design_color')); $this->out->element('legend', null, _('Change colours')); @@ -586,6 +641,27 @@ class DesignAdminPanelForm extends AdminForm $this->out->elementEnd('ul'); } + function showAdvanced() + { + if (common_config('custom_css', 'enabled')) { + $this->out->elementStart('fieldset', array('id' => 'settings_design_advanced')); + $this->out->element('legend', null, _('Advanced')); + $this->out->elementStart('ul', 'form_data'); + + $this->li(); + $this->out->element('label', array('for' => 'css'), _('Custom CSS')); + $this->out->element('textarea', array('name' => 'css', + 'id' => 'css', + 'cols' => '50', + 'rows' => '10'), + strval(common_config('custom_css', 'css'))); + $this->unli(); + + $this->out->elementEnd('fieldset'); + $this->out->elementEnd('ul'); + } + } + /** * Action elements * diff --git a/lib/action.php b/lib/action.php index c4d9fd5cbf..22ea4f275d 100644 --- a/lib/action.php +++ b/lib/action.php @@ -233,6 +233,16 @@ class Action extends HTMLOutputter // lawsuit Event::handle('EndShowDesign', array($this)); } Event::handle('EndShowStyles', array($this)); + + if (common_config('custom_css', 'enabled')) { + $css = common_config('custom_css', 'css'); + if (Event::handle('StartShowCustomCss', array($this, &$css))) { + if (trim($css) != '') { + $this->style($css); + } + Event::handle('EndShowCustomCss', array($this)); + } + } } } diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index a927e23336..7d6a616eb0 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -283,9 +283,10 @@ class AdminPanelAction extends Action $this->clientError(_("Unable to delete design setting.")); return null; } + return $result; } - return $result; + return null; } function canAdmin($name) diff --git a/lib/default.php b/lib/default.php index 950c6018d8..dcf225d1fa 100644 --- a/lib/default.php +++ b/lib/default.php @@ -141,10 +141,17 @@ $default = 'dir' => null, 'path'=> null, 'ssl' => null), + 'theme_upload' => + array('enabled' => extension_loaded('zip')), 'javascript' => array('server' => null, 'path'=> null, 'ssl' => null), + 'local' => // To override path/server for themes in 'local' dir (not currently applied to local plugins) + array('server' => null, + 'dir' => null, + 'path' => null, + 'ssl' => null), 'throttle' => array('enabled' => false, // whether to throttle edits; false by default 'count' => 20, // number of allowed messages in timespan @@ -260,6 +267,9 @@ $default = 'linkcolor' => null, 'backgroundimage' => null, 'disposition' => null), + 'custom_css' => + array('enabled' => true, + 'css' => ''), 'notice' => array('contentlimit' => null), 'message' => diff --git a/lib/theme.php b/lib/theme.php index 0be8c3b9df..a9d0cbc84d 100644 --- a/lib/theme.php +++ b/lib/theme.php @@ -38,6 +38,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * Themes are directories with some expected sub-directories and files * in them. They're found in either local/theme (for locally-installed themes) * or theme/ subdir of installation dir. + * + * Note that the 'local' directory can be overridden as $config['local']['path'] + * and $config['local']['dir'] etc. * * This used to be a couple of functions, but for various reasons it's nice * to have a class instead. @@ -76,7 +79,7 @@ class Theme if (file_exists($fulldir) && is_dir($fulldir)) { $this->dir = $fulldir; - $this->path = common_path('local/theme/'.$name.'/'); + $this->path = $this->relativeThemePath('local', 'local', 'theme/' . $name); return; } @@ -89,44 +92,65 @@ class Theme if (file_exists($fulldir) && is_dir($fulldir)) { $this->dir = $fulldir; - - $path = common_config('theme', 'path'); - - if (empty($path)) { - $path = common_config('site', 'path') . '/theme/'; - } - - if ($path[strlen($path)-1] != '/') { - $path .= '/'; - } - - if ($path[0] != '/') { - $path = '/'.$path; - } - - $server = common_config('theme', 'server'); - - if (empty($server)) { - $server = common_config('site', 'server'); - } - - $ssl = common_config('theme', 'ssl'); - - if (is_null($ssl)) { // null -> guess - if (common_config('site', 'ssl') == 'always' && - !common_config('theme', 'server')) { - $ssl = true; - } else { - $ssl = false; - } - } - - $protocol = ($ssl) ? 'https' : 'http'; - - $this->path = $protocol . '://'.$server.$path.$name; + $this->path = $this->relativeThemePath('theme', 'theme', $name); } } + /** + * Build a full URL to the given theme's base directory, possibly + * using an offsite theme server path. + * + * @param string $group configuration section name to pull paths from + * @param string $fallbackSubdir default subdirectory under INSTALLDIR + * @param string $name theme name + * + * @return string URL + * + * @todo consolidate code with that for other customizable paths + */ + + protected function relativeThemePath($group, $fallbackSubdir, $name) + { + $path = common_config($group, 'path'); + + if (empty($path)) { + $path = common_config('site', 'path') . '/'; + if ($fallbackSubdir) { + $path .= $fallbackSubdir . '/'; + } + } + + if ($path[strlen($path)-1] != '/') { + $path .= '/'; + } + + if ($path[0] != '/') { + $path = '/'.$path; + } + + $server = common_config($group, 'server'); + + if (empty($server)) { + $server = common_config('site', 'server'); + } + + $ssl = common_config($group, 'ssl'); + + if (is_null($ssl)) { // null -> guess + if (common_config('site', 'ssl') == 'always' && + !common_config($group, 'server')) { + $ssl = true; + } else { + $ssl = false; + } + } + + $protocol = ($ssl) ? 'https' : 'http'; + + $path = $protocol . '://'.$server.$path.$name; + return $path; + } + /** * Gets the full local filename of a file in this theme. * @@ -236,7 +260,13 @@ class Theme protected static function localRoot() { - return INSTALLDIR.'/local/theme'; + $basedir = common_config('local', 'dir'); + + if (empty($basedir)) { + $basedir = INSTALLDIR . '/local'; + } + + return $basedir . '/theme'; } /** diff --git a/lib/themeuploader.php b/lib/themeuploader.php new file mode 100644 index 0000000000..18ef8c4d1a --- /dev/null +++ b/lib/themeuploader.php @@ -0,0 +1,311 @@ +. + * + * @category Paths + * @package StatusNet + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Encapsulation of the validation-and-save process when dealing with + * a user-uploaded StatusNet theme archive... + * + * @todo extract theme metadata from css/display.css + * @todo allow saving multiple themes + */ +class ThemeUploader +{ + protected $sourceFile; + protected $isUpload; + private $prevErrorReporting; + + public function __construct($filename) + { + if (!class_exists('ZipArchive')) { + throw new Exception(_("This server cannot handle theme uploads without ZIP support.")); + } + $this->sourceFile = $filename; + } + + public static function fromUpload($name) + { + if (!isset($_FILES[$name]['error'])) { + throw new ServerException(_("Theme upload missing or failed.")); + } + if ($_FILES[$name]['error'] != UPLOAD_ERR_OK) { + throw new ServerException(_("Theme upload missing or failed.")); + } + return new ThemeUploader($_FILES[$name]['tmp_name']); + } + + /** + * @param string $destDir + * @throws Exception on bogus files + */ + public function extract($destDir) + { + $zip = $this->openArchive(); + + // First pass: validate but don't save anything to disk. + // Any errors will trip an exception. + $this->traverseArchive($zip); + + // Second pass: now that we know we're good, actually extract! + $tmpDir = $destDir . '.tmp' . getmypid(); + $this->traverseArchive($zip, $tmpDir); + + $zip->close(); + + if (file_exists($destDir)) { + $killDir = $tmpDir . '.old'; + $this->quiet(); + $ok = rename($destDir, $killDir); + $this->loud(); + if (!$ok) { + common_log(LOG_ERR, "Could not move old custom theme from $destDir to $killDir"); + throw new ServerException(_("Failed saving theme.")); + } + } else { + $killDir = false; + } + + $this->quiet(); + $ok = rename($tmpDir, $destDir); + $this->loud(); + if (!$ok) { + common_log(LOG_ERR, "Could not move saved theme from $tmpDir to $destDir"); + throw new ServerException(_("Failed saving theme.")); + } + + if ($killDir) { + $this->recursiveRmdir($killDir); + } + } + + /** + * + */ + protected function traverseArchive($zip, $outdir=false) + { + $sizeLimit = 2 * 1024 * 1024; // 2 megabyte space limit? + $blockSize = 4096; // estimated; any entry probably takes this much space + + $totalSize = 0; + $hasMain = false; + $commonBaseDir = false; + + for ($i = 0; $i < $zip->numFiles; $i++) { + $data = $zip->statIndex($i); + $name = str_replace('\\', '/', $data['name']); + + if (substr($name, -1) == '/') { + // A raw directory... skip! + continue; + } + + // Check the directory structure... + $path = pathinfo($name); + $dirs = explode('/', $path['dirname']); + $baseDir = array_shift($dirs); + if ($commonBaseDir === false) { + $commonBaseDir = $baseDir; + } else { + if ($commonBaseDir != $baseDir) { + throw new ClientException(_("Invalid theme: bad directory structure.")); + } + } + + foreach ($dirs as $dir) { + $this->validateFileOrFolder($dir); + } + + // Is this a safe or skippable file? + if ($this->skippable($path['filename'], $path['extension'])) { + // Documentation and such... booooring + continue; + } else { + $this->validateFile($path['filename'], $path['extension']); + } + + $fullPath = $dirs; + $fullPath[] = $path['basename']; + $localFile = implode('/', $fullPath); + if ($localFile == 'css/display.css') { + $hasMain = true; + } + + $size = $data['size']; + $estSize = $blockSize * max(1, intval(ceil($size / $blockSize))); + $totalSize += $estSize; + if ($totalSize > $sizeLimit) { + $msg = sprintf(_("Uploaded theme is too large; " . + "must be less than %d bytes uncompressed."), + $sizeLimit); + throw new ClientException($msg); + } + + if ($outdir) { + $this->extractFile($zip, $data['name'], "$outdir/$localFile"); + } + } + + if (!$hasMain) { + throw new ClientException(_("Invalid theme archive: " . + "missing file css/display.css")); + } + } + + protected function skippable($filename, $ext) + { + $skip = array('txt', 'rtf', 'doc', 'docx', 'odt'); + if (strtolower($filename) == 'readme') { + return true; + } + if (in_array(strtolower($ext), $skip)) { + return true; + } + return false; + } + + protected function validateFile($filename, $ext) + { + $this->validateFileOrFolder($filename); + $this->validateExtension($ext); + // @fixme validate content + } + + protected function validateFileOrFolder($name) + { + if (!preg_match('/^[a-z0-9_-]+$/i', $name)) { + $msg = _("Theme contains invalid file or folder name. " . + "Stick with ASCII letters, digits, underscore, and minus sign."); + throw new ClientException($msg); + } + return true; + } + + protected function validateExtension($ext) + { + $allowed = array('css', 'png', 'gif', 'jpg', 'jpeg'); + if (!in_array(strtolower($ext), $allowed)) { + $msg = sprintf(_("Theme contains file of type '.%s', " . + "which is not allowed."), + $ext); + throw new ClientException($msg); + } + return true; + } + + /** + * @return ZipArchive + */ + protected function openArchive() + { + $zip = new ZipArchive; + $ok = $zip->open($this->sourceFile); + if ($ok !== true) { + common_log(LOG_ERR, "Error opening theme zip archive: " . + "{$this->sourceFile} code: {$ok}"); + throw new Exception(_("Error opening theme archive.")); + } + return $zip; + } + + /** + * @param ZipArchive $zip + * @param string $from original path inside ZIP archive + * @param string $to final destination path in filesystem + */ + protected function extractFile($zip, $from, $to) + { + $dir = dirname($to); + if (!file_exists($dir)) { + $this->quiet(); + $ok = mkdir($dir, 0755, true); + $this->loud(); + if (!$ok) { + common_log(LOG_ERR, "Failed to mkdir $dir while uploading theme"); + throw new ServerException(_("Failed saving theme.")); + } + } else if (!is_dir($dir)) { + common_log(LOG_ERR, "Output directory $dir not a directory while uploading theme"); + throw new ServerException(_("Failed saving theme.")); + } + + // ZipArchive::extractTo would be easier, but won't let us alter + // the directory structure. + $in = $zip->getStream($from); + if (!$in) { + common_log(LOG_ERR, "Couldn't open archived file $from while uploading theme"); + throw new ServerException(_("Failed saving theme.")); + } + $this->quiet(); + $out = fopen($to, "wb"); + $this->loud(); + if (!$out) { + common_log(LOG_ERR, "Couldn't open output file $to while uploading theme"); + throw new ServerException(_("Failed saving theme.")); + } + while (!feof($in)) { + $buffer = fread($in, 65536); + fwrite($out, $buffer); + } + fclose($in); + fclose($out); + } + + private function quiet() + { + $this->prevErrorReporting = error_reporting(); + error_reporting($this->prevErrorReporting & ~E_WARNING); + } + + private function loud() + { + error_reporting($this->prevErrorReporting); + } + + private function recursiveRmdir($dir) + { + $list = dir($dir); + while (($file = $list->read()) !== false) { + if ($file == '.' || $file == '..') { + continue; + } + $full = "$dir/$file"; + if (is_dir($full)) { + $this->recursiveRmdir($full); + } else { + unlink($full); + } + } + $list->close(); + rmdir($dir); + } + +} From 1cd029753f0ca2bded9ff64b4783084be9266666 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 8 Jun 2010 16:27:10 +1200 Subject: [PATCH 235/730] added 2 missing authors, foudn automatically in git logs --- index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.php b/index.php index d68a057c4b..bf6cf7c00c 100644 --- a/index.php +++ b/index.php @@ -19,16 +19,19 @@ * @category StatusNet * @package StatusNet * @author Brenda Wallace + * @author Brion Vibber * @author Christopher Vollick * @author CiaranG * @author Craig Andrews * @author Evan Prodromou * @author Gina Haeussge + * @author James Walker * @author Jeffery To * @author Mike Cochrane * @author Robin Millette * @author Sarven Capadisli * @author Tom Adams + * @author Zach Copley * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * * @license GNU Affero General Public License http://www.gnu.org/licenses/ From dc0f7189f28f3c3fa4baa021c321fc6386a3e2f3 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 8 Jun 2010 16:32:53 +1200 Subject: [PATCH 236/730] added missing authors --- actions/all.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/actions/all.php b/actions/all.php index a6738863b2..9c01b63938 100644 --- a/actions/all.php +++ b/actions/all.php @@ -18,15 +18,18 @@ * * @category Actions * @package Actions - * @author Evan Prodromou - * @author Mike Cochrane - * @author Robin Millette * @author Adrian Lang - * @author Meitar Moscovitz - * @author Sarven Capadisli + * @author Brenda Wallace + * @author Brion Vibber * @author Craig Andrews + * @author Evan Prodromou * @author Jeffery To - * @author Zach Copley + * @author Meitar Moscovitz + * @author Mike Cochrane + * @author Robin Millette + * @author Sarven Capadisli + * @author Siebrand Mazeland + * @author Zach Copley * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license GNU Affero General Public License http://www.gnu.org/licenses/ * @link http://status.net From 4617545ece5f1597a9477cbe99b071ba17e119f8 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 8 Jun 2010 16:34:16 +1200 Subject: [PATCH 237/730] added missing authors --- actions/apiaccountratelimitstatus.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php index f19e315bf8..e2dff2db94 100644 --- a/actions/apiaccountratelimitstatus.php +++ b/actions/apiaccountratelimitstatus.php @@ -21,8 +21,10 @@ * * @category API * @package StatusNet + * @author Brion Vibber * @author Evan Prodromou * @author Robin Millette + * @author Siebrand Mazeland * @author Zach Copley * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 From 5afd07e5e8167eb0941c3ba8eece51f2f4c5bb88 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 8 Jun 2010 16:46:32 +1200 Subject: [PATCH 238/730] added missing author --- actions/apiaccountupdatedeliverydevice.php | 1 + 1 file changed, 1 insertion(+) diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php index 05d19c22de..295378aa67 100644 --- a/actions/apiaccountupdatedeliverydevice.php +++ b/actions/apiaccountupdatedeliverydevice.php @@ -21,6 +21,7 @@ * * @category API * @package StatusNet + * @author Siebrand Mazeland * @author Zach Copley * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 From e121d472e7dbb914a85b10bde0a9e2add4d19d11 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 9 Jun 2010 16:30:50 +1200 Subject: [PATCH 239/730] Revert "added notice.location to group by" This reverts commit 48dc899acb9a0ac87140353092dab1f5e67753d8. --- lib/popularnoticesection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php index 3f02417901..f70a972efe 100644 --- a/lib/popularnoticesection.php +++ b/lib/popularnoticesection.php @@ -72,7 +72,7 @@ class PopularNoticeSection extends NoticeSection $qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' . 'notice.rendered,notice.url,notice.created,notice.modified,' . 'notice.reply_to,notice.is_local,notice.source,notice.conversation, ' . - 'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of,notice.location' . + 'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of' . ' ORDER BY weight DESC'; $offset = 0; From 1768bfa04b2c046fd21657d47782250872f5687b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 10 Jun 2010 10:30:07 -0700 Subject: [PATCH 240/730] Ticket #2349: fix for Geonames semantic reference URLs in FOAF output (corrects a typo in the patch added in 4463768b) --- plugins/GeonamesPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php index bc5899943b..3815a31fa6 100644 --- a/plugins/GeonamesPlugin.php +++ b/plugins/GeonamesPlugin.php @@ -376,7 +376,7 @@ class GeonamesPlugin extends Plugin return true; } - $url = 'http://sw.geonames.org/' . $location->location_id . '/'; + $url = 'http://sws.geonames.org/' . $location->location_id . '/'; // it's been filled, so don't process further. return false; From 352a3edfb3a5b1a843f0aa217174c5ba43159a87 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 10 Jun 2010 11:42:58 -0700 Subject: [PATCH 241/730] Ticket #2350: fix for incorrect FOAF sioc:follows entries for users who are followed by, but don't themselves follow the user whose FOAF we're displaying. --- actions/foaf.php | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/actions/foaf.php b/actions/foaf.php index 2f054de0c9..09af7b5026 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -154,7 +154,9 @@ class FoafAction extends Action } $person = $this->showMicrobloggingAccount($this->profile, - common_root_url(), $this->user->uri, false); + common_root_url(), $this->user->uri, + /*$fetchSubscriptions*/true, + /*$isSubscriber*/false); // Get people who subscribe to user @@ -209,7 +211,8 @@ class FoafAction extends Action $this->showMicrobloggingAccount($profile, ($local == 'local') ? common_root_url() : null, $uri, - true); + /*$fetchSubscriptions*/false, + /*$isSubscriber*/($type == LISTENER || $type == BOTH)); if ($foaf_url) { $this->element('rdfs:seeAlso', array('rdf:resource' => $foaf_url)); } @@ -234,7 +237,21 @@ class FoafAction extends Action $this->elementEnd('PersonalProfileDocument'); } - function showMicrobloggingAccount($profile, $service=null, $useruri=null, $isSubscriber=false) + /** + * Output FOAF bit for the given profile. + * + * @param Profile $profile + * @param mixed $service Root URL of this StatusNet instance for a local + * user, otherwise null. + * @param mixed $useruri URI string for the referenced profile.. + * @param boolean $fetchSubscriptions Should we load and list all their subscriptions? + * @param boolean $isSubscriber if not fetching subs, we can still mark the user as following the current page. + * + * @return array if $fetchSubscribers is set, return a list of info on those + * subscriptions. + */ + + function showMicrobloggingAccount($profile, $service=null, $useruri=null, $fetchSubscriptions=false, $isSubscriber=false) { $attr = array(); if ($useruri) { @@ -256,9 +273,7 @@ class FoafAction extends Action $person = array(); - if ($isSubscriber) { - $this->element('sioc:follows', array('rdf:resource'=>$this->user->uri . '#acct')); - } else { + if ($fetchSubscriptions) { // Get people user is subscribed to $sub = new Subscription(); $sub->subscriber = $profile->id; @@ -283,6 +298,9 @@ class FoafAction extends Action } unset($sub); + } else if ($isSubscriber) { + // Just declare that they follow the user whose FOAF we're showing. + $this->element('sioc:follows', array('rdf:resource' => $this->user->uri . '#acct')); } $this->elementEnd('OnlineAccount'); From 7cc58b97feb822ab999b7fefa3a50ce53a7838d5 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 10 Jun 2010 15:23:57 -0700 Subject: [PATCH 242/730] Fix for compile error (misnamed function) in 4211b7f01188b4ab64407e32b380366a048102f4 --- plugins/TwitterBridge/twitterbasicauthclient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php index cc68b50100..23828ed4a3 100644 --- a/plugins/TwitterBridge/twitterbasicauthclient.php +++ b/plugins/TwitterBridge/twitterbasicauthclient.php @@ -135,7 +135,7 @@ class TwitterBasicAuthClient * * @return mixed an array of statuses similar to friends timeline but including retweets */ - function statusesFriendsTimeline($since_id = null, $max_id = null, + function statusesHomeTimeline($since_id = null, $max_id = null, $cnt = null, $page = null) { $url = 'https://twitter.com/statuses/home_timeline.json'; From e81f17e911f59c5ba68fddefd318ea6caf25924c Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 11 Jun 2010 00:55:14 +0200 Subject: [PATCH 243/730] Localisation updates from http://translatewiki.net --- locale/de/LC_MESSAGES/statusnet.po | 47 ++++--- locale/fr/LC_MESSAGES/statusnet.po | 47 ++++--- locale/hsb/LC_MESSAGES/statusnet.po | 202 +++++++++++++++------------- locale/ia/LC_MESSAGES/statusnet.po | 47 ++++--- locale/pt/LC_MESSAGES/statusnet.po | 57 ++++---- locale/ru/LC_MESSAGES/statusnet.po | 47 ++++--- locale/statusnet.pot | 40 +++--- locale/uk/LC_MESSAGES/statusnet.po | 111 +++++++-------- 8 files changed, 315 insertions(+), 283 deletions(-) diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 9f66162dcd..f781e4ee58 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -16,12 +16,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-06-03 23:01:09+0000\n" +"POT-Creation-Date: 2010-06-10 22:48+0000\n" +"PO-Revision-Date: 2010-06-10 22:49:22+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67833); Translate extension (2010-06-10)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -92,13 +92,13 @@ msgid "Save" msgstr "Speichern" #. TRANS: Server error when page not found (404) -#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:68 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Seite nicht vorhanden" -#: actions/all.php:76 actions/allrss.php:68 -#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/all.php:79 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:114 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -122,7 +122,7 @@ msgid "No such user." msgstr "Unbekannter Benutzer." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:87 +#: actions/all.php:90 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s und Freunde, Seite% 2$d" @@ -130,7 +130,7 @@ msgstr "%1$s und Freunde, Seite% 2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116 #: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format @@ -138,25 +138,25 @@ msgid "%s and friends" msgstr "%s und Freunde" #. TRANS: %1$s is user nickname -#: actions/all.php:104 +#: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Feed der Freunde von %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:113 +#: actions/all.php:116 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Feed der Freunde von %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:122 +#: actions/all.php:125 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Feed der Freunde von %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:135 +#: actions/all.php:138 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -164,7 +164,7 @@ msgstr "" "Dies ist die Zeitleiste für %s und Freunde aber bisher hat niemand etwas " "gepostet." -#: actions/all.php:140 +#: actions/all.php:143 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -174,7 +174,7 @@ msgstr "" "poste selber etwas." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:143 +#: actions/all.php:146 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -184,7 +184,7 @@ msgstr "" "posten](%%%%action.newnotice%%%%?status_textarea=%s) um seine Aufmerksamkeit " "zu erregen." -#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -195,7 +195,7 @@ msgstr "" "erregen?" #. TRANS: H1 text -#: actions/all.php:179 +#: actions/all.php:182 msgid "You and friends" msgstr "Du und Freunde" @@ -207,8 +207,8 @@ msgstr "Du und Freunde" msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" -#: actions/apiaccountratelimitstatus.php:70 -#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountratelimitstatus.php:72 +#: actions/apiaccountupdatedeliverydevice.php:94 #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 @@ -232,7 +232,7 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" msgid "API method not found." msgstr "API-Methode nicht gefunden." -#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdatedeliverydevice.php:86 #: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 @@ -246,7 +246,7 @@ msgstr "API-Methode nicht gefunden." msgid "This method requires a POST." msgstr "Diese Methode benötigt ein POST." -#: actions/apiaccountupdatedeliverydevice.php:105 +#: actions/apiaccountupdatedeliverydevice.php:106 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." @@ -254,7 +254,7 @@ msgstr "" "Du musst einen Parameter mit Namen 'device' übergeben. Mögliche Werte sind: " "sms, im, none." -#: actions/apiaccountupdatedeliverydevice.php:132 +#: actions/apiaccountupdatedeliverydevice.php:133 msgid "Could not update user." msgstr "Konnte Benutzerdaten nicht aktualisieren." @@ -641,7 +641,7 @@ msgstr "Zugang zu deinem Konto erlauben oder ablehnen" msgid "This method requires a POST or DELETE." msgstr "Diese Methode benötigt ein POST oder DELETE." -#: actions/apistatusesdestroy.php:131 +#: actions/apistatusesdestroy.php:126 msgid "You may not delete another user's status." msgstr "Du kannst den Status eines anderen Benutzers nicht löschen." @@ -6161,6 +6161,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Wenn du dir sicher bist, das dieses Benutzerkonto missbräuchlich benutzt " +"wurde, kannst du das Benutzerkonto von deiner Liste der Abonnenten sperren " +"und es den Seitenadministratoren unter %s als Spam melden." #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index cc2f510ea3..7d83639902 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-06-03 23:01:38+0000\n" +"POT-Creation-Date: 2010-06-10 22:48+0000\n" +"PO-Revision-Date: 2010-06-10 22:49:53+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67833); Translate extension (2010-06-10)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -90,13 +90,13 @@ msgid "Save" msgstr "Enregistrer" #. TRANS: Server error when page not found (404) -#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:68 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Page non trouvée." -#: actions/all.php:76 actions/allrss.php:68 -#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/all.php:79 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:114 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -120,7 +120,7 @@ msgid "No such user." msgstr "Utilisateur non trouvé." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:87 +#: actions/all.php:90 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s et ses amis, page %2$d" @@ -128,7 +128,7 @@ msgstr "%1$s et ses amis, page %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116 #: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format @@ -136,25 +136,25 @@ msgid "%s and friends" msgstr "%s et ses amis" #. TRANS: %1$s is user nickname -#: actions/all.php:104 +#: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Flux pour les amis de %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:113 +#: actions/all.php:116 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Flux pour les amis de %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:122 +#: actions/all.php:125 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Flux pour les amis de %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:135 +#: actions/all.php:138 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -162,7 +162,7 @@ msgstr "" "Ceci est le flux pour %s et ses amis mais personne n’a rien posté pour le " "moment." -#: actions/all.php:140 +#: actions/all.php:143 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -172,7 +172,7 @@ msgstr "" "(%%action.groups%%) ou de poster quelque chose vous-même." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:143 +#: actions/all.php:146 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -182,7 +182,7 @@ msgstr "" "profil ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?" "status_textarea=%3$s)." -#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -192,7 +192,7 @@ msgstr "" "un clin d’œil à %s ou poster un avis à son intention." #. TRANS: H1 text -#: actions/all.php:179 +#: actions/all.php:182 msgid "You and friends" msgstr "Vous et vos amis" @@ -204,8 +204,8 @@ msgstr "Vous et vos amis" msgid "Updates from %1$s and friends on %2$s!" msgstr "Statuts de %1$s et ses amis dans %2$s!" -#: actions/apiaccountratelimitstatus.php:70 -#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountratelimitstatus.php:72 +#: actions/apiaccountupdatedeliverydevice.php:94 #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 @@ -229,7 +229,7 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!" msgid "API method not found." msgstr "Méthode API non trouvée !" -#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdatedeliverydevice.php:86 #: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 @@ -243,7 +243,7 @@ msgstr "Méthode API non trouvée !" msgid "This method requires a POST." msgstr "Ce processus requiert un POST." -#: actions/apiaccountupdatedeliverydevice.php:105 +#: actions/apiaccountupdatedeliverydevice.php:106 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." @@ -251,7 +251,7 @@ msgstr "" "Vous devez spécifier un paramètre « device » avec une des valeurs suivantes : " "sms, im, none." -#: actions/apiaccountupdatedeliverydevice.php:132 +#: actions/apiaccountupdatedeliverydevice.php:133 msgid "Could not update user." msgstr "Impossible de mettre à jour l’utilisateur." @@ -643,7 +643,7 @@ msgstr "Autoriser ou refuser l’accès à votre compte." msgid "This method requires a POST or DELETE." msgstr "Ce processus requiert un POST ou un DELETE." -#: actions/apistatusesdestroy.php:131 +#: actions/apistatusesdestroy.php:126 msgid "You may not delete another user's status." msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur." @@ -6188,6 +6188,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Si vous pensez que ce compte est utilisé à des fins abusives, vous pouvez le " +"bloquer de votre liste d'abonnés et le signaler comme spam aux " +"administrateurs du site, sur %s." #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index d487b60858..6ed35a7442 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-06-03 23:01:55+0000\n" +"POT-Creation-Date: 2010-06-10 22:48+0000\n" +"PO-Revision-Date: 2010-06-10 22:50:14+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67833); Translate extension (2010-06-10)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -40,7 +40,7 @@ msgstr "Registrowanje" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" +msgstr "Anonymnym wužiwarjam (njepřizjewjenym) wobhladowanje sydła zakazć?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 @@ -85,13 +85,13 @@ msgid "Save" msgstr "Składować" #. TRANS: Server error when page not found (404) -#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:68 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Strona njeeksistuje." -#: actions/all.php:76 actions/allrss.php:68 -#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/all.php:79 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:114 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -115,7 +115,7 @@ msgid "No such user." msgstr "Wužiwar njeeksistuje" #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:87 +#: actions/all.php:90 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s a přećeljo, strona %2$d" @@ -123,7 +123,7 @@ msgstr "%1$s a přećeljo, strona %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116 #: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format @@ -131,31 +131,31 @@ msgid "%s and friends" msgstr "%s a přećeljo" #. TRANS: %1$s is user nickname -#: actions/all.php:104 +#: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Kanal za přećelow wužiwarja %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:113 +#: actions/all.php:116 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Kanal za přećelow wužiwarja %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:122 +#: actions/all.php:125 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Kanal za přećelow wužiwarja %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:135 +#: actions/all.php:138 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:140 +#: actions/all.php:143 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -163,14 +163,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:143 +#: actions/all.php:146 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -178,7 +178,7 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:179 +#: actions/all.php:182 msgid "You and friends" msgstr "Ty a přećeljo" @@ -190,8 +190,8 @@ msgstr "Ty a přećeljo" msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualizacije wot %1$s a přećelow na %2$s!" -#: actions/apiaccountratelimitstatus.php:70 -#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountratelimitstatus.php:72 +#: actions/apiaccountupdatedeliverydevice.php:94 #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 @@ -215,7 +215,7 @@ msgstr "Aktualizacije wot %1$s a přećelow na %2$s!" msgid "API method not found." msgstr "API-metoda njenamakana." -#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdatedeliverydevice.php:86 #: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 @@ -229,13 +229,13 @@ msgstr "API-metoda njenamakana." msgid "This method requires a POST." msgstr "Tuta metoda wužaduje sej POST." -#: actions/apiaccountupdatedeliverydevice.php:105 +#: actions/apiaccountupdatedeliverydevice.php:106 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" -#: actions/apiaccountupdatedeliverydevice.php:132 +#: actions/apiaccountupdatedeliverydevice.php:133 msgid "Could not update user." msgstr "Wužiwar njeje so dał aktualizować." @@ -328,6 +328,8 @@ msgstr "Přijimowar njenamakany." #: actions/apidirectmessagenew.php:142 msgid "Can't send direct messages to users who aren't your friend." msgstr "" +"Njeje móžno, direktne powěsće wužiwarjam pósłać, kotřiž twoji přećeljo " +"njejsu." #: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110 #: actions/apistatusesdestroy.php:114 @@ -340,7 +342,7 @@ msgstr "Tutón status je hižo faworit." #: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285 msgid "Could not create favorite." -msgstr "" +msgstr "Faworit njeda so wutworić." #: actions/apifavoritedestroy.php:123 msgid "That status is not a favorite." @@ -348,7 +350,7 @@ msgstr "Tón status faworit njeje." #: actions/apifavoritedestroy.php:135 actions/disfavor.php:87 msgid "Could not delete favorite." -msgstr "" +msgstr "Faworit njeda so zhašeć." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." @@ -369,7 +371,7 @@ msgstr "Njemóžeš slědowanje swójskich aktiwitow blokować." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." -msgstr "" +msgstr "Dwaj wužiwarskej ID abo wužiwarskej mjenje dyrbitej so podać." #: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." @@ -556,7 +558,7 @@ msgstr "" #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 #: actions/smssettings.php:277 lib/designsettings.php:304 msgid "Unexpected form submission." -msgstr "" +msgstr "Njewočakowane wotpósłanje formulara." #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" @@ -609,7 +611,7 @@ msgstr "Přistup ke kontowym informacijam dowolić abo wotpokazać." msgid "This method requires a POST or DELETE." msgstr "Tuta metoda wužaduje sej POST abo DELETE." -#: actions/apistatusesdestroy.php:131 +#: actions/apistatusesdestroy.php:126 msgid "You may not delete another user's status." msgstr "Njemóžeš status druheho wužiwarja zničić." @@ -1510,7 +1512,7 @@ msgstr "Žana adresa za dochadźace e-mejle." #: actions/emailsettings.php:504 actions/emailsettings.php:528 #: actions/smssettings.php:578 actions/smssettings.php:602 msgid "Couldn't update user record." -msgstr "" +msgstr "Datowa sadźba wužiwarja njeda so aktualizować." #. TRANS: Message given after successfully removing an incoming e-mail address. #: actions/emailsettings.php:508 actions/smssettings.php:581 @@ -1585,7 +1587,7 @@ msgstr "" #: actions/featured.php:99 #, php-format msgid "A selection of some great users on %s" -msgstr "" +msgstr "Wuběr wulkotnych wužiwarjow na %s" #: actions/file.php:34 msgid "No notice ID." @@ -1649,7 +1651,7 @@ msgstr "Njepłaćiwa róla." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Tuta róla je wuměnjena a njeda so stajić." #: actions/grantrole.php:75 msgid "You cannot grant user roles on this site." @@ -1712,7 +1714,7 @@ msgstr "Tutoho wužiwarja za tutu skupinu blokować" #: actions/groupblock.php:206 msgid "Database error blocking user from group." -msgstr "" +msgstr "Zmylk datoweje banki blokuje wužiwarja za skupinu." #: actions/groupbyid.php:74 actions/userbyid.php:70 msgid "No ID." @@ -1763,7 +1765,7 @@ msgstr "Logo zaktualizowane." #: actions/grouplogo.php:401 msgid "Failed updating logo." -msgstr "" +msgstr "Aktualizowanje loga je so njeporadźiło." #: actions/groupmembers.php:100 lib/groupnav.php:92 #, php-format @@ -1860,6 +1862,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"Jeli njemóžeš skupinu namakać, kotruž pytaš, móžeš [ju wutworić] (%%action." +"newgroup%%)." #: actions/groupsearch.php:85 #, php-format @@ -2152,7 +2156,7 @@ msgstr "" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." -msgstr "" +msgstr "Dyrbiš přizjewjeny być, zo by do skupiny zastupił." #: actions/joingroup.php:88 actions/leavegroup.php:88 msgid "No nickname or ID." @@ -2217,6 +2221,8 @@ msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" +"Prošu zapodaj z přičinow wěstoty swoje wužiwarske mjeno znowa, prjedy hač " +"změniš swoje nastajenja." #: actions/login.php:292 msgid "Login with your username and password." @@ -2227,6 +2233,7 @@ msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom." msgid "" "Don't have a username yet? [Register](%%action.register%%) a new account." msgstr "" +"Hišće nimaš wužiwarske mjeno? [Zregistruj (%%action.register%%) nowe konto." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2819,7 +2826,7 @@ msgstr "Městno" #: actions/profilesettings.php:134 actions/register.php:480 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "" +msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\"" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" @@ -2899,7 +2906,7 @@ msgstr "Nastajenja składowane." #: actions/public.php:83 #, php-format msgid "Beyond the page limit (%s)." -msgstr "" +msgstr "Limit stronow (%s) překročeny." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3644,12 +3651,12 @@ msgstr "" #: actions/showmessage.php:108 #, php-format msgid "Message to %1$s on %2$s" -msgstr "" +msgstr "Powěsć do %1$s na %2$s" #: actions/showmessage.php:113 #, php-format msgid "Message from %1$s on %2$s" -msgstr "" +msgstr "Powěsć wot %1$s na %2$s" #: actions/shownotice.php:90 msgid "Notice deleted." @@ -3773,7 +3780,7 @@ msgstr "Sydłowe mjeno" #: actions/siteadminpanel.php:225 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "Mjeno twojeho sydła, kaž \"TwojePředewzaće Microblog\"" #: actions/siteadminpanel.php:229 msgid "Brought by" @@ -3805,7 +3812,7 @@ msgstr "Standardne časowe pasmo" #: actions/siteadminpanel.php:257 msgid "Default timezone for the site; usually UTC." -msgstr "" +msgstr "Standardne časowe pasmo za sydło; zwjetša UTC." #: actions/siteadminpanel.php:262 msgid "Default language" @@ -3968,7 +3975,7 @@ msgstr "" #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number. #: actions/smssettings.php:413 msgid "That is the wrong confirmation number." -msgstr "" +msgstr "To je wopačne wobkrućenske čisło." #. TRANS: Message given after successfully canceling SMS phone number confirmation. #: actions/smssettings.php:427 @@ -4074,7 +4081,7 @@ msgstr "Njejsy tón profil abonował." #: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." -msgstr "" +msgstr "Abonement njeda so składować." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." @@ -4287,7 +4294,7 @@ msgstr "" #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "" +msgstr "Njepłaćiwy standardny abonement: '%1$s' wužiwar njeje." #. TRANS: Link description in user account settings menu. #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 @@ -4369,7 +4376,7 @@ msgstr "Tutón abonement wotpokazać" #: actions/userauthorization.php:232 msgid "No authorization request!" -msgstr "" +msgstr "Žane awtorizaciske naprašowanje!" #: actions/userauthorization.php:254 msgid "Subscription authorized" @@ -4416,7 +4423,7 @@ msgstr "" #: actions/userauthorization.php:345 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "URL awatara '%s' njeje płaćiwy" #: actions/userauthorization.php:350 #, php-format @@ -4569,7 +4576,7 @@ msgstr "" #: classes/Message.php:61 msgid "Could not insert message." -msgstr "" +msgstr "Powěsć njeda so zasunyć." #: classes/Message.php:71 msgid "Could not update message with new URI." @@ -4650,11 +4657,11 @@ msgstr "Abonoment njeje so dał zničić." #: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "" +msgstr "Witaj do %1$s, @%2$s!" #: classes/User_group.php:480 msgid "Could not create group." -msgstr "" +msgstr "Skupina njeda so wutowrić." #: classes/User_group.php:489 msgid "Could not set group URI." @@ -4662,7 +4669,7 @@ msgstr "URI skupiny njeda so nastajić." #: classes/User_group.php:510 msgid "Could not set group membership." -msgstr "" +msgstr "Skupinske čłonstwo njeda so stajić." #: classes/User_group.php:524 msgid "Could not save local group info." @@ -4671,17 +4678,17 @@ msgstr "Informacije wo lokalnej skupinje njedachu so składować." #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:109 msgid "Change your profile settings" -msgstr "" +msgstr "Twoje profilowe nastajenja změnić" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:116 msgid "Upload an avatar" -msgstr "" +msgstr "Awatar nahrać" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:123 msgid "Change your password" -msgstr "" +msgstr "Twoje hesło změnić" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:130 @@ -4985,7 +4992,7 @@ msgstr "" #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." -msgstr "" +msgstr "Njemóžeš tute sydło změnić." #. TRANS: Client error message throw when a certain panel's settings cannot be changed. #: lib/adminpanelaction.php:110 @@ -4995,12 +5002,12 @@ msgstr "Změny na tutym woknje njejsu dowolene." #. TRANS: Client error message. #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." -msgstr "" +msgstr "showForm() njeimplementowany." #. TRANS: Client error message #: lib/adminpanelaction.php:259 msgid "saveSettings() not implemented." -msgstr "" +msgstr "saveSettings() njeimplementowany." #. TRANS: Client error message thrown if design settings could not be deleted in #. TRANS: the admin panel Design. @@ -5011,7 +5018,7 @@ msgstr "" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:349 msgid "Basic site configuration" -msgstr "" +msgstr "Zakładna sydłowa konfiguracija" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:351 @@ -5104,12 +5111,12 @@ msgstr "URL žórła" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:233 msgid "Organization responsible for this application" -msgstr "" +msgstr "Organizacija, kotraž je za tutu aplikaciju zamołwita" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:242 msgid "URL for the homepage of the organization" -msgstr "" +msgstr "URL za startowu stronu organizacije" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:251 @@ -5134,12 +5141,12 @@ msgstr "" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:320 msgid "Read-only" -msgstr "" +msgstr "Jenož čitajomny" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:339 msgid "Read-write" -msgstr "" +msgstr "Popisujomny" #. TRANS: Form guide. #: lib/applicationeditform.php:341 @@ -5154,12 +5161,12 @@ msgstr "Přetorhnyć" #. TRANS: Application access type #: lib/applicationlist.php:136 msgid "read-write" -msgstr "" +msgstr "popisujomny" #. TRANS: Application access type #: lib/applicationlist.php:138 msgid "read-only" -msgstr "" +msgstr "jenož čitajomny" #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only) #: lib/applicationlist.php:144 @@ -5229,18 +5236,18 @@ msgstr "Wužiwar nima poslednju powěsć" #: lib/command.php:127 #, php-format msgid "Could not find a user with nickname %s" -msgstr "" +msgstr "Wužiwar z přimjenom %s njeda so namakać" #. TRANS: Message given getting a non-existing user. #. TRANS: %s is the nickname of the user that could not be found. #: lib/command.php:147 #, php-format msgid "Could not find a local user with nickname %s" -msgstr "" +msgstr "Lokalny wužiwar z přimjenom %s njeda so namakać" #: lib/command.php:180 msgid "Sorry, this command is not yet implemented." -msgstr "" +msgstr "Tutón přikaz hišće njeje implementowany." #: lib/command.php:225 msgid "It does not make a lot of sense to nudge yourself!" @@ -5370,7 +5377,7 @@ msgstr "" #: lib/command.php:620 msgid "Specify the name of the user to subscribe to" -msgstr "" +msgstr "Podaj mjeno wužiwarja, kotrehož chceš abonować" #: lib/command.php:628 msgid "Can't subscribe to OMB profiles by command." @@ -5379,16 +5386,16 @@ msgstr "OMB-profile njedadźa so přez přikaz abonować." #: lib/command.php:634 #, php-format msgid "Subscribed to %s" -msgstr "" +msgstr "%s abonowany" #: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" -msgstr "" +msgstr "Podaj mjeno wužiwarja, kotrehož chceš wotskazać" #: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" -msgstr "" +msgstr "%s wotskazany" #: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." @@ -5412,7 +5419,7 @@ msgstr "" #: lib/command.php:723 msgid "Login command is disabled" -msgstr "" +msgstr "Přizjewjenski přikaz je znjemóžnjeny" #: lib/command.php:734 #, php-format @@ -5426,7 +5433,7 @@ msgstr "%s wotskazany" #: lib/command.php:778 msgid "You are not subscribed to anyone." -msgstr "" +msgstr "Njejsy nikoho abonował." #: lib/command.php:780 msgid "You are subscribed to this person:" @@ -5438,7 +5445,7 @@ msgstr[3] "Sy tute wosoby abonował:" #: lib/command.php:800 msgid "No one is subscribed to you." -msgstr "" +msgstr "Nichtó njeje će abonował." #: lib/command.php:802 msgid "This person is subscribed to you:" @@ -5508,15 +5515,15 @@ msgstr "Žana konfiguraciska dataja namakana. " #: lib/common.php:136 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "Sym na slědowacych městnach za konfiguraciskimi datajemi pytał: " #: lib/common.php:138 msgid "You may wish to run the installer to fix this." -msgstr "" +msgstr "Móže być, zo chceš instalaciski program startować, zo by to porjedźił." #: lib/common.php:139 msgid "Go to the installer." -msgstr "" +msgstr "K instalaciji" #: lib/connectsettingsaction.php:110 msgid "IM" @@ -5536,7 +5543,7 @@ msgstr "Zwiski" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "Awtorizowane zwjazane aplikacije" #: lib/dberroraction.php:60 msgid "Database error" @@ -5611,7 +5618,7 @@ msgstr "" #: lib/galleryaction.php:143 msgid "Go" -msgstr "" +msgstr "Start" #: lib/grantroleform.php:91 #, php-format @@ -5635,6 +5642,8 @@ msgstr "Skupinu abo temu w %d znamješkach wopisać" msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" msgstr "" +"Městno za skupinu, jeli eksistuje, na př. \"město, zwjazkowy kraj (abo " +"region), kraj\"" #: lib/groupeditform.php:187 #, php-format @@ -5657,7 +5666,7 @@ msgstr "" #: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" -msgstr "" +msgstr "Kajkosće skupiny %s wobdźěłać" #: lib/groupnav.php:113 msgid "Logo" @@ -5690,6 +5699,8 @@ msgstr "" #: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" +"Tuta strona we wot tebje akceptowanym medijowym typje k dispoziciji " +"njesteji." #: lib/imagefile.php:72 msgid "Unsupported image file format." @@ -5740,7 +5751,7 @@ msgstr "Njeznate žórło postoweho kašćika %d." #: lib/joinform.php:114 msgid "Join" -msgstr "" +msgstr "Zastupić" #: lib/leaveform.php:114 msgid "Leave" @@ -5934,6 +5945,9 @@ msgid "" "\n" "\t%s" msgstr "" +"Dospołnu rozmołwu móžes tu čitać:\n" +"\n" +"%s" #: lib/mail.php:657 #, php-format @@ -5970,7 +5984,7 @@ msgstr "" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." -msgstr "" +msgstr "Jenož wužiwar móže swoje póstowe kašćiki čitać." #: lib/mailbox.php:139 msgid "" @@ -5984,7 +5998,7 @@ msgstr "wot" #: lib/mailhandler.php:37 msgid "Could not parse message." -msgstr "" +msgstr "Powěsć njeda so analyzować." #: lib/mailhandler.php:42 msgid "Not a registered user." @@ -6006,6 +6020,8 @@ msgstr "Njepodpěrany powěsćowy typ: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" +"Při składowanju twojeje dataje je zmylk w datowej bance wustupił. Prošu " +"spytaj hišće raz." #: lib/mediafile.php:142 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -6027,11 +6043,11 @@ msgstr "Temporerny rjadowka faluje." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "Dataju njeda so na tačel pisać." #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "Datajowe nahraće přez rozšěrjenje zastajene." #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota." @@ -6039,16 +6055,16 @@ msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "Dataja njeda so do ciloweho zapisa přesunyć." #: lib/mediafile.php:201 lib/mediafile.php:237 msgid "Could not determine file's MIME type." -msgstr "" +msgstr "MIME-typ dataje njeda so zwěsćić." #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr "Spytaj druhi format %s." #: lib/mediafile.php:275 #, php-format @@ -6174,7 +6190,7 @@ msgstr "Zmylk při zasunjenju awatara" #: lib/oauthstore.php:306 msgid "Error updating remote profile" -msgstr "" +msgstr "Zmylk při aktualizowanju zdaleneho profila" #: lib/oauthstore.php:311 msgid "Error inserting remote profile" @@ -6186,7 +6202,7 @@ msgstr "Dwójna zdźělenka" #: lib/oauthstore.php:490 msgid "Couldn't insert new subscription." -msgstr "" +msgstr "Nowy abonement njeda so zasunyć." #: lib/personalgroupnav.php:99 msgid "Personal" @@ -6305,7 +6321,7 @@ msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać" #: lib/router.php:709 msgid "No single user defined for single-user mode." -msgstr "" +msgstr "Žadyn jednotliwy wužiwar za modus jednotliweho wužiwarja definowany." #: lib/sandboxform.php:67 msgid "Sandbox" @@ -6366,7 +6382,7 @@ msgstr "" #: lib/subgroupnav.php:83 #, php-format msgid "People %s subscribes to" -msgstr "" +msgstr "Ludźo, kotrychž %s abonuje" #: lib/subgroupnav.php:91 #, php-format @@ -6376,7 +6392,7 @@ msgstr "Ludźo, kotřiž su %s abonowali" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "" +msgstr "Skupiny, w kotrychž %s je čłon" #: lib/subgroupnav.php:105 msgid "Invite" @@ -6444,7 +6460,7 @@ msgstr "Wužiwarske akcije" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Wužiwar so haša..." #: lib/userprofile.php:263 msgid "Edit profile settings" @@ -6464,7 +6480,7 @@ msgstr "Powěsć" #: lib/userprofile.php:326 msgid "Moderate" -msgstr "" +msgstr "Moderěrować" #: lib/userprofile.php:364 msgid "User role" @@ -6478,7 +6494,7 @@ msgstr "Administrator" #: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "" +msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1100 diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 77b7e0dd40..6f52622719 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-06-03 23:01:59+0000\n" +"POT-Creation-Date: 2010-06-10 22:48+0000\n" +"PO-Revision-Date: 2010-06-10 22:50:20+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67833); Translate extension (2010-06-10)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -83,13 +83,13 @@ msgid "Save" msgstr "Salveguardar" #. TRANS: Server error when page not found (404) -#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:68 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Pagina non existe." -#: actions/all.php:76 actions/allrss.php:68 -#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/all.php:79 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:114 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -113,7 +113,7 @@ msgid "No such user." msgstr "Usator non existe." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:87 +#: actions/all.php:90 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s e amicos, pagina %2$d" @@ -121,7 +121,7 @@ msgstr "%1$s e amicos, pagina %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116 #: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format @@ -129,25 +129,25 @@ msgid "%s and friends" msgstr "%s e amicos" #. TRANS: %1$s is user nickname -#: actions/all.php:104 +#: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Syndication pro le amicos de %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:113 +#: actions/all.php:116 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Syndication pro le amicos de %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:122 +#: actions/all.php:125 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Syndication pro le amicos de %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:135 +#: actions/all.php:138 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -155,7 +155,7 @@ msgstr "" "Isto es le chronologia pro %s e su amicos, ma necuno ha ancora publicate " "alique." -#: actions/all.php:140 +#: actions/all.php:143 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -165,7 +165,7 @@ msgstr "" "action.groups%%) o publica alique tu mesme." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:143 +#: actions/all.php:146 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -174,7 +174,7 @@ msgstr "" "Tu pote tentar [dar un pulsata a %1$s](../%2$s) in su profilo o [publicar un " "message a su attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." -#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -184,7 +184,7 @@ msgstr "" "pulsata a %s o publicar un message a su attention." #. TRANS: H1 text -#: actions/all.php:179 +#: actions/all.php:182 msgid "You and friends" msgstr "Tu e amicos" @@ -196,8 +196,8 @@ msgstr "Tu e amicos" msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualisationes de %1$s e su amicos in %2$s!" -#: actions/apiaccountratelimitstatus.php:70 -#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountratelimitstatus.php:72 +#: actions/apiaccountupdatedeliverydevice.php:94 #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 @@ -221,7 +221,7 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!" msgid "API method not found." msgstr "Methodo API non trovate." -#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdatedeliverydevice.php:86 #: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 @@ -235,7 +235,7 @@ msgstr "Methodo API non trovate." msgid "This method requires a POST." msgstr "Iste methodo require un POST." -#: actions/apiaccountupdatedeliverydevice.php:105 +#: actions/apiaccountupdatedeliverydevice.php:106 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." @@ -243,7 +243,7 @@ msgstr "" "Tu debe specificar un parametro nominate 'device' con un del valores: sms, " "im, none." -#: actions/apiaccountupdatedeliverydevice.php:132 +#: actions/apiaccountupdatedeliverydevice.php:133 msgid "Could not update user." msgstr "Non poteva actualisar le usator." @@ -627,7 +627,7 @@ msgstr "Permitter o refusar accesso al informationes de tu conto." msgid "This method requires a POST or DELETE." msgstr "Iste methodo require un commando POST o DELETE." -#: actions/apistatusesdestroy.php:131 +#: actions/apistatusesdestroy.php:126 msgid "You may not delete another user's status." msgstr "Tu non pote deler le stato de un altere usator." @@ -6119,6 +6119,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Si tu crede que iste conto es usate abusivemente, tu pote blocar lo de tu " +"lista de subscriptores e reportar lo como spam al administratores del sito a " +"%s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 70e3788d8e..4ad9a911dd 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-06-03 23:02:37+0000\n" +"POT-Creation-Date: 2010-06-10 22:48+0000\n" +"PO-Revision-Date: 2010-06-10 22:51:15+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67833); Translate extension (2010-06-10)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -85,13 +85,13 @@ msgid "Save" msgstr "Gravar" #. TRANS: Server error when page not found (404) -#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:68 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Página não foi encontrada." -#: actions/all.php:76 actions/allrss.php:68 -#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/all.php:79 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:114 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -115,7 +115,7 @@ msgid "No such user." msgstr "Utilizador não foi encontrado." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:87 +#: actions/all.php:90 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s e amigos, página %2$d" @@ -123,7 +123,7 @@ msgstr "%1$s e amigos, página %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116 #: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format @@ -131,32 +131,32 @@ msgid "%s and friends" msgstr "%s e amigos" #. TRANS: %1$s is user nickname -#: actions/all.php:104 +#: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Fonte para os amigos de %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:113 +#: actions/all.php:116 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Fonte para os amigos de %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:122 +#: actions/all.php:125 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Fonte para os amigos de %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:135 +#: actions/all.php:138 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" "Estas são as notas de %s e dos amigos, mas ainda não publicaram nenhuma." -#: actions/all.php:140 +#: actions/all.php:143 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -166,7 +166,7 @@ msgstr "" "publicar qualquer coisa." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:143 +#: actions/all.php:146 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -175,7 +175,7 @@ msgstr "" "Pode tentar [dar um toque em %1$s](../%2$s) a partir do perfil ou [publicar " "qualquer coisa à sua atenção](%%%%action.newnotice%%%%?status_textarea=%3$s)." -#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -185,7 +185,7 @@ msgstr "" "publicar uma nota à sua atenção." #. TRANS: H1 text -#: actions/all.php:179 +#: actions/all.php:182 msgid "You and friends" msgstr "Você e seus amigos" @@ -197,8 +197,8 @@ msgstr "Você e seus amigos" msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizações de %1$s e amigos no %2$s!" -#: actions/apiaccountratelimitstatus.php:70 -#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountratelimitstatus.php:72 +#: actions/apiaccountupdatedeliverydevice.php:94 #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 @@ -222,7 +222,7 @@ msgstr "Actualizações de %1$s e amigos no %2$s!" msgid "API method not found." msgstr "Método da API não encontrado." -#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdatedeliverydevice.php:86 #: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 @@ -236,14 +236,14 @@ msgstr "Método da API não encontrado." msgid "This method requires a POST." msgstr "Este método requer um POST." -#: actions/apiaccountupdatedeliverydevice.php:105 +#: actions/apiaccountupdatedeliverydevice.php:106 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" "Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none." -#: actions/apiaccountupdatedeliverydevice.php:132 +#: actions/apiaccountupdatedeliverydevice.php:133 msgid "Could not update user." msgstr "Não foi possível actualizar o utilizador." @@ -624,7 +624,7 @@ msgstr "Permitir ou negar acesso à informação da sua conta." msgid "This method requires a POST or DELETE." msgstr "Este método requer um POST ou DELETE." -#: actions/apistatusesdestroy.php:131 +#: actions/apistatusesdestroy.php:126 msgid "You may not delete another user's status." msgstr "Não pode apagar o estado de outro utilizador." @@ -2952,11 +2952,11 @@ msgstr "" #: actions/profilesettings.php:151 msgid "Language" -msgstr "Idioma" +msgstr "Língua" #: actions/profilesettings.php:152 msgid "Preferred language" -msgstr "Idioma preferido" +msgstr "Língua preferida" #: actions/profilesettings.php:161 msgid "Timezone" @@ -2982,7 +2982,7 @@ msgstr "Fuso horário não foi seleccionado." #: actions/profilesettings.php:241 msgid "Language is too long (max 50 chars)." -msgstr "Idioma é demasiado extenso (máx. 50 caracteres)." +msgstr "Língua é demasiado extensa (máx. 50 caracteres)." #: actions/profilesettings.php:253 actions/tagother.php:178 #, php-format @@ -4013,12 +4013,12 @@ msgstr "Fuso horário por omissão, para o site; normalmente, UTC." #: actions/siteadminpanel.php:262 msgid "Default language" -msgstr "Idioma do site, por omissão" +msgstr "Língua, por omissão" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" -"Idioma do site quando a sua detecção na configuração do browser não é " +"Língua do site quando a sua detecção na configuração do browser não é " "possível" #: actions/siteadminpanel.php:271 @@ -6114,6 +6114,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Se acredita que esta conta está sendo usada abusivamente pode bloqueá-la da " +"sua lista de subscritores e reportá-la como spam aos administradores do site " +"em %s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 81cfe0aad1..df75bded20 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 11:36+0000\n" -"PO-Revision-Date: 2010-06-03 23:02:43+0000\n" +"POT-Creation-Date: 2010-06-10 22:48+0000\n" +"PO-Revision-Date: 2010-06-10 22:51:24+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67833); Translate extension (2010-06-10)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -89,13 +89,13 @@ msgid "Save" msgstr "Сохранить" #. TRANS: Server error when page not found (404) -#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:68 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Нет такой страницы." -#: actions/all.php:76 actions/allrss.php:68 -#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/all.php:79 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:114 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -119,7 +119,7 @@ msgid "No such user." msgstr "Нет такого пользователя." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:87 +#: actions/all.php:90 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s и друзья, страница %2$d" @@ -127,7 +127,7 @@ msgstr "%1$s и друзья, страница %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116 #: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format @@ -135,31 +135,31 @@ msgid "%s and friends" msgstr "%s и друзья" #. TRANS: %1$s is user nickname -#: actions/all.php:104 +#: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Лента друзей %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:113 +#: actions/all.php:116 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Лента друзей %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:122 +#: actions/all.php:125 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Лента друзей %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:135 +#: actions/all.php:138 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "Это лента %s и друзей, однако пока никто ничего не отправил." -#: actions/all.php:140 +#: actions/all.php:143 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -169,7 +169,7 @@ msgstr "" "action.groups%%) или отправьте что-нибудь сами." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:143 +#: actions/all.php:146 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -179,7 +179,7 @@ msgstr "" "что-нибудь для привлечения его или её внимания](%%%%action.newnotice%%%%?" "status_textarea=%3$s)." -#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -189,7 +189,7 @@ msgstr "" "s или отправить запись для привлечения его или её внимания?" #. TRANS: H1 text -#: actions/all.php:179 +#: actions/all.php:182 msgid "You and friends" msgstr "Вы и друзья" @@ -201,8 +201,8 @@ msgstr "Вы и друзья" msgid "Updates from %1$s and friends on %2$s!" msgstr "Обновлено от %1$s и его друзей на %2$s!" -#: actions/apiaccountratelimitstatus.php:70 -#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountratelimitstatus.php:72 +#: actions/apiaccountupdatedeliverydevice.php:94 #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 @@ -226,7 +226,7 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!" msgid "API method not found." msgstr "Метод API не найден." -#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdatedeliverydevice.php:86 #: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 @@ -240,7 +240,7 @@ msgstr "Метод API не найден." msgid "This method requires a POST." msgstr "Этот метод требует POST." -#: actions/apiaccountupdatedeliverydevice.php:105 +#: actions/apiaccountupdatedeliverydevice.php:106 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." @@ -248,7 +248,7 @@ msgstr "" "Вы должны указать параметр с именем «device» и одним из значений: sms, im, " "none." -#: actions/apiaccountupdatedeliverydevice.php:132 +#: actions/apiaccountupdatedeliverydevice.php:133 msgid "Could not update user." msgstr "Не удаётся обновить пользователя." @@ -636,7 +636,7 @@ msgstr "Разрешить или запретить доступ к инфор msgid "This method requires a POST or DELETE." msgstr "Этот метод требует POST или DELETE." -#: actions/apistatusesdestroy.php:131 +#: actions/apistatusesdestroy.php:126 msgid "You may not delete another user's status." msgstr "Вы не можете удалять статус других пользователей." @@ -6136,6 +6136,9 @@ msgid "" "If you believe this account is being used abusively, you can block them from " "your subscribers list and report as spam to site administrators at %s" msgstr "" +"Если вы считаете, эта учётная запись используется со злоупотреблениями, вы " +"можете заблокировать её включение в свой список подписчиков и сообщить о " +"спаме администраторам сайта по %s" #. TRANS: Main body of new-subscriber notification e-mail #: lib/mail.php:254 diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 789e4bc869..d2890fa826 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-03 23:00+0000\n" +"POT-Creation-Date: 2010-06-10 22:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,13 +81,13 @@ msgid "Save" msgstr "" #. TRANS: Server error when page not found (404) -#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:68 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "" -#: actions/all.php:76 actions/allrss.php:68 -#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/all.php:79 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:114 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -111,7 +111,7 @@ msgid "No such user." msgstr "" #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:87 +#: actions/all.php:90 #, php-format msgid "%1$s and friends, page %2$d" msgstr "" @@ -119,7 +119,7 @@ msgstr "" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116 #: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format @@ -127,31 +127,31 @@ msgid "%s and friends" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:104 +#: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:113 +#: actions/all.php:116 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:122 +#: actions/all.php:125 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "" #. TRANS: %1$s is user nickname -#: actions/all.php:135 +#: actions/all.php:138 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" -#: actions/all.php:140 +#: actions/all.php:143 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -159,14 +159,14 @@ msgid "" msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:143 +#: actions/all.php:146 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -174,7 +174,7 @@ msgid "" msgstr "" #. TRANS: H1 text -#: actions/all.php:179 +#: actions/all.php:182 msgid "You and friends" msgstr "" @@ -186,8 +186,8 @@ msgstr "" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 -#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountratelimitstatus.php:72 +#: actions/apiaccountupdatedeliverydevice.php:94 #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 @@ -211,7 +211,7 @@ msgstr "" msgid "API method not found." msgstr "" -#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdatedeliverydevice.php:86 #: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 @@ -225,13 +225,13 @@ msgstr "" msgid "This method requires a POST." msgstr "" -#: actions/apiaccountupdatedeliverydevice.php:105 +#: actions/apiaccountupdatedeliverydevice.php:106 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" -#: actions/apiaccountupdatedeliverydevice.php:132 +#: actions/apiaccountupdatedeliverydevice.php:133 msgid "Could not update user." msgstr "" @@ -605,7 +605,7 @@ msgstr "" msgid "This method requires a POST or DELETE." msgstr "" -#: actions/apistatusesdestroy.php:131 +#: actions/apistatusesdestroy.php:126 msgid "You may not delete another user's status." msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index dbf7fc836a..046366ae66 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-27 22:55+0000\n" -"PO-Revision-Date: 2010-06-03 23:02:57+0000\n" +"POT-Creation-Date: 2010-06-10 22:48+0000\n" +"PO-Revision-Date: 2010-06-10 22:51:44+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n" +"X-Generator: MediaWiki 1.17alpha (r67833); Translate extension (2010-06-10)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -89,13 +89,13 @@ msgid "Save" msgstr "Зберегти" #. TRANS: Server error when page not found (404) -#: actions/all.php:65 actions/public.php:98 actions/replies.php:93 +#: actions/all.php:68 actions/public.php:98 actions/replies.php:93 #: actions/showfavorites.php:138 actions/tag.php:52 msgid "No such page." msgstr "Немає такої сторінки." -#: actions/all.php:76 actions/allrss.php:68 -#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/all.php:79 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:114 #: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -119,7 +119,7 @@ msgid "No such user." msgstr "Такого користувача немає." #. TRANS: Page title. %1$s is user nickname, %2$d is page number -#: actions/all.php:87 +#: actions/all.php:90 #, php-format msgid "%1$s and friends, page %2$d" msgstr "%1$s та друзі, сторінка %2$d" @@ -127,7 +127,7 @@ msgstr "%1$s та друзі, сторінка %2$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname #. TRANS: Message is used as link title. %s is a user nickname. -#: actions/all.php:90 actions/all.php:182 actions/allrss.php:116 +#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116 #: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116 #: lib/personalgroupnav.php:100 #, php-format @@ -135,31 +135,31 @@ msgid "%s and friends" msgstr "%s з друзями" #. TRANS: %1$s is user nickname -#: actions/all.php:104 +#: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "Стрічка дописів для друзів %s (RSS 1.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:113 +#: actions/all.php:116 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "Стрічка дописів для друзів %s (RSS 2.0)" #. TRANS: %1$s is user nickname -#: actions/all.php:122 +#: actions/all.php:125 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "Стрічка дописів для друзів %s (Atom)" #. TRANS: %1$s is user nickname -#: actions/all.php:135 +#: actions/all.php:138 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "Це стрічка дописів %s і друзів, але вона поки що порожня." -#: actions/all.php:140 +#: actions/all.php:143 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -169,7 +169,7 @@ msgstr "" "або напишіть щось самі." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" -#: actions/all.php:143 +#: actions/all.php:146 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " @@ -178,7 +178,7 @@ msgstr "" "Ви можете [«розштовхати» %1$s](../%2$s) зі сторінки його профілю або [щось " "йому написати](%%%%action.newnotice%%%%?status_textarea=%3$s)." -#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211 +#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -188,7 +188,7 @@ msgstr "" "«розштовхати» %s або щось йому написати." #. TRANS: H1 text -#: actions/all.php:179 +#: actions/all.php:182 msgid "You and friends" msgstr "Ви з друзями" @@ -200,8 +200,8 @@ msgstr "Ви з друзями" msgid "Updates from %1$s and friends on %2$s!" msgstr "Оновлення від %1$s та друзів на %2$s!" -#: actions/apiaccountratelimitstatus.php:70 -#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountratelimitstatus.php:72 +#: actions/apiaccountupdatedeliverydevice.php:94 #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 @@ -225,7 +225,7 @@ msgstr "Оновлення від %1$s та друзів на %2$s!" msgid "API method not found." msgstr "API метод не знайдено." -#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdatedeliverydevice.php:86 #: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 @@ -239,14 +239,14 @@ msgstr "API метод не знайдено." msgid "This method requires a POST." msgstr "Цей метод потребує POST." -#: actions/apiaccountupdatedeliverydevice.php:105 +#: actions/apiaccountupdatedeliverydevice.php:106 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" "Ви мусите встановити параметр «device» з одним зі значень: sms, im, none." -#: actions/apiaccountupdatedeliverydevice.php:132 +#: actions/apiaccountupdatedeliverydevice.php:133 msgid "Could not update user." msgstr "Не вдалося оновити користувача." @@ -453,7 +453,7 @@ msgstr "Помилкове додаткове ім’я: «%s»." #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "Додаткове ім’я \"%s\" вже використовується. Спробуйте інше." +msgstr "Додаткове ім’я «%s» вже використовується. Спробуйте інше." #: actions/apigroupcreate.php:289 actions/editgroup.php:238 #: actions/newgroup.php:178 @@ -632,7 +632,7 @@ msgstr "Дозволити або заборонити доступ до Ваш msgid "This method requires a POST or DELETE." msgstr "Цей метод потребує або НАПИСАТИ, або ВИДАЛИТИ." -#: actions/apistatusesdestroy.php:131 +#: actions/apistatusesdestroy.php:126 msgid "You may not delete another user's status." msgstr "Ви не можете видалити статус іншого користувача." @@ -970,7 +970,7 @@ msgstr "Підтвердити адресу" #: actions/confirmaddress.php:161 #, php-format msgid "The address \"%s\" has been confirmed for your account." -msgstr "Адресу \"%s\" було підтверджено для Вашого акаунту." +msgstr "Адресу «%s» було підтверджено для Вашого акаунту." #: actions/conversation.php:99 msgid "Conversation" @@ -1315,7 +1315,7 @@ msgstr "опис надто довгий (%d знаків максимум)." #: actions/editgroup.php:228 actions/newgroup.php:168 #, php-format msgid "Invalid alias: \"%s\"" -msgstr "Помилкове додаткове ім’я: \"%s\"" +msgstr "Помилкове додаткове ім’я: «%s»" #: actions/editgroup.php:258 msgid "Could not update group." @@ -1385,7 +1385,7 @@ msgstr "Скасувати" #. TRANS: Instructions for e-mail address input form. #: actions/emailsettings.php:135 msgid "Email address, like \"UserName@example.org\"" -msgstr "Електронна адреса, на зразок \"UserName@example.org\"" +msgstr "Електронна адреса, на зразок «UserName@example.org»" #. TRANS: Button label for adding an e-mail address in e-mail settings form. #. TRANS: Button label for adding an IM address in IM settings form. @@ -1444,7 +1444,7 @@ msgstr "Надсилати мені листа, коли хтось має пр #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:199 msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "Надсилати мені листа, коли на мій допис з’являється \"@-відповідь\"." +msgstr "Надсилати мені листа, коли на мій допис з’являється «@-відповідь»." #. TRANS: Checkbox label in e-mail preferences form. #: actions/emailsettings.php:205 @@ -1882,9 +1882,9 @@ msgid "" msgstr "" "Групи на сайті %%%%site.name%%%% дозволять Вам відшукати людей зі спільними " "інтересами. Лише приєднайтеся до групи і надсилайте повідомлення до усіх її " -"учасників використовуючи просту команду \"!groupname\" у тексті " -"повідомлення. Не бачите групу, яка Вас цікавить? Спробуйте її [знайти](%%%%" -"action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)" +"учасників використовуючи просту команду «!groupname» у тексті повідомлення. " +"Не бачите групу, яка Вас цікавить? Спробуйте її [знайти](%%%%action." +"groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)" #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122 msgid "Create a new group" @@ -1991,7 +1991,7 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Jabber або GTalk адреса, на зразок \"UserName@example.org\". Але спершу " +"Jabber або GTalk адреса, на зразок «UserName@example.org». Але спершу " "переконайтеся, що додали %s до списку контактів в своєму IM-клієнті або в " "GTalk." @@ -2468,12 +2468,12 @@ msgstr "" #: actions/noticesearchrss.php:96 #, php-format msgid "Updates with \"%s\"" -msgstr "Оновлення з \"%s\"" +msgstr "Оновлення з «%s»" #: actions/noticesearchrss.php:98 #, php-format msgid "Updates matching search term \"%1$s\" on %2$s!" -msgstr "Всі оновлення за збігом з \"%s\" на %2$s!" +msgstr "Всі оновлення за збігом з «%s» на %2$s!" #: actions/nudge.php:85 msgid "" @@ -2997,7 +2997,7 @@ msgstr "Мова задовга (50 знаків максимум)." #: actions/profilesettings.php:253 actions/tagother.php:178 #, php-format msgid "Invalid tag: \"%s\"" -msgstr "Недійсний теґ: \"%s\"" +msgstr "Недійсний теґ: «%s»" #: actions/profilesettings.php:306 msgid "Couldn't update user for autosubscribe." @@ -3079,7 +3079,7 @@ msgid "" "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" "Це %%site.name%% — сервіс [мікроблоґів](http://uk.wikipedia.org/wiki/" -"Мікроблоггінг), який працює на вільному програмному забезпеченні [StatusNet]" +"Мікроблогінг), який працює на вільному програмному забезпеченні [StatusNet]" "(http://status.net/). [Приєднуйтесь](%%action.register%%) зараз і зможете " "розділити своє життя з друзями, родиною і колегами! ([Дізнатися більше](%%" "doc.help%%))" @@ -3092,7 +3092,7 @@ msgid "" "tool." msgstr "" "Це %%site.name%% — сервіс [мікроблоґів](http://uk.wikipedia.org/wiki/" -"Мікроблоггінг), який працює на вільному програмному забезпеченні [StatusNet]" +"Мікроблогінг), який працює на вільному програмному забезпеченні [StatusNet]" "(http://status.net/)." #: actions/publictagcloud.php:57 @@ -3803,7 +3803,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" "**%s** це група на %%%%site.name%%%% — сервісі [мікроблоґів](http://uk." -"wikipedia.org/wiki/Мікроблоггінг), який працює на вільному програмному " +"wikipedia.org/wiki/Мікроблогінг), який працює на вільному програмному " "забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблять " "короткі дописи про своє життя та інтереси. [Приєднуйтесь](%%%%action.register" "%%%%) зараз і долучіться до спілкування! ([Дізнатися більше](%%%%doc.help%%%" @@ -3817,10 +3817,10 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" -"**%s** це група користувачів на %%site.name%% — сервісі [мікроблоґів](http://" -"uk.wikipedia.org/wiki/Мікроблоггінг), який працює на вільному програмному " -"забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблять " -"короткі дописи про своє життя та інтереси. " +"**%s** це група користувачів на %%%%site.name%%%% — сервісі [мікроблоґів]" +"(http://uk.wikipedia.org/wiki/Мікроблогінг), який працює на вільному " +"програмному забезпеченні [StatusNet](http://status.net/). Члени цієї групи " +"роблять короткі дописи про своє життя та інтереси. " #: actions/showgroup.php:497 msgid "Admins" @@ -3914,7 +3914,7 @@ msgid "" "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" "**%s** користується %%%%site.name%%%% — сервісом [мікроблоґів](http://uk." -"wikipedia.org/wiki/Мікроблоґ), який працює на вільному програмному " +"wikipedia.org/wiki/Мікроблогінг), який працює на вільному програмному " "забезпеченні [StatusNet](http://status.net/). [Приєднуйтесь](%%%%action." "register%%%%) зараз і слідкуйте за дописами **%s**, також на Вас чекає " "багато іншого! ([Дізнатися більше](%%%%doc.help%%%%))" @@ -3927,7 +3927,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" "**%s** є власником акаунту на сайті %%%%site.name%%%% — сервісі [мікроблоґів]" -"(http://uk.wikipedia.org/wiki/Мікроблоггінг), який працює на вільному " +"(http://uk.wikipedia.org/wiki/Мікроблогінг), який працює на вільному " "програмному забезпеченні [StatusNet](http://status.net/). " #: actions/showstream.php:305 @@ -4064,11 +4064,12 @@ msgstr "Максимальна довжина повідомлення сайт #: actions/sitenoticeadminpanel.php:176 msgid "Site notice text" -msgstr "Текст повідомлення сайту" +msgstr "Текст повідомлення" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "Текст повідомлення сайту (255 символів максимум; HTML дозволено)" +msgstr "" +"Текст повідомлення сайту (255 символів максимум; деякий HTML дозволено)" #: actions/sitenoticeadminpanel.php:198 msgid "Save site notice" @@ -4519,7 +4520,7 @@ msgstr "Помилковий текст привітання. Максималь #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "Помилкова підписка за замовчуванням: '%1$s' не є користувачем." +msgstr "Помилкова підписка за замовчуванням: «%1$s» не є користувачем." #. TRANS: Link description in user account settings menu. #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111 @@ -4643,32 +4644,32 @@ msgstr "URI слухача «%s» тут не знайдено" #: actions/userauthorization.php:308 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "URI слухача ‘%s’ задовге." +msgstr "URI слухача «%s» задовге." #: actions/userauthorization.php:314 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "URI слухача ‘%s’ це локальний користувач" +msgstr "URI слухача «%s» це локальний користувач" #: actions/userauthorization.php:329 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "URL-адреса профілю ‘%s’ для локального користувача." +msgstr "URL-адреса профілю «%s» для локального користувача." #: actions/userauthorization.php:345 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "URL-адреса автари ‘%s’ помилкова." +msgstr "URL-адреса аватари «%s» помилкова." #: actions/userauthorization.php:350 #, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "Не можна прочитати URL аватари ‘%s’." +msgstr "Не можна прочитати URL аватари «%s»." #: actions/userauthorization.php:355 #, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "Неправильний тип зображення для URL-адреси аватари ‘%s’." +msgstr "Неправильний тип зображення для URL-адреси аватари «%s»." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -5928,7 +5929,7 @@ msgstr "Вперед" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "Надати цьому користувачеві роль \"%s\"" +msgstr "Надати цьому користувачеві роль «%s»" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -6670,7 +6671,7 @@ msgstr "ІД" #: lib/profileaction.php:196 msgid "Member since" -msgstr "З нами від" +msgstr "Реєстрація" #. TRANS: Average count of posts made per day since account registration #: lib/profileaction.php:235 @@ -6724,7 +6725,7 @@ msgstr "Повторити цей допис" #: lib/revokeroleform.php:91 #, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Відкликати роль \"%s\" для цього користувача" +msgstr "Відкликати роль «%s» для цього користувача" #: lib/router.php:709 msgid "No single user defined for single-user mode." From ec155464765db36591bbb183b335abbc1ec8638c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 11 Jun 2010 11:52:06 -0700 Subject: [PATCH 244/730] Fix a couple bad format entries in router setup (format param had 'xmljson' instead of 'xml|json'). Warning: the format strings aren't actually being enforced here which is probably why they weren't caught earlier. Not quite sure why, it should be looked at! --- lib/router.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/router.php b/lib/router.php index afe44f92ad..f2b2b845f2 100644 --- a/lib/router.php +++ b/lib/router.php @@ -540,7 +540,7 @@ class Router $m->connect('api/favorites/:id.:format', array('action' => 'ApiTimelineFavorites', 'id' => '[a-zA-Z0-9]+', - 'format' => '(xmljson|rss|atom)')); + 'format' => '(xml|json|rss|atom)')); $m->connect('api/favorites/create/:id.:format', array('action' => 'ApiFavoriteCreate', @@ -597,7 +597,7 @@ class Router $m->connect('api/statusnet/groups/timeline/:id.:format', array('action' => 'ApiTimelineGroup', 'id' => '[a-zA-Z0-9]+', - 'format' => '(xmljson|rss|atom)')); + 'format' => '(xml|json|rss|atom)')); $m->connect('api/statusnet/groups/show.:format', array('action' => 'ApiGroupShow', @@ -658,7 +658,7 @@ class Router // Tags $m->connect('api/statusnet/tags/timeline/:tag.:format', array('action' => 'ApiTimelineTag', - 'format' => '(xmljson|rss|atom)')); + 'format' => '(xml|json|rss|atom)')); // media related $m->connect( From 3da8914edb81a1789d69ee6c32092959630e4e1c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 11 Jun 2010 12:38:22 -0700 Subject: [PATCH 245/730] Fix for DB error reporting in installer (MySQL path) --- lib/installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/installer.php b/lib/installer.php index 7936d5d5d1..78461efb72 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -446,7 +446,7 @@ abstract class Installer case 'mysqli': $res = $conn->query($stmt); if ($res === false) { - $error = $conn->error(); + $error = $conn->error; } break; case 'pgsql': From 0264f66d76f6a8e5669d305985f96533a156e9ae Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Sat, 12 Jun 2010 17:28:43 +0100 Subject: [PATCH 246/730] Initial commit of msn-plugin work --- plugins/Msn/MsnPlugin.php | 173 + plugins/Msn/Queued_Msn.php | 120 + plugins/Msn/extlib/phpmsnclass/msn.class.php | 3755 +++++++++++++++++ plugins/Msn/extlib/phpmsnclass/msnbot.php | 63 + plugins/Msn/extlib/phpmsnclass/sample.php | 40 + .../extlib/phpmsnclass/soap/.svn/all-wcprops | 23 + .../Msn/extlib/phpmsnclass/soap/.svn/entries | 130 + .../text-base/msnab_datatypes.xsd.svn-base | 832 ++++ .../text-base/msnab_servicetypes.xsd.svn-base | 567 +++ .../msnab_sharingservice.wsdl.svn-base | 532 +++ .../phpmsnclass/soap/msnab_datatypes.xsd | 832 ++++ .../phpmsnclass/soap/msnab_servicetypes.xsd | 567 +++ .../soap/msnab_sharingservice.wsdl | 532 +++ plugins/Msn/msnmanager.php | 105 + 14 files changed, 8271 insertions(+) create mode 100644 plugins/Msn/MsnPlugin.php create mode 100644 plugins/Msn/Queued_Msn.php create mode 100644 plugins/Msn/extlib/phpmsnclass/msn.class.php create mode 100755 plugins/Msn/extlib/phpmsnclass/msnbot.php create mode 100644 plugins/Msn/extlib/phpmsnclass/sample.php create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/entries create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/msnab_datatypes.xsd create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/msnab_servicetypes.xsd create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/msnab_sharingservice.wsdl create mode 100644 plugins/Msn/msnmanager.php diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php new file mode 100644 index 0000000000..6737e727ab --- /dev/null +++ b/plugins/Msn/MsnPlugin.php @@ -0,0 +1,173 @@ +. + * + * @category IM + * @package StatusNet + * @author Craig Andrews + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} +// We bundle the phptoclib library... +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phptoclib'); + +/** + * Plugin for AIM + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +class MsnPlugin extends ImPlugin +{ + public $user = null; + public $password = null; + public $publicFeed = array(); + + public $transport = 'msnim'; + + function getDisplayName() + { + return _m('MSN'); + } + + function normalize($screenname) + { + $screenname = str_replace(" ","", $screenname); + return strtolower($screenname); + } + + function daemon_screenname() + { + return $this->user; + } + + function validate($screenname) + { + if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) { + return true; + }else{ + return false; + } + } + + /** + * Load related modules when needed + * + * @param string $cls Name of the class to be loaded + * + * @return boolean hook value; true means continue processing, false means stop. + */ + function onAutoload($cls) + { + $dir = dirname(__FILE__); + + switch ($cls) + { + case 'Msn': + require_once(INSTALLDIR.'/plugins/Msn/extlib/phpmsnclass/msn.class.php'); + return false; + case 'MsnManager': + include_once $dir . '/'.strtolower($cls).'.php'; + return false; + case 'Fake_Msn': + include_once $dir . '/'. $cls .'.php'; + return false; + default: + return true; + } + } + + function onStartImDaemonIoManagers(&$classes) + { + parent::onStartImDaemonIoManagers(&$classes); + $classes[] = new MsnManager($this); // handles sending/receiving + return true; + } + + function microiduri($screenname) + { + return 'msnim:' . $screenname; + } + + function send_message($screenname, $body) + { + //$this->fake_aim->sendIm($screenname, $body); + //$this->enqueue_outgoing_raw($this->fake_aim->would_be_sent); + $this->enqueue_outgoing_raw(array($screenname, $body)); + return true; + } + + /** + * Accept a queued input message. + * + * @return true if processing completed, false if message should be reprocessed + */ + function receive_raw_message($message) + { + $info=Aim::getMessageInfo($message); + $from = $info['from']; + $user = $this->get_user($from); + $notice_text = $info['message']; + + $this->handle_incoming($from, $notice_text); + + return true; + } + + function initialize(){ + if(!isset($this->user)){ + throw new Exception("must specify a user"); + } + if(!isset($this->password)){ + throw new Exception("must specify a password"); + } + if(!isset($this->nickname)) { + throw new Exception("must specify a nickname"); + } + + $this->fake_msn = new Fake_Msn($this->user,$this->password,4); + return true; + } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'MSN', + 'version' => STATUSNET_VERSION, + 'author' => 'Luke Fitzgerald', + 'homepage' => 'http://status.net/wiki/Plugin:MSN', + 'rawdescription' => + _m('The MSN plugin allows users to send and receive notices over the MSN network.')); + return true; + } +} + diff --git a/plugins/Msn/Queued_Msn.php b/plugins/Msn/Queued_Msn.php new file mode 100644 index 0000000000..bc8e0a1d15 --- /dev/null +++ b/plugins/Msn/Queued_Msn.php @@ -0,0 +1,120 @@ +. + * + * @category Network + * @package StatusNet + * @author Luke Fitzgerald + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +class Queued_XMPP extends MSN { + /** + * Reference to the MsnPlugin object we're hooked up to. + */ + public $plugin; + + /** + * Constructor + * + * @param MsnPlugin $plugin + * @param string $host + * @param integer $port + * @param string $user + * @param string $password + * @param string $resource + * @param string $server + * @param boolean $printlog + * @param string $loglevel + */ + public function __construct($plugin, $host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null) + { + $this->plugin = $plugin; + + parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel); + + // We use $host to connect, but $server to build JIDs if specified. + // This seems to fix an upstream bug where $host was used to build + // $this->basejid, never seen since it isn't actually used in the base + // classes. + if (!$server) { + $server = $this->host; + } + $this->basejid = $this->user . '@' . $server; + + // Normally the fulljid is filled out by the server at resource binding + // time, but we need to do it since we're not talking to a real server. + $this->fulljid = "{$this->basejid}/{$this->resource}"; + } + + /** + * Send a formatted message to the outgoing queue for later forwarding + * to a real XMPP connection. + * + * @param string $msg + */ + public function send($msg, $timeout=NULL) + { + $this->plugin->enqueue_outgoing_raw($msg); + } + + //@{ + /** + * Stream i/o functions disabled; only do output + */ + public function connect($timeout = 30, $persistent = false, $sendinit = true) + { + throw new Exception("Can't connect to server from fake XMPP."); + } + + public function disconnect() + { + throw new Exception("Can't connect to server from fake XMPP."); + } + + public function process() + { + throw new Exception("Can't read stream from fake XMPP."); + } + + public function processUntil($event, $timeout=-1) + { + throw new Exception("Can't read stream from fake XMPP."); + } + + public function read() + { + throw new Exception("Can't read stream from fake XMPP."); + } + + public function readyToProcess() + { + throw new Exception("Can't read stream from fake XMPP."); + } + //@} + +} + diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php new file mode 100644 index 0000000000..355d828eb5 --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -0,0 +1,3755 @@ +Main Process,1 => sb_control_process,2 => sb_ring_process + private $SwitchBoardSessionUser=false; + private $SwitchBoardMessageQueue=array(); + private $ABAuthHeader; + private $ABService; + private $Contacts; + + public $server = 'messenger.hotmail.com'; + public $port = 1863; + + + public $clientid = ''; + + public $oim_maildata_url = 'https://rsi.hotmail.com/rsi/rsi.asmx'; + public $oim_maildata_soap = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMetadata'; + public $oim_read_url = 'https://rsi.hotmail.com/rsi/rsi.asmx'; + public $oim_read_soap = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMessage'; + public $oim_del_url = 'https://rsi.hotmail.com/rsi/rsi.asmx'; + public $oim_del_soap = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/DeleteMessages'; + + public $membership_url = 'https://contacts.msn.com/abservice/SharingService.asmx'; + public $membership_soap = 'http://www.msn.com/webservices/AddressBook/FindMembership'; + + public $addmember_url = 'https://contacts.msn.com/abservice/SharingService.asmx'; + public $addmember_soap = 'http://www.msn.com/webservices/AddressBook/AddMember'; + + public $addcontact_url = 'https://contacts.msn.com/abservice/abservice.asmx'; + public $addcontact_soap = 'http://www.msn.com/webservices/AddressBook/ABContactAdd'; + + public $delmember_url = 'https://contacts.msn.com/abservice/SharingService.asmx'; + public $delmember_soap = 'http://www.msn.com/webservices/AddressBook/DeleteMember'; + + + public $error = ''; + + public $authed = false; + + public $oim_try = 3; + + public $log_file = ''; + + public $log_path = false; + + public $font_fn = 'Arial'; + public $font_co = '333333'; + public $font_ef = ''; + + + // the message length (include header) is limited (maybe since WLM 8.5 released) + // for WLM: 1664 bytes + // for YIM: 518 bytes + public $max_msn_message_len = 1664; + public $max_yahoo_message_len = 518; + + // Begin added for StatusNet + + private $aContactList = array(); + private $switchBoardSessions = array(); + + /** + * Event Handler Functions + */ + private $myEventHandlers = array(); + + // End added for StatusNet + + private function Array2SoapVar($Array,$ReturnSoapVarObj=true,$TypeName=null,$TypeNameSpace=null) + { + $ArrayString=''; + foreach($Array as $Key => $Val) + { + if($Key{0}==':') continue; + $Attrib=''; + if(is_array($Val[':'])) + { + foreach($Val[':'] as $AttribName => $AttribVal) + $Attrib.=" $AttribName='$AttribVal'"; + } + if($Key{0}=='!') + { + //List Type Define + $Key=substr($Key,1); + foreach($Val as $ListKey => $ListVal) + { + if($ListKey{0}==':') continue; + if(is_array($ListVal)) $ListVal=$this->Array2SoapVar($ListVal,false); + elseif(is_bool($ListVal)) $ListVal=$ListVal?'true':'false'; + $ArrayString.="<$Key$Attrib>$ListVal"; + } + continue; + } + if(is_array($Val)) $Val=$this->Array2SoapVar($Val,false); + elseif(is_bool($Val)) $Val=$Val?'true':'false'; + $ArrayString.="<$Key$Attrib>$Val"; + } + if($ReturnSoapVarObj) return new SoapVar($ArrayString,XSD_ANYXML,$TypeName,$TypeNameSpace); + return $ArrayString; + } + + public function End() + { + $this->log_message("*** someone kill me ***"); + $this->kill_me=true; + } + public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C) + { + $this->user = $Configs['user']; + $this->password = $Configs['password']; + $this->alias = isset($Configs['alias']) ? $Configs['alias'] : ''; + $this->psm = isset($Configs['psm']) ? $Configs['psm'] : ''; + $my_add_function = isset($Configs['add_user_function']) ? $Configs['add_user_function'] : false; + $my_rem_function = isset($Configs['remove_user_function']) ? $Configs['remove_user_function'] : false; + $this->use_ping = isset($Configs['use_ping']) ? $Configs['use_ping'] : false; + $this->retry_wait = isset($Configs['retry_wait']) ? $Configs['retry_wait'] : 30; + $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true; + $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true; + $this->PhotoStickerFile=$Configs['PhotoSticker']; + if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) + { + foreach($this->Emotions as $EmotionFilePath) + $this->MsnObj($EmotionFilePath,$Type=2); + } + $this->debug = isset($Configs['debug']) ? $Configs['debug'] : false; + $this->timeout = $timeout; + // check support + if (!function_exists('curl_init')) throw new Exception("We need curl module!\n"); + if (!function_exists('preg_match')) throw new Exception("We need pcre module!\n"); + if (!function_exists('mhash')) throw new Exception("We need mhash module!\n"); + + if (!function_exists('mcrypt_cbc')) throw new Exception("We need mcrypt module!\n"); + if (!function_exists('bcmod')) throw new Exception("We need bcmath module for $protocol!\n"); + + /* + http://msnpiki.msnfanatic.com/index.php/Client_ID + Client ID for MSN: + normal MSN 8.1 clientid is: + 01110110 01001100 11000000 00101100 + = 0x764CC02C + + we just use following: + * 0x04: Your client can send/receive Ink (GIF format) + * 0x08: Your client can send/recieve Ink (ISF format) + * 0x8000: This means you support Winks receiving (If not set the official Client will warn with 'contact has an older client and is not capable of receiving Winks') + * 0x70000000: This is the value for MSNC7 (WL Msgr 8.1) + = 0x7000800C; + */ + $this->clientid = $client_id; + $this->windows =(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'); + $this->ABService=new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl',array('trace' => 1)); + } + + private function get_passport_ticket($url = '') + { + $user = $this->user; + $password = htmlspecialchars($this->password); + + if ($url === '') + $passport_url = $this->passport_url; + else + $passport_url = $url; + + $XML = ' + +
+ + {7108E71A-9926-4FCB-BCC9-9A9D3F32E423} + 4 + 1 + + AQAAAAIAAABsYwQAAAAxMDMz + + + + '.$user.' + '.$password.' + + +
+ + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + http://Passport.NET/tb + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + messengerclear.live.com + + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + messenger.msn.com + + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + contacts.msn.com + + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + messengersecure.live.com + + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + spaces.live.com + + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + storage.msn.com + + + + + + +'; + + $this->debug_message("*** URL: $passport_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $passport_url); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + // sometimes, rediret to another URL + // MSNP15 + //psf:Redirect + //https://msnia.login.live.com/pp450/RST.srf + //Authentication Failure + if (strpos($data, 'psf:Redirect') === false) { + $this->debug_message("*** Can't get passport ticket! http code = $http_code"); + return false; + } + preg_match("#(.*)#", $data, $matches); + if (count($matches) == 0) { + $this->debug_message("*** redirect, but can't get redirect URL!"); + return false; + } + $redirect_url = $matches[1]; + if ($redirect_url == $passport_url) { + $this->debug_message("*** redirect, but redirect to same URL!"); + return false; + } + $this->debug_message("*** redirect to $redirect_url"); + return $this->get_passport_ticket($redirect_url); + } + + // sometimes, rediret to another URL, also return 200 + // MSNP15 + //psf:Redirect + //https://msnia.login.live.com/pp450/RST.srf + //Authentication Failure + if (strpos($data, 'psf:Redirect') !== false) { + preg_match("#(.*)#", $data, $matches); + if (count($matches) != 0) { + $redirect_url = $matches[1]; + if ($redirect_url == $passport_url) { + $this->debug_message("*** redirect, but redirect to same URL!"); + return false; + } + $this->debug_message("*** redirect to $redirect_url"); + return $this->get_passport_ticket($redirect_url); + } + } + + // no Redurect faultcode or URL + // we should get the ticket here + + // we need ticket and secret code + // RST1: messengerclear.live.com + // t=tick&p= + // binary secret + // RST2: messenger.msn.com + // t=tick + // RST3: contacts.msn.com + // t=tick&p= + // RST4: messengersecure.live.com + // t=tick&p= + // RST5: spaces.live.com + // t=tick&p= + // RST6: storage.msn.com + // t=tick&p= + preg_match("#". + "(.*)(.*)". + "(.*)(.*)". + "(.*)(.*)". + "(.*)(.*)". + "(.*)(.*)". + "(.*)(.*)". + "(.*)(.*)". + "#", + $data, $matches); + + // no ticket found! + if (count($matches) == 0) { + $this->debug_message("*** Can't get passport ticket!"); + return false; + } + + //$this->debug_message(var_export($matches, true)); + // matches[0]: all data + // matches[1]: RST1 (messengerclear.live.com) ticket + // matches[2]: ... + // matches[3]: RST1 (messengerclear.live.com) binary secret + // matches[4]: ... + // matches[5]: RST2 (messenger.msn.com) ticket + // matches[6]: ... + // matches[7]: RST3 (contacts.msn.com) ticket + // matches[8]: ... + // matches[9]: RST4 (messengersecure.live.com) ticket + // matches[10]: ... + // matches[11]: RST5 (spaces.live.com) ticket + // matches[12]: ... + // matches[13]: RST6 (storage.live.com) ticket + // matches[14]: ... + + // so + // ticket => $matches[1] + // secret => $matches[3] + // web_ticket => $matches[5] + // contact_ticket => $matches[7] + // oim_ticket => $matches[9] + // space_ticket => $matches[11] + // storage_ticket => $matches[13] + + // yes, we get ticket + $aTickets = array( + 'ticket' => html_entity_decode($matches[1]), + 'secret' => html_entity_decode($matches[3]), + 'web_ticket' => html_entity_decode($matches[5]), + 'contact_ticket' => html_entity_decode($matches[7]), + 'oim_ticket' => html_entity_decode($matches[9]), + 'space_ticket' => html_entity_decode($matches[11]), + 'storage_ticket' => html_entity_decode($matches[13]) + ); + $this->ticket=$aTickets; + $this->debug_message(var_export($aTickets, true)); + $ABAuthHeaderArray=array( + 'ABAuthHeader'=>array( + ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'ManagedGroupRequest'=>false, + 'TicketToken'=>htmlspecialchars($this->ticket['contact_ticket']), + ) + ); + $this->ABAuthHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook","ABAuthHeader", $this->Array2SoapVar($ABAuthHeaderArray)); + file_put_contents('/tmp/STTicket.txt',htmlspecialchars($this->ticket['storage_ticket'])); + //$this->debug_message("StorageTicket:\n",htmlspecialchars($this->ticket['storage_ticket'])); + return $aTickets; + } + private function UpdateContacts() + { + $ABApplicationHeaderArray=array( + 'ABApplicationHeader'=>array( + ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'ApplicationId'=>'CFE80F9D-180F-4399-82AB-413F33A1FA11', + 'IsMigration'=>false, + 'PartnerScenario'=>'ContactSave' + ) + ); + $ABApplicationHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook",'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray)); + $ABFindAllArray=array( + 'ABFindAll'=>array( + ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'abId'=>'00000000-0000-0000-0000-000000000000', + 'abView'=>'Full', + 'lastChange'=>'0001-01-01T00:00:00.0000000-08:00', + ) + ); + $ABFindAll=new SoapParam($this->Array2SoapVar($ABFindAllArray),'ABFindAll'); + $this->ABService->__setSoapHeaders(array($ABApplicationHeader,$this->ABAuthHeader)); + $this->Contacts=array(); + try + { + $this->debug_message("*** Update Contacts..."); + $Result=$this->ABService->ABFindAll($ABFindAll); + $this->debug_message("*** Result:\n".print_r($Result,true)."\n".$this->ABService->__getLastResponse()); + foreach($Result->ABFindAllResult->contacts->Contact as $Contact) + $this->Contacts[$Contact->contactInfo->passportName]=$Contact; + } + catch(Exception $e) + { + $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); + } + } + protected function addContact($email, $network, $display = '', $sendADL = false) + { + if ($network != 1) return true; + if(isset($this->Contacts[$email])) return true; + + $ABContactAddArray=array( + 'ABContactAdd'=>array( + ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'abId'=>'00000000-0000-0000-0000-000000000000', + 'contacts'=>array( + 'Contact'=>array( + ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'contactInfo'=>array( + 'contactType'=>'LivePending', + 'passportName'=>$email, + 'isMessengerUser'=>true, + 'MessengerMemberInfo'=>array( + 'DisplayName'=>$email + ) + ) + ) + ), + 'options'=>array( + 'EnableAllowListManagement'=>true + ) + ) + ); + $ABContactAdd=new SoapParam($this->Array2SoapVar($ABContactAddArray),'ABContactAdd'); + try + { + $this->debug_message("*** Add Contacts $email..."); + $this->ABService->ABContactAdd($ABContactAdd); + } + catch(Exception $e) + { + $this->debug_message("*** Add Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); + } + if ($sendADL && !feof($this->NSfp)) { + @list($u_name, $u_domain) = @explode('@', $email); + foreach (array('1', '2') as $l) { + $str = ''; + $len = strlen($str); + // NS: >>> ADL {id} {size} + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); + } + } + $this->UpdateContacts(); + return true; + + + $ABContactAdd=new SoapParam($this->Array2SoapVar($ABContactAddArray),'ABContactAdd'); + + // add contact for WLM + $ticket = htmlspecialchars($this->ticket['contact_ticket']); + $displayName = htmlspecialchars($display); + $user = $email; + + $XML = ' + + + + CFE80F9D-180F-4399-82AB-413F33A1FA11 + false + ContactSave + + + false + '.$ticket.' + + + + + 00000000-0000-0000-0000-000000000000 + + + + LivePending + '.$user.' + true + + '.$displayName.' + + + + + + true + + + +'; + + $header_array = array( + 'SOAPAction: '.$this->addcontact_soap, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' + ); + + $this->debug_message("*** URL: $this->addcontact_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->addcontact_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + preg_match('#(.*)(.*)#', $data, $matches); + if (count($matches) == 0) { + $this->log_message("*** can't add contact (network: $network) $email"); + return false; + } + $faultcode = trim($matches[1]); + $faultstring = trim($matches[2]); + $this->log_message("*** can't add contact (network: $network) $email, error code: $faultcode, $faultstring"); + return false; + } + $this->log_message("*** add contact (network: $network) $email"); + if ($sendADL && !feof($this->NSfp)) { + @list($u_name, $u_domain) = @explode('@', $email); + foreach (array('1', '2') as $l) { + $str = ''; + $len = strlen($str); + // NS: >>> ADL {id} {size} + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); + } + } + $this->UpdateContacts(); + return true; + } + + function delMemberFromList($memberID, $email, $network, $list) { + if ($network != 1 && $network != 32) return true; + if ($memberID === false) return true; + $user = $email; + $ticket = htmlspecialchars($this->ticket['contact_ticket']); + if ($network == 1) + $XML = ' + + + + 996CDE1E-AA53-4477-B943-2BE802EA6166 + false + ContactMsgrAPI + + + false + '.$ticket.' + + + + + + 0 + Messenger + + + + + '.$list.' + + + Passport + '.$memberID.' + Accepted + + + + + + +'; + else + $XML = ' + + + + 996CDE1E-AA53-4477-B943-2BE802EA6166 + false + ContactMsgrAPI + + + false + '.$ticket.' + + + + + + 0 + Messenger + + + + + '.$list.' + + + Email + '.$memberID.' + Accepted + + + + + + +'; + + $header_array = array( + 'SOAPAction: '.$this->delmember_soap, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' + ); + + $this->debug_message("*** URL: $this->delmember_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->delmember_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + preg_match('#(.*)(.*)#', $data, $matches); + if (count($matches) == 0) { + $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list"); + return false; + } + $faultcode = trim($matches[1]); + $faultstring = trim($matches[2]); + if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) { + $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring"); + return false; + } + $this->log_message("*** delete member (network: $network) $email ($memberID) from $list, not exist"); + return true; + } + $this->log_message("*** delete member (network: $network) $email ($memberID) from $list"); + return true; + } + + function addMemberToList($email, $network, $list) { + if ($network != 1 && $network != 32) return true; + $ticket = htmlspecialchars($this->ticket['contact_ticket']); + $user = $email; + + if ($network == 1) + $XML = ' + + + + 996CDE1E-AA53-4477-B943-2BE802EA6166 + false + ContactMsgrAPI + + + false + '.$ticket.' + + + + + + 0 + Messenger + + + + + '.$list.' + + + Passport + Accepted + '.$user.' + + + + + + +'; + else + $XML = ' + + + + 996CDE1E-AA53-4477-B943-2BE802EA6166 + false + ContactMsgrAPI + + + false + '.$ticket.' + + + + + + 0 + Messenger + + + + + '.$list.' + + + Email + Accepted + '.$user.' + + + MSN.IM.BuddyType + 32:YAHOO + + + + + + + + +'; + $header_array = array( + 'SOAPAction: '.$this->addmember_soap, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' + ); + + $this->debug_message("*** URL: $this->addmember_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->addmember_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + preg_match('#(.*)(.*)#', $data, $matches); + if (count($matches) == 0) { + $this->log_message("*** can't add member (network: $network) $email to $list"); + return false; + } + $faultcode = trim($matches[1]); + $faultstring = trim($matches[2]); + if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) { + $this->log_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring"); + return false; + } + $this->log_message("*** add member (network: $network) $email to $list, already exist!"); + return true; + } + $this->log_message("*** add member (network: $network) $email to $list"); + return true; + } + + function getMembershipList($returnData=false) { + $ticket = htmlspecialchars($this->ticket['contact_ticket']); + $XML = ' + + + + 996CDE1E-AA53-4477-B943-2BE802EA6166 + false + Initial + + + false + '.$ticket.' + + + + + + + Messenger + Invitation + SocialNetwork + Space + Profile + + + + +'; + $header_array = array( + 'SOAPAction: '.$this->membership_soap, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' + ); + $this->debug_message("*** URL: $this->membership_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->membership_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + if(($http_code != 200)||(!$returnData)) return array(); + $p = $data; + $aMemberships = array(); + while (1) { + //$this->debug_message("search p = $p"); + $start = strpos($p, ''); + $end = strpos($p, ''); + if ($start === false || $end === false || $start > $end) break; + //$this->debug_message("start = $start, end = $end"); + $end += 13; + $sMembership = substr($p, $start, $end - $start); + $aMemberships[] = $sMembership; + //$this->debug_message("add sMembership = $sMembership"); + $p = substr($p, $end); + } + //$this->debug_message("aMemberships = ".var_export($aMemberships, true)); + + $aContactList = array(); + foreach ($aMemberships as $sMembership) { + //$this->debug_message("sMembership = $sMembership"); + if (isset($matches)) unset($matches); + preg_match('#(.*)#', $sMembership, $matches); + if (count($matches) == 0) continue; + $sMemberRole = $matches[1]; + //$this->debug_message("MemberRole = $sMemberRole"); + if ($sMemberRole != 'Allow' && $sMemberRole != 'Reverse' && $sMemberRole != 'Pending') continue; + $p = $sMembership; + if (isset($aMembers)) unset($aMembers); + $aMembers = array(); + while (1) { + //$this->debug_message("search p = $p"); + $start = strpos($p, 'debug_message("add sMember = $sMember"); + $p = substr($p, $end); + } + //$this->debug_message("aMembers = ".var_export($aMembers, true)); + foreach ($aMembers as $sMember) { + //$this->debug_message("sMember = $sMember"); + if (isset($matches)) unset($matches); + preg_match('##', $sMember, $matches); + if (count($matches) == 0) continue; + $sMemberType = $matches[1]; + //$this->debug_message("MemberType = $sMemberType"); + $network = -1; + preg_match('#(.*)#', $sMember, $matches); + if (count($matches) == 0) continue; + $id = $matches[1]; + if ($sMemberType == 'PassportMember') { + if (strpos($sMember, 'Passport') === false) continue; + $network = 1; + preg_match('#(.*)#', $sMember, $matches); + } + else if ($sMemberType == 'EmailMember') { + if (strpos($sMember, 'Email') === false) continue; + // Value is 32: or 32:YAHOO + preg_match('#MSN.IM.BuddyType(.*):(.*)#', $sMember, $matches); + if (count($matches) == 0) continue; + if ($matches[1] != 32) continue; + $network = 32; + preg_match('#(.*)#', $sMember, $matches); + } + if ($network == -1) continue; + if (count($matches) > 0) { + $email = $matches[1]; + @list($u_name, $u_domain) = @explode('@', $email); + if ($u_domain == NULL) continue; + $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id; + $this->log_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)"); + } + } + } + return $aContactList; + } + + private function connect($user, $password, $redirect_server = '', $redirect_port = 1863) { + $this->id = 1; + if ($redirect_server === '') { + $this->NSfp = @fsockopen($this->server, $this->port, $errno, $errstr, 5); + if (!$this->NSfp) { + $this->error = "Can't connect to $this->server:$this->port, error => $errno, $errstr"; + return false; + } + } + else { + $this->NSfp = @fsockopen($redirect_server, $redirect_port, $errno, $errstr, 5); + if (!$this->NSfp) { + $this->error = "Can't connect to $redirect_server:$redirect_port, error => $errno, $errstr"; + return false; + } + } + + stream_set_timeout($this->NSfp, $this->NSStreamTimeout); + $this->authed = false; + // MSNP9 + // NS: >> VER {id} MSNP9 CVR0 + // MSNP15 + // NS: >>> VER {id} MSNP15 CVR0 + $this->ns_writeln("VER $this->id $this->protocol CVR0"); + + $start_tm = time(); + while (!feof($this->NSfp)) + { + $data = $this->ns_readln(); + // no data? + if ($data === false) { + if ($this->timeout > 0) { + $now_tm = time(); + $used_time = ($now_tm >= $start_tm) ? $now_tm - $start_tm : $now_tm; + if ($used_time > $this->timeout) { + // logout now + // NS: >>> OUT + $this->ns_writeln("OUT"); + fclose($this->NSfp); + $this->error = 'Timeout, maybe protocol changed!'; + $this->debug_message("*** $this->error"); + return false; + } + } + continue; + } + $code = substr($data, 0, 3); + $start_tm = time(); + + switch ($code) { + case 'VER': + // MSNP9 + // NS: <<< VER {id} MSNP9 CVR0 + // NS: >>> CVR {id} 0x0409 winnt 5.1 i386 MSMSGS 6.0.0602 msmsgs {user} + // MSNP15 + // NS: <<< VER {id} MSNP15 CVR0 + // NS: >>> CVR {id} 0x0409 winnt 5.1 i386 MSMSGS 8.1.0178 msmsgs {user} + $this->ns_writeln("CVR $this->id 0x0409 winnt 5.1 i386 MSMSGS $this->buildver msmsgs $user"); + break; + + case 'CVR': + // MSNP9 + // NS: <<< CVR {id} {ver_list} {download_serve} .... + // NS: >>> USR {id} TWN I {user} + // MSNP15 + // NS: <<< CVR {id} {ver_list} {download_serve} .... + // NS: >>> USR {id} SSO I {user} + $this->ns_writeln("USR $this->id $this->login_method I $user"); + break; + + case 'USR': + // already login for passport site, finish the login process now. + // NS: <<< USR {id} OK {user} {verify} 0 + if ($this->authed) return true; + // max. 16 digits for password + if (strlen($password) > 16) + $password = substr($password, 0, 16); + + $this->user = $user; + $this->password = $password; + // NS: <<< USR {id} SSO S {policy} {nonce} + @list(/* USR */, /* id */, /* SSO */, /* S */, $policy, $nonce,) = @explode(' ', $data); + + $this->passport_policy = $policy; + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // logout now + // NS: >>> OUT + $this->ns_writeln("OUT"); + fclose($this->NSfp); + $this->error = 'Passport authenticated fail!'; + $this->debug_message("*** $this->error"); + return false; + } + + $ticket = $aTickets['ticket']; + $secret = $aTickets['secret']; + $this->ticket = $aTickets; + $login_code = $this->generateLoginBLOB($secret, $nonce); + + // NS: >>> USR {id} SSO S {ticket} {login_code} + $this->ns_writeln("USR $this->id $this->login_method S $ticket $login_code"); + $this->authed = true; + break; + + case 'XFR': + // main login server will redirect to anther NS after USR command + // MSNP9 + // NS: <<< XFR {id} NS {server} 0 {server} + // MSNP15 + // NS: <<< XFR {id} NS {server} U D + @list(/* XFR */, /* id */, $Type, $server, /* ... */) = @explode(' ', $data); + if($Type!='NS') break; + @list($ip, $port) = @explode(':', $server); + // this connection will close after XFR + fclose($this->NSfp); + + $this->NSfp = @fsockopen($ip, $port, $errno, $errstr, 5); + if (!$this->NSfp) { + $this->error = "Can't connect to $ip:$port, error => $errno, $errstr"; + $this->debug_message("*** $this->error"); + return false; + } + + stream_set_timeout($this->NSfp, $this->NSStreamTimeout); + // MSNP9 + // NS: >> VER {id} MSNP9 CVR0 + // MSNP15 + // NS: >>> VER {id} MSNP15 CVR0 + $this->ns_writeln("VER $this->id $this->protocol CVR0"); + break; + + case 'GCF': + // return some policy data after 'USR {id} SSO I {user}' command + // NS: <<< GCF 0 {size} + @list(/* GCF */, /* 0 */, $size,) = @explode(' ', $data); + // we don't need the data, just read it and drop + if (is_numeric($size) && $size > 0) + $this->ns_readdata($size); + break; + + default: + // we'll quit if got any error + if (is_numeric($code)) { + // logout now + // NS: >>> OUT + $this->ns_writeln("OUT"); + fclose($this->NSfp); + $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; + $this->debug_message("*** $this->error"); + return false; + } + // unknown response from server, just ignore it + break; + } + } + // never goto here + } + + function derive_key($key, $magic) { + $hash1 = mhash(MHASH_SHA1, $magic, $key); + $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key); + $hash3 = mhash(MHASH_SHA1, $hash1, $key); + $hash4 = mhash(MHASH_SHA1, $hash3.$magic, $key); + return $hash2.substr($hash4, 0, 4); + } + + function generateLoginBLOB($key, $challenge) { + $key1 = base64_decode($key); + $key2 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY HASH'); + $key3 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY ENCRYPTION'); + + // get hash of challenge using key2 + $hash = mhash(MHASH_SHA1, $challenge, $key2); + + // get 8 bytes random data + $iv = substr(base64_encode(rand(1000,9999).rand(1000,9999)), 2, 8); + + $cipher = mcrypt_cbc(MCRYPT_3DES, $key3, $challenge."\x08\x08\x08\x08\x08\x08\x08\x08", MCRYPT_ENCRYPT, $iv); + + $blob = pack('LLLLLLL', 28, 1, 0x6603, 0x8004, 8, 20, 72); + $blob .= $iv; + $blob .= $hash; + $blob .= $cipher; + + return base64_encode($blob); + } + + function getOIM_maildata() { + preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches); + if (count($matches) == 0) { + $this->debug_message('*** no web ticket?'); + return false; + } + $t = htmlspecialchars($matches[1]); + $p = htmlspecialchars($matches[2]); + $XML = ' + + + + '.$t.' +

'.$p.'

+ + + + + +'; + + $header_array = array( + 'SOAPAction: '.$this->oim_maildata_soap, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' + ); + + $this->debug_message("*** URL: $this->oim_maildata_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->oim_maildata_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + $this->debug_message("*** Can't get OIM maildata! http code: $http_code"); + return false; + } + + // See #XML_Data + preg_match('#]*)>(.*)#', $data, $matches); + if (count($matches) == 0) { + $this->debug_message("*** Can't get OIM maildata"); + return ''; + } + return $matches[2]; + } + + function getOIM_message($msgid) { + preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches); + if (count($matches) == 0) { + $this->debug_message('*** no web ticket?'); + return false; + } + $t = htmlspecialchars($matches[1]); + $p = htmlspecialchars($matches[2]); + + // read OIM + $XML = ' + + + + '.$t.' +

'.$p.'

+ + + + + '.$msgid.' + false + + +'; + + $header_array = array( + 'SOAPAction: '.$this->oim_read_soap, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' + ); + + $this->debug_message("*** URL: $this->oim_read_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->oim_read_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code"); + return false; + } + + // why can't use preg_match('#(.*)#', $data, $matches)? + // multi-lines? + $start = strpos($data, ''); + $end = strpos($data, ''); + if ($start === false || $end === false || $start > $end) { + $this->debug_message("*** Can't get OIM: $msgid"); + return false; + } + $lines = substr($data, $start + 18, $end - $start); + $aLines = @explode("\n", $lines); + $header = true; + $ignore = false; + $sOIM = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + continue; + } + // stop at empty lines + if ($line === '') break; + $sOIM .= $line; + } + $sMsg = base64_decode($sOIM); + $this->debug_message("*** we get OIM ($msgid): $sMsg"); + + // delete OIM + $XML = ' + + + + '.$t.' +

'.$p.'

+ + + + + + '.$msgid.' + + + +'; + + $header_array = array( + 'SOAPAction: '.$this->oim_del_soap, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' + ); + + $this->debug_message("*** URL: $this->oim_del_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->oim_del_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) + $this->debug_message("*** Can't delete OIM: $msgid, http code = $http_code"); + else + $this->debug_message("*** OIM ($msgid) deleted"); + return $sMsg; + } + private function NSLogout() { + if (is_resource($this->NSfp) && !feof($this->NSfp)) { + // logout now + // NS: >>> OUT + $this->ns_writeln("OUT"); + fclose($this->NSfp); + $this->NSfp = false; + $this->log_message("*** logout now!"); + } + + } + private function NSRetryWait($Wait) { + $this->log_message("*** wait for $Wait seconds"); + for($i=0;$i<$Wait;$i++) { + sleep(1); + if($this->kill_me) return false; + } + return true; + } + public function ProcessSendMessageFileQueue() { + $aFiles = glob(MSN_CLASS_SPOOL_DIR.DIRECTORY_SEPARATOR.'*.msn'); + if (!is_array($aFiles)) return true; + clearstatcache(); + foreach ($aFiles as $filename) { + $fp = fopen($filename, 'rt'); + if (!$fp) continue; + $aTo = array(); + $sMessage = ''; + $buf = trim(fgets($fp)); + if (substr($buf, 0, 3) == 'TO:') { + $aTo = @explode(',', str_replace(array("\r","\n","\t",' '),'',substr($buf, 3))); + while (!feof($fp)) $sMessage.=rtrim(fgets($fp))."\n"; + } + fclose($fp); + if (!is_array($aTo) || count($aTo) == 0 || $sMessage == '') + $this->log_message("!!! message format error? delete $filename"); + else + { + foreach($aTo as $To) + { + @list($user, $domain, $network) = @explode('@', $To); + $MessageList[$network]["$user@$domain"]=$sMessage; + } + } + if($this->backup_file) + { + $backup_dir = MSN_CLASS_SPOOL_DIR.'/backup'; + if (!file_exists($backup_dir)) @mkdir($backup_dir); + $backup_name = $backup_dir.'/'.strftime('%Y%m%d%H%M%S').'_'.posix_getpid().'_'.basename($filename); + if (@rename($filename, $backup_name)) + $this->log_message("*** move file to $backup_name"); + } + else @unlink($filename); + } + foreach ($MessageList as $network => $Messages) + { + switch(trim($network)) + { + case '': + case 1: //MSN + // okay, try to ask a switchboard (SB) for sending message + // NS: >>> XFR {id} SB + // $this->ns_writeln("XFR $this->id SB"); + foreach($Messages as $User => $Message) + $this->MessageQueue[$User][]=$Message; + break; + case 'Offline': //MSN + //Send OIM + //FIXME: 修正Send OIM + foreach($Messages as $To => $Message) + { + $lockkey=''; + for ($i = 0; $i < $this->oim_try; $i++) + { + if(($oim_result = $this->sendOIM($To, $Message, $lockkey))===true) break; + if (is_array($oim_result) && $oim_result['challenge'] !== false) { + // need challenge lockkey + $this->log_message("*** we need a new challenge code for ".$oim_result['challenge']); + $lockkey = $this->getChallenge($oim_result['challenge']); + continue; + } + if ($oim_result === false || $oim_result['auth_policy'] !== false) + { + if ($re_login) + { + $this->log_message("*** can't send OIM, but we already re-login again, so ignore this OIM"); + break; + } + $this->log_message("*** can't send OIM, maybe ticket expired, try to login again"); + // maybe we need to re-login again + if(!$this->get_passport_ticket()) + { + $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + break; + } + $this->log_message("**** get new ticket, try it again"); + continue; + } + } + } + break; + default: //Other + foreach($Messages as $To => $Message) { + $Message=$this->getMessage($Message, $network); + $len = strlen($Message); + $this->ns_writeln("UUM $this->id $To $network 1 $len"); + $this->ns_writedata($Message); + $this->log_message("*** sent to $To (network: $network):\n$Message"); + } + } + } + if(isset($this->MessageQueue[$User])&&(!isset($this->MessageQueue[$User]['XFRSent']))) + { + $this->MessageQueue[$User]['XFRSent']=false; + $this->MessageQueue[$User]['ReqTime']=false; + } + return true; + } + public function SignalFunction($signal) + { + switch($signal) + { + case SIGTRAP: + case SIGTERM: + case SIGHUP: + $this->End(); + return; + case SIGCHLD: + $ChildPid=pcntl_wait($status,WUNTRACED); + if($ChildPid>0) + { + $this->log_message("*** Child Process End for ".$this->ChildProcess[$ChildPid]); + unset($this->ChildProcess[$ChildPid]); + } + return; + } + } + + public function Run() + { + $this->log_message("*** startup ***"); + if(!pcntl_signal(SIGCHLD,array($this,'SignalFunction'))) die("Signal SIGCHLD Error\n"); + if(!pcntl_signal(SIGTERM,array($this,'SignalFunction'))) die("Signal SIGTERM Error\n"); + if(!pcntl_signal(SIGTRAP,array($this,'SignalFunction'))) die("Signal SIGTRAP Error\n"); + $process_file = false; + $sent = false; + $aADL = array(); + $aContactList = array(); + while (true) + { + if($this->kill_me) + { + $this->log_message("*** Okay, kill me now!"); + return $this->NSLogout(); + } + if (!is_resource($this->NSfp) || feof($this->NSfp)) + { + $this->log_message("*** try to connect to MSN network"); + if (!$this->connect($this->user, $this->password)) + { + $this->log_message("!!! Can't connect to server: $this->error"); + if(!$this->NSRetryWait($this->retry_wait)) continue; + } + $this->UpdateContacts(); + $this->LastPing=time(); + $this->log_message("*** connected, wait for command"); + $start_tm = time(); + $ping_tm = time(); + stream_set_timeout($this->NSfp, $this->NSStreamTimeout); + $aContactList = $this->getMembershipList(true); + if ($this->update_pending) { + if (is_array($aContactList)) { + $pending = 'Pending'; + foreach ($aContactList as $u_domain => $aUserList) { + foreach ($aUserList as $u_name => $aNetworks) { + foreach ($aNetworks as $network => $aData) { + if (isset($aData[$pending])) { + // pending list + $cnt = 0; + foreach (array('Allow', 'Reverse') as $list) { + if (isset($aData[$list])) + $cnt++; + else { + if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { + $aContactList[$u_domain][$u_name][$network][$list] = false; + $cnt++; + } + } + } + if ($cnt >= 2) { + $id = $aData[$pending]; + // we can delete it from pending now + if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending)) + unset($aContactList[$u_domain][$u_name][$network][$pending]); + } + } + else { + // sync list + foreach (array('Allow', 'Reverse') as $list) { + if (!isset($aData[$list])) { + if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) + $aContactList[$u_domain][$u_name][$network][$list] = false; + } + } + } + } + } + } + } + } + $n = 0; + $sList = ''; + $len = 0; + if (is_array($aContactList)) { + foreach ($aContactList as $u_domain => $aUserList) { + $str = ''; + $len += strlen($str); + if ($len > 7400) { + $aADL[$n] = ''.$sList.''; + $n++; + $sList = ''; + $len = strlen($str); + } + $sList .= $str; + foreach ($aUserList as $u_name => $aNetworks) { + foreach ($aNetworks as $network => $status) { + $str = ''; + $len += strlen($str); + // max: 7500, but is 19, + // so we use 7475 + if ($len > 7475) { + $sList .= ''; + $aADL[$n] = ''.$sList.''; + $n++; + $sList = ''.$str; + $len = strlen($sList); + } + else + $sList .= $str; + } + } + $sList .= ''; + } + } + $aADL[$n] = ''.$sList.''; + // NS: >>> BLP {id} BL + $this->ns_writeln("BLP $this->id BL"); + foreach ($aADL as $str) { + $len = strlen($str); + // NS: >>> ADL {id} {size} + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); + } + // NS: >>> PRP {id} MFN name + if ($this->alias == '') $this->alias = $user; + $aliasname = rawurlencode($this->alias); + $this->ns_writeln("PRP $this->id MFN $aliasname"); + //設定個人大頭貼 + //$MsnObj=$this->PhotoStckObj(); + // NS: >>> CHG {id} {status} {clientid} {msnobj} + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + if($this->PhotoStickerFile!==false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + // NS: >>> UUX {id} length + $str = ''.htmlspecialchars($this->psm).''; + $len = strlen($str); + $this->ns_writeln("UUX $this->id $len"); + $this->ns_writedata($str); + } + $data = $this->ns_readln(); + if($data===false) + { + //If No NS Message Process SendMessageFileQueue + if (time()-$this->LastPing > $this->ping_wait) + { + // NS: >>> PNG + $this->ns_writeln("PNG"); + $this->LastPing = time(); + } + if(count($this->ChildProcess)<$this->MAXChildProcess) + { + $Index=0; + foreach($this->MessageQueue as $User => $Message) + { + if(!trim($User)) continue; + if($Inxdex>=$this->MAXChildProcess-count($this->ChildProcess)) break; + if((!$Message['XFRSent'])||($Message['XFRSent']&&(time()-$this->MessageQueue[$User]['ReqTime']>$this->ReqSBXFRTimeout))) + { + $this->MessageQueue[$User]['XFRSent']=true; + $this->MessageQueue[$User]['ReqTime']=time(); + $this->log_message("*** Request SB for $User"); + $this->ns_writeln("XFR $this->id SB"); + $Index++; + } + } + } + if($this->ProcessSendMessageFileQueue()) continue; + break; + } + switch (substr($data,0,3)) + { + case 'SBS': + // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us + // NS: <<< SBS 0 null + break; + + case 'RFS': + // FIXME: + // NS: <<< RFS ??? + // refresh ADL, so we re-send it again + if (is_array($aADL)) { + foreach ($aADL as $str) { + $len = strlen($str); + // NS: >>> ADL {id} {size} + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); + } + } + break; + + case 'LST': + // NS: <<< LST {email} {alias} 11 0 + @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data); + @list($u_name, $u_domain) = @explode('@', $email); + if (!isset($aContactList[$u_domain][$u_name][1])) { + $aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow'; + $this->log_message("*** add to our contact list: $u_name@$u_domain"); + } + break; + + case 'ADL': + // randomly, we get ADL command, someome add us to their contact list for MSNP15 + // NS: <<< ADL 0 {size} + @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) + { + $data = $this->ns_readdata($size); + preg_match('##', $data, $matches); + if (is_array($matches) && count($matches) > 0) + { + $u_domain = $matches[1]; + $u_name = $matches[2]; + $network = $matches[4]; + if (isset($aContactList[$u_domain][$u_name][$network])) + $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain"); + else + { + $re_login = false; + $cnt = 0; + foreach (array('Allow', 'Reverse') as $list) + { + if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) + { + if ($re_login) { + $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + continue; + } + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->log_message("*** can't re-login, something wrong here"); + $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + continue; + } + $re_login = true; + $this->ticket = $aTickets; + $this->log_message("**** get new ticket, try it again"); + if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) + { + $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + continue; + } + } + $aContactList[$u_domain][$u_name][$network][$list] = false; + $cnt++; + } + $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain"); + } + $str = ''; + $len = strlen($str); + } + else + $this->log_message("*** someone add us to their list: $data"); + $this->AddUsToMemberList($u_name.'@'.$u_domain, $network); + } + break; + + case 'RML': + // randomly, we get RML command, someome remove us to their contact list for MSNP15 + // NS: <<< RML 0 {size} + @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) + { + $data = $this->ns_readdata($size); + preg_match('##', $data, $matches); + if (is_array($matches) && count($matches) > 0) + { + $u_domain = $matches[1]; + $u_name = $matches[2]; + $network = $matches[4]; + if (isset($aContactList[$u_domain][$u_name][$network])) + { + $aData = $aContactList[$u_domain][$u_name][$network]; + foreach ($aData as $list => $id) + $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list); + unset($aContactList[$u_domain][$u_name][$network]); + $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain"); + } + else + $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain"); + $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network); + } + else + $this->log_message("*** someone remove us from their list: $data"); + } + break; + + case 'MSG': + // randomly, we get MSG notification from server + // NS: <<< MSG Hotmail Hotmail {size} + @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) { + $data = $this->ns_readdata($size); + $aLines = @explode("\n", $data); + $header = true; + $ignore = false; + $maildata = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + if (strncasecmp($line, 'Content-Type:', 13) == 0) { + if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && + strpos($line, 'text/x-msmsgsoimnotification') === false) { + // we just need text/x-msmsgsinitialmdatanotification + // or text/x-msmsgsoimnotification + $ignore = true; + break; + } + } + continue; + } + if (strncasecmp($line, 'Mail-Data:', 10) == 0) { + $maildata = trim(substr($line, 10)); + break; + } + } + if ($ignore) { + $this->log_message("*** ingnore MSG for: $line"); + break; + } + if ($maildata == '') { + $this->log_message("*** ingnore MSG not for OIM"); + break; + } + $re_login = false; + if (strcasecmp($maildata, 'too-large') == 0) { + $this->log_message("*** large mail-data, need to get the data via SOAP"); + $maildata = $this->getOIM_maildata(); + if ($maildata === false) { + $this->log_message("*** can't get mail-data via SOAP"); + // maybe we need to re-login again + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + break; + } + $re_login = true; + $this->ticket = $aTickets; + $this->log_message("**** get new ticket, try it again"); + $maildata = $this->getOIM_maildata(); + if ($maildata === false) { + $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM"); + break; + } + } + } + // could be a lots of ..., so we can't use preg_match here + $p = $maildata; + $aOIMs = array(); + while (1) { + $start = strpos($p, ''); + $end = strpos($p, ''); + if ($start === false || $end === false || $start > $end) break; + $end += 4; + $sOIM = substr($p, $start, $end - $start); + $aOIMs[] = $sOIM; + $p = substr($p, $end); + } + if (count($aOIMs) == 0) { + $this->log_message("*** ingnore empty OIM"); + break; + } + foreach ($aOIMs as $maildata) { + // T: 11 for MSN, 13 for Yahoo + // S: 6 for MSN, 7 for Yahoo + // RT: the datetime received by server + // RS: already read or not + // SZ: size of message + // E: sender + // I: msgid + // F: always 00000000-0000-0000-0000-000000000009 + // N: sender alias + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->log_message("*** ingnore OIM maildata without type"); + continue; + } + $oim_type = $matches[1]; + if ($oim_type = 13) + $network = 32; + else + $network = 1; + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->log_message("*** ingnore OIM maildata without sender"); + continue; + } + $oim_sender = $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->log_message("*** ingnore OIM maildata without msgid"); + continue; + } + $oim_msgid = $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + $oim_size = (count($matches) == 0) ? 0 : $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + $oim_time = (count($matches) == 0) ? 0 : $matches[1]; + $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); + $sMsg = $this->getOIM_message($oim_msgid); + if ($sMsg === false) { + $this->log_message("*** can't get OIM, msgid = $oim_msgid"); + if ($re_login) { + $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + continue; + } + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + continue; + } + $re_login = true; + $this->ticket = $aTickets; + $this->log_message("**** get new ticket, try it again"); + $sMsg = $this->getOIM_message($oim_msgid); + if ($sMsg === false) { + $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + continue; + } + } + $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg"); + + $this->ReceivedMessage($oim_sender,$sMsg,$network,true); + } + } + break; + + case 'UBM': + // randomly, we get UBM, this is the message from other network, like Yahoo! + // NS: <<< UBM {email} $network $type {size} + @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) + { + $data = $this->ns_readdata($size); + $aLines = @explode("\n", $data); + $header = true; + $ignore = false; + $sMsg = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + if (strncasecmp($line, 'TypingUser:', 11) == 0) { + $ignore = true; + break; + } + continue; + } + $aSubLines = @explode("\r", $line); + foreach ($aSubLines as $str) { + if ($sMsg !== '') + $sMsg .= "\n"; + $sMsg .= $str; + } + } + if($ignore) + { + $this->log_message("*** ingnore from $from_email: $line"); + break; + } + $this->log_message("*** MSG from $from_email (network: $network): $sMsg"); + $this->ReceivedMessage($from_email,$sMsg,$network,false); + } + break; + + case 'UBX': + // randomly, we get UBX notification from server + // NS: <<< UBX email {network} {size} + @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data); + // we don't need the notification data, so just ignore it + if (is_numeric($size) && $size > 0) + $this->ns_readdata($size); + break; + + case 'CHL': + // randomly, we'll get challenge from server + // NS: <<< CHL 0 {code} + @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data); + $fingerprint = $this->getChallenge($chl_code); + // NS: >>> QRY {id} {product_id} 32 + // NS: >>> fingerprint + $this->ns_writeln("QRY $this->id $this->prod_id 32"); + $this->ns_writedata($fingerprint); + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + if($this->PhotoStickerFile!==false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + break; + case 'CHG': + // NS: <<< CHG {id} {status} {code} + // ignore it + // change our status to online first + break; + + case 'XFR': + // sometimes, NS will redirect to another NS + // MSNP9 + // NS: <<< XFR {id} NS {server} 0 {server} + // MSNP15 + // NS: <<< XFR {id} NS {server} U D + // for normal switchboard XFR + // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0 + @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data); + @list($ip, $port) = @explode(':', $server); + if ($server_type != 'SB') { + // maybe exit? + // this connection will close after XFR + $this->NSLogout(); + continue; + } + if(count($this->MessageQueue)) + { + foreach($this->MessageQueue as $User => $Message) + { + //$this->ChildProcess[$ChildPid] + $this->log_message("*** XFR SB $User"); + $pid=pcntl_fork(); + if($pid) + { + //Parrent Process + $this->ChildProcess[$pid]=$User; + break; + } + elseif($pid==-1) + { + $this->log_message("*** Fork Error $User"); + break; + } + else + { + //Child Process + $this->log_message("*** Child Process Start for $User"); + unset($Message['XFRSent']); + unset($Message['ReqTime']); + $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message); + if ($bSBresult === false) + { + // error for switchboard + $this->log_message("!!! error for sending message to ".$User); + } + die; + } + } + unset($this->MessageQueue[$User]); + } + /* + $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage); + if ($bSBresult === false) { + // error for switchboard + $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]); + $aOfflineUsers[] = $aMSNUsers[$nCurrentUser]; + }*/ + break; + case 'QNG': + // NS: <<< QNG {time} + @list(/* QNG */, $this->ping_wait) = @explode(' ', $data); + if ($this->ping_wait == 0) $this->ping_wait = 50; + //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping; + //Mod by Ricky Set Online + break; + + case 'RNG': + if($this->PhotoStickerFile!==false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + else + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + // someone is trying to talk to us + // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0 + $this->log_message("NS: <<< RNG $data"); + @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data); + @list($sb_ip, $sb_port) = @explode(':', $server); + $this->log_message("*** RING from $email, $sb_ip:$sb_port"); + $this->addContact($email,1,$email, true); + $pid=pcntl_fork(); + if($pid) + { + //Parrent Process + $this->ChildProcess[$pid]='RNG'; + break; + } + elseif($pid==-1) + { + $this->log_message("*** Fork Error $User"); + break; + } + else + { + //Child Process + $this->log_message("*** Ring Child Process Start for $User"); + $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email); + die; + } + break; + case 'OUT': + // force logout from NS + // NS: <<< OUT xxx + fclose($this->NSfp); + $this->log_message("*** LOGOUT from NS"); + break; + + default: + $code = substr($data,0,3); + if (is_numeric($code)) { + $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; + $this->debug_message("*** NS: $this->error"); + + return $this->NsLogout(); + } + break; + } + } + return $this->NsLogout(); + } + + /*public function SendMessage($Message, $To) + { + $FileName = MSN_CLASS_SPOOL_DIR.'/'.strftime('%Y%m%d%H%M%S',time()).'_'.posix_getpid().'_sendMessage.msn'; + if(!is_array($To)) + $To=array($To); + $Receiver=''; + foreach($To as $Email) + { + list($name,$host,$network)=explode('@',$Email); + $network=$network==''?1:$network; + if($network==1 && $this->SwitchBoardProcess && $this->SwitchBoardSessionUser=="$name@$host" ) + { + $this->debug_message("*** SendMessage to $Receiver use SB message queue."); + array_push($this->SwitchBoardMessageQueue,$Message); + continue; + } + $Receiver.="$name@$host@$network,"; + } + if($Receiver=='') return; + $Receiver=substr($Receiver,0,-1); + $this->debug_message("*** SendMessage to $Receiver use File queue."); + file_put_contents($FileName,"TO: $Receiver\n$Message\n"); + }*/ + + function getChallenge($code) + { + // MSNP15 + // http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges + // Step 1: The MD5 Hash + $md5Hash = md5($code.$this->prod_key); + $aMD5 = @explode("\0", chunk_split($md5Hash, 8, "\0")); + for ($i = 0; $i < 4; $i++) { + $aMD5[$i] = implode('', array_reverse(@explode("\0", chunk_split($aMD5[$i], 2, "\0")))); + $aMD5[$i] = (0 + base_convert($aMD5[$i], 16, 10)) & 0x7FFFFFFF; + } + + // Step 2: A new string + $chl_id = $code.$this->prod_id; + $chl_id .= str_repeat('0', 8 - (strlen($chl_id) % 8)); + + $aID = @explode("\0", substr(chunk_split($chl_id, 4, "\0"), 0, -1)); + for ($i = 0; $i < count($aID); $i++) { + $aID[$i] = implode('', array_reverse(@explode("\0", chunk_split($aID[$i], 1, "\0")))); + $aID[$i] = 0 + base_convert(bin2hex($aID[$i]), 16, 10); + } + + // Step 3: The 64 bit key + $magic_num = 0x0E79A9C1; + $str7f = 0x7FFFFFFF; + $high = 0; + $low = 0; + for ($i = 0; $i < count($aID); $i += 2) { + $temp = $aID[$i]; + $temp = bcmod(bcmul($magic_num, $temp), $str7f); + $temp = bcadd($temp, $high); + $temp = bcadd(bcmul($aMD5[0], $temp), $aMD5[1]); + $temp = bcmod($temp, $str7f); + + $high = $aID[$i+1]; + $high = bcmod(bcadd($high, $temp), $str7f); + $high = bcadd(bcmul($aMD5[2], $high), $aMD5[3]); + $high = bcmod($high, $str7f); + + $low = bcadd(bcadd($low, $high), $temp); + } + + $high = bcmod(bcadd($high, $aMD5[1]), $str7f); + $low = bcmod(bcadd($low, $aMD5[3]), $str7f); + + $new_high = bcmul($high & 0xFF, 0x1000000); + $new_high = bcadd($new_high, bcmul($high & 0xFF00, 0x100)); + $new_high = bcadd($new_high, bcdiv($high & 0xFF0000, 0x100)); + $new_high = bcadd($new_high, bcdiv($high & 0xFF000000, 0x1000000)); + // we need integer here + $high = 0+$new_high; + + $new_low = bcmul($low & 0xFF, 0x1000000); + $new_low = bcadd($new_low, bcmul($low & 0xFF00, 0x100)); + $new_low = bcadd($new_low, bcdiv($low & 0xFF0000, 0x100)); + $new_low = bcadd($new_low, bcdiv($low & 0xFF000000, 0x1000000)); + // we need integer here + $low = 0+$new_low; + + // we just use 32 bits integer, don't need the key, just high/low + // $key = bcadd(bcmul($high, 0x100000000), $low); + + // Step 4: Using the key + $md5Hash = md5($code.$this->prod_key); + $aHash = @explode("\0", chunk_split($md5Hash, 8, "\0")); + + $hash = ''; + $hash .= sprintf("%08x", (0 + base_convert($aHash[0], 16, 10)) ^ $high); + $hash .= sprintf("%08x", (0 + base_convert($aHash[1], 16, 10)) ^ $low); + $hash .= sprintf("%08x", (0 + base_convert($aHash[2], 16, 10)) ^ $high); + $hash .= sprintf("%08x", (0 + base_convert($aHash[3], 16, 10)) ^ $low); + + return $hash; + } + + private function getMessage($sMessage, $network = 1) + { + $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n"; + $msg_header_len = strlen($msg_header); + if ($network == 1) + $maxlen = $this->max_msn_message_len - $msg_header_len; + else + $maxlen = $this->max_yahoo_message_len - $msg_header_len; + $sMessage=str_replace("\r", '', $sMessage); + $msg=substr($sMessage,0,$maxlen); + return $msg_header.$msg; + } + /** + * + * @param $Action 連線模式 'Active' => 主動傳送訊息,'Passive' => 接收訊息 + * @param $Param + * @return boolean + */ + private function DoSwitchBoard($Action,$Param) + { + $SessionEnd=false; + $Joined=false; + $id=1; + $LastActive=time(); + stream_set_timeout($this->SBFp, $this->SBTimeout); + switch($Action) + { + case 'Active': + $cki_code=$Param['cki']; + $user=$Param['user']; + $this->SwitchBoardMessageQueue=$Param['Msg']; + // SB: >>> USR {id} {user} {cki} + $this->SB_writeln("USR $id $this->user $cki_code"); + $id++; + $this->SwitchBoardSessionUser=$user; + break; + case 'Passive': + $ticket=$Param['ticket']; + $sid=$Param['sid']; + $user=$Param['user']; + // SB: >>> ANS {id} {user} {ticket} {session_id} + $this->SB_writeln("ANS $id $this->user $ticket $sid"); + $id++; + $this->SwitchBoardSessionUser=$user; + break; + default: + return false; + } + while((!feof($this->SBFp))&&(!$SessionEnd)) + { + $data = $this->SB_readln(); + if($this->kill_me) + { + $this->log_message("*** SB Okay, kill me now!"); + break; + } + if($data === false) + { + if(time()-$LastActive > $this->SBIdleTimeout) + { + $this->debug_message("*** SB Idle Timeout!"); + break; + } + if(!$Joined) continue; + foreach($this->SwitchBoardMessageQueue as $Message) + { + if($Message=='') continue; + $aMessage = $this->getMessage($Message); + //CheckEmotion... + $MsnObjDefine=$this->GetMsnObjDefine($aMessage); + if($MsnObjDefine!=='') + { + $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine"; + $len = strlen($SendString); + $this->SB_writeln("MSG $id N $len"); + $id++; + $this->SB_writedata($SendString); + $this->id++; + } + $len = strlen($aMessage); + $this->SB_writeln("MSG $id N $len"); + $id++; + $this->SB_writedata($aMessage); + } + $this->SwitchBoardMessageQueue=array(); + $LastActive=time(); + continue; + } + $code = substr($data, 0, 3); + switch($code) + { + case 'IRO': + // SB: <<< IRO {id} {rooster} {roostercount} {email} {alias} {clientid} + @list(/* IRO */, /* id */, $cur_num, $total, $email, $alias, $clientid) = @explode(' ', $data); + $this->log_message("*** $email join us"); + $Joined=true; + break; + case 'BYE': + $this->log_message("*** Quit for BYE"); + $SessionEnd=true; + break; + case 'USR': + // SB: <<< USR {id} OK {user} {alias} + // we don't need the data, just ignore it + // request user to join this switchboard + // SB: >>> CAL {id} {user} + $this->SB_writeln("CAL $id $user"); + $id++; + break; + case 'CAL': + // SB: <<< CAL {id} RINGING {?} + // we don't need this, just ignore, and wait for other response + $this->id++; + break; + case 'JOI': + // SB: <<< JOI {user} {alias} {clientid?} + // someone join us + // we don't need the data, just ignore it + // no more user here + $Joined=true; + break; + case 'MSG': + // SB: <<< MSG {email} {alias} {len} + @list(/* MSG */, $from_email, /* alias */, $len, ) = @explode(' ', $data); + $len = trim($len); + $data = $this->SB_readdata($len); + $aLines = @explode("\n", $data); + $header = true; + $ignore = false; + $is_p2p = false; + $sMsg = ''; + foreach ($aLines as $line) + { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + if (strncasecmp($line, 'TypingUser:', 11) == 0) { + // typing notification, just ignore + $ignore = true; + break; + } + if (strncasecmp($line, 'Chunk:', 6) == 0) { + // we don't handle any split message, just ignore + $ignore = true; + break; + } + if (strncasecmp($line, 'Content-Type: application/x-msnmsgrp2p', 38) == 0) { + // p2p message, ignore it, but we need to send acknowledgement for it... + $is_p2p = true; + $p = strstr($data, "\n\n"); + $sMsg = ''; + if ($p === false) { + $p = strstr($data, "\r\n\r\n"); + if ($p !== false) + $sMsg = substr($p, 4); + } + else + $sMsg = substr($p, 2); + break; + } + if (strncasecmp($line, 'Content-Type: application/x-', 28) == 0) { + // ignore all application/x-... message + // for example: + // application/x-ms-ink => ink message + $ignore = true; + break; + } + if (strncasecmp($line, 'Content-Type: text/x-', 21) == 0) { + // ignore all text/x-... message + // for example: + // text/x-msnmsgr-datacast => nudge, voice clip.... + // text/x-mms-animemoticon => customized animemotion word + $ignore = true; + break; + } + continue; + } + if ($sMsg !== '') + $sMsg .= "\n"; + $sMsg .= $line; + } + if ($ignore) + { + $this->log_message("*** ingnore from $from_email: $line"); + break; + } + if ($is_p2p) + { + // we will ignore any p2p message after sending acknowledgement + $ignore = true; + $len = strlen($sMsg); + $this->log_message("*** p2p message from $from_email, size $len"); + // header = 48 bytes + // content >= 0 bytes + // footer = 4 bytes + // so it need to >= 52 bytes + /*if ($len < 52) { + $this->log_message("*** p2p: size error, less than 52!"); + break; + }*/ + $aDwords = @unpack("V12dword", $sMsg); + if (!is_array($aDwords)) { + $this->log_message("*** p2p: header unpack error!"); + break; + } + $this->debug_message("*** p2p: dump received message:\n".$this->dump_binary($sMsg)); + $hdr_SessionID = $aDwords['dword1']; + $hdr_Identifier = $aDwords['dword2']; + $hdr_DataOffsetLow = $aDwords['dword3']; + $hdr_DataOffsetHigh = $aDwords['dword4']; + $hdr_TotalDataSizeLow = $aDwords['dword5']; + $hdr_TotalDataSizeHigh = $aDwords['dword6']; + $hdr_MessageLength = $aDwords['dword7']; + $hdr_Flag = $aDwords['dword8']; + $hdr_AckID = $aDwords['dword9']; + $hdr_AckUID = $aDwords['dword10']; + $hdr_AckSizeLow = $aDwords['dword11']; + $hdr_AckSizeHigh = $aDwords['dword12']; + $this->debug_message("*** p2p: header SessionID = $hdr_SessionID"); + $this->debug_message("*** p2p: header Inentifier = $hdr_Identifier"); + $this->debug_message("*** p2p: header Data Offset Low = $hdr_DataOffsetLow"); + $this->debug_message("*** p2p: header Data Offset High = $hdr_DataOffsetHigh"); + $this->debug_message("*** p2p: header Total Data Size Low = $hdr_TotalDataSizeLow"); + $this->debug_message("*** p2p: header Total Data Size High = $hdr_TotalDataSizeHigh"); + $this->debug_message("*** p2p: header MessageLength = $hdr_MessageLength"); + $this->debug_message("*** p2p: header Flag = $hdr_Flag"); + $this->debug_message("*** p2p: header AckID = $hdr_AckID"); + $this->debug_message("*** p2p: header AckUID = $hdr_AckUID"); + $this->debug_message("*** p2p: header AckSize Low = $hdr_AckSizeLow"); + $this->debug_message("*** p2p: header AckSize High = $hdr_AckSizeHigh"); + if($hdr_Flag==2) { + //This is an ACK from SB ignore.... + $this->debug_message("*** p2p: //This is an ACK from SB ignore....:\n"); + break; + } + $MsgBody=$this->linetoArray(substr($sMsg,48,-4)); + $this->debug_message("*** p2p: body".print_r($MsgBody,true)); + if(($MsgBody['EUF-GUID']=='{A4268EEC-FEC5-49E5-95C3-F126696BDBF6}')&&($PictureFilePath=$this->GetPictureFilePath($MsgBody['Context']))) + { + while(true) + { + if($this->SB_readln()===false) break; + } + $this->debug_message("*** p2p: Inv hdr:\n".$this->dump_binary(substr($sMsg,0,48))); + preg_match('/{([0-9A-F\-]*)}/i',$MsgBody['Via'],$Matches); + $BranchGUID=$Matches[1]; + //it's an invite to send a display picture. + $new_id = ~$hdr_Identifier; + $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID, + $new_id, + 0, 0, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, + 0, + 2, + $hdr_Identifier, + $hdr_AckID, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh); + $footer = pack("L", 0); + $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer"; + $len = strlen($message); + $this->SB_writeln("MSG $id D $len"); + $id++; + $this->SB_writedata($message); + $this->log_message("*** p2p: send display picture acknowledgement for $hdr_SessionID"); + $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message)); + $this->SB_readln();//Read ACK; + $this->debug_message("*** p2p: Invite ACK Hdr:\n".$this->dump_binary($hdr)); + $new_id-=3; + //Send 200 OK message + $MessageContent="SessionID: ".$MsgBody['SessionID']."\r\n\r\n".pack("C", 0); + $MessagePayload= + "MSNSLP/1.0 200 OK\r\n". + "To: \r\n". + "From: user.">\r\n". + "Via: ".$MsgBody['Via']."\r\n". + "CSeq: ".($MsgBody['CSeq']+1)."\r\n". + "Call-ID: ".$MsgBody['Call-ID']."\r\n". + "Max-Forwards: 0\r\n". + "Content-Type: application/x-msnmsgr-sessionreqbody\r\n". + "Content-Length: ".strlen($MessageContent)."\r\n\r\n". + $MessageContent; + $hdr_TotalDataSizeLow=strlen($MessagePayload); + $hdr_TotalDataSizeHigh=0; + $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID, + $new_id, + 0, 0, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, + strlen($MessagePayload), + 0, + rand(), + 0, + 0,0); + + $message = + "MIME-Version: 1.0\r\n". + "Content-Type: application/x-msnmsgrp2p\r\n". + "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer"; + $this->SB_writeln("MSG $id D ".strlen($message)); + $id++; + $this->SB_writedata($message); + $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message)); + $this->SB_readln();//Read ACK; + + $this->debug_message("*** p2p: 200 ok:\n".$this->dump_binary($hdr)); + //send Data preparation message + //send 4 null bytes as data + $hdr_TotalDataSizeLow=4; + $hdr_TotalDataSizeHigh=0; + $new_id++; + $hdr = pack("LLLLLLLLLLLL", + $MsgBody['SessionID'], + $new_id, + 0, 0, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, + $hdr_TotalDataSizeLow, + 0, + rand(), + 0, + 0,0); + $message = + "MIME-Version: 1.0\r\n". + "Content-Type: application/x-msnmsgrp2p\r\n". + "P2P-Dest: $from_email\r\n\r\n$hdr".pack('L',0)."$footer"; + $this->SB_writeln("MSG $id D ".strlen($message)); + $id++; + $this->SB_writedata($message); + $this->debug_message("*** p2p: dump send Data preparation message:\n".$this->dump_binary($message)); + $this->debug_message("*** p2p: Data Prepare Hdr:\n".$this->dump_binary($hdr)); + $this->SB_readln();//Read ACK; + + //send Data Content.. + $footer=pack('N',1); + $new_id++; + $FileSize=filesize($PictureFilePath); + if($hTitle=fopen($PictureFilePath,'rb')) + { + $Offset=0; + //$new_id++; + while(!feof($hTitle)) + { + $FileContent=fread($hTitle,1024); + $FileContentSize=strlen($FileContent); + $hdr = pack("LLLLLLLLLLLL", + $MsgBody['SessionID'], + $new_id, + $Offset, 0, + $FileSize,0, + $FileContentSize, + 0x20, + rand(), + 0, + 0,0 + ); + $message = + "MIME-Version: 1.0\r\n". + "Content-Type: application/x-msnmsgrp2p\r\n". + "P2P-Dest: $from_email\r\n\r\n$hdr$FileContent$footer"; + $this->SB_writeln("MSG $id D ".strlen($message)); + $id++; + $this->SB_writedata($message); + $this->debug_message("*** p2p: dump send Data Content message $Offset / $FileSize :\n".$this->dump_binary($message)); + $this->debug_message("*** p2p: Data Content Hdr:\n".$this->dump_binary($hdr)); + //$this->SB_readln();//Read ACK; + $Offset+=$FileContentSize; + } + } + //Send Bye + /* + $MessageContent="\r\n".pack("C", 0); + $MessagePayload= + "BYE MSNMSGR:MSNSLP/1.0\r\n". + "To: \r\n". + "From: user.">\r\n". + "Via: MSNSLP/1.0/TLP ;branch={".$BranchGUID."}\r\n". + "CSeq: 0\r\n". + "Call-ID: ".$MsgBody['Call-ID']."\r\n". + "Max-Forwards: 0\r\n". + "Content-Type: application/x-msnmsgr-sessionclosebody\r\n". + "Content-Length: ".strlen($MessageContent)."\r\n\r\n".$MessageContent; + $footer=pack('N',0); + $hdr_TotalDataSizeLow=strlen($MessagePayload); + $hdr_TotalDataSizeHigh=0; + $new_id++; + $hdr = pack("LLLLLLLLLLLL", + 0, + $new_id, + 0, 0, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, + 0, + 0, + rand(), + 0, + 0,0); + $message = + "MIME-Version: 1.0\r\n". + "Content-Type: application/x-msnmsgrp2p\r\n". + "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer"; + $this->SB_writeln("MSG $id D ".strlen($message)); + $id++; + $this->SB_writedata($message); + $this->debug_message("*** p2p: dump send BYE message :\n".$this->dump_binary($message)); + */ + break; + } + //TODO: + //if ($hdr_Flag == 2) { + // just send ACK... + // $this->SB_writeln("ACK $id"); + // break; + //} + if ($hdr_SessionID == 4) { + // ignore? + $this->debug_message("*** p2p: ignore flag 4"); + break; + } + $finished = false; + if ($hdr_TotalDataSizeHigh == 0) { + // only 32 bites size + if (($hdr_MessageLength + $hdr_DataOffsetLow) == $hdr_TotalDataSizeLow) + $finished = true; + } + else { + // we won't accept any file transfer + // so I think we won't get any message size need to use 64 bits + // 64 bits size here, can't count directly... + $totalsize = base_convert(sprintf("%X%08X", $hdr_TotalDataSizeHigh, $hdr_TotalDataSizeLow), 16, 10); + $dataoffset = base_convert(sprintf("%X%08X", $hdr_DataOffsetHigh, $hdr_DataOffsetLow), 16, 10); + $messagelength = base_convert(sprintf("%X", $hdr_MessageLength), 16, 10); + $now_size = bcadd($dataoffset, $messagelength); + if (bccomp($now_size, $totalsize) >= 0) + $finished = true; + } + if (!$finished) { + // ignore not finished split packet + $this->debug_message("*** p2p: ignore split packet, not finished"); + break; + } + //$new_id = ~$hdr_Identifier; + /* + $new_id++; + $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID, + $new_id, + 0, 0, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, + 0, + 2, + $hdr_Identifier, + $hdr_AckID, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh); + $footer = pack("L", 0); + $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer"; + $len = strlen($message); + $this->SB_writeln("MSG $id D $len"); + $id++; + $this->SB_writedata($message); + $this->log_message("*** p2p: send acknowledgement for $hdr_SessionID"); + $this->debug_message("*** p2p: dump sent message:\n".$this->dump_binary($hdr.$footer)); + */ + break; + } + $this->log_message("*** MSG from $from_email: $sMsg"); + $this->ReceivedMessage($from_email,$sMsg,$network,false); + break; + case '217': + $this->log_message("*** User $user is offline. Try OIM."); + foreach($this->SwitchBoardMessageQueue as $Message) + $this->SendMessage($Message,"$user@Offline"); + $SessionEnd=true; + break; + default: + if (is_numeric($code)) + { + $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; + $this->debug_message("*** SB: $this->error"); + $SessionEnd=true; + } + break; + } + $LastActive = time(); + } + if (feof($this->SBFp)) + { + // lost connection? error? try OIM later + @fclose($this->SBFp); + return false; + } + $this->SB_writeln("OUT"); + @fclose($this->SBFp); + return true; + } + private function switchboard_control($ip, $port, $cki_code, $user, $Messages) + { + $this->SwitchBoardProcess=1; + $this->debug_message("*** SB: try to connect to switchboard server $ip:$port"); + $this->SBFp = @fsockopen($ip, $port, $errno, $errstr, 5); + if (!$this->SBFp) + { + $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr"); + return false; + } + return $this->DoSwitchBoard('Active',array('cki'=>$cki_code, 'user'=>$user,'Msg'=>$Messages)); + } + private function switchboard_ring($ip, $port, $sid, $ticket,$user) + { + $this->SwitchBoardProcess=2; + $this->debug_message("*** SB: try to connect to switchboard server $ip:$port"); + $this->SBFp = @fsockopen($ip, $port, $errno, $errstr, 5); + if (!$this->SBFp) + { + $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr"); + return false; + } + return $this->DoSwitchBoard('Passive',array('sid'=>$sid,'user'=>$user,'ticket'=>$ticket)); + } + + private function sendOIM($to, $sMessage, $lockkey) + { + $XML = ' + + + + + + + http://messenger.msn.com + 1 + + + + text + MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: base64 +X-OIM-Message-Type: OfflineMessage +X-OIM-Run-Id: {DAB68CFA-38C9-449B-945E-38AFA51E50A7} +X-OIM-Sequence-Num: 1 + +'.chunk_split(base64_encode($sMessage)).' + + +'; + + $header_array = array( + 'SOAPAction: '.$this->oim_send_soap, + 'Content-Type: text/xml', + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' + ); + + $this->debug_message("*** URL: $this->oim_send_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->oim_send_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code == 200) { + $this->debug_message("*** OIM sent for $to"); + return true; + } + + $challenge = false; + $auth_policy = false; + // the lockkey is invalid, authenticated fail, we need challenge it again + // 364763969 + preg_match("#(.*)#", $data, $matches); + if (count($matches) != 0) { + // yes, we get new LockKeyChallenge + $challenge = $matches[2]; + $this->debug_message("*** OIM need new challenge ($challenge) for $to"); + } + // auth policy error + // MBI_SSL + preg_match("#(.*)#", $data, $matches); + if (count($matches) != 0) { + $auth_policy = $matches[2]; + $this->debug_message("*** OIM need new auth policy ($auth_policy) for $to"); + } + if ($auth_policy === false && $challenge === false) { + //q0:AuthenticationFailed + preg_match("#(.*)#", $data, $matches); + if (count($matches) == 0) { + // no error, we assume the OIM is sent + $this->debug_message("*** OIM sent for $to"); + return true; + } + $err_code = $matches[2]; + //Exception of type 'System.Web.Services.Protocols.SoapException' was thrown. + preg_match("#(.*)#", $data, $matches); + if (count($matches) > 0) + $err_msg = $matches[1]; + else + $err_msg = ''; + $this->debug_message("*** OIM failed for $to"); + $this->debug_message("*** OIM Error code: $err_code"); + $this->debug_message("*** OIM Error Message: $err_msg"); + return false; + } + return array('challenge' => $challenge, 'auth_policy' => $auth_policy); + } + + // read data for specified size + private function ns_readdata($size) { + $data = ''; + $count = 0; + while (!feof($this->NSfp)) { + $buf = @fread($this->NSfp, $size - $count); + $data .= $buf; + $count += strlen($buf); + if ($count >= $size) break; + } + $this->debug_message("NS: data ($size/$count) <<<\n$data"); + return $data; + } + + // read one line + private function ns_readln() { + $data = @fgets($this->NSfp, 4096); + if ($data !== false) { + $data = trim($data); + $this->debug_message("NS: <<< $data"); + } + return $data; + } + + // write to server, append \r\n, also increase id + private function ns_writeln($data) { + @fwrite($this->NSfp, $data."\r\n"); + $this->debug_message("NS: >>> $data"); + $this->id++; + return; + } + + // write data to server + private function ns_writedata($data) { + @fwrite($this->NSfp, $data); + $this->debug_message("NS: >>> $data"); + return; + } + + // read data for specified size for SB + private function sb_readdata($size) { + $data = ''; + $count = 0; + while (!feof($this->SBFp)) { + $buf = @fread($this->SBFp, $size - $count); + $data .= $buf; + $count += strlen($buf); + if ($count >= $size) break; + } + $this->debug_message("SB: data ($size/$count) <<<\n$data"); + return $data; + } + + // read one line for SB + private function sb_readln() { + $data = @fgets($this->SBFp, 4096); + if ($data !== false) { + $data = trim($data); + $this->debug_message("SB: <<< $data"); + } + return $data; + } + + // write to server for SB, append \r\n, also increase id + // switchboard server only accept \r\n, it will lost connection if just \n only + private function sb_writeln($data) { + @fwrite($this->SBFp, $data."\r\n"); + $this->debug_message("SB: >>> $data"); + $this->id++; + return; + } + + // write data to server + private function sb_writedata($data) { + @fwrite($this->SBFp, $data); + $this->debug_message("SB: >>> $data"); + return; + } + + // show debug information + function debug_message($str) { + if (!$this->debug) return; + if($this->debug===STDOUT) echo $str."\n"; + /*$fname=MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msn_'.strftime('%Y%m%d').'.debug'; + $fp = fopen($fname, 'at'); + if ($fp) { + fputs($fp, strftime('%m/%d/%y %H:%M:%S').' ['.posix_getpid().'] '.$str."\n"); + fclose($fp); + return; + }*/ + // still show debug information, if we can't open log_file + echo $str."\n"; + return; + } + + function dump_binary($str) { + $buf = ''; + $a_str = ''; + $h_str = ''; + $len = strlen($str); + for ($i = 0; $i < $len; $i++) { + if (($i % 16) == 0) { + if ($buf !== '') { + $buf .= "$h_str $a_str\n"; + } + $buf .= sprintf("%04X:", $i); + $a_str = ''; + $h_str = ''; + } + $ch = ord($str[$i]); + if ($ch < 32) + $a_str .= '.'; + else + $a_str .= chr($ch); + $h_str .= sprintf(" %02X", $ch); + } + if ($h_str !== '') + $buf .= "$h_str $a_str\n"; + return $buf; + } + + // write log + function log_message($str) { + /*$fname = MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msn_'.strftime('%Y%m%d').'.log'; + $fp = fopen($fname, 'at'); + if ($fp) { + fputs($fp, strftime('%m/%d/%y %H:%M:%S').' ['.posix_getpid().'] '.$str."\n"); + fclose($fp); + }*/ + $this->debug_message($str); + return; + } + /** + * + * @param $FilePath 圖檔路徑 + * @param $Type 檔案類型 3=>大頭貼,2表情圖案 + * @return array + */ + private function MsnObj($FilePath,$Type=3) + { + if(!($FileSize=filesize($FilePath))) return ''; + $Location=md5($FilePath); + $Friendly=md5($FilePath.$Type); + if(isset($this->MsnObjMap[$Location])) return $this->MsnObjMap[$Location]; + $sha1d=base64_encode(sha1(file_get_contents($FilePath),true)); + $sha1c=base64_encode(sha1("Creator".$this->user."Size$FileSize"."Type$Type"."Location$Location"."Friendly".$Friendly."SHA1D$sha1d",true)); + $this->MsnObjArray[$Location]=$FilePath; + $MsnObj=''; + $this->MsnObjMap[$Location]=$MsnObj; + $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n"); + return $MsnObj; + } + private function linetoArray($lines) { + $lines=str_replace("\r",'',$lines); + $lines=explode("\n",$lines); + foreach($lines as $line) { + if(!isset($line{3})) continue; + list($Key,$Val)=explode(':',$line); + $Data[trim($Key)]=trim($Val); + } + return $Data; + } + private function GetPictureFilePath($Context) + { + $MsnObj=base64_decode($Context); + if(preg_match('/location="(.*?)"/i',$MsnObj,$Match)) + $location=$Match[1]; + $this->debug_message("*** p2p: PictureFile[$location] ::All".print_r($this->MsnObjArray,true)."\n"); + if($location&&(isset($this->MsnObjArray[$location]))) + return $this->MsnObjArray[$location]; + return false; + } + private function GetMsnObjDefine($Message) + { + $DefineString=''; + if(is_array($this->Emotions)) + foreach($this->Emotions as $Pattern => $FilePath) + { + if(strpos($Message,$Pattern)!==false) + $DefineString.="$Pattern\t".$this->MsnObj($FilePath,2)."\t"; + } + return $DefineString; + } + /** + * Receive Message Overload Function + * @param $Sender + * @param $Message + * @param $Network 1 => msn , 32 =>yahoo + * @param $IsOIM + * @return unknown_type + */ + protected function ReceivedMessage($Sender,$Message,$Network,$IsOIM=false){} + /** + * Remove Us From Member List Overload Function + * @param $User + * @param $Message + * @param $Network 1 => msn , 32 =>yahoo + * @return unknown_type + */ + protected function RemoveUsFromMemberList($User,$Network){} + /** + * Add Us to Member List Overload Function + * @param $User + * @param $Message + * @param $Network 1 => msn , 32 =>yahoo + * @return unknown_type + */ + protected function AddUsToMemberList($User,$Network){} + + public function signon() { + $this->log_message("*** try to connect to MSN network"); + while(!$this->connect($this->user, $this->password)) + { + $this->log_message("!!! Can't connect to server: $this->error"); + if(!$this->NSRetryWait($this->retry_wait)) return; + } + $this->UpdateContacts(); + $this->LastPing=time(); + $this->log_message("*** connected, wait for command"); + $start_tm = time(); + $ping_tm = time(); + stream_set_timeout($this->NSfp, $this->NSStreamTimeout); + $this->aContactList = $this->getMembershipList(true); + if ($this->update_pending) { + if (is_array($this->aContactList)) { + $pending = 'Pending'; + foreach ($this->aContactList as $u_domain => $aUserList) { + foreach ($aUserList as $u_name => $aNetworks) { + foreach ($aNetworks as $network => $aData) { + if (isset($aData[$pending])) { + // pending list + $cnt = 0; + foreach (array('Allow', 'Reverse') as $list) { + if (isset($aData[$list])) + $cnt++; + else { + if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { + $this->aContactList[$u_domain][$u_name][$network][$list] = false; + $cnt++; + } + } + } + if ($cnt >= 2) { + $id = $aData[$pending]; + // we can delete it from pending now + if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending)) + unset($this->aContactList[$u_domain][$u_name][$network][$pending]); + } + } + else { + // sync list + foreach (array('Allow', 'Reverse') as $list) { + if (!isset($aData[$list])) { + if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) + $this->aContactList[$u_domain][$u_name][$network][$list] = false; + } + } + } + } + } + } + } + } + $n = 0; + $sList = ''; + $len = 0; + if (is_array($this->aContactList)) { + foreach ($this->aContactList as $u_domain => $aUserList) { + $str = ''; + $len += strlen($str); + if ($len > 7400) { + $aADL[$n] = ''.$sList.''; + $n++; + $sList = ''; + $len = strlen($str); + } + $sList .= $str; + foreach ($aUserList as $u_name => $aNetworks) { + foreach ($aNetworks as $network => $status) { + $str = ''; + $len += strlen($str); + // max: 7500, but is 19, + // so we use 7475 + if ($len > 7475) { + $sList .= ''; + $aADL[$n] = ''.$sList.''; + $n++; + $sList = ''.$str; + $len = strlen($sList); + } + else + $sList .= $str; + } + } + $sList .= ''; + } + } + $aADL[$n] = ''.$sList.''; + // NS: >>> BLP {id} BL + $this->ns_writeln("BLP $this->id BL"); + foreach ($aADL as $str) { + $len = strlen($str); + // NS: >>> ADL {id} {size} + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); + } + // NS: >>> PRP {id} MFN name + if ($this->alias == '') $this->alias = $user; + $aliasname = rawurlencode($this->alias); + $this->ns_writeln("PRP $this->id MFN $aliasname"); + //設定個人大頭貼 + //$MsnObj=$this->PhotoStckObj(); + // NS: >>> CHG {id} {status} {clientid} {msnobj} + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + if($this->PhotoStickerFile!==false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + // NS: >>> UUX {id} length + $str = ''.htmlspecialchars($this->psm).''; + $len = strlen($str); + $this->ns_writeln("UUX $this->id $len"); + $this->ns_writedata($str); + } + + public function NSreceive() { + $this->log_message("*** startup ***"); + + $aADL = array(); + + // Sign in again if not signed in or socket failed + if (!is_resource($this->NSfp) || feof($this->NSfp)) { + $this->signon(); + } + + $data = $this->ns_readln(); + /*if($data===false) + { + //If No NS Message Process SendMessageFileQueue + if (time()-$this->LastPing > $this->ping_wait) + { + // NS: >>> PNG + $this->ns_writeln("PNG"); + $this->LastPing = time(); + } + if(count($this->ChildProcess)<$this->MAXChildProcess) + { + $Index=0; + foreach($this->MessageQueue as $User => $Message) + { + if(!trim($User)) continue; + if($Inxdex>=$this->MAXChildProcess-count($this->ChildProcess)) break; + if((!$Message['XFRSent'])||($Message['XFRSent']&&(time()-$this->MessageQueue[$User]['ReqTime']>$this->ReqSBXFRTimeout))) + { + $this->MessageQueue[$User]['XFRSent']=true; + $this->MessageQueue[$User]['ReqTime']=time(); + $this->log_message("*** Request SB for $User"); + $this->ns_writeln("XFR $this->id SB"); + $Index++; + } + } + } + if($this->ProcessSendMessageFileQueue()) continue; + break; + }*/ + switch (substr($data,0,3)) + { + case 'SBS': + // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us + // NS: <<< SBS 0 null + break; + + case 'RFS': + // FIXME: + // NS: <<< RFS ??? + // refresh ADL, so we re-send it again + if (is_array($aADL)) { + foreach ($aADL as $str) { + $len = strlen($str); + // NS: >>> ADL {id} {size} + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); + } + } + break; + + case 'LST': + // NS: <<< LST {email} {alias} 11 0 + @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data); + @list($u_name, $u_domain) = @explode('@', $email); + if (!isset($this->aContactList[$u_domain][$u_name][1])) { + $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow'; + $this->log_message("*** add to our contact list: $u_name@$u_domain"); + } + break; + + case 'ADL': + // randomly, we get ADL command, someome add us to their contact list for MSNP15 + // NS: <<< ADL 0 {size} + @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) + { + $data = $this->ns_readdata($size); + preg_match('##', $data, $matches); + if (is_array($matches) && count($matches) > 0) + { + $u_domain = $matches[1]; + $u_name = $matches[2]; + $network = $matches[4]; + if (isset($this->aContactList[$u_domain][$u_name][$network])) + $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain"); + else + { + $re_login = false; + $cnt = 0; + foreach (array('Allow', 'Reverse') as $list) + { + if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) + { + if ($re_login) { + $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + continue; + } + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->log_message("*** can't re-login, something wrong here"); + $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + continue; + } + $re_login = true; + $this->ticket = $aTickets; + $this->log_message("**** get new ticket, try it again"); + if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) + { + $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + continue; + } + } + $this->aContactList[$u_domain][$u_name][$network][$list] = false; + $cnt++; + } + $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain"); + } + $str = ''; + $len = strlen($str); + } + else + $this->log_message("*** someone add us to their list: $data"); + $this->AddUsToMemberList($u_name.'@'.$u_domain, $network); + } + break; + + case 'RML': + // randomly, we get RML command, someome remove us to their contact list for MSNP15 + // NS: <<< RML 0 {size} + @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) + { + $data = $this->ns_readdata($size); + preg_match('##', $data, $matches); + if (is_array($matches) && count($matches) > 0) + { + $u_domain = $matches[1]; + $u_name = $matches[2]; + $network = $matches[4]; + if (isset($this->aContactList[$u_domain][$u_name][$network])) + { + $aData = $this->aContactList[$u_domain][$u_name][$network]; + foreach ($aData as $list => $id) + $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list); + unset($this->aContactList[$u_domain][$u_name][$network]); + $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain"); + } + else + $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain"); + $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network); + } + else + $this->log_message("*** someone remove us from their list: $data"); + } + break; + + case 'MSG': + // randomly, we get MSG notification from server + // NS: <<< MSG Hotmail Hotmail {size} + @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) { + $data = $this->ns_readdata($size); + $aLines = @explode("\n", $data); + $header = true; + $ignore = false; + $maildata = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + if (strncasecmp($line, 'Content-Type:', 13) == 0) { + if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && + strpos($line, 'text/x-msmsgsoimnotification') === false) { + // we just need text/x-msmsgsinitialmdatanotification + // or text/x-msmsgsoimnotification + $ignore = true; + break; + } + } + continue; + } + if (strncasecmp($line, 'Mail-Data:', 10) == 0) { + $maildata = trim(substr($line, 10)); + break; + } + } + if ($ignore) { + $this->log_message("*** ingnore MSG for: $line"); + break; + } + if ($maildata == '') { + $this->log_message("*** ingnore MSG not for OIM"); + break; + } + $re_login = false; + if (strcasecmp($maildata, 'too-large') == 0) { + $this->log_message("*** large mail-data, need to get the data via SOAP"); + $maildata = $this->getOIM_maildata(); + if ($maildata === false) { + $this->log_message("*** can't get mail-data via SOAP"); + // maybe we need to re-login again + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + break; + } + $re_login = true; + $this->ticket = $aTickets; + $this->log_message("**** get new ticket, try it again"); + $maildata = $this->getOIM_maildata(); + if ($maildata === false) { + $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM"); + break; + } + } + } + // could be a lots of ..., so we can't use preg_match here + $p = $maildata; + $aOIMs = array(); + while (1) { + $start = strpos($p, ''); + $end = strpos($p, ''); + if ($start === false || $end === false || $start > $end) break; + $end += 4; + $sOIM = substr($p, $start, $end - $start); + $aOIMs[] = $sOIM; + $p = substr($p, $end); + } + if (count($aOIMs) == 0) { + $this->log_message("*** ingnore empty OIM"); + break; + } + foreach ($aOIMs as $maildata) { + // T: 11 for MSN, 13 for Yahoo + // S: 6 for MSN, 7 for Yahoo + // RT: the datetime received by server + // RS: already read or not + // SZ: size of message + // E: sender + // I: msgid + // F: always 00000000-0000-0000-0000-000000000009 + // N: sender alias + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->log_message("*** ingnore OIM maildata without type"); + continue; + } + $oim_type = $matches[1]; + if ($oim_type = 13) + $network = 32; + else + $network = 1; + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->log_message("*** ingnore OIM maildata without sender"); + continue; + } + $oim_sender = $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->log_message("*** ingnore OIM maildata without msgid"); + continue; + } + $oim_msgid = $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + $oim_size = (count($matches) == 0) ? 0 : $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + $oim_time = (count($matches) == 0) ? 0 : $matches[1]; + $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); + $sMsg = $this->getOIM_message($oim_msgid); + if ($sMsg === false) { + $this->log_message("*** can't get OIM, msgid = $oim_msgid"); + if ($re_login) { + $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + continue; + } + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + continue; + } + $re_login = true; + $this->ticket = $aTickets; + $this->log_message("**** get new ticket, try it again"); + $sMsg = $this->getOIM_message($oim_msgid); + if ($sMsg === false) { + $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + continue; + } + } + $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg"); + + //$this->ReceivedMessage($oim_sender,$sMsg,$network,true); + $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true)); + } + } + break; + + case 'UBM': + // randomly, we get UBM, this is the message from other network, like Yahoo! + // NS: <<< UBM {email} $network $type {size} + @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) + { + $data = $this->ns_readdata($size); + $aLines = @explode("\n", $data); + $header = true; + $ignore = false; + $sMsg = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + if (strncasecmp($line, 'TypingUser:', 11) == 0) { + $ignore = true; + break; + } + continue; + } + $aSubLines = @explode("\r", $line); + foreach ($aSubLines as $str) { + if ($sMsg !== '') + $sMsg .= "\n"; + $sMsg .= $str; + } + } + if($ignore) + { + $this->log_message("*** ingnore from $from_email: $line"); + break; + } + $this->log_message("*** MSG from $from_email (network: $network): $sMsg"); + //$this->ReceivedMessage($from_email,$sMsg,$network,false); + $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false)); + } + break; + + case 'UBX': + // randomly, we get UBX notification from server + // NS: <<< UBX email {network} {size} + @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data); + // we don't need the notification data, so just ignore it + if (is_numeric($size) && $size > 0) + $this->ns_readdata($size); + break; + + case 'CHL': + // randomly, we'll get challenge from server + // NS: <<< CHL 0 {code} + @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data); + $fingerprint = $this->getChallenge($chl_code); + // NS: >>> QRY {id} {product_id} 32 + // NS: >>> fingerprint + $this->ns_writeln("QRY $this->id $this->prod_id 32"); + $this->ns_writedata($fingerprint); + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + if($this->PhotoStickerFile!==false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + break; + case 'CHG': + // NS: <<< CHG {id} {status} {code} + // ignore it + // change our status to online first + break; + + case 'XFR': + // sometimes, NS will redirect to another NS + // MSNP9 + // NS: <<< XFR {id} NS {server} 0 {server} + // MSNP15 + // NS: <<< XFR {id} NS {server} U D + // for normal switchboard XFR + // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0 + @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data); + @list($ip, $port) = @explode(':', $server); + if ($server_type != 'SB') { + // maybe exit? + // this connection will close after XFR + $this->NSLogout(); + continue; + } + if(count($this->MessageQueue)) + { + foreach($this->MessageQueue as $User => $Message) + { + //$this->ChildProcess[$ChildPid] + $this->log_message("*** XFR SB $User"); + $pid=pcntl_fork(); + if($pid) + { + //Parrent Process + $this->ChildProcess[$pid]=$User; + break; + } + elseif($pid==-1) + { + $this->log_message("*** Fork Error $User"); + break; + } + else + { + //Child Process + $this->log_message("*** Child Process Start for $User"); + unset($Message['XFRSent']); + unset($Message['ReqTime']); + $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message); + if ($bSBresult === false) + { + // error for switchboard + $this->log_message("!!! error for sending message to ".$User); + } + die; + } + } + unset($this->MessageQueue[$User]); + } + /* + $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage); + if ($bSBresult === false) { + // error for switchboard + $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]); + $aOfflineUsers[] = $aMSNUsers[$nCurrentUser]; + }*/ + break; + case 'QNG': + // NS: <<< QNG {time} + @list(/* QNG */, $this->ping_wait) = @explode(' ', $data); + if ($this->ping_wait == 0) $this->ping_wait = 50; + //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping; + //Mod by Ricky Set Online + break; + + case 'RNG': + if($this->PhotoStickerFile!==false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + else + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + // someone is trying to talk to us + // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0 + $this->log_message("NS: <<< RNG $data"); + @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data); + @list($sb_ip, $sb_port) = @explode(':', $server); + $this->log_message("*** RING from $email, $sb_ip:$sb_port"); + $this->addContact($email,1,$email, true); + $pid=pcntl_fork(); + if($pid) + { + //Parrent Process + $this->ChildProcess[$pid]='RNG'; + break; + } + elseif($pid==-1) + { + $this->log_message("*** Fork Error $User"); + break; + } + else + { + //Child Process + $this->log_message("*** Ring Child Process Start for $User"); + $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email); + die; + } + break; + case 'OUT': + // force logout from NS + // NS: <<< OUT xxx + $this->log_message("*** LOGOUT from NS"); + return $this->NsLogout(); + + default: + $code = substr($data,0,3); + if (is_numeric($code)) { + $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; + $this->debug_message("*** NS: $this->error"); + + return $this->NsLogout(); + } + break; + } + } + + public function SendMessage($Message, $To) { + if(!is_array($To)) + $To=array($To); + $Receiver=''; + foreach($To as $Email) + { + list($name,$host,$network)=explode('@',$Email); + $network=$network==''?1:$network; + if($network==1 && isset($this->switchBoardSessions[$Email]) ) { + $this->debug_message("*** SendMessage to $Receiver use SB message queue."); + array_push($this->SwitchBoardMessageQueue,$Message); + continue; + } + $Receiver.="$name@$host@$network,"; + } + if($Receiver=='') return; + $Receiver=substr($Receiver,0,-1); + $this->debug_message("*** SendMessage to $Receiver use File queue."); + file_put_contents($FileName,"TO: $Receiver\n$Message\n"); + } + + public function getNSSocket() { + return $this->NSfp; + } + + public function getSBSocket() { + return $this->SBfp; + } + + public function getSockets() { + return array($this->NSfp, $this->SBfp); + } + + /** + * Calls User Handler + * + * Calls registered handler for a specific event. + * + * @param String $event Command (event) name (Rvous etc) + * @param String $data Raw message from server + * @see registerHandler + * @return void + */ + private function callHandler($event, $data) { + if (isset($this->myEventHandlers[$event])) { + call_user_func($this->myEventHandlers[$event], $data); + } else { + $this->noHandler($data); + } + } + + /** + * Registers a user handler + * + * Handler List + * IMIn + * + * @param String $event Event name + * @param String $handler User function to call + * @see callHandler + * @return boolean Returns true if successful + */ + public function registerHandler($event, $handler) { + if (is_callable($handler)) { + $this->myEventHandlers[$event] = $handler; + return true; + } else { + return false; + } + } +} diff --git a/plugins/Msn/extlib/phpmsnclass/msnbot.php b/plugins/Msn/extlib/phpmsnclass/msnbot.php new file mode 100755 index 0000000000..7a9f66ca2e --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/msnbot.php @@ -0,0 +1,63 @@ +#!/usr/bin/php +End(); + return; + } +} + +// network: +// 1: WLM/MSN +// 2: LCS +// 4: Mobile Phones +// 32: Yahoo! +function getNetworkName($network) +{ + switch ($network) + { + case 1: + return 'WLM/MSN'; + case 2: + return 'LCS'; + case 4: + return 'Mobile Phones'; + case 32: + return 'Yahoo!'; + } + return "Unknown ($network)"; +} + + +require_once('config.php'); +include_once('msn.class.php'); + +$msn = new MSN(array( + 'user' => 'xxx@hotmail.com', + 'password' => 'mypassword', + 'alias' => 'myalias', + 'psm' => 'psm', +// 'PhotoSticker' => 'msntitle.jpg', + 'debug'=> true, +/* 'Emotions' => array( + 'aaa' => 'emotion.gif' + ),*/ +)); + +$fp=fopen(MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msnbot.pid', 'wt'); +if($fp) +{ + fputs($fp,posix_getpid()); + fclose($fp); +} +declare(ticks = 1); +$msn->Run(); +$msn->log_message("done!"); +@unlink(dirname($_SERVER['argv'][0]).DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR.'msnbot.pid'); diff --git a/plugins/Msn/extlib/phpmsnclass/sample.php b/plugins/Msn/extlib/phpmsnclass/sample.php new file mode 100644 index 0000000000..32539c56c2 --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/sample.php @@ -0,0 +1,40 @@ +#!/usr/bin/php -Cq + 'statusnetbot@inflatablegoldfish.com', 'password' => 'statusnetplugin', 'alias' => 'statusnetbot', 'psm' => '', 'debug' => true)); + +if ($msn->Run()) { + echo "Error for connect to MSN network\n"; + echo "$msn->error\n"; + exit; +} + +//$msn->sendMessage('Now: '.strftime('%D %T')."\nTesting\nSecond Line\n\n\n\nand Empty Line", + // array( + // 'darkip@inflatablegoldfish.com' + // ) + // ); +echo "Done!\n"; +exit; + +?> + diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops b/plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops new file mode 100644 index 0000000000..0e73537c01 --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops @@ -0,0 +1,23 @@ +K 25 +svn:wc:ra_dav:version-url +V 41 +/svn/!svn/ver/39/trunk/phpmsnclassv2/soap +END +msnab_servicetypes.xsd +K 25 +svn:wc:ra_dav:version-url +V 64 +/svn/!svn/ver/39/trunk/phpmsnclassv2/soap/msnab_servicetypes.xsd +END +msnab_sharingservice.wsdl +K 25 +svn:wc:ra_dav:version-url +V 67 +/svn/!svn/ver/39/trunk/phpmsnclassv2/soap/msnab_sharingservice.wsdl +END +msnab_datatypes.xsd +K 25 +svn:wc:ra_dav:version-url +V 61 +/svn/!svn/ver/39/trunk/phpmsnclassv2/soap/msnab_datatypes.xsd +END diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/entries b/plugins/Msn/extlib/phpmsnclass/soap/.svn/entries new file mode 100644 index 0000000000..062f5cb1de --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/soap/.svn/entries @@ -0,0 +1,130 @@ +10 + +dir +46 +http://phpmsnclass.googlecode.com/svn/trunk/phpmsnclassv2/soap +http://phpmsnclass.googlecode.com/svn + + + +2009-07-27T06:16:08.380493Z +39 +ricky@ez2.us + + + + + + + + + + + + + + +d71849f3-712d-0410-a681-1795f7bea18a + +msnab_servicetypes.xsd +file + + + + +2010-06-08T18:29:30.506015Z +096c0222d82879fa2b4bd47fa45f4aaf +2009-07-27T06:16:08.380493Z +39 +ricky@ez2.us + + + + + + + + + + + + + + + + + + + + + +27903 + +msnab_sharingservice.wsdl +file + + + + +2010-06-08T18:29:30.506015Z +40f2d65d6cf6245c064defb02bd62705 +2009-07-27T06:16:08.380493Z +39 +ricky@ez2.us + + + + + + + + + + + + + + + + + + + + + +27625 + +msnab_datatypes.xsd +file + + + + +2010-06-08T18:29:30.506015Z +6a376c90de444594c1c75970586f99f8 +2009-07-27T06:16:08.380493Z +39 +ricky@ez2.us + + + + + + + + + + + + + + + + + + + + + +42170 + diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base new file mode 100644 index 0000000000..46fc23f911 --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base @@ -0,0 +1,832 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A space (ASCII #32) separated list of properties that + have changed as part of an update request. The property + names don't always match the name of the associated + element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Indicates whether the contact has a Windows Live + Space or not. + + + + + + + + + + + + + Seen is YYYY/MM/DD format. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A space (ASCII #32) separated list of properties that + have changed as part of an update request. The property + names don't always match the name of the associated + element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base new file mode 100644 index 0000000000..3fa9798b62 --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base @@ -0,0 +1,567 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base new file mode 100644 index 0000000000..7ec87f90c9 --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base @@ -0,0 +1,532 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/Msn/extlib/phpmsnclass/soap/msnab_datatypes.xsd b/plugins/Msn/extlib/phpmsnclass/soap/msnab_datatypes.xsd new file mode 100644 index 0000000000..46fc23f911 --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/soap/msnab_datatypes.xsd @@ -0,0 +1,832 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A space (ASCII #32) separated list of properties that + have changed as part of an update request. The property + names don't always match the name of the associated + element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Indicates whether the contact has a Windows Live + Space or not. + + + + + + + + + + + + + Seen is YYYY/MM/DD format. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A space (ASCII #32) separated list of properties that + have changed as part of an update request. The property + names don't always match the name of the associated + element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/Msn/extlib/phpmsnclass/soap/msnab_servicetypes.xsd b/plugins/Msn/extlib/phpmsnclass/soap/msnab_servicetypes.xsd new file mode 100644 index 0000000000..3fa9798b62 --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/soap/msnab_servicetypes.xsd @@ -0,0 +1,567 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/Msn/extlib/phpmsnclass/soap/msnab_sharingservice.wsdl b/plugins/Msn/extlib/phpmsnclass/soap/msnab_sharingservice.wsdl new file mode 100644 index 0000000000..7ec87f90c9 --- /dev/null +++ b/plugins/Msn/extlib/phpmsnclass/soap/msnab_sharingservice.wsdl @@ -0,0 +1,532 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php new file mode 100644 index 0000000000..72de11cb10 --- /dev/null +++ b/plugins/Msn/msnmanager.php @@ -0,0 +1,105 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +/** + * AIM background connection manager for AIM-using queue handlers, + * allowing them to send outgoing messages on the right connection. + * + * Input is handled during socket select loop, keepalive pings during idle. + * Any incoming messages will be handled. + * + * In a multi-site queuedaemon.php run, one connection will be instantiated + * for each site being handled by the current process that has XMPP enabled. + */ + +class MsnManager extends ImManager +{ + + public $conn = null; + /** + * Initialize connection to server. + * @return boolean true on success + */ + public function start($master) + { + if(parent::start($master)) + { + $this->connect(); + return true; + }else{ + return false; + } + } + + public function getSockets() + { + $this->connect(); + if($this->conn){ + return $this->conn->getSockets(); + }else{ + return array(); + } + } + + /** + * Process AIM events that have come in over the wire. + * @param resource $socket + */ + public function handleInput($socket) + { + common_log(LOG_DEBUG, "Servicing the MSN queue."); + $this->stats('msn_process'); + $this->conn->receive(); + } + + function connect() + { + if (!$this->conn) { + $this->conn=new MSN(array( + 'user' => $this->plugin->user, + 'password' => $this->plugin->password, + 'alias' => $this->plugin->nickname, + 'psm' => 'Send me a message to post a notice', + 'debug' => true + ) + ); + $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message')); + $this->conn->signon(); + } + return $this->conn; + } + + function handle_msn_message($data) + { + $this->plugin->enqueue_incoming_raw($data); + return true; + } + + function send_raw_message($data) + { + $this->connect(); + if (!$this->conn) { + return false; + } + $this->conn->sflapSend($data[0],$data[1],$data[2],$data[3]); + return true; + } +} From d97b5982144571b70cee4c833dfa8262ba13a2f1 Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Sat, 12 Jun 2010 17:34:25 +0100 Subject: [PATCH 247/730] Removed phpmsnclass sample --- plugins/Msn/extlib/phpmsnclass/sample.php | 40 ----------------------- 1 file changed, 40 deletions(-) delete mode 100644 plugins/Msn/extlib/phpmsnclass/sample.php diff --git a/plugins/Msn/extlib/phpmsnclass/sample.php b/plugins/Msn/extlib/phpmsnclass/sample.php deleted file mode 100644 index 32539c56c2..0000000000 --- a/plugins/Msn/extlib/phpmsnclass/sample.php +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/php -Cq - 'statusnetbot@inflatablegoldfish.com', 'password' => 'statusnetplugin', 'alias' => 'statusnetbot', 'psm' => '', 'debug' => true)); - -if ($msn->Run()) { - echo "Error for connect to MSN network\n"; - echo "$msn->error\n"; - exit; -} - -//$msn->sendMessage('Now: '.strftime('%D %T')."\nTesting\nSecond Line\n\n\n\nand Empty Line", - // array( - // 'darkip@inflatablegoldfish.com' - // ) - // ); -echo "Done!\n"; -exit; - -?> - From 89808a86d53cbb6581b2c549e6015626ec1f0242 Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Sat, 12 Jun 2010 19:49:28 +0100 Subject: [PATCH 248/730] More work on adapting the phpmsnclass to work with the IM architecture (far from finished still) --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 114 ++++++++++++++----- plugins/Msn/msnmanager.php | 38 ++++++- 2 files changed, 122 insertions(+), 30 deletions(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 355d828eb5..c387bbeae9 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -3203,13 +3203,6 @@ X-OIM-Sequence-Num: 1 $data = $this->ns_readln(); /*if($data===false) { - //If No NS Message Process SendMessageFileQueue - if (time()-$this->LastPing > $this->ping_wait) - { - // NS: >>> PNG - $this->ns_writeln("PNG"); - $this->LastPing = time(); - } if(count($this->ChildProcess)<$this->MAXChildProcess) { $Index=0; @@ -3626,8 +3619,8 @@ X-OIM-Sequence-Num: 1 break; case 'QNG': // NS: <<< QNG {time} - @list(/* QNG */, $this->ping_wait) = @explode(' ', $data); - if ($this->ping_wait == 0) $this->ping_wait = 50; + //@list(/* QNG */, $this->ping_wait) = @explode(' ', $data); + //if ($this->ping_wait == 0) $this->ping_wait = 50; //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping; //Mod by Ricky Set Online break; @@ -3682,31 +3675,100 @@ X-OIM-Sequence-Num: 1 } } - public function SendMessage($Message, $To) { - if(!is_array($To)) - $To=array($To); - $Receiver=''; - foreach($To as $Email) + public function sendMessageViaSB($message, $to) { + $socket = $this->switchBoardSessions[$to]['socket']; + $lastActive = $this->switchBoardSessions[$to]['lastActive']; + $joined = $this->switchBoardSessions[$to]['joined']; + + //TODO Probably not needed (we're not running in a loop anymore) + /*if($this->kill_me) { - list($name,$host,$network)=explode('@',$Email); - $network=$network==''?1:$network; - if($network==1 && isset($this->switchBoardSessions[$Email]) ) { - $this->debug_message("*** SendMessage to $Receiver use SB message queue."); - array_push($this->SwitchBoardMessageQueue,$Message); - continue; - } - $Receiver.="$name@$host@$network,"; + $this->log_message("*** SB Okay, kill me now!"); + endSBSession($socket); + }*/ + + if(!$Joined) { + // If our participant has not joined the session yet we can't message them! + //TODO Check the behaviour of the queue runner when we return false + return false; } - if($Receiver=='') return; - $Receiver=substr($Receiver,0,-1); - $this->debug_message("*** SendMessage to $Receiver use File queue."); - file_put_contents($FileName,"TO: $Receiver\n$Message\n"); + + $aMessage = $this->getMessage($Message); + //CheckEmotion... + $MsnObjDefine=$this->GetMsnObjDefine($aMessage); + if($MsnObjDefine !== '') + { + $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine"; + $len = strlen($SendString); + $this->SB_writeln("MSG $id N $len"); + $id++; + $this->SB_writedata($SendString); + $this->id++; + } + $len = strlen($aMessage); + $this->SB_writeln("MSG $id N $len"); + + // Increment the trID + $this->switchBoardSessions[$to]['id']++; + + $this->SB_writedata($aMessage); + + if (feof($this->SBFp)) + { + // lost connection? error? try OIM later + @fclose($this->SBFp); + //TODO introduce callback to add offline message to queue? + return false; + } + $this->SB_writeln("OUT"); + @fclose($this->SBFp); + return true; + } + + //TODO Not sure if this is needed? + private function endSBSession($socket) { + if (feof($this->SBFp)) + { + // lost connection? error? try OIM later + @fclose($this->SBFp); + return false; + } + $this->SB_writeln("OUT"); + @fclose($this->SBFp); + return true; + } + + public function sendMessage($message, $to) { + if($message != '') { + list($name,$host,$network)=explode('@',$to); + $network=$network==''?1:$network; + + if($network === 1 && isset($this->switchBoardSessions[$to])) { + $recipient = $name . $host; + $this->debug_message("*** Sending Message to $recipient using existing SB session"); + $this->sendMessageViaSB($message, $recipient); + } else { + $this->debug_message("*** Not MSN network or no existing SB session"); + + } + } + } + + /** + * Sends a ping command + * + * Should be called about every 50 seconds + */ + public function send_ping() { + // NS: >>> PNG + $this->ns_writeln("PNG"); } public function getNSSocket() { return $this->NSfp; } + // TODO Allow for multiple SB session sockets public function getSBSocket() { return $this->SBfp; } diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php index 72de11cb10..aae6906d6c 100644 --- a/plugins/Msn/msnmanager.php +++ b/plugins/Msn/msnmanager.php @@ -32,8 +32,12 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class MsnManager extends ImManager { - public $conn = null; + + protected $lastping = null; + + const PING_INTERVAL = 50; + /** * Initialize connection to server. * @return boolean true on success @@ -58,9 +62,21 @@ class MsnManager extends ImManager return array(); } } - + /** - * Process AIM events that have come in over the wire. + * Idle processing for io manager's execution loop. + * Send keepalive pings to server. + */ + public function idle($timeout=0) + { + $now = time(); + if (empty($this->lastping) || $now - $this->lastping > self::PING_INTERVAL) { + $this->send_ping(); + } + } + + /** + * Process MSN events that have come in over the wire. * @param resource $socket */ public function handleInput($socket) @@ -83,10 +99,24 @@ class MsnManager extends ImManager ); $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message')); $this->conn->signon(); + $this->lastping = time(); } return $this->conn; } - + + function send_ping() { + $this->connect(); + if (!$this->conn) { + return false; + } + + $now = time(); + + $this->conn->send_ping(); + $this->lastping = $now; + return true; + } + function handle_msn_message($data) { $this->plugin->enqueue_incoming_raw($data); From 52cfc0866c4dd54f8628d47c56abd105e1f79d18 Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Sat, 12 Jun 2010 21:19:08 +0100 Subject: [PATCH 249/730] Merged in changes to phpmsnclass --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 986 +++++++++---------- 1 file changed, 443 insertions(+), 543 deletions(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index c387bbeae9..030cc5dc04 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -60,6 +60,7 @@ class MSN { private $ABAuthHeader; private $ABService; private $Contacts; + private $IgnoreList; public $server = 'messenger.hotmail.com'; public $port = 1863; @@ -107,18 +108,6 @@ class MSN { // for YIM: 518 bytes public $max_msn_message_len = 1664; public $max_yahoo_message_len = 518; - - // Begin added for StatusNet - - private $aContactList = array(); - private $switchBoardSessions = array(); - - /** - * Event Handler Functions - */ - private $myEventHandlers = array(); - - // End added for StatusNet private function Array2SoapVar($Array,$ReturnSoapVarObj=true,$TypeName=null,$TypeNameSpace=null) { @@ -158,6 +147,15 @@ class MSN { $this->log_message("*** someone kill me ***"); $this->kill_me=true; } + private function IsIgnoreMail($Email) + { + if($this->IgnoreList==false) return false; + foreach($this->IgnoreList as $Pattern) + { + if(preg_match($Pattern,$Email)) return true; + } + return false; + } public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C) { $this->user = $Configs['user']; @@ -171,6 +169,7 @@ class MSN { $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true; $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true; $this->PhotoStickerFile=$Configs['PhotoSticker']; + $this->IgnoreList=isset($Configs['IgnoreList'])?$Configs['IgnoreList']:false; if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) { foreach($this->Emotions as $EmotionFilePath) @@ -532,99 +531,6 @@ class MSN { } $this->UpdateContacts(); return true; - - - $ABContactAdd=new SoapParam($this->Array2SoapVar($ABContactAddArray),'ABContactAdd'); - - // add contact for WLM - $ticket = htmlspecialchars($this->ticket['contact_ticket']); - $displayName = htmlspecialchars($display); - $user = $email; - - $XML = ' - - - - CFE80F9D-180F-4399-82AB-413F33A1FA11 - false - ContactSave - - - false - '.$ticket.' - - - - - 00000000-0000-0000-0000-000000000000 - - - - LivePending - '.$user.' - true - - '.$displayName.' - - - - - - true - - - -'; - - $header_array = array( - 'SOAPAction: '.$this->addcontact_soap, - 'Content-Type: text/xml; charset=utf-8', - 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' - ); - - $this->debug_message("*** URL: $this->addcontact_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->addcontact_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); - - if ($http_code != 200) { - preg_match('#(.*)(.*)#', $data, $matches); - if (count($matches) == 0) { - $this->log_message("*** can't add contact (network: $network) $email"); - return false; - } - $faultcode = trim($matches[1]); - $faultstring = trim($matches[2]); - $this->log_message("*** can't add contact (network: $network) $email, error code: $faultcode, $faultstring"); - return false; - } - $this->log_message("*** add contact (network: $network) $email"); - if ($sendADL && !feof($this->NSfp)) { - @list($u_name, $u_domain) = @explode('@', $email); - foreach (array('1', '2') as $l) { - $str = ''; - $len = strlen($str); - // NS: >>> ADL {id} {size} - $this->ns_writeln("ADL $this->id $len"); - $this->ns_writedata($str); - } - } - $this->UpdateContacts(); - return true; } function delMemberFromList($memberID, $email, $network, $list) { @@ -934,7 +840,7 @@ class MSN { $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); curl_close($curl); $this->debug_message("*** Get Result:\n$data"); - if(($http_code != 200)||(!$returnData)) return array(); + if($http_code != 200) return array(); $p = $data; $aMemberships = array(); while (1) { @@ -1562,7 +1468,7 @@ class MSN { $start_tm = time(); $ping_tm = time(); stream_set_timeout($this->NSfp, $this->NSStreamTimeout); - $aContactList = $this->getMembershipList(true); + $aContactList = $this->getMembershipList(); if ($this->update_pending) { if (is_array($aContactList)) { $pending = 'Pending'; @@ -2102,6 +2008,11 @@ class MSN { $this->log_message("NS: <<< RNG $data"); @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data); @list($sb_ip, $sb_port) = @explode(':', $server); + if($this->IsIgnoreMail($email)) + { + $this->log_message("*** Ignore RNG from $email"); + break; + } $this->log_message("*** RING from $email, $sb_ip:$sb_port"); $this->addContact($email,1,$email, true); $pid=pcntl_fork(); @@ -2132,7 +2043,7 @@ class MSN { break; default: - $code = substr($data,0,3); + $code = substr($data,0,3); if (is_numeric($code)) { $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; $this->debug_message("*** NS: $this->error"); @@ -2329,7 +2240,7 @@ class MSN { $this->SB_writedata($aMessage); } $this->SwitchBoardMessageQueue=array(); - $LastActive=time(); + if(!$this->IsIgnoreMail($user)) $LastActive = time(); continue; } $code = substr($data, 0, 3); @@ -2725,7 +2636,7 @@ class MSN { } break; } - $LastActive = time(); + if(!$this->IsIgnoreMail($user)) $LastActive = time(); } if (feof($this->SBFp)) { @@ -3089,7 +3000,7 @@ X-OIM-Sequence-Num: 1 $start_tm = time(); $ping_tm = time(); stream_set_timeout($this->NSfp, $this->NSStreamTimeout); - $this->aContactList = $this->getMembershipList(true); + $this->aContactList = $this->getMembershipList(); if ($this->update_pending) { if (is_array($this->aContactList)) { $pending = 'Pending'; @@ -3182,7 +3093,7 @@ X-OIM-Sequence-Num: 1 // NS: >>> CHG {id} {status} {clientid} {msnobj} $this->ns_writeln("CHG $this->id NLN $this->clientid"); if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); // NS: >>> UUX {id} length $str = ''.htmlspecialchars($this->psm).''; $len = strlen($str); @@ -3201,477 +3112,465 @@ X-OIM-Sequence-Num: 1 } $data = $this->ns_readln(); - /*if($data===false) - { - if(count($this->ChildProcess)<$this->MAXChildProcess) + if($data === false) { + // There was no data / an error when reading from the socket so reconnect + $this->signon(); + } else { + switch (substr($data,0,3)) { - $Index=0; - foreach($this->MessageQueue as $User => $Message) - { - if(!trim($User)) continue; - if($Inxdex>=$this->MAXChildProcess-count($this->ChildProcess)) break; - if((!$Message['XFRSent'])||($Message['XFRSent']&&(time()-$this->MessageQueue[$User]['ReqTime']>$this->ReqSBXFRTimeout))) - { - $this->MessageQueue[$User]['XFRSent']=true; - $this->MessageQueue[$User]['ReqTime']=time(); - $this->log_message("*** Request SB for $User"); - $this->ns_writeln("XFR $this->id SB"); - $Index++; + case 'SBS': + // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us + // NS: <<< SBS 0 null + break; + + case 'RFS': + // FIXME: + // NS: <<< RFS ??? + // refresh ADL, so we re-send it again + if (is_array($aADL)) { + foreach ($aADL as $str) { + $len = strlen($str); + // NS: >>> ADL {id} {size} + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); + } } - } - } - if($this->ProcessSendMessageFileQueue()) continue; - break; - }*/ - switch (substr($data,0,3)) - { - case 'SBS': - // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us - // NS: <<< SBS 0 null - break; - - case 'RFS': - // FIXME: - // NS: <<< RFS ??? - // refresh ADL, so we re-send it again - if (is_array($aADL)) { - foreach ($aADL as $str) { - $len = strlen($str); - // NS: >>> ADL {id} {size} - $this->ns_writeln("ADL $this->id $len"); - $this->ns_writedata($str); + break; + + case 'LST': + // NS: <<< LST {email} {alias} 11 0 + @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data); + @list($u_name, $u_domain) = @explode('@', $email); + if (!isset($this->aContactList[$u_domain][$u_name][1])) { + $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow'; + $this->log_message("*** add to our contact list: $u_name@$u_domain"); } - } - break; - - case 'LST': - // NS: <<< LST {email} {alias} 11 0 - @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data); - @list($u_name, $u_domain) = @explode('@', $email); - if (!isset($this->aContactList[$u_domain][$u_name][1])) { - $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow'; - $this->log_message("*** add to our contact list: $u_name@$u_domain"); - } - break; - - case 'ADL': - // randomly, we get ADL command, someome add us to their contact list for MSNP15 - // NS: <<< ADL 0 {size} - @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) - { - $data = $this->ns_readdata($size); - preg_match('##', $data, $matches); - if (is_array($matches) && count($matches) > 0) + break; + + case 'ADL': + // randomly, we get ADL command, someome add us to their contact list for MSNP15 + // NS: <<< ADL 0 {size} + @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) { - $u_domain = $matches[1]; - $u_name = $matches[2]; - $network = $matches[4]; - if (isset($this->aContactList[$u_domain][$u_name][$network])) - $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain"); - else + $data = $this->ns_readdata($size); + preg_match('##', $data, $matches); + if (is_array($matches) && count($matches) > 0) { - $re_login = false; - $cnt = 0; - foreach (array('Allow', 'Reverse') as $list) + $u_domain = $matches[1]; + $u_name = $matches[2]; + $network = $matches[4]; + if (isset($this->aContactList[$u_domain][$u_name][$network])) + $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain"); + else { - if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) + $re_login = false; + $cnt = 0; + foreach (array('Allow', 'Reverse') as $list) { - if ($re_login) { - $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); - continue; - } - $aTickets = $this->get_passport_ticket(); - if (!$aTickets || !is_array($aTickets)) { - // failed to login? ignore it - $this->log_message("*** can't re-login, something wrong here"); - $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); - continue; - } - $re_login = true; - $this->ticket = $aTickets; - $this->log_message("**** get new ticket, try it again"); if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { - $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); - continue; + if ($re_login) { + $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + continue; + } + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->log_message("*** can't re-login, something wrong here"); + $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + continue; + } + $re_login = true; + $this->ticket = $aTickets; + $this->log_message("**** get new ticket, try it again"); + if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) + { + $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + continue; + } } + $this->aContactList[$u_domain][$u_name][$network][$list] = false; + $cnt++; } - $this->aContactList[$u_domain][$u_name][$network][$list] = false; - $cnt++; + $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain"); } - $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain"); - } - $str = ''; - $len = strlen($str); - } - else - $this->log_message("*** someone add us to their list: $data"); - $this->AddUsToMemberList($u_name.'@'.$u_domain, $network); - } - break; - - case 'RML': - // randomly, we get RML command, someome remove us to their contact list for MSNP15 - // NS: <<< RML 0 {size} - @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) - { - $data = $this->ns_readdata($size); - preg_match('##', $data, $matches); - if (is_array($matches) && count($matches) > 0) - { - $u_domain = $matches[1]; - $u_name = $matches[2]; - $network = $matches[4]; - if (isset($this->aContactList[$u_domain][$u_name][$network])) - { - $aData = $this->aContactList[$u_domain][$u_name][$network]; - foreach ($aData as $list => $id) - $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list); - unset($this->aContactList[$u_domain][$u_name][$network]); - $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain"); + $str = ''; + $len = strlen($str); } else - $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain"); - $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network); + $this->log_message("*** someone add us to their list: $data"); + $this->AddUsToMemberList($u_name.'@'.$u_domain, $network); } - else - $this->log_message("*** someone remove us from their list: $data"); - } - break; - - case 'MSG': - // randomly, we get MSG notification from server - // NS: <<< MSG Hotmail Hotmail {size} - @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) { - $data = $this->ns_readdata($size); - $aLines = @explode("\n", $data); - $header = true; - $ignore = false; - $maildata = ''; - foreach ($aLines as $line) { - $line = rtrim($line); - if ($header) { - if ($line === '') { - $header = false; + break; + + case 'RML': + // randomly, we get RML command, someome remove us to their contact list for MSNP15 + // NS: <<< RML 0 {size} + @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) + { + $data = $this->ns_readdata($size); + preg_match('##', $data, $matches); + if (is_array($matches) && count($matches) > 0) + { + $u_domain = $matches[1]; + $u_name = $matches[2]; + $network = $matches[4]; + if (isset($this->aContactList[$u_domain][$u_name][$network])) + { + $aData = $this->aContactList[$u_domain][$u_name][$network]; + foreach ($aData as $list => $id) + $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list); + unset($this->aContactList[$u_domain][$u_name][$network]); + $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain"); + } + else + $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain"); + $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network); + } + else + $this->log_message("*** someone remove us from their list: $data"); + } + break; + + case 'MSG': + // randomly, we get MSG notification from server + // NS: <<< MSG Hotmail Hotmail {size} + @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) { + $data = $this->ns_readdata($size); + $aLines = @explode("\n", $data); + $header = true; + $ignore = false; + $maildata = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + if (strncasecmp($line, 'Content-Type:', 13) == 0) { + if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && + strpos($line, 'text/x-msmsgsoimnotification') === false) { + // we just need text/x-msmsgsinitialmdatanotification + // or text/x-msmsgsoimnotification + $ignore = true; + break; + } + } continue; } - if (strncasecmp($line, 'Content-Type:', 13) == 0) { - if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && - strpos($line, 'text/x-msmsgsoimnotification') === false) { - // we just need text/x-msmsgsinitialmdatanotification - // or text/x-msmsgsoimnotification - $ignore = true; + if (strncasecmp($line, 'Mail-Data:', 10) == 0) { + $maildata = trim(substr($line, 10)); + break; + } + } + if ($ignore) { + $this->log_message("*** ingnore MSG for: $line"); + break; + } + if ($maildata == '') { + $this->log_message("*** ingnore MSG not for OIM"); + break; + } + $re_login = false; + if (strcasecmp($maildata, 'too-large') == 0) { + $this->log_message("*** large mail-data, need to get the data via SOAP"); + $maildata = $this->getOIM_maildata(); + if ($maildata === false) { + $this->log_message("*** can't get mail-data via SOAP"); + // maybe we need to re-login again + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + break; + } + $re_login = true; + $this->ticket = $aTickets; + $this->log_message("**** get new ticket, try it again"); + $maildata = $this->getOIM_maildata(); + if ($maildata === false) { + $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM"); break; } } - continue; } - if (strncasecmp($line, 'Mail-Data:', 10) == 0) { - $maildata = trim(substr($line, 10)); + // could be a lots of ..., so we can't use preg_match here + $p = $maildata; + $aOIMs = array(); + while (1) { + $start = strpos($p, ''); + $end = strpos($p, ''); + if ($start === false || $end === false || $start > $end) break; + $end += 4; + $sOIM = substr($p, $start, $end - $start); + $aOIMs[] = $sOIM; + $p = substr($p, $end); + } + if (count($aOIMs) == 0) { + $this->log_message("*** ingnore empty OIM"); break; } - } - if ($ignore) { - $this->log_message("*** ingnore MSG for: $line"); - break; - } - if ($maildata == '') { - $this->log_message("*** ingnore MSG not for OIM"); - break; - } - $re_login = false; - if (strcasecmp($maildata, 'too-large') == 0) { - $this->log_message("*** large mail-data, need to get the data via SOAP"); - $maildata = $this->getOIM_maildata(); - if ($maildata === false) { - $this->log_message("*** can't get mail-data via SOAP"); - // maybe we need to re-login again - $aTickets = $this->get_passport_ticket(); - if (!$aTickets || !is_array($aTickets)) { - // failed to login? ignore it - $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); - break; - } - $re_login = true; - $this->ticket = $aTickets; - $this->log_message("**** get new ticket, try it again"); - $maildata = $this->getOIM_maildata(); - if ($maildata === false) { - $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM"); - break; - } - } - } - // could be a lots of ..., so we can't use preg_match here - $p = $maildata; - $aOIMs = array(); - while (1) { - $start = strpos($p, ''); - $end = strpos($p, ''); - if ($start === false || $end === false || $start > $end) break; - $end += 4; - $sOIM = substr($p, $start, $end - $start); - $aOIMs[] = $sOIM; - $p = substr($p, $end); - } - if (count($aOIMs) == 0) { - $this->log_message("*** ingnore empty OIM"); - break; - } - foreach ($aOIMs as $maildata) { - // T: 11 for MSN, 13 for Yahoo - // S: 6 for MSN, 7 for Yahoo - // RT: the datetime received by server - // RS: already read or not - // SZ: size of message - // E: sender - // I: msgid - // F: always 00000000-0000-0000-0000-000000000009 - // N: sender alias - preg_match('#(.*)#', $maildata, $matches); - if (count($matches) == 0) { - $this->log_message("*** ingnore OIM maildata without type"); - continue; - } - $oim_type = $matches[1]; - if ($oim_type = 13) - $network = 32; - else - $network = 1; - preg_match('#(.*)#', $maildata, $matches); - if (count($matches) == 0) { - $this->log_message("*** ingnore OIM maildata without sender"); - continue; - } - $oim_sender = $matches[1]; - preg_match('#(.*)#', $maildata, $matches); - if (count($matches) == 0) { - $this->log_message("*** ingnore OIM maildata without msgid"); - continue; - } - $oim_msgid = $matches[1]; - preg_match('#(.*)#', $maildata, $matches); - $oim_size = (count($matches) == 0) ? 0 : $matches[1]; - preg_match('#(.*)#', $maildata, $matches); - $oim_time = (count($matches) == 0) ? 0 : $matches[1]; - $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); - $sMsg = $this->getOIM_message($oim_msgid); - if ($sMsg === false) { - $this->log_message("*** can't get OIM, msgid = $oim_msgid"); - if ($re_login) { - $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + foreach ($aOIMs as $maildata) { + // T: 11 for MSN, 13 for Yahoo + // S: 6 for MSN, 7 for Yahoo + // RT: the datetime received by server + // RS: already read or not + // SZ: size of message + // E: sender + // I: msgid + // F: always 00000000-0000-0000-0000-000000000009 + // N: sender alias + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->log_message("*** ingnore OIM maildata without type"); continue; } - $aTickets = $this->get_passport_ticket(); - if (!$aTickets || !is_array($aTickets)) { - // failed to login? ignore it - $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + $oim_type = $matches[1]; + if ($oim_type = 13) + $network = 32; + else + $network = 1; + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->log_message("*** ingnore OIM maildata without sender"); continue; } - $re_login = true; - $this->ticket = $aTickets; - $this->log_message("**** get new ticket, try it again"); + $oim_sender = $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->log_message("*** ingnore OIM maildata without msgid"); + continue; + } + $oim_msgid = $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + $oim_size = (count($matches) == 0) ? 0 : $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + $oim_time = (count($matches) == 0) ? 0 : $matches[1]; + $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); $sMsg = $this->getOIM_message($oim_msgid); if ($sMsg === false) { - $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + $this->log_message("*** can't get OIM, msgid = $oim_msgid"); + if ($re_login) { + $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + continue; + } + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + continue; + } + $re_login = true; + $this->ticket = $aTickets; + $this->log_message("**** get new ticket, try it again"); + $sMsg = $this->getOIM_message($oim_msgid); + if ($sMsg === false) { + $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + continue; + } + } + $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg"); + + //$this->ReceivedMessage($oim_sender,$sMsg,$network,true); + $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true)); + } + } + break; + + case 'UBM': + // randomly, we get UBM, this is the message from other network, like Yahoo! + // NS: <<< UBM {email} $network $type {size} + @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) + { + $data = $this->ns_readdata($size); + $aLines = @explode("\n", $data); + $header = true; + $ignore = false; + $sMsg = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + if (strncasecmp($line, 'TypingUser:', 11) == 0) { + $ignore = true; + break; + } continue; } + $aSubLines = @explode("\r", $line); + foreach ($aSubLines as $str) { + if ($sMsg !== '') + $sMsg .= "\n"; + $sMsg .= $str; + } } - $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg"); - - //$this->ReceivedMessage($oim_sender,$sMsg,$network,true); - $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true)); + if($ignore) + { + $this->log_message("*** ingnore from $from_email: $line"); + break; + } + $this->log_message("*** MSG from $from_email (network: $network): $sMsg"); + //$this->ReceivedMessage($from_email,$sMsg,$network,false); + $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false)); } - } - break; - - case 'UBM': - // randomly, we get UBM, this is the message from other network, like Yahoo! - // NS: <<< UBM {email} $network $type {size} - @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) - { - $data = $this->ns_readdata($size); - $aLines = @explode("\n", $data); - $header = true; - $ignore = false; - $sMsg = ''; - foreach ($aLines as $line) { - $line = rtrim($line); - if ($header) { - if ($line === '') { - $header = false; - continue; - } - if (strncasecmp($line, 'TypingUser:', 11) == 0) { - $ignore = true; + break; + + case 'UBX': + // randomly, we get UBX notification from server + // NS: <<< UBX email {network} {size} + @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data); + // we don't need the notification data, so just ignore it + if (is_numeric($size) && $size > 0) + $this->ns_readdata($size); + break; + + case 'CHL': + // randomly, we'll get challenge from server + // NS: <<< CHL 0 {code} + @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data); + $fingerprint = $this->getChallenge($chl_code); + // NS: >>> QRY {id} {product_id} 32 + // NS: >>> fingerprint + $this->ns_writeln("QRY $this->id $this->prod_id 32"); + $this->ns_writedata($fingerprint); + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + if($this->PhotoStickerFile!==false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + break; + case 'CHG': + // NS: <<< CHG {id} {status} {code} + // ignore it + // change our status to online first + break; + + case 'XFR': + // sometimes, NS will redirect to another NS + // MSNP9 + // NS: <<< XFR {id} NS {server} 0 {server} + // MSNP15 + // NS: <<< XFR {id} NS {server} U D + // for normal switchboard XFR + // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0 + @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data); + @list($ip, $port) = @explode(':', $server); + if ($server_type != 'SB') { + // maybe exit? + // this connection will close after XFR + $this->NSLogout(); + continue; + } + if(count($this->MessageQueue)) + { + foreach($this->MessageQueue as $User => $Message) + { + //$this->ChildProcess[$ChildPid] + $this->log_message("*** XFR SB $User"); + $pid=pcntl_fork(); + if($pid) + { + //Parrent Process + $this->ChildProcess[$pid]=$User; break; } - continue; - } - $aSubLines = @explode("\r", $line); - foreach ($aSubLines as $str) { - if ($sMsg !== '') - $sMsg .= "\n"; - $sMsg .= $str; + elseif($pid==-1) + { + $this->log_message("*** Fork Error $User"); + break; + } + else + { + //Child Process + $this->log_message("*** Child Process Start for $User"); + unset($Message['XFRSent']); + unset($Message['ReqTime']); + $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message); + if ($bSBresult === false) + { + // error for switchboard + $this->log_message("!!! error for sending message to ".$User); + } + die; + } } + unset($this->MessageQueue[$User]); } - if($ignore) + /* + $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage); + if ($bSBresult === false) { + // error for switchboard + $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]); + $aOfflineUsers[] = $aMSNUsers[$nCurrentUser]; + }*/ + break; + case 'QNG': + // NS: <<< QNG {time} + //@list(/* QNG */, $this->ping_wait) = @explode(' ', $data); + //if ($this->ping_wait == 0) $this->ping_wait = 50; + //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping; + //Mod by Ricky Set Online + break; + + case 'RNG': + if($this->PhotoStickerFile!==false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + else + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + // someone is trying to talk to us + // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0 + $this->log_message("NS: <<< RNG $data"); + @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data); + @list($sb_ip, $sb_port) = @explode(':', $server); + if($this->IsIgnoreMail($email)) { - $this->log_message("*** ingnore from $from_email: $line"); + $this->log_message("*** Ignore RNG from $email"); break; } - $this->log_message("*** MSG from $from_email (network: $network): $sMsg"); - //$this->ReceivedMessage($from_email,$sMsg,$network,false); - $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false)); - } - break; - - case 'UBX': - // randomly, we get UBX notification from server - // NS: <<< UBX email {network} {size} - @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data); - // we don't need the notification data, so just ignore it - if (is_numeric($size) && $size > 0) - $this->ns_readdata($size); - break; - - case 'CHL': - // randomly, we'll get challenge from server - // NS: <<< CHL 0 {code} - @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data); - $fingerprint = $this->getChallenge($chl_code); - // NS: >>> QRY {id} {product_id} 32 - // NS: >>> fingerprint - $this->ns_writeln("QRY $this->id $this->prod_id 32"); - $this->ns_writedata($fingerprint); - $this->ns_writeln("CHG $this->id NLN $this->clientid"); - if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); - break; - case 'CHG': - // NS: <<< CHG {id} {status} {code} - // ignore it - // change our status to online first - break; - - case 'XFR': - // sometimes, NS will redirect to another NS - // MSNP9 - // NS: <<< XFR {id} NS {server} 0 {server} - // MSNP15 - // NS: <<< XFR {id} NS {server} U D - // for normal switchboard XFR - // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0 - @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data); - @list($ip, $port) = @explode(':', $server); - if ($server_type != 'SB') { - // maybe exit? - // this connection will close after XFR - $this->NSLogout(); - continue; - } - if(count($this->MessageQueue)) - { - foreach($this->MessageQueue as $User => $Message) + $this->log_message("*** RING from $email, $sb_ip:$sb_port"); + $this->addContact($email,1,$email, true); + $pid=pcntl_fork(); + if($pid) { - //$this->ChildProcess[$ChildPid] - $this->log_message("*** XFR SB $User"); - $pid=pcntl_fork(); - if($pid) - { - //Parrent Process - $this->ChildProcess[$pid]=$User; - break; - } - elseif($pid==-1) - { - $this->log_message("*** Fork Error $User"); - break; - } - else - { - //Child Process - $this->log_message("*** Child Process Start for $User"); - unset($Message['XFRSent']); - unset($Message['ReqTime']); - $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message); - if ($bSBresult === false) - { - // error for switchboard - $this->log_message("!!! error for sending message to ".$User); - } - die; - } + //Parrent Process + $this->ChildProcess[$pid]='RNG'; + break; + } + elseif($pid==-1) + { + $this->log_message("*** Fork Error $User"); + break; + } + else + { + //Child Process + $this->log_message("*** Ring Child Process Start for $User"); + $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email); + die; } - unset($this->MessageQueue[$User]); - } - /* - $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage); - if ($bSBresult === false) { - // error for switchboard - $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]); - $aOfflineUsers[] = $aMSNUsers[$nCurrentUser]; - }*/ - break; - case 'QNG': - // NS: <<< QNG {time} - //@list(/* QNG */, $this->ping_wait) = @explode(' ', $data); - //if ($this->ping_wait == 0) $this->ping_wait = 50; - //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping; - //Mod by Ricky Set Online - break; - - case 'RNG': - if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); - else - $this->ns_writeln("CHG $this->id NLN $this->clientid"); - // someone is trying to talk to us - // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0 - $this->log_message("NS: <<< RNG $data"); - @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data); - @list($sb_ip, $sb_port) = @explode(':', $server); - $this->log_message("*** RING from $email, $sb_ip:$sb_port"); - $this->addContact($email,1,$email, true); - $pid=pcntl_fork(); - if($pid) - { - //Parrent Process - $this->ChildProcess[$pid]='RNG'; break; - } - elseif($pid==-1) - { - $this->log_message("*** Fork Error $User"); - break; - } - else - { - //Child Process - $this->log_message("*** Ring Child Process Start for $User"); - $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email); - die; - } - break; - case 'OUT': - // force logout from NS - // NS: <<< OUT xxx - $this->log_message("*** LOGOUT from NS"); - return $this->NsLogout(); - - default: - $code = substr($data,0,3); - if (is_numeric($code)) { - $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; - $this->debug_message("*** NS: $this->error"); - + case 'OUT': + // force logout from NS + // NS: <<< OUT xxx + $this->log_message("*** LOGOUT from NS"); return $this->NsLogout(); - } - break; + + default: + $code = substr($data,0,3); + if (is_numeric($code)) { + $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; + $this->debug_message("*** NS: $this->error"); + + return $this->NsLogout(); + } + break; + } } } @@ -3680,7 +3579,7 @@ X-OIM-Sequence-Num: 1 $lastActive = $this->switchBoardSessions[$to]['lastActive']; $joined = $this->switchBoardSessions[$to]['joined']; - //TODO Probably not needed (we're not running in a loop anymore) + //FIXME Probably not needed (we're not running in a loop anymore) /*if($this->kill_me) { $this->log_message("*** SB Okay, kill me now!"); @@ -3725,7 +3624,7 @@ X-OIM-Sequence-Num: 1 return true; } - //TODO Not sure if this is needed? + //FIXME Not sure if this is needed? private function endSBSession($socket) { if (feof($this->SBFp)) { @@ -3746,12 +3645,13 @@ X-OIM-Sequence-Num: 1 if($network === 1 && isset($this->switchBoardSessions[$to])) { $recipient = $name . $host; $this->debug_message("*** Sending Message to $recipient using existing SB session"); - $this->sendMessageViaSB($message, $recipient); + return $this->sendMessageViaSB($message, $recipient); } else { $this->debug_message("*** Not MSN network or no existing SB session"); - + //TODO implement creation of SB session etc } } + return true; } /** From 4007bce9aa7e1364d5aa90de65a9715f6e11d12f Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Sat, 12 Jun 2010 21:21:09 +0100 Subject: [PATCH 250/730] Added in missing properties --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 030cc5dc04..b230e346f7 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -108,6 +108,18 @@ class MSN { // for YIM: 518 bytes public $max_msn_message_len = 1664; public $max_yahoo_message_len = 518; + + // Begin added for StatusNet + + private $aContactList = array(); + private $switchBoardSessions = array(); + + /** + * Event Handler Functions + */ + private $myEventHandlers = array(); + + // End added for StatusNet private function Array2SoapVar($Array,$ReturnSoapVarObj=true,$TypeName=null,$TypeNameSpace=null) { From dc66503f33929c2218a8f05151075329fac5005a Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Sun, 13 Jun 2010 01:54:09 +0100 Subject: [PATCH 251/730] Added callback for pong (to update time till next ping required) --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 24 +++++++++++--------- plugins/Msn/msnmanager.php | 13 +++++++++-- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index b230e346f7..65525fe556 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -1573,7 +1573,7 @@ class MSN { // NS: >>> CHG {id} {status} {clientid} {msnobj} $this->ns_writeln("CHG $this->id NLN $this->clientid"); if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); // NS: >>> UUX {id} length $str = ''.htmlspecialchars($this->psm).''; $len = strlen($str); @@ -1935,7 +1935,7 @@ class MSN { $this->ns_writedata($fingerprint); $this->ns_writeln("CHG $this->id NLN $this->clientid"); if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); break; case 'CHG': // NS: <<< CHG {id} {status} {code} @@ -2012,9 +2012,9 @@ class MSN { case 'RNG': if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); else - $this->ns_writeln("CHG $this->id NLN $this->clientid"); + $this->ns_writeln("CHG $this->id NLN $this->clientid"); // someone is trying to talk to us // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0 $this->log_message("NS: <<< RNG $data"); @@ -2022,8 +2022,8 @@ class MSN { @list($sb_ip, $sb_port) = @explode(':', $server); if($this->IsIgnoreMail($email)) { - $this->log_message("*** Ignore RNG from $email"); - break; + $this->log_message("*** Ignore RNG from $email"); + break; } $this->log_message("*** RING from $email, $sb_ip:$sb_port"); $this->addContact($email,1,$email, true); @@ -3455,7 +3455,7 @@ X-OIM-Sequence-Num: 1 $this->ns_writedata($fingerprint); $this->ns_writeln("CHG $this->id NLN $this->clientid"); if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); break; case 'CHG': // NS: <<< CHG {id} {status} {code} @@ -3524,17 +3524,19 @@ X-OIM-Sequence-Num: 1 break; case 'QNG': // NS: <<< QNG {time} - //@list(/* QNG */, $this->ping_wait) = @explode(' ', $data); + @list(/* QNG */, $ping_wait) = @explode(' ', $data); //if ($this->ping_wait == 0) $this->ping_wait = 50; //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping; //Mod by Ricky Set Online + + $this->callHandler('Pong', $ping_wait); break; case 'RNG': if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); else - $this->ns_writeln("CHG $this->id NLN $this->clientid"); + $this->ns_writeln("CHG $this->id NLN $this->clientid"); // someone is trying to talk to us // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0 $this->log_message("NS: <<< RNG $data"); @@ -3711,7 +3713,7 @@ X-OIM-Sequence-Num: 1 * Registers a user handler * * Handler List - * IMIn + * IMIn, Pong * * @param String $event Event name * @param String $handler User function to call diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php index aae6906d6c..99ac219157 100644 --- a/plugins/Msn/msnmanager.php +++ b/plugins/Msn/msnmanager.php @@ -36,7 +36,7 @@ class MsnManager extends ImManager protected $lastping = null; - const PING_INTERVAL = 50; + private $pingInterval; /** * Initialize connection to server. @@ -70,7 +70,7 @@ class MsnManager extends ImManager public function idle($timeout=0) { $now = time(); - if (empty($this->lastping) || $now - $this->lastping > self::PING_INTERVAL) { + if (empty($this->lastping) || $now - $this->lastping > $pingInterval) { $this->send_ping(); } } @@ -98,6 +98,7 @@ class MsnManager extends ImManager ) ); $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message')); + $this->conn->registerHandler('Pong', array($this, 'update_ping_time')); $this->conn->signon(); $this->lastping = time(); } @@ -117,6 +118,14 @@ class MsnManager extends ImManager return true; } + /** + * Update the time till the next ping + * @param $data Time till next ping + */ + function update_ping_time($data) { + $pingInterval = $data; + } + function handle_msn_message($data) { $this->plugin->enqueue_incoming_raw($data); From 0083e58db304704be71c6c2fe9dba5484b7ae492 Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Sun, 13 Jun 2010 03:42:21 +0100 Subject: [PATCH 252/730] - Corrected PhotoSticker bug in phpmsnclass - Update time till next ping when a command is sent --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 17 +++++++---------- plugins/Msn/msnmanager.php | 4 ++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 65525fe556..ef4f45b441 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -180,7 +180,7 @@ class MSN { $this->retry_wait = isset($Configs['retry_wait']) ? $Configs['retry_wait'] : 30; $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true; $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true; - $this->PhotoStickerFile=$Configs['PhotoSticker']; + $this->PhotoStickerFile=isset($Configs['PhotoSticker']) ? $Configs['PhotoSticker'] : false; $this->IgnoreList=isset($Configs['IgnoreList'])?$Configs['IgnoreList']:false; if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) { @@ -3626,15 +3626,8 @@ X-OIM-Sequence-Num: 1 $this->SB_writedata($aMessage); - if (feof($this->SBFp)) - { - // lost connection? error? try OIM later - @fclose($this->SBFp); - //TODO introduce callback to add offline message to queue? - return false; - } - $this->SB_writeln("OUT"); - @fclose($this->SBFp); + // Don't close the SB session, we might as well leave it open + return true; } @@ -3651,6 +3644,10 @@ X-OIM-Sequence-Num: 1 return true; } + private function getSBSession($to) { + + } + public function sendMessage($message, $to) { if($message != '') { list($name,$host,$network)=explode('@',$to); diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php index 99ac219157..1ef496f56f 100644 --- a/plugins/Msn/msnmanager.php +++ b/plugins/Msn/msnmanager.php @@ -139,6 +139,10 @@ class MsnManager extends ImManager return false; } $this->conn->sflapSend($data[0],$data[1],$data[2],$data[3]); + + // Sending a command updates the time till next ping + $this->lastping = time(); + $this->pingInterval = 50; return true; } } From f3c1e9da9a0784dc3e071ad8610f701197ab0c84 Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Sun, 13 Jun 2010 04:14:29 +0100 Subject: [PATCH 253/730] Added some more event handlers and corrected aADL scope --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 28 ++++++++++---------- plugins/Msn/msnmanager.php | 10 +++++++ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index ef4f45b441..36b47f8e9c 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -112,6 +112,7 @@ class MSN { // Begin added for StatusNet private $aContactList = array(); + private $aADL = array(); private $switchBoardSessions = array(); /** @@ -2172,9 +2173,9 @@ class MSN { $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n"; $msg_header_len = strlen($msg_header); if ($network == 1) - $maxlen = $this->max_msn_message_len - $msg_header_len; + $maxlen = $this->max_msn_message_len - $msg_header_len; else - $maxlen = $this->max_yahoo_message_len - $msg_header_len; + $maxlen = $this->max_yahoo_message_len - $msg_header_len; $sMessage=str_replace("\r", '', $sMessage); $msg=substr($sMessage,0,$maxlen); return $msg_header.$msg; @@ -3004,7 +3005,8 @@ X-OIM-Sequence-Num: 1 while(!$this->connect($this->user, $this->password)) { $this->log_message("!!! Can't connect to server: $this->error"); - if(!$this->NSRetryWait($this->retry_wait)) return; + $this->callHandler('ConnectFailed', NULL); + $this->NSRetryWait($this->retry_wait); } $this->UpdateContacts(); $this->LastPing=time(); @@ -3061,7 +3063,7 @@ X-OIM-Sequence-Num: 1 $str = ''; $len += strlen($str); if ($len > 7400) { - $aADL[$n] = ''.$sList.''; + $this->aADL[$n] = ''.$sList.''; $n++; $sList = ''; $len = strlen($str); @@ -3075,7 +3077,7 @@ X-OIM-Sequence-Num: 1 // so we use 7475 if ($len > 7475) { $sList .= ''; - $aADL[$n] = ''.$sList.''; + $this->aADL[$n] = ''.$sList.''; $n++; $sList = ''.$str; $len = strlen($sList); @@ -3087,10 +3089,10 @@ X-OIM-Sequence-Num: 1 $sList .= ''; } } - $aADL[$n] = ''.$sList.''; + $this->aADL[$n] = ''.$sList.''; // NS: >>> BLP {id} BL $this->ns_writeln("BLP $this->id BL"); - foreach ($aADL as $str) { + foreach ($this->aADL as $str) { $len = strlen($str); // NS: >>> ADL {id} {size} $this->ns_writeln("ADL $this->id $len"); @@ -3116,16 +3118,16 @@ X-OIM-Sequence-Num: 1 public function NSreceive() { $this->log_message("*** startup ***"); - $aADL = array(); - // Sign in again if not signed in or socket failed if (!is_resource($this->NSfp) || feof($this->NSfp)) { + $this->callHandler('Reconnect', NULL); $this->signon(); } $data = $this->ns_readln(); if($data === false) { // There was no data / an error when reading from the socket so reconnect + $this->callHandler('Reconnect', NULL); $this->signon(); } else { switch (substr($data,0,3)) @@ -3139,8 +3141,8 @@ X-OIM-Sequence-Num: 1 // FIXME: // NS: <<< RFS ??? // refresh ADL, so we re-send it again - if (is_array($aADL)) { - foreach ($aADL as $str) { + if (is_array($this->aADL)) { + foreach ($this->aADL as $str) { $len = strlen($str); // NS: >>> ADL {id} {size} $this->ns_writeln("ADL $this->id $len"); @@ -3701,8 +3703,6 @@ X-OIM-Sequence-Num: 1 private function callHandler($event, $data) { if (isset($this->myEventHandlers[$event])) { call_user_func($this->myEventHandlers[$event], $data); - } else { - $this->noHandler($data); } } @@ -3710,7 +3710,7 @@ X-OIM-Sequence-Num: 1 * Registers a user handler * * Handler List - * IMIn, Pong + * IMIn, Pong, ConnectFailed, Reconnect * * @param String $event Event name * @param String $handler User function to call diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php index 1ef496f56f..354ed0f3ef 100644 --- a/plugins/Msn/msnmanager.php +++ b/plugins/Msn/msnmanager.php @@ -99,6 +99,8 @@ class MsnManager extends ImManager ); $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message')); $this->conn->registerHandler('Pong', array($this, 'update_ping_time')); + $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed')); + $this->conn->registerHandler('Reconnect', array($this, 'handle_reconnect')); $this->conn->signon(); $this->lastping = time(); } @@ -131,6 +133,14 @@ class MsnManager extends ImManager $this->plugin->enqueue_incoming_raw($data); return true; } + + function handle_connect_failed($data) { + common_log(LOG_NOTICE, 'MSN connect failed, retrying'); + } + + function handle_reconnect($data) { + common_log(LOG_NOTICE, 'MSN reconnecting'); + } function send_raw_message($data) { From 4b750b75da05e32bf8676883ad01e8b5965eceae Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 13 Jun 2010 14:58:06 -0400 Subject: [PATCH 254/730] show site claim keys on top page --- plugins/Sitemap/SitemapPlugin.php | 39 +++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 7ef5f1aa9b..87a70585e7 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -127,6 +127,45 @@ class SitemapPlugin extends Plugin return true; } + /** + * Meta tags for "claiming" a site + * + * We add extra meta tags that search engines like Yahoo!, Google, and Bing + * require to let you claim your site. + * + * @param Action $action Action being executed + * + * @return boolean hook value. + */ + + function onStartShowHeadElements($action) + { + $actionName = $action->trimmed('action'); + + $singleUser = common_config('singleuser', 'enabled'); + + // Different "top" pages if it's single user or not + + if (($singleUser && $actionName == 'showstream') || + (!$singleUser && $actionName == 'public')) { + + $keys = array('googlekey' => 'google-site-verification', + 'yahookey' => 'y_key', + 'bingkey' => 'msvalidate.01'); // XXX: is this the same for all sites? + + foreach ($keys as $config => $metaname) { + $content = common_config('sitemap', $config); + + if (!empty($content)) { + $action->element('meta', array('name' => $metaname, + 'content' => $content)); + } + } + } + + return true; + } + /** * Database schema setup * From bfbebe597792d8bb49c0f04ccbd665ba1e1db19b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 13 Jun 2010 15:23:23 -0400 Subject: [PATCH 255/730] admin panel for setting site-claim metadata --- plugins/Sitemap/SitemapPlugin.php | 16 ++ plugins/Sitemap/sitemapadminpanel.php | 205 ++++++++++++++++++++++++++ 2 files changed, 221 insertions(+) create mode 100644 plugins/Sitemap/sitemapadminpanel.php diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 87a70585e7..d4d295237d 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -71,6 +71,7 @@ class SitemapPlugin extends Plugin case 'SitemapindexAction': case 'NoticesitemapAction': case 'UsersitemapAction': + case 'SitemapadminpanelAction': require_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; return false; case 'SitemapAction': @@ -124,6 +125,10 @@ class SitemapPlugin extends Plugin 'month' => '[01][0-9]', 'day' => '[0123][0-9]', 'index' => '[1-9][0-9]*')); + + $m->connect('admin/sitemap', + array('action' => 'sitemapadminpanel')); + return true; } @@ -199,4 +204,15 @@ class SitemapPlugin extends Plugin return true; } + + function onEndAdminPanelNav($menu) { + if (AdminPanelAction::canAdmin('sitemap')) { + // TRANS: Menu item title/tooltip + $menu_title = _('Sitemap configuration'); + // TRANS: Menu item for site administration + $menu->out->menuItem(common_local_url('sitemapadminpanel'), _('Sitemap'), + $menu_title, $action_name == 'sitemapadminpanel', 'nav_sitemap_admin_panel'); + } + return true; + } } diff --git a/plugins/Sitemap/sitemapadminpanel.php b/plugins/Sitemap/sitemapadminpanel.php new file mode 100644 index 0000000000..3c295b08e0 --- /dev/null +++ b/plugins/Sitemap/sitemapadminpanel.php @@ -0,0 +1,205 @@ +. + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Administer sitemap settings + * + * @category Sitemap + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class SitemapadminpanelAction extends AdminPanelAction +{ + /** + * Returns the page title + * + * @return string page title + */ + + function title() + { + return _('Sitemap'); + } + + /** + * Instructions for using this form. + * + * @return string instructions + */ + + function getInstructions() + { + return _('Sitemap settings for this StatusNet site'); + } + + /** + * Show the site admin panel form + * + * @return void + */ + + function showForm() + { + $form = new SitemapAdminPanelForm($this); + $form->show(); + return; + } + + /** + * Save settings from the form + * + * @return void + */ + + function saveSettings() + { + static $settings = array('sitemap' => array('googlekey', 'yahookey', 'bingkey')); + + $values = array(); + + foreach ($settings as $section => $parts) { + foreach ($parts as $setting) { + $values[$section][$setting] = $this->trimmed($setting); + } + } + + // This throws an exception on validation errors + + $this->validate($values); + + // assert(all values are valid); + + $config = new Config(); + + $config->query('BEGIN'); + + foreach ($settings as $section => $parts) { + foreach ($parts as $setting) { + Config::save($section, $setting, $values[$section][$setting]); + } + } + + $config->query('COMMIT'); + + return; + } + + function validate(&$values) + { + } +} + +/** + * Form for the sitemap admin panel + */ + +class SitemapAdminPanelForm extends AdminForm +{ + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return 'form_sitemap_admin_panel'; + } + + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_sitemap'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url('sitemapadminpanel'); + } + + /** + * Data elements of the form + * + * @return void + */ + + function formData() + { + $this->out->elementStart('fieldset', array('id' => 'sitemap_admin')); + $this->out->elementStart('ul', 'form_data'); + $this->li(); + $this->input('googlekey', + _('Google key'), + _('Google Webmaster Tools verification key'), + 'sitemap'); + $this->unli(); + $this->li(); + $this->input('yahookey', + _('Yahoo key'), + _('Yahoo! Site Explorer verification key'), + 'sitemap'); + $this->unli(); + $this->li(); + $this->input('bingkey', + _('Bing key'), + _('Bing Webmaster Tools verification key'), + 'sitemap'); + $this->unli(); + $this->out->elementEnd('ul'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', _('Save'), 'submit', null, _('Save sitemap settings')); + } +} From 3d6bb5a5974d002dfbf067374783adf89c296d43 Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Mon, 14 Jun 2010 03:47:44 +0100 Subject: [PATCH 256/730] More work on adapting phpmsnclass --- plugins/Msn/MsnPlugin.php | 1 - plugins/Msn/Queued_Msn.php | 120 -- plugins/Msn/extlib/phpmsnclass/msn.class.php | 1567 +++++++++--------- plugins/Msn/msnmanager.php | 2 +- 4 files changed, 827 insertions(+), 863 deletions(-) delete mode 100644 plugins/Msn/Queued_Msn.php diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php index 6737e727ab..5566b54302 100644 --- a/plugins/Msn/MsnPlugin.php +++ b/plugins/Msn/MsnPlugin.php @@ -170,4 +170,3 @@ class MsnPlugin extends ImPlugin return true; } } - diff --git a/plugins/Msn/Queued_Msn.php b/plugins/Msn/Queued_Msn.php deleted file mode 100644 index bc8e0a1d15..0000000000 --- a/plugins/Msn/Queued_Msn.php +++ /dev/null @@ -1,120 +0,0 @@ -. - * - * @category Network - * @package StatusNet - * @author Luke Fitzgerald - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -class Queued_XMPP extends MSN { - /** - * Reference to the MsnPlugin object we're hooked up to. - */ - public $plugin; - - /** - * Constructor - * - * @param MsnPlugin $plugin - * @param string $host - * @param integer $port - * @param string $user - * @param string $password - * @param string $resource - * @param string $server - * @param boolean $printlog - * @param string $loglevel - */ - public function __construct($plugin, $host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null) - { - $this->plugin = $plugin; - - parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel); - - // We use $host to connect, but $server to build JIDs if specified. - // This seems to fix an upstream bug where $host was used to build - // $this->basejid, never seen since it isn't actually used in the base - // classes. - if (!$server) { - $server = $this->host; - } - $this->basejid = $this->user . '@' . $server; - - // Normally the fulljid is filled out by the server at resource binding - // time, but we need to do it since we're not talking to a real server. - $this->fulljid = "{$this->basejid}/{$this->resource}"; - } - - /** - * Send a formatted message to the outgoing queue for later forwarding - * to a real XMPP connection. - * - * @param string $msg - */ - public function send($msg, $timeout=NULL) - { - $this->plugin->enqueue_outgoing_raw($msg); - } - - //@{ - /** - * Stream i/o functions disabled; only do output - */ - public function connect($timeout = 30, $persistent = false, $sendinit = true) - { - throw new Exception("Can't connect to server from fake XMPP."); - } - - public function disconnect() - { - throw new Exception("Can't connect to server from fake XMPP."); - } - - public function process() - { - throw new Exception("Can't read stream from fake XMPP."); - } - - public function processUntil($event, $timeout=-1) - { - throw new Exception("Can't read stream from fake XMPP."); - } - - public function read() - { - throw new Exception("Can't read stream from fake XMPP."); - } - - public function readyToProcess() - { - throw new Exception("Can't read stream from fake XMPP."); - } - //@} - -} - diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 36b47f8e9c..317acd0d53 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -25,14 +25,11 @@ class MSN { private $login_method = 'SSO'; private $oim_send_url = 'https://ows.messenger.msn.com/OimWS/oim.asmx'; private $oim_send_soap = 'http://messenger.live.com/ws/2006/09/oim/Store2'; - private $windows; - private $kill_me = false; private $id; private $ticket; private $user = ''; private $password = ''; private $NSfp=false; - private $SBfp; private $passport_policy = ''; private $alias; private $psm; @@ -46,11 +43,10 @@ class MSN { private $ChildProcess=array(); private $MAXChildProcess=3; private $ReqSBXFRTimeout=60; - private $SBTimeout=2; private $LastPing; private $ping_wait=50; private $SBIdleTimeout=10; - private $SBStreamTimeout=10; + private $SBStreamTimeout=2; private $NSStreamTimeout=2; private $MsnObjArray=array(); private $MsnObjMap=array(); @@ -113,7 +109,10 @@ class MSN { private $aContactList = array(); private $aADL = array(); + private $re_login; private $switchBoardSessions = array(); + private $switchBoardSockets = array(); + private $waitingForXFR = array(); /** * Event Handler Functions @@ -121,6 +120,50 @@ class MSN { private $myEventHandlers = array(); // End added for StatusNet + + public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C) + { + $this->user = $Configs['user']; + $this->password = $Configs['password']; + $this->alias = isset($Configs['alias']) ? $Configs['alias'] : ''; + $this->psm = isset($Configs['psm']) ? $Configs['psm'] : ''; + $this->use_ping = isset($Configs['use_ping']) ? $Configs['use_ping'] : false; + $this->retry_wait = isset($Configs['retry_wait']) ? $Configs['retry_wait'] : 30; + $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true; + $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true; + $this->PhotoStickerFile=isset($Configs['PhotoSticker']) ? $Configs['PhotoSticker'] : false; + if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) + { + foreach($this->Emotions as $EmotionFilePath) + $this->MsnObj($EmotionFilePath,$Type=2); + } + $this->debug = isset($Configs['debug']) ? $Configs['debug'] : false; + $this->timeout = $timeout; + // check support + if (!function_exists('curl_init')) throw new Exception("We need curl module!\n"); + if (!function_exists('preg_match')) throw new Exception("We need pcre module!\n"); + if (!function_exists('mhash')) throw new Exception("We need mhash module!\n"); + + if (!function_exists('mcrypt_cbc')) throw new Exception("We need mcrypt module!\n"); + if (!function_exists('bcmod')) throw new Exception("We need bcmath module for $protocol!\n"); + + /* + http://msnpiki.msnfanatic.com/index.php/Client_ID + Client ID for MSN: + normal MSN 8.1 clientid is: + 01110110 01001100 11000000 00101100 + = 0x764CC02C + + we just use following: + * 0x04: Your client can send/receive Ink (GIF format) + * 0x08: Your client can send/recieve Ink (ISF format) + * 0x8000: This means you support Winks receiving (If not set the official Client will warn with 'contact has an older client and is not capable of receiving Winks') + * 0x70000000: This is the value for MSNC7 (WL Msgr 8.1) + = 0x7000800C; + */ + $this->clientid = $client_id; + $this->ABService=new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl',array('trace' => 1)); + } private function Array2SoapVar($Array,$ReturnSoapVarObj=true,$TypeName=null,$TypeNameSpace=null) { @@ -154,78 +197,16 @@ class MSN { if($ReturnSoapVarObj) return new SoapVar($ArrayString,XSD_ANYXML,$TypeName,$TypeNameSpace); return $ArrayString; } - - public function End() - { - $this->log_message("*** someone kill me ***"); - $this->kill_me=true; - } - private function IsIgnoreMail($Email) - { - if($this->IgnoreList==false) return false; - foreach($this->IgnoreList as $Pattern) - { - if(preg_match($Pattern,$Email)) return true; - } - return false; - } - public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C) - { - $this->user = $Configs['user']; - $this->password = $Configs['password']; - $this->alias = isset($Configs['alias']) ? $Configs['alias'] : ''; - $this->psm = isset($Configs['psm']) ? $Configs['psm'] : ''; - $my_add_function = isset($Configs['add_user_function']) ? $Configs['add_user_function'] : false; - $my_rem_function = isset($Configs['remove_user_function']) ? $Configs['remove_user_function'] : false; - $this->use_ping = isset($Configs['use_ping']) ? $Configs['use_ping'] : false; - $this->retry_wait = isset($Configs['retry_wait']) ? $Configs['retry_wait'] : 30; - $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true; - $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true; - $this->PhotoStickerFile=isset($Configs['PhotoSticker']) ? $Configs['PhotoSticker'] : false; - $this->IgnoreList=isset($Configs['IgnoreList'])?$Configs['IgnoreList']:false; - if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) - { - foreach($this->Emotions as $EmotionFilePath) - $this->MsnObj($EmotionFilePath,$Type=2); - } - $this->debug = isset($Configs['debug']) ? $Configs['debug'] : false; - $this->timeout = $timeout; - // check support - if (!function_exists('curl_init')) throw new Exception("We need curl module!\n"); - if (!function_exists('preg_match')) throw new Exception("We need pcre module!\n"); - if (!function_exists('mhash')) throw new Exception("We need mhash module!\n"); - - if (!function_exists('mcrypt_cbc')) throw new Exception("We need mcrypt module!\n"); - if (!function_exists('bcmod')) throw new Exception("We need bcmath module for $protocol!\n"); - - /* - http://msnpiki.msnfanatic.com/index.php/Client_ID - Client ID for MSN: - normal MSN 8.1 clientid is: - 01110110 01001100 11000000 00101100 - = 0x764CC02C - - we just use following: - * 0x04: Your client can send/receive Ink (GIF format) - * 0x08: Your client can send/recieve Ink (ISF format) - * 0x8000: This means you support Winks receiving (If not set the official Client will warn with 'contact has an older client and is not capable of receiving Winks') - * 0x70000000: This is the value for MSNC7 (WL Msgr 8.1) - = 0x7000800C; - */ - $this->clientid = $client_id; - $this->windows =(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'); - $this->ABService=new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl',array('trace' => 1)); - } - + private function get_passport_ticket($url = '') { $user = $this->user; $password = htmlspecialchars($this->password); if ($url === '') - $passport_url = $this->passport_url; + $passport_url = $this->passport_url; else - $passport_url = $url; + $passport_url = $url; $XML = ' ticket=$aTickets; $this->debug_message(var_export($aTickets, true)); $ABAuthHeaderArray=array( - 'ABAuthHeader'=>array( - ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'ManagedGroupRequest'=>false, - 'TicketToken'=>htmlspecialchars($this->ticket['contact_ticket']), - ) + 'ABAuthHeader'=>array( + ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'ManagedGroupRequest'=>false, + 'TicketToken'=>htmlspecialchars($this->ticket['contact_ticket']), + ) ); $this->ABAuthHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook","ABAuthHeader", $this->Array2SoapVar($ABAuthHeaderArray)); - file_put_contents('/tmp/STTicket.txt',htmlspecialchars($this->ticket['storage_ticket'])); - //$this->debug_message("StorageTicket:\n",htmlspecialchars($this->ticket['storage_ticket'])); return $aTickets; } + private function UpdateContacts() { $ABApplicationHeaderArray=array( - 'ABApplicationHeader'=>array( - ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'ApplicationId'=>'CFE80F9D-180F-4399-82AB-413F33A1FA11', - 'IsMigration'=>false, - 'PartnerScenario'=>'ContactSave' - ) - ); - $ABApplicationHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook",'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray)); - $ABFindAllArray=array( - 'ABFindAll'=>array( - ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'abId'=>'00000000-0000-0000-0000-000000000000', - 'abView'=>'Full', - 'lastChange'=>'0001-01-01T00:00:00.0000000-08:00', - ) - ); - $ABFindAll=new SoapParam($this->Array2SoapVar($ABFindAllArray),'ABFindAll'); - $this->ABService->__setSoapHeaders(array($ABApplicationHeader,$this->ABAuthHeader)); - $this->Contacts=array(); - try - { - $this->debug_message("*** Update Contacts..."); - $Result=$this->ABService->ABFindAll($ABFindAll); - $this->debug_message("*** Result:\n".print_r($Result,true)."\n".$this->ABService->__getLastResponse()); - foreach($Result->ABFindAllResult->contacts->Contact as $Contact) - $this->Contacts[$Contact->contactInfo->passportName]=$Contact; - } - catch(Exception $e) - { - $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); - } + 'ABApplicationHeader'=>array( + ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'ApplicationId'=>'CFE80F9D-180F-4399-82AB-413F33A1FA11', + 'IsMigration'=>false, + 'PartnerScenario'=>'ContactSave' + ) + ); + + $ABApplicationHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook",'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray)); + $ABFindAllArray=array( + 'ABFindAll'=>array( + ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'abId'=>'00000000-0000-0000-0000-000000000000', + 'abView'=>'Full', + 'lastChange'=>'0001-01-01T00:00:00.0000000-08:00', + ) + ); + $ABFindAll=new SoapParam($this->Array2SoapVar($ABFindAllArray),'ABFindAll'); + $this->ABService->__setSoapHeaders(array($ABApplicationHeader,$this->ABAuthHeader)); + $this->Contacts=array(); + try + { + $this->debug_message("*** Update Contacts..."); + $Result=$this->ABService->ABFindAll($ABFindAll); + $this->debug_message("*** Result:\n".print_r($Result,true)."\n".$this->ABService->__getLastResponse()); + foreach($Result->ABFindAllResult->contacts->Contact as $Contact) + $this->Contacts[$Contact->contactInfo->passportName]=$Contact; + } + catch(Exception $e) + { + $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); + return false; + } + return true; } - protected function addContact($email, $network, $display = '', $sendADL = false) + + private function addContact($email, $network, $display = '', $sendADL = false) { if ($network != 1) return true; if(isset($this->Contacts[$email])) return true; $ABContactAddArray=array( - 'ABContactAdd'=>array( - ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'abId'=>'00000000-0000-0000-0000-000000000000', - 'contacts'=>array( - 'Contact'=>array( - ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'contactInfo'=>array( - 'contactType'=>'LivePending', - 'passportName'=>$email, - 'isMessengerUser'=>true, - 'MessengerMemberInfo'=>array( - 'DisplayName'=>$email - ) - ) - ) - ), - 'options'=>array( - 'EnableAllowListManagement'=>true - ) - ) + 'ABContactAdd'=>array( + ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'abId'=>'00000000-0000-0000-0000-000000000000', + 'contacts'=>array( + 'Contact'=>array( + ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'contactInfo'=>array( + 'contactType'=>'LivePending', + 'passportName'=>$email, + 'isMessengerUser'=>true, + 'MessengerMemberInfo'=>array( + 'DisplayName'=>$email + ) + ) + ) + ), + 'options'=>array( + 'EnableAllowListManagement'=>true + ) + ) ); $ABContactAdd=new SoapParam($this->Array2SoapVar($ABContactAddArray),'ABContactAdd'); try @@ -531,6 +515,7 @@ class MSN { catch(Exception $e) { $this->debug_message("*** Add Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); + return false; } if ($sendADL && !feof($this->NSfp)) { @list($u_name, $u_domain) = @explode('@', $email); @@ -552,7 +537,7 @@ class MSN { $user = $email; $ticket = htmlspecialchars($this->ticket['contact_ticket']); if ($network == 1) - $XML = ' + $XML = ' '; else - $XML = ' + $XML = ' delmember_soap, 'Content-Type: text/xml; charset=utf-8', 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' - ); + ); - $this->debug_message("*** URL: $this->delmember_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->delmember_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + $this->debug_message("*** URL: $this->delmember_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->delmember_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); - if ($http_code != 200) { - preg_match('#(.*)(.*)#', $data, $matches); - if (count($matches) == 0) { - $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list"); - return false; - } - $faultcode = trim($matches[1]); - $faultstring = trim($matches[2]); - if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) { - $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring"); - return false; - } - $this->log_message("*** delete member (network: $network) $email ($memberID) from $list, not exist"); - return true; + if ($http_code != 200) { + preg_match('#(.*)(.*)#', $data, $matches); + if (count($matches) == 0) { + $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list"); + return false; } - $this->log_message("*** delete member (network: $network) $email ($memberID) from $list"); + $faultcode = trim($matches[1]); + $faultstring = trim($matches[2]); + if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) { + $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring"); + return false; + } + $this->log_message("*** delete member (network: $network) $email ($memberID) from $list, not exist"); return true; + } + $this->log_message("*** delete member (network: $network) $email ($memberID) from $list"); + return true; } function addMemberToList($email, $network, $list) { @@ -677,7 +662,7 @@ class MSN { $user = $email; if ($network == 1) - $XML = ' + $XML = ' '; else - $XML = ' + $XML = ' addmember_soap, 'Content-Type: text/xml; charset=utf-8', 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' - ); + ); - $this->debug_message("*** URL: $this->addmember_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->addmember_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + $this->debug_message("*** URL: $this->addmember_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->addmember_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); - if ($http_code != 200) { - preg_match('#(.*)(.*)#', $data, $matches); - if (count($matches) == 0) { - $this->log_message("*** can't add member (network: $network) $email to $list"); - return false; - } - $faultcode = trim($matches[1]); - $faultstring = trim($matches[2]); - if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) { - $this->log_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring"); - return false; - } - $this->log_message("*** add member (network: $network) $email to $list, already exist!"); - return true; + if ($http_code != 200) { + preg_match('#(.*)(.*)#', $data, $matches); + if (count($matches) == 0) { + $this->log_message("*** can't add member (network: $network) $email to $list"); + return false; } - $this->log_message("*** add member (network: $network) $email to $list"); + $faultcode = trim($matches[1]); + $faultstring = trim($matches[2]); + if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) { + $this->log_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring"); + return false; + } + $this->log_message("*** add member (network: $network) $email to $list, already exist!"); return true; + } + $this->log_message("*** add member (network: $network) $email to $list"); + return true; } function getMembershipList($returnData=false) { @@ -837,102 +822,109 @@ class MSN { 'SOAPAction: '.$this->membership_soap, 'Content-Type: text/xml; charset=utf-8', 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' - ); - $this->debug_message("*** URL: $this->membership_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->membership_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); - if($http_code != 200) return array(); - $p = $data; - $aMemberships = array(); + ); + $this->debug_message("*** URL: $this->membership_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->membership_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + if($http_code != 200) return false; + $p = $data; + $aMemberships = array(); + while (1) { + //$this->debug_message("search p = $p"); + $start = strpos($p, ''); + $end = strpos($p, ''); + if ($start === false || $end === false || $start > $end) break; + //$this->debug_message("start = $start, end = $end"); + $end += 13; + $sMembership = substr($p, $start, $end - $start); + $aMemberships[] = $sMembership; + //$this->debug_message("add sMembership = $sMembership"); + $p = substr($p, $end); + } + //$this->debug_message("aMemberships = ".var_export($aMemberships, true)); + + $aContactList = array(); + foreach ($aMemberships as $sMembership) { + //$this->debug_message("sMembership = $sMembership"); + if (isset($matches)) unset($matches); + preg_match('#(.*)#', $sMembership, $matches); + if (count($matches) == 0) continue; + $sMemberRole = $matches[1]; + //$this->debug_message("MemberRole = $sMemberRole"); + if ($sMemberRole != 'Allow' && $sMemberRole != 'Reverse' && $sMemberRole != 'Pending') continue; + $p = $sMembership; + if (isset($aMembers)) unset($aMembers); + $aMembers = array(); while (1) { //$this->debug_message("search p = $p"); - $start = strpos($p, ''); - $end = strpos($p, ''); + $start = strpos($p, 'debug_message("add sMembership = $sMembership"); + $end += 9; + $sMember = substr($p, $start, $end - $start); + $aMembers[] = $sMember; + //$this->debug_message("add sMember = $sMember"); $p = substr($p, $end); } - //$this->debug_message("aMemberships = ".var_export($aMemberships, true)); - - $aContactList = array(); - foreach ($aMemberships as $sMembership) { - //$this->debug_message("sMembership = $sMembership"); + //$this->debug_message("aMembers = ".var_export($aMembers, true)); + foreach ($aMembers as $sMember) { + //$this->debug_message("sMember = $sMember"); if (isset($matches)) unset($matches); - preg_match('#(.*)#', $sMembership, $matches); + preg_match('##', $sMember, $matches); if (count($matches) == 0) continue; - $sMemberRole = $matches[1]; - //$this->debug_message("MemberRole = $sMemberRole"); - if ($sMemberRole != 'Allow' && $sMemberRole != 'Reverse' && $sMemberRole != 'Pending') continue; - $p = $sMembership; - if (isset($aMembers)) unset($aMembers); - $aMembers = array(); - while (1) { - //$this->debug_message("search p = $p"); - $start = strpos($p, 'debug_message("add sMember = $sMember"); - $p = substr($p, $end); + $sMemberType = $matches[1]; + //$this->debug_message("MemberType = $sMemberType"); + $network = -1; + preg_match('#(.*)#', $sMember, $matches); + if (count($matches) == 0) continue; + $id = $matches[1]; + if ($sMemberType == 'PassportMember') { + if (strpos($sMember, 'Passport') === false) continue; + $network = 1; + preg_match('#(.*)#', $sMember, $matches); } - //$this->debug_message("aMembers = ".var_export($aMembers, true)); - foreach ($aMembers as $sMember) { - //$this->debug_message("sMember = $sMember"); - if (isset($matches)) unset($matches); - preg_match('##', $sMember, $matches); + else if ($sMemberType == 'EmailMember') { + if (strpos($sMember, 'Email') === false) continue; + // Value is 32: or 32:YAHOO + preg_match('#MSN.IM.BuddyType(.*):(.*)#', $sMember, $matches); if (count($matches) == 0) continue; - $sMemberType = $matches[1]; - //$this->debug_message("MemberType = $sMemberType"); - $network = -1; - preg_match('#(.*)#', $sMember, $matches); - if (count($matches) == 0) continue; - $id = $matches[1]; - if ($sMemberType == 'PassportMember') { - if (strpos($sMember, 'Passport') === false) continue; - $network = 1; - preg_match('#(.*)#', $sMember, $matches); - } - else if ($sMemberType == 'EmailMember') { - if (strpos($sMember, 'Email') === false) continue; - // Value is 32: or 32:YAHOO - preg_match('#MSN.IM.BuddyType(.*):(.*)#', $sMember, $matches); - if (count($matches) == 0) continue; - if ($matches[1] != 32) continue; - $network = 32; - preg_match('#(.*)#', $sMember, $matches); - } - if ($network == -1) continue; - if (count($matches) > 0) { - $email = $matches[1]; - @list($u_name, $u_domain) = @explode('@', $email); - if ($u_domain == NULL) continue; - $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id; - $this->log_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)"); - } + if ($matches[1] != 32) continue; + $network = 32; + preg_match('#(.*)#', $sMember, $matches); + } + if ($network == -1) continue; + if (count($matches) > 0) { + $email = $matches[1]; + @list($u_name, $u_domain) = @explode('@', $email); + if ($u_domain == NULL) continue; + $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id; + $this->log_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)"); } } - return $aContactList; + } + return $aContactList; } + /** + * Connect to the NS server + * @param $user Username + * @param $password Password + * @param $redirect_server Redirect server + * @param $redirect_port Redirect port + */ private function connect($user, $password, $redirect_server = '', $redirect_port = 1863) { $this->id = 1; if ($redirect_server === '') { @@ -1092,6 +1084,133 @@ class MSN { // never goto here } + /** + * Sign onto the NS server and retrieve the address book + */ + public function signon() { + $this->log_message("*** try to connect to MSN network"); + while(!$this->connect($this->user, $this->password)) + { + $this->signonFailed("!!! Can't connect to server: $this->error"); + } + if(!$this->UpdateContacts()) { + $this->signonFailed('!!! Could not update contacts'); + return $this->signon(); + } + $this->LastPing=time(); + $this->log_message("*** connected, wait for command"); + $start_tm = time(); + $ping_tm = time(); + if(($this->aContactList = $this->getMembershipList()) === false) { + $this->signonFailed('!!! Could not get Membership List'); + return $this->signon(); + } + if ($this->update_pending) { + if (is_array($this->aContactList)) { + $pending = 'Pending'; + foreach ($this->aContactList as $u_domain => $aUserList) { + foreach ($aUserList as $u_name => $aNetworks) { + foreach ($aNetworks as $network => $aData) { + if (isset($aData[$pending])) { + // pending list + $cnt = 0; + foreach (array('Allow', 'Reverse') as $list) { + if (isset($aData[$list])) + $cnt++; + else { + if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { + $this->aContactList[$u_domain][$u_name][$network][$list] = false; + $cnt++; + } + } + } + if ($cnt >= 2) { + $id = $aData[$pending]; + // we can delete it from pending now + if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending)) + unset($this->aContactList[$u_domain][$u_name][$network][$pending]); + } + } + else { + // sync list + foreach (array('Allow', 'Reverse') as $list) { + if (!isset($aData[$list])) { + if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) + $this->aContactList[$u_domain][$u_name][$network][$list] = false; + } + } + } + } + } + } + } + } + $n = 0; + $sList = ''; + $len = 0; + if (is_array($this->aContactList)) { + foreach ($this->aContactList as $u_domain => $aUserList) { + $str = ''; + $len += strlen($str); + if ($len > 7400) { + $this->aADL[$n] = ''.$sList.''; + $n++; + $sList = ''; + $len = strlen($str); + } + $sList .= $str; + foreach ($aUserList as $u_name => $aNetworks) { + foreach ($aNetworks as $network => $status) { + $str = ''; + $len += strlen($str); + // max: 7500, but is 19, + // so we use 7475 + if ($len > 7475) { + $sList .= ''; + $this->aADL[$n] = ''.$sList.''; + $n++; + $sList = ''.$str; + $len = strlen($sList); + } + else + $sList .= $str; + } + } + $sList .= ''; + } + } + $this->aADL[$n] = ''.$sList.''; + // NS: >>> BLP {id} BL + $this->ns_writeln("BLP $this->id BL"); + foreach ($this->aADL as $str) { + $len = strlen($str); + // NS: >>> ADL {id} {size} + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); + } + // NS: >>> PRP {id} MFN name + if ($this->alias == '') $this->alias = $user; + $aliasname = rawurlencode($this->alias); + $this->ns_writeln("PRP $this->id MFN $aliasname"); + //設定個人大頭貼 + //$MsnObj=$this->PhotoStckObj(); + // NS: >>> CHG {id} {status} {clientid} {msnobj} + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + if($this->PhotoStickerFile!==false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + // NS: >>> UUX {id} length + $str = ''.htmlspecialchars($this->psm).''; + $len = strlen($str); + $this->ns_writeln("UUX $this->id $len"); + $this->ns_writedata($str); + } + + private function signonFailed($message) { + $this->log_message($message); + $this->callHandler('ConnectFailed', NULL); + $this->NSRetryWait($this->retry_wait); + } + function derive_key($key, $magic) { $hash1 = mhash(MHASH_SHA1, $magic, $key); $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key); @@ -1148,36 +1267,36 @@ class MSN { 'SOAPAction: '.$this->oim_maildata_soap, 'Content-Type: text/xml; charset=utf-8', 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' - ); + ); - $this->debug_message("*** URL: $this->oim_maildata_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->oim_maildata_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + $this->debug_message("*** URL: $this->oim_maildata_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->oim_maildata_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); - if ($http_code != 200) { - $this->debug_message("*** Can't get OIM maildata! http code: $http_code"); - return false; - } + if ($http_code != 200) { + $this->debug_message("*** Can't get OIM maildata! http code: $http_code"); + return false; + } - // See #XML_Data - preg_match('#]*)>(.*)#', $data, $matches); - if (count($matches) == 0) { - $this->debug_message("*** Can't get OIM maildata"); - return ''; - } - return $matches[2]; + // See #XML_Data + preg_match('#]*)>(.*)#', $data, $matches); + if (count($matches) == 0) { + $this->debug_message("*** Can't get OIM maildata"); + return ''; + } + return $matches[2]; } function getOIM_message($msgid) { @@ -1212,60 +1331,60 @@ class MSN { 'SOAPAction: '.$this->oim_read_soap, 'Content-Type: text/xml; charset=utf-8', 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' - ); + ); - $this->debug_message("*** URL: $this->oim_read_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->oim_read_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + $this->debug_message("*** URL: $this->oim_read_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->oim_read_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); - if ($http_code != 200) { - $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code"); - return false; - } + if ($http_code != 200) { + $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code"); + return false; + } - // why can't use preg_match('#(.*)#', $data, $matches)? - // multi-lines? - $start = strpos($data, ''); - $end = strpos($data, ''); - if ($start === false || $end === false || $start > $end) { - $this->debug_message("*** Can't get OIM: $msgid"); - return false; - } - $lines = substr($data, $start + 18, $end - $start); - $aLines = @explode("\n", $lines); - $header = true; - $ignore = false; - $sOIM = ''; - foreach ($aLines as $line) { - $line = rtrim($line); - if ($header) { - if ($line === '') { - $header = false; - continue; - } + // why can't use preg_match('#(.*)#', $data, $matches)? + // multi-lines? + $start = strpos($data, ''); + $end = strpos($data, ''); + if ($start === false || $end === false || $start > $end) { + $this->debug_message("*** Can't get OIM: $msgid"); + return false; + } + $lines = substr($data, $start + 18, $end - $start); + $aLines = @explode("\n", $lines); + $header = true; + $ignore = false; + $sOIM = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; continue; } - // stop at empty lines - if ($line === '') break; - $sOIM .= $line; + continue; } - $sMsg = base64_decode($sOIM); - $this->debug_message("*** we get OIM ($msgid): $sMsg"); + // stop at empty lines + if ($line === '') break; + $sOIM .= $line; + } + $sMsg = base64_decode($sOIM); + $this->debug_message("*** we get OIM ($msgid): $sMsg"); - // delete OIM - $XML = ' + // delete OIM + $XML = ' @@ -1284,33 +1403,33 @@ class MSN { '; - $header_array = array( + $header_array = array( 'SOAPAction: '.$this->oim_del_soap, 'Content-Type: text/xml; charset=utf-8', 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' - ); + ); - $this->debug_message("*** URL: $this->oim_del_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->oim_del_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + $this->debug_message("*** URL: $this->oim_del_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->oim_del_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); - if ($http_code != 200) + if ($http_code != 200) $this->debug_message("*** Can't delete OIM: $msgid, http code = $http_code"); - else + else $this->debug_message("*** OIM ($msgid) deleted"); - return $sMsg; + return $sMsg; } private function NSLogout() { if (is_resource($this->NSfp) && !feof($this->NSfp)) { @@ -1395,7 +1514,7 @@ class MSN { } if ($oim_result === false || $oim_result['auth_policy'] !== false) { - if ($re_login) + if ($this->re_login) { $this->log_message("*** can't send OIM, but we already re-login again, so ignore this OIM"); break; @@ -1480,7 +1599,6 @@ class MSN { $this->log_message("*** connected, wait for command"); $start_tm = time(); $ping_tm = time(); - stream_set_timeout($this->NSfp, $this->NSStreamTimeout); $aContactList = $this->getMembershipList(); if ($this->update_pending) { if (is_array($aContactList)) { @@ -1659,13 +1777,13 @@ class MSN { $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain"); else { - $re_login = false; + $this->re_login = false; $cnt = 0; foreach (array('Allow', 'Reverse') as $list) { if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { - if ($re_login) { + if ($this->re_login) { $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); continue; } @@ -1676,7 +1794,7 @@ class MSN { $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); continue; } - $re_login = true; + $this->re_login = true; $this->ticket = $aTickets; $this->log_message("**** get new ticket, try it again"); if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) @@ -1770,7 +1888,7 @@ class MSN { $this->log_message("*** ingnore MSG not for OIM"); break; } - $re_login = false; + $this->re_login = false; if (strcasecmp($maildata, 'too-large') == 0) { $this->log_message("*** large mail-data, need to get the data via SOAP"); $maildata = $this->getOIM_maildata(); @@ -1783,7 +1901,7 @@ class MSN { $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); break; } - $re_login = true; + $this->re_login = true; $this->ticket = $aTickets; $this->log_message("**** get new ticket, try it again"); $maildata = $this->getOIM_maildata(); @@ -1849,7 +1967,7 @@ class MSN { $sMsg = $this->getOIM_message($oim_msgid); if ($sMsg === false) { $this->log_message("*** can't get OIM, msgid = $oim_msgid"); - if ($re_login) { + if ($this->re_login) { $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); continue; } @@ -1859,7 +1977,7 @@ class MSN { $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); continue; } - $re_login = true; + $this->re_login = true; $this->ticket = $aTickets; $this->log_message("**** get new ticket, try it again"); $sMsg = $this->getOIM_message($oim_msgid); @@ -2069,30 +2187,6 @@ class MSN { return $this->NsLogout(); } - /*public function SendMessage($Message, $To) - { - $FileName = MSN_CLASS_SPOOL_DIR.'/'.strftime('%Y%m%d%H%M%S',time()).'_'.posix_getpid().'_sendMessage.msn'; - if(!is_array($To)) - $To=array($To); - $Receiver=''; - foreach($To as $Email) - { - list($name,$host,$network)=explode('@',$Email); - $network=$network==''?1:$network; - if($network==1 && $this->SwitchBoardProcess && $this->SwitchBoardSessionUser=="$name@$host" ) - { - $this->debug_message("*** SendMessage to $Receiver use SB message queue."); - array_push($this->SwitchBoardMessageQueue,$Message); - continue; - } - $Receiver.="$name@$host@$network,"; - } - if($Receiver=='') return; - $Receiver=substr($Receiver,0,-1); - $this->debug_message("*** SendMessage to $Receiver use File queue."); - file_put_contents($FileName,"TO: $Receiver\n$Message\n"); - }*/ - function getChallenge($code) { // MSNP15 @@ -2190,9 +2284,9 @@ class MSN { { $SessionEnd=false; $Joined=false; - $id=1; + $this->id=1; $LastActive=time(); - stream_set_timeout($this->SBFp, $this->SBTimeout); + stream_set_timeout($this->SBfp, $this->SBStreamTimeout); switch($Action) { case 'Active': @@ -2200,8 +2294,7 @@ class MSN { $user=$Param['user']; $this->SwitchBoardMessageQueue=$Param['Msg']; // SB: >>> USR {id} {user} {cki} - $this->SB_writeln("USR $id $this->user $cki_code"); - $id++; + $this->SB_writeln("USR $this->id $this->user $cki_code"); $this->SwitchBoardSessionUser=$user; break; case 'Passive': @@ -2209,14 +2302,13 @@ class MSN { $sid=$Param['sid']; $user=$Param['user']; // SB: >>> ANS {id} {user} {ticket} {session_id} - $this->SB_writeln("ANS $id $this->user $ticket $sid"); - $id++; + $this->SB_writeln("ANS $this->id $this->user $ticket $sid"); $this->SwitchBoardSessionUser=$user; break; default: return false; } - while((!feof($this->SBFp))&&(!$SessionEnd)) + while((!feof($this->SBfp))&&(!$SessionEnd)) { $data = $this->SB_readln(); if($this->kill_me) @@ -2242,14 +2334,12 @@ class MSN { { $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine"; $len = strlen($SendString); - $this->SB_writeln("MSG $id N $len"); - $id++; + $this->SB_writeln("MSG $this->id N $len"); $this->SB_writedata($SendString); $this->id++; } $len = strlen($aMessage); - $this->SB_writeln("MSG $id N $len"); - $id++; + $this->SB_writeln("MSG $this->id N $len"); $this->SB_writedata($aMessage); } $this->SwitchBoardMessageQueue=array(); @@ -2274,8 +2364,7 @@ class MSN { // we don't need the data, just ignore it // request user to join this switchboard // SB: >>> CAL {id} {user} - $this->SB_writeln("CAL $id $user"); - $id++; + $this->SB_writeln("CAL $this->id $user"); break; case 'CAL': // SB: <<< CAL {id} RINGING {?} @@ -2431,8 +2520,7 @@ class MSN { $footer = pack("L", 0); $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer"; $len = strlen($message); - $this->SB_writeln("MSG $id D $len"); - $id++; + $this->SB_writeln("MSG $this->id D $len"); $this->SB_writedata($message); $this->log_message("*** p2p: send display picture acknowledgement for $hdr_SessionID"); $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message)); @@ -2468,8 +2556,7 @@ class MSN { "MIME-Version: 1.0\r\n". "Content-Type: application/x-msnmsgrp2p\r\n". "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer"; - $this->SB_writeln("MSG $id D ".strlen($message)); - $id++; + $this->SB_writeln("MSG $this->id D ".strlen($message)); $this->SB_writedata($message); $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message)); $this->SB_readln();//Read ACK; @@ -2494,8 +2581,7 @@ class MSN { "MIME-Version: 1.0\r\n". "Content-Type: application/x-msnmsgrp2p\r\n". "P2P-Dest: $from_email\r\n\r\n$hdr".pack('L',0)."$footer"; - $this->SB_writeln("MSG $id D ".strlen($message)); - $id++; + $this->SB_writeln("MSG $this->id D ".strlen($message)); $this->SB_writedata($message); $this->debug_message("*** p2p: dump send Data preparation message:\n".$this->dump_binary($message)); $this->debug_message("*** p2p: Data Prepare Hdr:\n".$this->dump_binary($hdr)); @@ -2528,8 +2614,7 @@ class MSN { "MIME-Version: 1.0\r\n". "Content-Type: application/x-msnmsgrp2p\r\n". "P2P-Dest: $from_email\r\n\r\n$hdr$FileContent$footer"; - $this->SB_writeln("MSG $id D ".strlen($message)); - $id++; + $this->SB_writeln("MSG $this->id D ".strlen($message)); $this->SB_writedata($message); $this->debug_message("*** p2p: dump send Data Content message $Offset / $FileSize :\n".$this->dump_binary($message)); $this->debug_message("*** p2p: Data Content Hdr:\n".$this->dump_binary($hdr)); @@ -2651,22 +2736,22 @@ class MSN { } if(!$this->IsIgnoreMail($user)) $LastActive = time(); } - if (feof($this->SBFp)) + if (feof($this->SBfp)) { // lost connection? error? try OIM later - @fclose($this->SBFp); + @fclose($this->SBfp); return false; } $this->SB_writeln("OUT"); - @fclose($this->SBFp); + @fclose($this->SBfp); return true; } - private function switchboard_control($ip, $port, $cki_code, $user, $Messages) + /*private function switchboard_control($ip, $port, $cki_code, $user, $Messages) { $this->SwitchBoardProcess=1; $this->debug_message("*** SB: try to connect to switchboard server $ip:$port"); - $this->SBFp = @fsockopen($ip, $port, $errno, $errstr, 5); - if (!$this->SBFp) + $this->SBfp = @fsockopen($ip, $port, $errno, $errstr, 5); + if (!$this->SBfp) { $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr"); return false; @@ -2677,119 +2762,14 @@ class MSN { { $this->SwitchBoardProcess=2; $this->debug_message("*** SB: try to connect to switchboard server $ip:$port"); - $this->SBFp = @fsockopen($ip, $port, $errno, $errstr, 5); - if (!$this->SBFp) + $this->SBfp = @fsockopen($ip, $port, $errno, $errstr, 5); + if (!$this->SBfp) { $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr"); return false; } return $this->DoSwitchBoard('Passive',array('sid'=>$sid,'user'=>$user,'ticket'=>$ticket)); - } - - private function sendOIM($to, $sMessage, $lockkey) - { - $XML = ' - - - - - - - http://messenger.msn.com - 1 - - - - text - MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: base64 -X-OIM-Message-Type: OfflineMessage -X-OIM-Run-Id: {DAB68CFA-38C9-449B-945E-38AFA51E50A7} -X-OIM-Sequence-Num: 1 - -'.chunk_split(base64_encode($sMessage)).' - - -'; - - $header_array = array( - 'SOAPAction: '.$this->oim_send_soap, - 'Content-Type: text/xml', - 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' - ); - - $this->debug_message("*** URL: $this->oim_send_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->oim_send_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); - - if ($http_code == 200) { - $this->debug_message("*** OIM sent for $to"); - return true; - } - - $challenge = false; - $auth_policy = false; - // the lockkey is invalid, authenticated fail, we need challenge it again - // 364763969 - preg_match("#(.*)#", $data, $matches); - if (count($matches) != 0) { - // yes, we get new LockKeyChallenge - $challenge = $matches[2]; - $this->debug_message("*** OIM need new challenge ($challenge) for $to"); - } - // auth policy error - // MBI_SSL - preg_match("#(.*)#", $data, $matches); - if (count($matches) != 0) { - $auth_policy = $matches[2]; - $this->debug_message("*** OIM need new auth policy ($auth_policy) for $to"); - } - if ($auth_policy === false && $challenge === false) { - //q0:AuthenticationFailed - preg_match("#(.*)#", $data, $matches); - if (count($matches) == 0) { - // no error, we assume the OIM is sent - $this->debug_message("*** OIM sent for $to"); - return true; - } - $err_code = $matches[2]; - //Exception of type 'System.Web.Services.Protocols.SoapException' was thrown. - preg_match("#(.*)#", $data, $matches); - if (count($matches) > 0) - $err_msg = $matches[1]; - else - $err_msg = ''; - $this->debug_message("*** OIM failed for $to"); - $this->debug_message("*** OIM Error code: $err_code"); - $this->debug_message("*** OIM Error Message: $err_msg"); - return false; - } - return array('challenge' => $challenge, 'auth_policy' => $auth_policy); - } + }*/ // read data for specified size private function ns_readdata($size) { @@ -2831,11 +2811,11 @@ X-OIM-Sequence-Num: 1 } // read data for specified size for SB - private function sb_readdata($size) { + private function sb_readdata($socket, $size) { $data = ''; $count = 0; - while (!feof($this->SBFp)) { - $buf = @fread($this->SBFp, $size - $count); + while (!feof($this->SBfp)) { + $buf = @fread($this->SBfp, $size - $count); $data .= $buf; $count += strlen($buf); if ($count >= $size) break; @@ -2845,8 +2825,8 @@ X-OIM-Sequence-Num: 1 } // read one line for SB - private function sb_readln() { - $data = @fgets($this->SBFp, 4096); + private function sb_readln($socket) { + $data = @fgets($socket, 4096); if ($data !== false) { $data = trim($data); $this->debug_message("SB: <<< $data"); @@ -2856,16 +2836,16 @@ X-OIM-Sequence-Num: 1 // write to server for SB, append \r\n, also increase id // switchboard server only accept \r\n, it will lost connection if just \n only - private function sb_writeln($data) { - @fwrite($this->SBFp, $data."\r\n"); + private function sb_writeln($socket, &$id, $data) { + @fwrite($socket, $data."\r\n"); $this->debug_message("SB: >>> $data"); - $this->id++; + $id++; return; } // write data to server - private function sb_writedata($data) { - @fwrite($this->SBFp, $data); + private function sb_writedata($socket, $data) { + @fwrite($socket, $data); $this->debug_message("SB: >>> $data"); return; } @@ -2943,6 +2923,7 @@ X-OIM-Sequence-Num: 1 $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n"); return $MsnObj; } + private function linetoArray($lines) { $lines=str_replace("\r",'',$lines); $lines=explode("\n",$lines); @@ -2953,6 +2934,7 @@ X-OIM-Sequence-Num: 1 } return $Data; } + private function GetPictureFilePath($Context) { $MsnObj=base64_decode($Context); @@ -2963,6 +2945,7 @@ X-OIM-Sequence-Num: 1 return $this->MsnObjArray[$location]; return false; } + private function GetMsnObjDefine($Message) { $DefineString=''; @@ -2974,154 +2957,16 @@ X-OIM-Sequence-Num: 1 } return $DefineString; } - /** - * Receive Message Overload Function - * @param $Sender - * @param $Message - * @param $Network 1 => msn , 32 =>yahoo - * @param $IsOIM - * @return unknown_type - */ - protected function ReceivedMessage($Sender,$Message,$Network,$IsOIM=false){} - /** - * Remove Us From Member List Overload Function - * @param $User - * @param $Message - * @param $Network 1 => msn , 32 =>yahoo - * @return unknown_type - */ - protected function RemoveUsFromMemberList($User,$Network){} - /** - * Add Us to Member List Overload Function - * @param $User - * @param $Message - * @param $Network 1 => msn , 32 =>yahoo - * @return unknown_type - */ - protected function AddUsToMemberList($User,$Network){} - public function signon() { - $this->log_message("*** try to connect to MSN network"); - while(!$this->connect($this->user, $this->password)) - { - $this->log_message("!!! Can't connect to server: $this->error"); - $this->callHandler('ConnectFailed', NULL); - $this->NSRetryWait($this->retry_wait); - } - $this->UpdateContacts(); - $this->LastPing=time(); - $this->log_message("*** connected, wait for command"); - $start_tm = time(); - $ping_tm = time(); - stream_set_timeout($this->NSfp, $this->NSStreamTimeout); - $this->aContactList = $this->getMembershipList(); - if ($this->update_pending) { - if (is_array($this->aContactList)) { - $pending = 'Pending'; - foreach ($this->aContactList as $u_domain => $aUserList) { - foreach ($aUserList as $u_name => $aNetworks) { - foreach ($aNetworks as $network => $aData) { - if (isset($aData[$pending])) { - // pending list - $cnt = 0; - foreach (array('Allow', 'Reverse') as $list) { - if (isset($aData[$list])) - $cnt++; - else { - if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { - $this->aContactList[$u_domain][$u_name][$network][$list] = false; - $cnt++; - } - } - } - if ($cnt >= 2) { - $id = $aData[$pending]; - // we can delete it from pending now - if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending)) - unset($this->aContactList[$u_domain][$u_name][$network][$pending]); - } - } - else { - // sync list - foreach (array('Allow', 'Reverse') as $list) { - if (!isset($aData[$list])) { - if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) - $this->aContactList[$u_domain][$u_name][$network][$list] = false; - } - } - } - } - } - } - } - } - $n = 0; - $sList = ''; - $len = 0; - if (is_array($this->aContactList)) { - foreach ($this->aContactList as $u_domain => $aUserList) { - $str = ''; - $len += strlen($str); - if ($len > 7400) { - $this->aADL[$n] = ''.$sList.''; - $n++; - $sList = ''; - $len = strlen($str); - } - $sList .= $str; - foreach ($aUserList as $u_name => $aNetworks) { - foreach ($aNetworks as $network => $status) { - $str = ''; - $len += strlen($str); - // max: 7500, but is 19, - // so we use 7475 - if ($len > 7475) { - $sList .= ''; - $this->aADL[$n] = ''.$sList.''; - $n++; - $sList = ''.$str; - $len = strlen($sList); - } - else - $sList .= $str; - } - } - $sList .= ''; - } - } - $this->aADL[$n] = ''.$sList.''; - // NS: >>> BLP {id} BL - $this->ns_writeln("BLP $this->id BL"); - foreach ($this->aADL as $str) { - $len = strlen($str); - // NS: >>> ADL {id} {size} - $this->ns_writeln("ADL $this->id $len"); - $this->ns_writedata($str); - } - // NS: >>> PRP {id} MFN name - if ($this->alias == '') $this->alias = $user; - $aliasname = rawurlencode($this->alias); - $this->ns_writeln("PRP $this->id MFN $aliasname"); - //設定個人大頭貼 - //$MsnObj=$this->PhotoStckObj(); - // NS: >>> CHG {id} {status} {clientid} {msnobj} - $this->ns_writeln("CHG $this->id NLN $this->clientid"); - if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); - // NS: >>> UUX {id} length - $str = ''.htmlspecialchars($this->psm).''; - $len = strlen($str); - $this->ns_writeln("UUX $this->id $len"); - $this->ns_writedata($str); - } - - public function NSreceive() { - $this->log_message("*** startup ***"); - + /** + * Read and handle incoming command from NS + */ + public function nsReceive() { // Sign in again if not signed in or socket failed if (!is_resource($this->NSfp) || feof($this->NSfp)) { $this->callHandler('Reconnect', NULL); $this->signon(); + return; } $data = $this->ns_readln(); @@ -3178,13 +3023,13 @@ X-OIM-Sequence-Num: 1 $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain"); else { - $re_login = false; + $this->re_login = false; $cnt = 0; foreach (array('Allow', 'Reverse') as $list) { if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { - if ($re_login) { + if ($this->re_login) { $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); continue; } @@ -3195,7 +3040,7 @@ X-OIM-Sequence-Num: 1 $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); continue; } - $re_login = true; + $this->re_login = true; $this->ticket = $aTickets; $this->log_message("**** get new ticket, try it again"); if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) @@ -3289,7 +3134,7 @@ X-OIM-Sequence-Num: 1 $this->log_message("*** ingnore MSG not for OIM"); break; } - $re_login = false; + $this->re_login = false; if (strcasecmp($maildata, 'too-large') == 0) { $this->log_message("*** large mail-data, need to get the data via SOAP"); $maildata = $this->getOIM_maildata(); @@ -3302,7 +3147,7 @@ X-OIM-Sequence-Num: 1 $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); break; } - $re_login = true; + $this->re_login = true; $this->ticket = $aTickets; $this->log_message("**** get new ticket, try it again"); $maildata = $this->getOIM_maildata(); @@ -3368,7 +3213,7 @@ X-OIM-Sequence-Num: 1 $sMsg = $this->getOIM_message($oim_msgid); if ($sMsg === false) { $this->log_message("*** can't get OIM, msgid = $oim_msgid"); - if ($re_login) { + if ($this->re_login) { $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); continue; } @@ -3378,7 +3223,7 @@ X-OIM-Sequence-Num: 1 $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); continue; } - $re_login = true; + $this->re_login = true; $this->ticket = $aTickets; $this->log_message("**** get new ticket, try it again"); $sMsg = $this->getOIM_message($oim_msgid); @@ -3590,23 +3435,87 @@ X-OIM-Sequence-Num: 1 } } - public function sendMessageViaSB($message, $to) { + /** + * Read and handle incoming command/message from + * a switchboard session socket + */ + public function sbReceive() { + + } + + /** + * Send a request for a switchboard session + * @param $to Target email for switchboard session + */ + private function reqSBSession($to) { + $this->log_message("*** Request SB for $to"); + $this->ns_writeln("XFR $this->id SB"); + + // Add to the queue of those waiting for a switchboard session reponse + $this->switchBoardSessions[$to] = array('socket' => NULL, 'id' => 1, 'lastActive' => NULL, 'joined' => false, 'XFRReqTime' => time()); + $this->waitingForXFR[] = &$this->switchBoardSessions[$to]; + } + + /** + * Following an XFR or RNG, connect to the switchboard session + * @param $mode Mode, either 'Active' (in the case of XFR) or 'Passive' (in the case or RNG) + * @param $ip IP of Switchboard + * @param $port Port of Switchboard + * @param $to User on other end of Switchboard + * @param $param Array of parameters - 'cki', 'ticket', 'sid' + * @return Whether successful + */ + private function connectToSBSession($mode, $ip, $port, $to, $param) { + $this->debug_message("*** SB: try to connect to switchboard server $ip:$port"); + + $this->switchBoardSessions[$to]['socket'] = @fsockopen($ip, $port, $errno, $errstr, 5); $socket = $this->switchBoardSessions[$to]['socket']; - $lastActive = $this->switchBoardSessions[$to]['lastActive']; - $joined = $this->switchBoardSessions[$to]['joined']; - - //FIXME Probably not needed (we're not running in a loop anymore) - /*if($this->kill_me) - { - $this->log_message("*** SB Okay, kill me now!"); - endSBSession($socket); - }*/ - - if(!$Joined) { - // If our participant has not joined the session yet we can't message them! - //TODO Check the behaviour of the queue runner when we return false + if(!$socket) { + $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr"); return false; } + $this->switchBoardSockets[$socket] = $socket; + + stream_set_timeout($socket, $this->SBStreamTimeout); + + $id = &$this->switchBoardSessions[$to]['id']; + + if($mode == 'Active') { + $cki_code = $param['cki']; + + // SB: >>> USR {id} {user} {cki} + $this->sb_writeln($socket, $id, "USR $id $this->user $cki_code"); + } else { + // Passive + $ticket = $param['ticket']; + $sid = $param['sid']; + + // SB: >>> ANS {id} {user} {ticket} {session_id} + $this->sb_writeln($socket, $id, "ANS $id $this->user $ticket $sid"); + } + + $this->switchBoardSessions[$to]['lastActive'] = time(); + } + + /** + * Send a message via an existing SB session + * @param $message Message + * @param $to Recipient for message + * @return Whether successful + */ + private function sendMessageViaSB($message, $to) { + if(socketcheck($this->switchBoardSessions[$to]['socket'])) { + $this->reqSBSession($to); + return false; + } + + if(!$this->switchBoardSessions[$to]['joined']) { + // If our participant has not joined the session yet we can't message them! + return false; + } + + $id = &$this->switchBoardSessions[$to]['id']; + $socket = $this->switchBoardSessions[$to]['socket']; $aMessage = $this->getMessage($Message); //CheckEmotion... @@ -3615,79 +3524,255 @@ X-OIM-Sequence-Num: 1 { $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine"; $len = strlen($SendString); - $this->SB_writeln("MSG $id N $len"); - $id++; - $this->SB_writedata($SendString); - $this->id++; + // TODO handle failure during write to socket + $this->sb_writeln($socket, $id, "MSG $id N $len"); + $this->sb_writedata($socket, $SendString); } $len = strlen($aMessage); - $this->SB_writeln("MSG $id N $len"); - - // Increment the trID - $this->switchBoardSessions[$to]['id']++; - - $this->SB_writedata($aMessage); + // TODO handle failure during write to socket + $this->sb_writeln($socket, $id, "MSG $id N $len"); + $this->sb_writedata($socket, $aMessage); // Don't close the SB session, we might as well leave it open return true; } - //FIXME Not sure if this is needed? - private function endSBSession($socket) { - if (feof($this->SBFp)) - { - // lost connection? error? try OIM later - @fclose($this->SBFp); + /** + * + * @param $to + * @param $sMessage + * @param $lockkey + */ + private function sendOIM($to, $sMessage, $lockkey) { + $XML = ' + + + + + + + http://messenger.msn.com + 1 + + + + text + MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: base64 +X-OIM-Message-Type: OfflineMessage +X-OIM-Run-Id: {DAB68CFA-38C9-449B-945E-38AFA51E50A7} +X-OIM-Sequence-Num: 1 + +'.chunk_split(base64_encode($sMessage)).' + + +'; + + $header_array = array( + 'SOAPAction: '.$this->oim_send_soap, + 'Content-Type: text/xml', + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' + ); + + $this->debug_message("*** URL: $this->oim_send_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $this->oim_send_url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code == 200) { + $this->debug_message("*** OIM sent for $to"); + return true; + } + + $challenge = false; + $auth_policy = false; + // the lockkey is invalid, authenticated fail, we need challenge it again + // 364763969 + preg_match("#(.*)#", $data, $matches); + if (count($matches) != 0) { + // yes, we get new LockKeyChallenge + $challenge = $matches[2]; + $this->debug_message("*** OIM need new challenge ($challenge) for $to"); + } + // auth policy error + // MBI_SSL + preg_match("#(.*)#", $data, $matches); + if (count($matches) != 0) { + $auth_policy = $matches[2]; + $this->debug_message("*** OIM need new auth policy ($auth_policy) for $to"); + } + if ($auth_policy === false && $challenge === false) { + //q0:AuthenticationFailed + preg_match("#(.*)#", $data, $matches); + if (count($matches) == 0) { + // no error, we assume the OIM is sent + $this->debug_message("*** OIM sent for $to"); + return true; + } + $err_code = $matches[2]; + //Exception of type 'System.Web.Services.Protocols.SoapException' was thrown. + preg_match("#(.*)#", $data, $matches); + if (count($matches) > 0) + $err_msg = $matches[1]; + else + $err_msg = ''; + $this->debug_message("*** OIM failed for $to"); + $this->debug_message("*** OIM Error code: $err_code"); + $this->debug_message("*** OIM Error Message: $err_msg"); return false; } - $this->SB_writeln("OUT"); - @fclose($this->SBFp); - return true; + return array('challenge' => $challenge, 'auth_policy' => $auth_policy); } - private function getSBSession($to) { - + /** + * Send a message to a user on another network + * @param $message Message + * @param $to Intended recipient + * @param $network Network + */ + private function sendOtherNetworkMessage($message, $to, $network) { + $message=$this->getMessage($nessage, $network); + $len = strlen($message); + $this->ns_writeln("UUM $this->id $to $network 1 $len"); + $this->ns_writedata($Message); + $this->log_message("*** sent to $to (network: $network):\n$Message"); } + /** + * Send a message + * @param $message Message + * @param $to To address in form user@host.com@network + * where network is 1 for MSN, 32 for Yahoo + * and 'Offline' for offline messages + */ public function sendMessage($message, $to) { if($message != '') { list($name,$host,$network)=explode('@',$to); $network=$network==''?1:$network; - if($network === 1 && isset($this->switchBoardSessions[$to])) { + if($network === 1 && $this->switchBoardSessions[$to]['socket'] != NULL && time()-$this->switchBoardSessions[$to]['lastActive'] < $this->SBIdleTimeout) { $recipient = $name . $host; $this->debug_message("*** Sending Message to $recipient using existing SB session"); return $this->sendMessageViaSB($message, $recipient); + } elseif($network == 'Offline') { + //Send OIM + //FIXME: 修正Send OIM + $lockkey=''; + for ($i = 0; $i < $this->oim_try; $i++) + { + if(($oim_result = $this->sendOIM($To, $Message, $lockkey))===true) break; + if (is_array($oim_result) && $oim_result['challenge'] !== false) { + // need challenge lockkey + $this->log_message("*** we need a new challenge code for ".$oim_result['challenge']); + $lockkey = $this->getChallenge($oim_result['challenge']); + continue; + } + if ($oim_result === false || $oim_result['auth_policy'] !== false) + { + if ($this->re_login) + { + $this->log_message("*** can't send OIM, but we already re-login again, so ignore this OIM"); + break; + } + $this->log_message("*** can't send OIM, maybe ticket expired, try to login again"); + // maybe we need to re-login again + if(!$this->get_passport_ticket()) + { + $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + break; + } + $this->log_message("**** get new ticket, try it again"); + continue; + } + } } else { $this->debug_message("*** Not MSN network or no existing SB session"); - //TODO implement creation of SB session etc + $this->reqSBSession($to); + return false; } } return true; } + //FIXME Not sure if this is needed? + private function endSBSession($socket) { + if (feof($socket)) + { + // lost connection? error? try OIM later + @fclose($socket); + return false; + } + $fake = 0; + $this->sb_writeln($socket, $fake, "OUT"); + @fclose($socket); + return true; + } + /** * Sends a ping command * * Should be called about every 50 seconds */ - public function send_ping() { + public function sendPing() { // NS: >>> PNG $this->ns_writeln("PNG"); } + /** + * Get the NS socket + */ public function getNSSocket() { return $this->NSfp; } - // TODO Allow for multiple SB session sockets - public function getSBSocket() { - return $this->SBfp; + /** + * Get the Switchboard sockets currently in use + */ + public function getSBSockets() { + return $this->switchBoardSockets; } + /** + * Get all the sockets currently in use + */ public function getSockets() { - return array($this->NSfp, $this->SBfp); + return array_merge($this->NSfp, $this->switchBoardSockets); + } + + /** + * Checks socket for end of file + * + * @access public + * @param Resource $socket Socket to check + * @return boolean true if end of file (socket) + */ + private static function socketcheck($socket){ + $info = stream_get_meta_data($socket); + return $info['eof']; } /** diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php index 354ed0f3ef..b0540c46e5 100644 --- a/plugins/Msn/msnmanager.php +++ b/plugins/Msn/msnmanager.php @@ -115,7 +115,7 @@ class MsnManager extends ImManager $now = time(); - $this->conn->send_ping(); + $this->conn->sendPing(); $this->lastping = $now; return true; } From d1c9908282052228be9822846c9dcac1f430cbfe Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Mon, 14 Jun 2010 04:26:41 +0100 Subject: [PATCH 257/730] Added better error handling to signon method --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 209 ++++++++++--------- 1 file changed, 109 insertions(+), 100 deletions(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 317acd0d53..73f02f6d73 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -139,6 +139,7 @@ class MSN { } $this->debug = isset($Configs['debug']) ? $Configs['debug'] : false; $this->timeout = $timeout; + // check support if (!function_exists('curl_init')) throw new Exception("We need curl module!\n"); if (!function_exists('preg_match')) throw new Exception("We need pcre module!\n"); @@ -1089,123 +1090,131 @@ class MSN { */ public function signon() { $this->log_message("*** try to connect to MSN network"); - while(!$this->connect($this->user, $this->password)) - { - $this->signonFailed("!!! Can't connect to server: $this->error"); - } - if(!$this->UpdateContacts()) { - $this->signonFailed('!!! Could not update contacts'); - return $this->signon(); - } - $this->LastPing=time(); - $this->log_message("*** connected, wait for command"); - $start_tm = time(); - $ping_tm = time(); - if(($this->aContactList = $this->getMembershipList()) === false) { - $this->signonFailed('!!! Could not get Membership List'); - return $this->signon(); - } - if ($this->update_pending) { - if (is_array($this->aContactList)) { - $pending = 'Pending'; - foreach ($this->aContactList as $u_domain => $aUserList) { - foreach ($aUserList as $u_name => $aNetworks) { - foreach ($aNetworks as $network => $aData) { - if (isset($aData[$pending])) { - // pending list - $cnt = 0; - foreach (array('Allow', 'Reverse') as $list) { - if (isset($aData[$list])) - $cnt++; - else { - if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { - $this->aContactList[$u_domain][$u_name][$network][$list] = false; + + while(true) { + while(!$this->connect($this->user, $this->password)) + { + $this->signonFailure("!!! Can't connect to server: $this->error"); + } + if($this->UpdateContacts() === false) { + $this->signonFailure('!!! Update Contacts failed'); + continue; + } + $this->LastPing=time(); + $this->log_message("*** connected, wait for command"); + $start_tm = time(); + $ping_tm = time(); + if(($this->aContactList = $this->getMembershipList()) === false) { + continue; + } + if ($this->update_pending) { + if (is_array($this->aContactList)) { + $pending = 'Pending'; + foreach ($this->aContactList as $u_domain => $aUserList) { + foreach ($aUserList as $u_name => $aNetworks) { + foreach ($aNetworks as $network => $aData) { + if (isset($aData[$pending])) { + // pending list + $cnt = 0; + foreach (array('Allow', 'Reverse') as $list) { + if (isset($aData[$list])) $cnt++; + else { + if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { + $this->aContactList[$u_domain][$u_name][$network][$list] = false; + $cnt++; + } + } + } + if ($cnt >= 2) { + $id = $aData[$pending]; + // we can delete it from pending now + if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending)) + unset($this->aContactList[$u_domain][$u_name][$network][$pending]); + } + } + else { + // sync list + foreach (array('Allow', 'Reverse') as $list) { + if (!isset($aData[$list])) { + if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) + $this->aContactList[$u_domain][$u_name][$network][$list] = false; } } } - if ($cnt >= 2) { - $id = $aData[$pending]; - // we can delete it from pending now - if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending)) - unset($this->aContactList[$u_domain][$u_name][$network][$pending]); - } - } - else { - // sync list - foreach (array('Allow', 'Reverse') as $list) { - if (!isset($aData[$list])) { - if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) - $this->aContactList[$u_domain][$u_name][$network][$list] = false; - } - } } } } } } - } - $n = 0; - $sList = ''; - $len = 0; - if (is_array($this->aContactList)) { - foreach ($this->aContactList as $u_domain => $aUserList) { - $str = ''; - $len += strlen($str); - if ($len > 7400) { - $this->aADL[$n] = ''.$sList.''; - $n++; - $sList = ''; - $len = strlen($str); - } - $sList .= $str; - foreach ($aUserList as $u_name => $aNetworks) { - foreach ($aNetworks as $network => $status) { - $str = ''; - $len += strlen($str); - // max: 7500, but is 19, - // so we use 7475 - if ($len > 7475) { - $sList .= ''; - $this->aADL[$n] = ''.$sList.''; - $n++; - $sList = ''.$str; - $len = strlen($sList); - } - else - $sList .= $str; + $n = 0; + $sList = ''; + $len = 0; + if (is_array($this->aContactList)) { + foreach ($this->aContactList as $u_domain => $aUserList) { + $str = ''; + $len += strlen($str); + if ($len > 7400) { + $this->aADL[$n] = ''.$sList.''; + $n++; + $sList = ''; + $len = strlen($str); } + $sList .= $str; + foreach ($aUserList as $u_name => $aNetworks) { + foreach ($aNetworks as $network => $status) { + $str = ''; + $len += strlen($str); + // max: 7500, but is 19, + // so we use 7475 + if ($len > 7475) { + $sList .= ''; + $this->aADL[$n] = ''.$sList.''; + $n++; + $sList = ''.$str; + $len = strlen($sList); + } + else + $sList .= $str; + } + } + $sList .= ''; } - $sList .= ''; } - } - $this->aADL[$n] = ''.$sList.''; - // NS: >>> BLP {id} BL - $this->ns_writeln("BLP $this->id BL"); - foreach ($this->aADL as $str) { + $this->aADL[$n] = ''.$sList.''; + // NS: >>> BLP {id} BL + $this->ns_writeln("BLP $this->id BL"); + foreach ($this->aADL as $str) { + $len = strlen($str); + // NS: >>> ADL {id} {size} + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); + } + // NS: >>> PRP {id} MFN name + if ($this->alias == '') $this->alias = $user; + $aliasname = rawurlencode($this->alias); + $this->ns_writeln("PRP $this->id MFN $aliasname"); + //設定個人大頭貼 + //$MsnObj=$this->PhotoStckObj(); + // NS: >>> CHG {id} {status} {clientid} {msnobj} + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + if($this->PhotoStickerFile!==false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + // NS: >>> UUX {id} length + $str = ''.htmlspecialchars($this->psm).''; $len = strlen($str); - // NS: >>> ADL {id} {size} - $this->ns_writeln("ADL $this->id $len"); + $this->ns_writeln("UUX $this->id $len"); $this->ns_writedata($str); + break; } - // NS: >>> PRP {id} MFN name - if ($this->alias == '') $this->alias = $user; - $aliasname = rawurlencode($this->alias); - $this->ns_writeln("PRP $this->id MFN $aliasname"); - //設定個人大頭貼 - //$MsnObj=$this->PhotoStckObj(); - // NS: >>> CHG {id} {status} {clientid} {msnobj} - $this->ns_writeln("CHG $this->id NLN $this->clientid"); - if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); - // NS: >>> UUX {id} length - $str = ''.htmlspecialchars($this->psm).''; - $len = strlen($str); - $this->ns_writeln("UUX $this->id $len"); - $this->ns_writedata($str); } - private function signonFailed($message) { + /** + * Called if there is an error during signon + * + * @param $message Error message to log + */ + private function signonFailure($message) { $this->log_message($message); $this->callHandler('ConnectFailed', NULL); $this->NSRetryWait($this->retry_wait); From 2ef01c5b7468c269bcb5f1abc837687cc5644b21 Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Mon, 14 Jun 2010 04:54:03 +0100 Subject: [PATCH 258/730] Removed Run method as all code has been moved into new methods --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 73f02f6d73..16ce72bde7 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -1097,7 +1097,7 @@ class MSN { $this->signonFailure("!!! Can't connect to server: $this->error"); } if($this->UpdateContacts() === false) { - $this->signonFailure('!!! Update Contacts failed'); + $this->signonFailure('!!! Update contacts failed'); continue; } $this->LastPing=time(); @@ -1105,6 +1105,7 @@ class MSN { $start_tm = time(); $ping_tm = time(); if(($this->aContactList = $this->getMembershipList()) === false) { + $this->signonFailure('!!! Get Membership list failed'); continue; } if ($this->update_pending) { From 0a4738a8060714fa7dc6dbd7af7f7f4d6b6c0c70 Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Mon, 14 Jun 2010 19:53:43 +0100 Subject: [PATCH 259/730] Lots more work on adapting library. Added more commenting and fixed some stuff on the integration side. --- plugins/Msn/MsnPlugin.php | 362 ++--- plugins/Msn/extlib/phpmsnclass/msn.class.php | 1371 +++++------------- plugins/Msn/msnmanager.php | 341 +++-- 3 files changed, 716 insertions(+), 1358 deletions(-) diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php index 5566b54302..9a9e703986 100644 --- a/plugins/Msn/MsnPlugin.php +++ b/plugins/Msn/MsnPlugin.php @@ -1,172 +1,190 @@ -. - * - * @category IM - * @package StatusNet - * @author Craig Andrews - * @copyright 2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} -// We bundle the phptoclib library... -set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phptoclib'); - -/** - * Plugin for AIM - * - * @category Plugin - * @package StatusNet - * @author Craig Andrews - * @copyright 2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ - -class MsnPlugin extends ImPlugin -{ - public $user = null; - public $password = null; - public $publicFeed = array(); - - public $transport = 'msnim'; - - function getDisplayName() - { - return _m('MSN'); - } - - function normalize($screenname) - { - $screenname = str_replace(" ","", $screenname); - return strtolower($screenname); - } - - function daemon_screenname() - { - return $this->user; - } - - function validate($screenname) - { - if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) { - return true; - }else{ - return false; - } - } - - /** - * Load related modules when needed - * - * @param string $cls Name of the class to be loaded - * - * @return boolean hook value; true means continue processing, false means stop. - */ - function onAutoload($cls) - { - $dir = dirname(__FILE__); - - switch ($cls) - { - case 'Msn': - require_once(INSTALLDIR.'/plugins/Msn/extlib/phpmsnclass/msn.class.php'); - return false; - case 'MsnManager': - include_once $dir . '/'.strtolower($cls).'.php'; - return false; - case 'Fake_Msn': - include_once $dir . '/'. $cls .'.php'; - return false; - default: - return true; - } - } - - function onStartImDaemonIoManagers(&$classes) - { - parent::onStartImDaemonIoManagers(&$classes); - $classes[] = new MsnManager($this); // handles sending/receiving - return true; - } - - function microiduri($screenname) - { - return 'msnim:' . $screenname; - } - - function send_message($screenname, $body) - { - //$this->fake_aim->sendIm($screenname, $body); - //$this->enqueue_outgoing_raw($this->fake_aim->would_be_sent); - $this->enqueue_outgoing_raw(array($screenname, $body)); - return true; - } - - /** - * Accept a queued input message. - * - * @return true if processing completed, false if message should be reprocessed - */ - function receive_raw_message($message) - { - $info=Aim::getMessageInfo($message); - $from = $info['from']; - $user = $this->get_user($from); - $notice_text = $info['message']; - - $this->handle_incoming($from, $notice_text); - - return true; - } - - function initialize(){ - if(!isset($this->user)){ - throw new Exception("must specify a user"); - } - if(!isset($this->password)){ - throw new Exception("must specify a password"); - } - if(!isset($this->nickname)) { - throw new Exception("must specify a nickname"); - } - - $this->fake_msn = new Fake_Msn($this->user,$this->password,4); - return true; - } - - function onPluginVersion(&$versions) - { - $versions[] = array('name' => 'MSN', - 'version' => STATUSNET_VERSION, - 'author' => 'Luke Fitzgerald', - 'homepage' => 'http://status.net/wiki/Plugin:MSN', - 'rawdescription' => - _m('The MSN plugin allows users to send and receive notices over the MSN network.')); - return true; - } -} +. + * + * @category IM + * @package StatusNet + * @author Luke Fitzgerald + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} +// We bundle the phpmsnclass library... +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phpmsnclass'); + +/** + * Plugin for MSN + * + * @category Plugin + * @package StatusNet + * @author Luke Fitzgerald + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +class MsnPlugin extends ImPlugin { + public $user = null; + public $password = null; + public $nickname = null; + public $transport = 'msnim'; + + /** + * Get the internationalized/translated display name of this IM service + * + * @return string Name of service + */ + function getDisplayName() { + return _m('MSN'); + } + + /** + * Normalize a screenname for comparison + * + * @param string $screenname screenname to normalize + * @return string an equivalent screenname in normalized form + */ + function normalize($screenname) { + $screenname = str_replace(" ","", $screenname); + return strtolower($screenname); + } + + /** + * Get the screenname of the daemon that sends and receives messages + * + * @return string Screenname + */ + function daemon_screenname() { + return $this->user; + } + + /** + * Validate (ensure the validity of) a screenname + * + * @param string $screenname screenname to validate + * + * @return boolean + */ + function validate($screenname) { + //TODO Correct this for MSN screennames + if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) { + return true; + }else{ + return false; + } + } + + /** + * Load related modules when needed + * + * @param string $cls Name of the class to be loaded + * + * @return boolean hook value; true means continue processing, false means stop. + */ + public function onAutoload($cls) { + $dir = dirname(__FILE__); + + switch ($cls) { + case 'Msn': + require_once(INSTALLDIR.'/plugins/Msn/extlib/phpmsnclass/msn.class.php'); + return false; + case 'MsnManager': + include_once $dir . '/'.strtolower($cls).'.php'; + return false; + default: + return true; + } + } + + public function onStartImDaemonIoManagers(&$classes) { + parent::onStartImDaemonIoManagers(&$classes); + $classes[] = new MsnManager($this); // handles sending/receiving + return true; + } + + /** + * Get a microid URI for the given screenname + * + * @param string $screenname + * @return string microid URI + */ + public function microiduri($screenname) { + return 'msnim:' . $screenname; + } + + /** + * Send a message to a given screenname + * + * @param string $screenname Screenname to send to + * @param string $body Text to send + * @return boolean success value + */ + public function send_message($screenname, $body) { + $this->enqueue_outgoing_raw(array('to' => $screenname, 'message' => $body)); + return true; + } + + /** + * Accept a queued input message. + * + * @param array $data Data + * @return true if processing completed, false if message should be reprocessed + */ + public function receive_raw_message($data) { + $this->handle_incoming($data['sender'], $data['message']); + return true; + } + + /** + * Initialize plugin + * + * @return void + */ + public function initialize() { + if (!isset($this->user)) { + throw new Exception("Must specify a user"); + } + if (!isset($this->password)) { + throw new Exception("Must specify a password"); + } + if (!isset($this->nickname)) { + throw new Exception("Must specify a nickname"); + } + + return true; + } + + function onPluginVersion(&$versions) { + $versions[] = array('name' => 'MSN', + 'version' => STATUSNET_VERSION, + 'author' => 'Luke Fitzgerald', + 'homepage' => 'http://status.net/wiki/Plugin:MSN', + 'rawdescription' => + _m('The MSN plugin allows users to send and receive notices over the MSN network.')); + return true; + } +} diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 16ce72bde7..9b087ac792 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -33,33 +33,24 @@ class MSN { private $passport_policy = ''; private $alias; private $psm; - private $use_ping; private $retry_wait; - private $backup_file; private $update_pending; private $PhotoStickerFile=false; private $Emotions=false; - private $MessageQueue=array(); - private $ChildProcess=array(); - private $MAXChildProcess=3; private $ReqSBXFRTimeout=60; private $LastPing; private $ping_wait=50; private $SBIdleTimeout=10; private $SBStreamTimeout=2; - private $NSStreamTimeout=2; private $MsnObjArray=array(); private $MsnObjMap=array(); - private $SwitchBoardProcess=false; // false=>Main Process,1 => sb_control_process,2 => sb_ring_process - private $SwitchBoardSessionUser=false; - private $SwitchBoardMessageQueue=array(); private $ABAuthHeader; private $ABService; private $Contacts; private $IgnoreList; - public $server = 'messenger.hotmail.com'; - public $port = 1863; + private $server = 'messenger.hotmail.com'; + private $port = 1863; public $clientid = ''; @@ -104,49 +95,61 @@ class MSN { // for YIM: 518 bytes public $max_msn_message_len = 1664; public $max_yahoo_message_len = 518; - + // Begin added for StatusNet - + private $aContactList = array(); private $aADL = array(); - private $re_login; private $switchBoardSessions = array(); private $switchBoardSockets = array(); private $waitingForXFR = array(); - + /** * Event Handler Functions */ private $myEventHandlers = array(); - + // End added for StatusNet - + + /** + * Constructor method + * + * @param array $Configs Array of configuration options + * 'user' - Username + * 'password' - Password + * 'alias' - Bot nickname + * 'psm' - Bot personal status message + * 'retry_wait' - Time to wait before trying to reconnect + * 'update_pending' - Whether to update pending contacts + * 'PhotoSticker' - Photo file to use (?) + * 'debug' - Enable/Disable debugging mode + * @param integer $timeout Connection timeout + * @param integer $client_id Client id (hexadecimal) + * @return MSN + */ public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C) { $this->user = $Configs['user']; $this->password = $Configs['password']; $this->alias = isset($Configs['alias']) ? $Configs['alias'] : ''; $this->psm = isset($Configs['psm']) ? $Configs['psm'] : ''; - $this->use_ping = isset($Configs['use_ping']) ? $Configs['use_ping'] : false; $this->retry_wait = isset($Configs['retry_wait']) ? $Configs['retry_wait'] : 30; - $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true; $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true; $this->PhotoStickerFile=isset($Configs['PhotoSticker']) ? $Configs['PhotoSticker'] : false; - if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) - { + + if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) { foreach($this->Emotions as $EmotionFilePath) $this->MsnObj($EmotionFilePath,$Type=2); - } + } $this->debug = isset($Configs['debug']) ? $Configs['debug'] : false; $this->timeout = $timeout; - - // check support - if (!function_exists('curl_init')) throw new Exception("We need curl module!\n"); - if (!function_exists('preg_match')) throw new Exception("We need pcre module!\n"); - if (!function_exists('mhash')) throw new Exception("We need mhash module!\n"); - if (!function_exists('mcrypt_cbc')) throw new Exception("We need mcrypt module!\n"); - if (!function_exists('bcmod')) throw new Exception("We need bcmath module for $protocol!\n"); + // Check support + if (!function_exists('curl_init')) throw new Exception("curl module not found!\n"); + if (!function_exists('preg_match')) throw new Exception("pcre module not found!\n"); + if (!function_exists('mhash')) throw new Exception("mhash module not found!\n"); + if (!function_exists('mcrypt_cbc')) throw new Exception("mcrypt module not found!\n"); + if (!function_exists('bcmod')) throw new Exception("bcmath module not found!\n"); /* http://msnpiki.msnfanatic.com/index.php/Client_ID @@ -198,7 +201,13 @@ class MSN { if($ReturnSoapVarObj) return new SoapVar($ArrayString,XSD_ANYXML,$TypeName,$TypeNameSpace); return $ArrayString; } - + + /** + * Get Passport ticket + * + * @param string $url URL string (Optional) + * @return mixed Array of tickets or false on failure + */ private function get_passport_ticket($url = '') { $user = $this->user; @@ -427,7 +436,7 @@ class MSN { 'oim_ticket' => html_entity_decode($matches[9]), 'space_ticket' => html_entity_decode($matches[11]), 'storage_ticket' => html_entity_decode($matches[13]) - ); + ); $this->ticket=$aTickets; $this->debug_message(var_export($aTickets, true)); $ABAuthHeaderArray=array( @@ -440,7 +449,7 @@ class MSN { $this->ABAuthHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook","ABAuthHeader", $this->Array2SoapVar($ABAuthHeaderArray)); return $aTickets; } - + private function UpdateContacts() { $ABApplicationHeaderArray=array( @@ -451,7 +460,7 @@ class MSN { 'PartnerScenario'=>'ContactSave' ) ); - + $ABApplicationHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook",'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray)); $ABFindAllArray=array( 'ABFindAll'=>array( @@ -479,7 +488,7 @@ class MSN { } return true; } - + private function addContact($email, $network, $display = '', $sendADL = false) { if ($network != 1) return true; @@ -532,7 +541,8 @@ class MSN { return true; } - function delMemberFromList($memberID, $email, $network, $list) { + function delMemberFromList($memberID, $email, $network, $list) + { if ($network != 1 && $network != 32) return true; if ($memberID === false) return true; $user = $email; @@ -641,23 +651,24 @@ class MSN { if ($http_code != 200) { preg_match('#(.*)(.*)#', $data, $matches); if (count($matches) == 0) { - $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list"); + $this->debug_message("*** can't delete member (network: $network) $email ($memberID) to $list"); return false; } $faultcode = trim($matches[1]); $faultstring = trim($matches[2]); if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) { - $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring"); + $this->debug_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring"); return false; } - $this->log_message("*** delete member (network: $network) $email ($memberID) from $list, not exist"); + $this->debug_message("*** delete member (network: $network) $email ($memberID) from $list, not exist"); return true; } - $this->log_message("*** delete member (network: $network) $email ($memberID) from $list"); + $this->debug_message("*** delete member (network: $network) $email ($memberID) from $list"); return true; } - function addMemberToList($email, $network, $list) { + function addMemberToList($email, $network, $list) + { if ($network != 1 && $network != 32) return true; $ticket = htmlspecialchars($this->ticket['contact_ticket']); $user = $email; @@ -771,23 +782,24 @@ class MSN { if ($http_code != 200) { preg_match('#(.*)(.*)#', $data, $matches); if (count($matches) == 0) { - $this->log_message("*** can't add member (network: $network) $email to $list"); + $this->debug_message("*** can't add member (network: $network) $email to $list"); return false; } $faultcode = trim($matches[1]); $faultstring = trim($matches[2]); if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) { - $this->log_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring"); + $this->debug_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring"); return false; } - $this->log_message("*** add member (network: $network) $email to $list, already exist!"); + $this->debug_message("*** add member (network: $network) $email to $list, already exist!"); return true; } - $this->log_message("*** add member (network: $network) $email to $list"); + $this->debug_message("*** add member (network: $network) $email to $list"); return true; } - function getMembershipList($returnData=false) { + function getMembershipList($returnData=false) + { $ticket = htmlspecialchars($this->ticket['contact_ticket']); $XML = ' log_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)"); + $this->debug_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)"); } } } @@ -921,10 +933,11 @@ class MSN { /** * Connect to the NS server - * @param $user Username - * @param $password Password - * @param $redirect_server Redirect server - * @param $redirect_port Redirect port + * @param String $user Username + * @param String $password Password + * @param String $redirect_server Redirect server + * @param Integer $redirect_port Redirect port + * @return Boolean Returns true if successful */ private function connect($user, $password, $redirect_server = '', $redirect_port = 1863) { $this->id = 1; @@ -943,7 +956,7 @@ class MSN { } } - stream_set_timeout($this->NSfp, $this->NSStreamTimeout); + stream_set_timeout($this->NSfp, $this->timeout); $this->authed = false; // MSNP9 // NS: >> VER {id} MSNP9 CVR0 @@ -952,26 +965,20 @@ class MSN { $this->ns_writeln("VER $this->id $this->protocol CVR0"); $start_tm = time(); - while (!feof($this->NSfp)) + while (!self::socketcheck($this->NSfp)) { $data = $this->ns_readln(); // no data? if ($data === false) { - if ($this->timeout > 0) { - $now_tm = time(); - $used_time = ($now_tm >= $start_tm) ? $now_tm - $start_tm : $now_tm; - if ($used_time > $this->timeout) { - // logout now - // NS: >>> OUT - $this->ns_writeln("OUT"); - fclose($this->NSfp); - $this->error = 'Timeout, maybe protocol changed!'; - $this->debug_message("*** $this->error"); - return false; - } - } - continue; + // logout now + // NS: >>> OUT + $this->ns_writeln("OUT"); + @fclose($this->NSfp); + $this->error = 'Timeout, maybe protocol changed!'; + $this->debug_message("*** $this->error"); + return false; } + $code = substr($data, 0, 3); $start_tm = time(); @@ -1015,7 +1022,7 @@ class MSN { // logout now // NS: >>> OUT $this->ns_writeln("OUT"); - fclose($this->NSfp); + @fclose($this->NSfp); $this->error = 'Passport authenticated fail!'; $this->debug_message("*** $this->error"); return false; @@ -1041,7 +1048,7 @@ class MSN { if($Type!='NS') break; @list($ip, $port) = @explode(':', $server); // this connection will close after XFR - fclose($this->NSfp); + @fclose($this->NSfp); $this->NSfp = @fsockopen($ip, $port, $errno, $errstr, 5); if (!$this->NSfp) { @@ -1050,7 +1057,7 @@ class MSN { return false; } - stream_set_timeout($this->NSfp, $this->NSStreamTimeout); + stream_set_timeout($this->NSfp, $this->timeout); // MSNP9 // NS: >> VER {id} MSNP9 CVR0 // MSNP15 @@ -1073,7 +1080,7 @@ class MSN { // logout now // NS: >>> OUT $this->ns_writeln("OUT"); - fclose($this->NSfp); + @fclose($this->NSfp); $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; $this->debug_message("*** $this->error"); return false; @@ -1087,13 +1094,14 @@ class MSN { /** * Sign onto the NS server and retrieve the address book + * + * @return void */ public function signon() { - $this->log_message("*** try to connect to MSN network"); - + $this->debug_message("*** try to connect to MSN network"); + while(true) { - while(!$this->connect($this->user, $this->password)) - { + while(!$this->connect($this->user, $this->password)) { $this->signonFailure("!!! Can't connect to server: $this->error"); } if($this->UpdateContacts() === false) { @@ -1101,11 +1109,10 @@ class MSN { continue; } $this->LastPing=time(); - $this->log_message("*** connected, wait for command"); $start_tm = time(); $ping_tm = time(); if(($this->aContactList = $this->getMembershipList()) === false) { - $this->signonFailure('!!! Get Membership list failed'); + $this->signonFailure('!!! Get membership list failed'); continue; } if ($this->update_pending) { @@ -1206,21 +1213,26 @@ class MSN { $len = strlen($str); $this->ns_writeln("UUX $this->id $len"); $this->ns_writedata($str); - break; + if(!socketcheck($this->NSfp)) { + $this->debug_message("*** connected, wait for command"); + break; + } else { + $this->NSRetryWait($this->retry_wait); + } } } - + /** * Called if there is an error during signon - * - * @param $message Error message to log + * + * @param string $message Error message to log */ private function signonFailure($message) { - $this->log_message($message); - $this->callHandler('ConnectFailed', NULL); + $this->debug_message($message); + $this->callHandler('ConnectFailed'); $this->NSRetryWait($this->retry_wait); } - + function derive_key($key, $magic) { $hash1 = mhash(MHASH_SHA1, $magic, $key); $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key); @@ -1441,6 +1453,7 @@ class MSN { $this->debug_message("*** OIM ($msgid) deleted"); return $sMsg; } + private function NSLogout() { if (is_resource($this->NSfp) && !feof($this->NSfp)) { // logout now @@ -1448,753 +1461,14 @@ class MSN { $this->ns_writeln("OUT"); fclose($this->NSfp); $this->NSfp = false; - $this->log_message("*** logout now!"); + $this->debug_message("*** logout now!"); } } - private function NSRetryWait($Wait) { - $this->log_message("*** wait for $Wait seconds"); - for($i=0;$i<$Wait;$i++) { - sleep(1); - if($this->kill_me) return false; - } - return true; - } - public function ProcessSendMessageFileQueue() { - $aFiles = glob(MSN_CLASS_SPOOL_DIR.DIRECTORY_SEPARATOR.'*.msn'); - if (!is_array($aFiles)) return true; - clearstatcache(); - foreach ($aFiles as $filename) { - $fp = fopen($filename, 'rt'); - if (!$fp) continue; - $aTo = array(); - $sMessage = ''; - $buf = trim(fgets($fp)); - if (substr($buf, 0, 3) == 'TO:') { - $aTo = @explode(',', str_replace(array("\r","\n","\t",' '),'',substr($buf, 3))); - while (!feof($fp)) $sMessage.=rtrim(fgets($fp))."\n"; - } - fclose($fp); - if (!is_array($aTo) || count($aTo) == 0 || $sMessage == '') - $this->log_message("!!! message format error? delete $filename"); - else - { - foreach($aTo as $To) - { - @list($user, $domain, $network) = @explode('@', $To); - $MessageList[$network]["$user@$domain"]=$sMessage; - } - } - if($this->backup_file) - { - $backup_dir = MSN_CLASS_SPOOL_DIR.'/backup'; - if (!file_exists($backup_dir)) @mkdir($backup_dir); - $backup_name = $backup_dir.'/'.strftime('%Y%m%d%H%M%S').'_'.posix_getpid().'_'.basename($filename); - if (@rename($filename, $backup_name)) - $this->log_message("*** move file to $backup_name"); - } - else @unlink($filename); - } - foreach ($MessageList as $network => $Messages) - { - switch(trim($network)) - { - case '': - case 1: //MSN - // okay, try to ask a switchboard (SB) for sending message - // NS: >>> XFR {id} SB - // $this->ns_writeln("XFR $this->id SB"); - foreach($Messages as $User => $Message) - $this->MessageQueue[$User][]=$Message; - break; - case 'Offline': //MSN - //Send OIM - //FIXME: 修正Send OIM - foreach($Messages as $To => $Message) - { - $lockkey=''; - for ($i = 0; $i < $this->oim_try; $i++) - { - if(($oim_result = $this->sendOIM($To, $Message, $lockkey))===true) break; - if (is_array($oim_result) && $oim_result['challenge'] !== false) { - // need challenge lockkey - $this->log_message("*** we need a new challenge code for ".$oim_result['challenge']); - $lockkey = $this->getChallenge($oim_result['challenge']); - continue; - } - if ($oim_result === false || $oim_result['auth_policy'] !== false) - { - if ($this->re_login) - { - $this->log_message("*** can't send OIM, but we already re-login again, so ignore this OIM"); - break; - } - $this->log_message("*** can't send OIM, maybe ticket expired, try to login again"); - // maybe we need to re-login again - if(!$this->get_passport_ticket()) - { - $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); - break; - } - $this->log_message("**** get new ticket, try it again"); - continue; - } - } - } - break; - default: //Other - foreach($Messages as $To => $Message) { - $Message=$this->getMessage($Message, $network); - $len = strlen($Message); - $this->ns_writeln("UUM $this->id $To $network 1 $len"); - $this->ns_writedata($Message); - $this->log_message("*** sent to $To (network: $network):\n$Message"); - } - } - } - if(isset($this->MessageQueue[$User])&&(!isset($this->MessageQueue[$User]['XFRSent']))) - { - $this->MessageQueue[$User]['XFRSent']=false; - $this->MessageQueue[$User]['ReqTime']=false; - } - return true; - } - public function SignalFunction($signal) - { - switch($signal) - { - case SIGTRAP: - case SIGTERM: - case SIGHUP: - $this->End(); - return; - case SIGCHLD: - $ChildPid=pcntl_wait($status,WUNTRACED); - if($ChildPid>0) - { - $this->log_message("*** Child Process End for ".$this->ChildProcess[$ChildPid]); - unset($this->ChildProcess[$ChildPid]); - } - return; - } - } - public function Run() - { - $this->log_message("*** startup ***"); - if(!pcntl_signal(SIGCHLD,array($this,'SignalFunction'))) die("Signal SIGCHLD Error\n"); - if(!pcntl_signal(SIGTERM,array($this,'SignalFunction'))) die("Signal SIGTERM Error\n"); - if(!pcntl_signal(SIGTRAP,array($this,'SignalFunction'))) die("Signal SIGTRAP Error\n"); - $process_file = false; - $sent = false; - $aADL = array(); - $aContactList = array(); - while (true) - { - if($this->kill_me) - { - $this->log_message("*** Okay, kill me now!"); - return $this->NSLogout(); - } - if (!is_resource($this->NSfp) || feof($this->NSfp)) - { - $this->log_message("*** try to connect to MSN network"); - if (!$this->connect($this->user, $this->password)) - { - $this->log_message("!!! Can't connect to server: $this->error"); - if(!$this->NSRetryWait($this->retry_wait)) continue; - } - $this->UpdateContacts(); - $this->LastPing=time(); - $this->log_message("*** connected, wait for command"); - $start_tm = time(); - $ping_tm = time(); - $aContactList = $this->getMembershipList(); - if ($this->update_pending) { - if (is_array($aContactList)) { - $pending = 'Pending'; - foreach ($aContactList as $u_domain => $aUserList) { - foreach ($aUserList as $u_name => $aNetworks) { - foreach ($aNetworks as $network => $aData) { - if (isset($aData[$pending])) { - // pending list - $cnt = 0; - foreach (array('Allow', 'Reverse') as $list) { - if (isset($aData[$list])) - $cnt++; - else { - if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { - $aContactList[$u_domain][$u_name][$network][$list] = false; - $cnt++; - } - } - } - if ($cnt >= 2) { - $id = $aData[$pending]; - // we can delete it from pending now - if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending)) - unset($aContactList[$u_domain][$u_name][$network][$pending]); - } - } - else { - // sync list - foreach (array('Allow', 'Reverse') as $list) { - if (!isset($aData[$list])) { - if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) - $aContactList[$u_domain][$u_name][$network][$list] = false; - } - } - } - } - } - } - } - } - $n = 0; - $sList = ''; - $len = 0; - if (is_array($aContactList)) { - foreach ($aContactList as $u_domain => $aUserList) { - $str = ''; - $len += strlen($str); - if ($len > 7400) { - $aADL[$n] = ''.$sList.''; - $n++; - $sList = ''; - $len = strlen($str); - } - $sList .= $str; - foreach ($aUserList as $u_name => $aNetworks) { - foreach ($aNetworks as $network => $status) { - $str = ''; - $len += strlen($str); - // max: 7500, but is 19, - // so we use 7475 - if ($len > 7475) { - $sList .= ''; - $aADL[$n] = ''.$sList.''; - $n++; - $sList = ''.$str; - $len = strlen($sList); - } - else - $sList .= $str; - } - } - $sList .= ''; - } - } - $aADL[$n] = ''.$sList.''; - // NS: >>> BLP {id} BL - $this->ns_writeln("BLP $this->id BL"); - foreach ($aADL as $str) { - $len = strlen($str); - // NS: >>> ADL {id} {size} - $this->ns_writeln("ADL $this->id $len"); - $this->ns_writedata($str); - } - // NS: >>> PRP {id} MFN name - if ($this->alias == '') $this->alias = $user; - $aliasname = rawurlencode($this->alias); - $this->ns_writeln("PRP $this->id MFN $aliasname"); - //設定個人大頭貼 - //$MsnObj=$this->PhotoStckObj(); - // NS: >>> CHG {id} {status} {clientid} {msnobj} - $this->ns_writeln("CHG $this->id NLN $this->clientid"); - if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); - // NS: >>> UUX {id} length - $str = ''.htmlspecialchars($this->psm).''; - $len = strlen($str); - $this->ns_writeln("UUX $this->id $len"); - $this->ns_writedata($str); - } - $data = $this->ns_readln(); - if($data===false) - { - //If No NS Message Process SendMessageFileQueue - if (time()-$this->LastPing > $this->ping_wait) - { - // NS: >>> PNG - $this->ns_writeln("PNG"); - $this->LastPing = time(); - } - if(count($this->ChildProcess)<$this->MAXChildProcess) - { - $Index=0; - foreach($this->MessageQueue as $User => $Message) - { - if(!trim($User)) continue; - if($Inxdex>=$this->MAXChildProcess-count($this->ChildProcess)) break; - if((!$Message['XFRSent'])||($Message['XFRSent']&&(time()-$this->MessageQueue[$User]['ReqTime']>$this->ReqSBXFRTimeout))) - { - $this->MessageQueue[$User]['XFRSent']=true; - $this->MessageQueue[$User]['ReqTime']=time(); - $this->log_message("*** Request SB for $User"); - $this->ns_writeln("XFR $this->id SB"); - $Index++; - } - } - } - if($this->ProcessSendMessageFileQueue()) continue; - break; - } - switch (substr($data,0,3)) - { - case 'SBS': - // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us - // NS: <<< SBS 0 null - break; - - case 'RFS': - // FIXME: - // NS: <<< RFS ??? - // refresh ADL, so we re-send it again - if (is_array($aADL)) { - foreach ($aADL as $str) { - $len = strlen($str); - // NS: >>> ADL {id} {size} - $this->ns_writeln("ADL $this->id $len"); - $this->ns_writedata($str); - } - } - break; - - case 'LST': - // NS: <<< LST {email} {alias} 11 0 - @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data); - @list($u_name, $u_domain) = @explode('@', $email); - if (!isset($aContactList[$u_domain][$u_name][1])) { - $aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow'; - $this->log_message("*** add to our contact list: $u_name@$u_domain"); - } - break; - - case 'ADL': - // randomly, we get ADL command, someome add us to their contact list for MSNP15 - // NS: <<< ADL 0 {size} - @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) - { - $data = $this->ns_readdata($size); - preg_match('##', $data, $matches); - if (is_array($matches) && count($matches) > 0) - { - $u_domain = $matches[1]; - $u_name = $matches[2]; - $network = $matches[4]; - if (isset($aContactList[$u_domain][$u_name][$network])) - $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain"); - else - { - $this->re_login = false; - $cnt = 0; - foreach (array('Allow', 'Reverse') as $list) - { - if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) - { - if ($this->re_login) { - $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); - continue; - } - $aTickets = $this->get_passport_ticket(); - if (!$aTickets || !is_array($aTickets)) { - // failed to login? ignore it - $this->log_message("*** can't re-login, something wrong here"); - $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); - continue; - } - $this->re_login = true; - $this->ticket = $aTickets; - $this->log_message("**** get new ticket, try it again"); - if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) - { - $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); - continue; - } - } - $aContactList[$u_domain][$u_name][$network][$list] = false; - $cnt++; - } - $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain"); - } - $str = ''; - $len = strlen($str); - } - else - $this->log_message("*** someone add us to their list: $data"); - $this->AddUsToMemberList($u_name.'@'.$u_domain, $network); - } - break; - - case 'RML': - // randomly, we get RML command, someome remove us to their contact list for MSNP15 - // NS: <<< RML 0 {size} - @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) - { - $data = $this->ns_readdata($size); - preg_match('##', $data, $matches); - if (is_array($matches) && count($matches) > 0) - { - $u_domain = $matches[1]; - $u_name = $matches[2]; - $network = $matches[4]; - if (isset($aContactList[$u_domain][$u_name][$network])) - { - $aData = $aContactList[$u_domain][$u_name][$network]; - foreach ($aData as $list => $id) - $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list); - unset($aContactList[$u_domain][$u_name][$network]); - $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain"); - } - else - $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain"); - $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network); - } - else - $this->log_message("*** someone remove us from their list: $data"); - } - break; - - case 'MSG': - // randomly, we get MSG notification from server - // NS: <<< MSG Hotmail Hotmail {size} - @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) { - $data = $this->ns_readdata($size); - $aLines = @explode("\n", $data); - $header = true; - $ignore = false; - $maildata = ''; - foreach ($aLines as $line) { - $line = rtrim($line); - if ($header) { - if ($line === '') { - $header = false; - continue; - } - if (strncasecmp($line, 'Content-Type:', 13) == 0) { - if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && - strpos($line, 'text/x-msmsgsoimnotification') === false) { - // we just need text/x-msmsgsinitialmdatanotification - // or text/x-msmsgsoimnotification - $ignore = true; - break; - } - } - continue; - } - if (strncasecmp($line, 'Mail-Data:', 10) == 0) { - $maildata = trim(substr($line, 10)); - break; - } - } - if ($ignore) { - $this->log_message("*** ingnore MSG for: $line"); - break; - } - if ($maildata == '') { - $this->log_message("*** ingnore MSG not for OIM"); - break; - } - $this->re_login = false; - if (strcasecmp($maildata, 'too-large') == 0) { - $this->log_message("*** large mail-data, need to get the data via SOAP"); - $maildata = $this->getOIM_maildata(); - if ($maildata === false) { - $this->log_message("*** can't get mail-data via SOAP"); - // maybe we need to re-login again - $aTickets = $this->get_passport_ticket(); - if (!$aTickets || !is_array($aTickets)) { - // failed to login? ignore it - $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); - break; - } - $this->re_login = true; - $this->ticket = $aTickets; - $this->log_message("**** get new ticket, try it again"); - $maildata = $this->getOIM_maildata(); - if ($maildata === false) { - $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM"); - break; - } - } - } - // could be a lots of ..., so we can't use preg_match here - $p = $maildata; - $aOIMs = array(); - while (1) { - $start = strpos($p, ''); - $end = strpos($p, ''); - if ($start === false || $end === false || $start > $end) break; - $end += 4; - $sOIM = substr($p, $start, $end - $start); - $aOIMs[] = $sOIM; - $p = substr($p, $end); - } - if (count($aOIMs) == 0) { - $this->log_message("*** ingnore empty OIM"); - break; - } - foreach ($aOIMs as $maildata) { - // T: 11 for MSN, 13 for Yahoo - // S: 6 for MSN, 7 for Yahoo - // RT: the datetime received by server - // RS: already read or not - // SZ: size of message - // E: sender - // I: msgid - // F: always 00000000-0000-0000-0000-000000000009 - // N: sender alias - preg_match('#(.*)#', $maildata, $matches); - if (count($matches) == 0) { - $this->log_message("*** ingnore OIM maildata without type"); - continue; - } - $oim_type = $matches[1]; - if ($oim_type = 13) - $network = 32; - else - $network = 1; - preg_match('#(.*)#', $maildata, $matches); - if (count($matches) == 0) { - $this->log_message("*** ingnore OIM maildata without sender"); - continue; - } - $oim_sender = $matches[1]; - preg_match('#(.*)#', $maildata, $matches); - if (count($matches) == 0) { - $this->log_message("*** ingnore OIM maildata without msgid"); - continue; - } - $oim_msgid = $matches[1]; - preg_match('#(.*)#', $maildata, $matches); - $oim_size = (count($matches) == 0) ? 0 : $matches[1]; - preg_match('#(.*)#', $maildata, $matches); - $oim_time = (count($matches) == 0) ? 0 : $matches[1]; - $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); - $sMsg = $this->getOIM_message($oim_msgid); - if ($sMsg === false) { - $this->log_message("*** can't get OIM, msgid = $oim_msgid"); - if ($this->re_login) { - $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); - continue; - } - $aTickets = $this->get_passport_ticket(); - if (!$aTickets || !is_array($aTickets)) { - // failed to login? ignore it - $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); - continue; - } - $this->re_login = true; - $this->ticket = $aTickets; - $this->log_message("**** get new ticket, try it again"); - $sMsg = $this->getOIM_message($oim_msgid); - if ($sMsg === false) { - $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); - continue; - } - } - $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg"); - - $this->ReceivedMessage($oim_sender,$sMsg,$network,true); - } - } - break; - - case 'UBM': - // randomly, we get UBM, this is the message from other network, like Yahoo! - // NS: <<< UBM {email} $network $type {size} - @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) - { - $data = $this->ns_readdata($size); - $aLines = @explode("\n", $data); - $header = true; - $ignore = false; - $sMsg = ''; - foreach ($aLines as $line) { - $line = rtrim($line); - if ($header) { - if ($line === '') { - $header = false; - continue; - } - if (strncasecmp($line, 'TypingUser:', 11) == 0) { - $ignore = true; - break; - } - continue; - } - $aSubLines = @explode("\r", $line); - foreach ($aSubLines as $str) { - if ($sMsg !== '') - $sMsg .= "\n"; - $sMsg .= $str; - } - } - if($ignore) - { - $this->log_message("*** ingnore from $from_email: $line"); - break; - } - $this->log_message("*** MSG from $from_email (network: $network): $sMsg"); - $this->ReceivedMessage($from_email,$sMsg,$network,false); - } - break; - - case 'UBX': - // randomly, we get UBX notification from server - // NS: <<< UBX email {network} {size} - @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data); - // we don't need the notification data, so just ignore it - if (is_numeric($size) && $size > 0) - $this->ns_readdata($size); - break; - - case 'CHL': - // randomly, we'll get challenge from server - // NS: <<< CHL 0 {code} - @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data); - $fingerprint = $this->getChallenge($chl_code); - // NS: >>> QRY {id} {product_id} 32 - // NS: >>> fingerprint - $this->ns_writeln("QRY $this->id $this->prod_id 32"); - $this->ns_writedata($fingerprint); - $this->ns_writeln("CHG $this->id NLN $this->clientid"); - if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); - break; - case 'CHG': - // NS: <<< CHG {id} {status} {code} - // ignore it - // change our status to online first - break; - - case 'XFR': - // sometimes, NS will redirect to another NS - // MSNP9 - // NS: <<< XFR {id} NS {server} 0 {server} - // MSNP15 - // NS: <<< XFR {id} NS {server} U D - // for normal switchboard XFR - // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0 - @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data); - @list($ip, $port) = @explode(':', $server); - if ($server_type != 'SB') { - // maybe exit? - // this connection will close after XFR - $this->NSLogout(); - continue; - } - if(count($this->MessageQueue)) - { - foreach($this->MessageQueue as $User => $Message) - { - //$this->ChildProcess[$ChildPid] - $this->log_message("*** XFR SB $User"); - $pid=pcntl_fork(); - if($pid) - { - //Parrent Process - $this->ChildProcess[$pid]=$User; - break; - } - elseif($pid==-1) - { - $this->log_message("*** Fork Error $User"); - break; - } - else - { - //Child Process - $this->log_message("*** Child Process Start for $User"); - unset($Message['XFRSent']); - unset($Message['ReqTime']); - $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message); - if ($bSBresult === false) - { - // error for switchboard - $this->log_message("!!! error for sending message to ".$User); - } - die; - } - } - unset($this->MessageQueue[$User]); - } - /* - $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage); - if ($bSBresult === false) { - // error for switchboard - $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]); - $aOfflineUsers[] = $aMSNUsers[$nCurrentUser]; - }*/ - break; - case 'QNG': - // NS: <<< QNG {time} - @list(/* QNG */, $this->ping_wait) = @explode(' ', $data); - if ($this->ping_wait == 0) $this->ping_wait = 50; - //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping; - //Mod by Ricky Set Online - break; - - case 'RNG': - if($this->PhotoStickerFile!==false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); - else - $this->ns_writeln("CHG $this->id NLN $this->clientid"); - // someone is trying to talk to us - // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0 - $this->log_message("NS: <<< RNG $data"); - @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data); - @list($sb_ip, $sb_port) = @explode(':', $server); - if($this->IsIgnoreMail($email)) - { - $this->log_message("*** Ignore RNG from $email"); - break; - } - $this->log_message("*** RING from $email, $sb_ip:$sb_port"); - $this->addContact($email,1,$email, true); - $pid=pcntl_fork(); - if($pid) - { - //Parrent Process - $this->ChildProcess[$pid]='RNG'; - break; - } - elseif($pid==-1) - { - $this->log_message("*** Fork Error $User"); - break; - } - else - { - //Child Process - $this->log_message("*** Ring Child Process Start for $User"); - $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email); - die; - } - break; - case 'OUT': - // force logout from NS - // NS: <<< OUT xxx - fclose($this->NSfp); - $this->log_message("*** LOGOUT from NS"); - break; - - default: - $code = substr($data,0,3); - if (is_numeric($code)) { - $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; - $this->debug_message("*** NS: $this->error"); - - return $this->NsLogout(); - } - break; - } - } - return $this->NsLogout(); + private function NSRetryWait($wait) { + $this->debug_message("*** wait for $Wait seconds"); + sleep($wait); } function getChallenge($code) @@ -2323,7 +1597,7 @@ class MSN { $data = $this->SB_readln(); if($this->kill_me) { - $this->log_message("*** SB Okay, kill me now!"); + $this->debug_message("*** SB Okay, kill me now!"); break; } if($data === false) @@ -2362,11 +1636,11 @@ class MSN { case 'IRO': // SB: <<< IRO {id} {rooster} {roostercount} {email} {alias} {clientid} @list(/* IRO */, /* id */, $cur_num, $total, $email, $alias, $clientid) = @explode(' ', $data); - $this->log_message("*** $email join us"); + $this->debug_message("*** $email join us"); $Joined=true; break; case 'BYE': - $this->log_message("*** Quit for BYE"); + $this->debug_message("*** Quit for BYE"); $SessionEnd=true; break; case 'USR': @@ -2453,7 +1727,7 @@ class MSN { } if ($ignore) { - $this->log_message("*** ingnore from $from_email: $line"); + $this->debug_message("*** ingnore from $from_email: $line"); break; } if ($is_p2p) @@ -2461,18 +1735,18 @@ class MSN { // we will ignore any p2p message after sending acknowledgement $ignore = true; $len = strlen($sMsg); - $this->log_message("*** p2p message from $from_email, size $len"); + $this->debug_message("*** p2p message from $from_email, size $len"); // header = 48 bytes // content >= 0 bytes // footer = 4 bytes // so it need to >= 52 bytes /*if ($len < 52) { - $this->log_message("*** p2p: size error, less than 52!"); + $this->debug_message("*** p2p: size error, less than 52!"); break; }*/ $aDwords = @unpack("V12dword", $sMsg); if (!is_array($aDwords)) { - $this->log_message("*** p2p: header unpack error!"); + $this->debug_message("*** p2p: header unpack error!"); break; } $this->debug_message("*** p2p: dump received message:\n".$this->dump_binary($sMsg)); @@ -2532,9 +1806,9 @@ class MSN { $len = strlen($message); $this->SB_writeln("MSG $this->id D $len"); $this->SB_writedata($message); - $this->log_message("*** p2p: send display picture acknowledgement for $hdr_SessionID"); - $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message)); - $this->SB_readln();//Read ACK; + $this->debug_message("*** p2p: send display picture acknowledgement for $hdr_SessionID"); + $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message)); + $this->SB_readln();//Read ACK; $this->debug_message("*** p2p: Invite ACK Hdr:\n".$this->dump_binary($hdr)); $new_id-=3; //Send 200 OK message @@ -2570,7 +1844,7 @@ class MSN { $this->SB_writedata($message); $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message)); $this->SB_readln();//Read ACK; - + $this->debug_message("*** p2p: 200 ok:\n".$this->dump_binary($hdr)); //send Data preparation message //send 4 null bytes as data @@ -2639,7 +1913,7 @@ class MSN { "BYE MSNMSGR:MSNSLP/1.0\r\n". "To: \r\n". "From: user.">\r\n". - "Via: MSNSLP/1.0/TLP ;branch={".$BranchGUID."}\r\n". + "Via: MSNSLP/1.0/TLP ;branch={".$BranchGUID."}\r\n". "CSeq: 0\r\n". "Call-ID: ".$MsgBody['Call-ID']."\r\n". "Max-Forwards: 0\r\n". @@ -2649,7 +1923,7 @@ class MSN { $hdr_TotalDataSizeLow=strlen($MessagePayload); $hdr_TotalDataSizeHigh=0; $new_id++; - $hdr = pack("LLLLLLLLLLLL", + $hdr = pack("LLLLLLLLLLLL", 0, $new_id, 0, 0, @@ -2721,16 +1995,16 @@ class MSN { $this->SB_writeln("MSG $id D $len"); $id++; $this->SB_writedata($message); - $this->log_message("*** p2p: send acknowledgement for $hdr_SessionID"); + $this->debug_message("*** p2p: send acknowledgement for $hdr_SessionID"); $this->debug_message("*** p2p: dump sent message:\n".$this->dump_binary($hdr.$footer)); */ break; } - $this->log_message("*** MSG from $from_email: $sMsg"); + $this->debug_message("*** MSG from $from_email: $sMsg"); $this->ReceivedMessage($from_email,$sMsg,$network,false); break; case '217': - $this->log_message("*** User $user is offline. Try OIM."); + $this->debug_message("*** User $user is offline. Try OIM."); foreach($this->SwitchBoardMessageQueue as $Message) $this->SendMessage($Message,"$user@Offline"); $SessionEnd=true; @@ -2902,21 +2176,10 @@ class MSN { return $buf; } - // write log - function log_message($str) { - /*$fname = MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msn_'.strftime('%Y%m%d').'.log'; - $fp = fopen($fname, 'at'); - if ($fp) { - fputs($fp, strftime('%m/%d/%y %H:%M:%S').' ['.posix_getpid().'] '.$str."\n"); - fclose($fp); - }*/ - $this->debug_message($str); - return; - } /** * * @param $FilePath 圖檔路徑 - * @param $Type 檔案類型 3=>大頭貼,2表情圖案 + * @param $Type 檔案類型 3=>大頭貼,2表情圖案 * @return array */ private function MsnObj($FilePath,$Type=3) @@ -2933,7 +2196,7 @@ class MSN { $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n"); return $MsnObj; } - + private function linetoArray($lines) { $lines=str_replace("\r",'',$lines); $lines=explode("\n",$lines); @@ -2944,7 +2207,7 @@ class MSN { } return $Data; } - + private function GetPictureFilePath($Context) { $MsnObj=base64_decode($Context); @@ -2955,7 +2218,7 @@ class MSN { return $this->MsnObjArray[$location]; return false; } - + private function GetMsnObjDefine($Message) { $DefineString=''; @@ -2967,23 +2230,26 @@ class MSN { } return $DefineString; } - + /** * Read and handle incoming command from NS */ - public function nsReceive() { + private function nsReceive() { // Sign in again if not signed in or socket failed - if (!is_resource($this->NSfp) || feof($this->NSfp)) { - $this->callHandler('Reconnect', NULL); + if (!is_resource($this->NSfp) || self::socketcheck($this->NSfp)) { + $this->callHandler('Reconnect'); + $this->NSRetryWait($this->retry_wait); $this->signon(); return; } - + $data = $this->ns_readln(); if($data === false) { // There was no data / an error when reading from the socket so reconnect - $this->callHandler('Reconnect', NULL); + $this->callHandler('Reconnect'); + $this->NSRetryWait($this->retry_wait); $this->signon(); + return; } else { switch (substr($data,0,3)) { @@ -2991,7 +2257,7 @@ class MSN { // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us // NS: <<< SBS 0 null break; - + case 'RFS': // FIXME: // NS: <<< RFS ??? @@ -3005,17 +2271,17 @@ class MSN { } } break; - + case 'LST': // NS: <<< LST {email} {alias} 11 0 @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data); @list($u_name, $u_domain) = @explode('@', $email); if (!isset($this->aContactList[$u_domain][$u_name][1])) { $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow'; - $this->log_message("*** add to our contact list: $u_name@$u_domain"); + $this->debug_message("*** add to our contact list: $u_name@$u_domain"); } break; - + case 'ADL': // randomly, we get ADL command, someome add us to their contact list for MSNP15 // NS: <<< ADL 0 {size} @@ -3030,49 +2296,48 @@ class MSN { $u_name = $matches[2]; $network = $matches[4]; if (isset($this->aContactList[$u_domain][$u_name][$network])) - $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain"); - else - { - $this->re_login = false; + $this->debug_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain"); + else { + $re_login = false; $cnt = 0; foreach (array('Allow', 'Reverse') as $list) { if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { - if ($this->re_login) { - $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + if ($re_login) { + $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list"); continue; } $aTickets = $this->get_passport_ticket(); if (!$aTickets || !is_array($aTickets)) { // failed to login? ignore it - $this->log_message("*** can't re-login, something wrong here"); - $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + $this->debug_message("*** can't re-login, something wrong here"); + $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list"); continue; } - $this->re_login = true; + $re_login = true; $this->ticket = $aTickets; - $this->log_message("**** get new ticket, try it again"); + $this->debug_message("**** get new ticket, try it again"); if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { - $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list"); continue; } } $this->aContactList[$u_domain][$u_name][$network][$list] = false; $cnt++; } - $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain"); + $this->debug_message("*** someone (network: $network) add us to their list: $u_name@$u_domain"); } $str = ''; $len = strlen($str); } else - $this->log_message("*** someone add us to their list: $data"); + $this->debug_message("*** someone add us to their list: $data"); $this->AddUsToMemberList($u_name.'@'.$u_domain, $network); } break; - + case 'RML': // randomly, we get RML command, someome remove us to their contact list for MSNP15 // NS: <<< RML 0 {size} @@ -3092,17 +2357,17 @@ class MSN { foreach ($aData as $list => $id) $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list); unset($this->aContactList[$u_domain][$u_name][$network]); - $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain"); + $this->debug_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain"); } else - $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain"); + $this->debug_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain"); $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network); } else - $this->log_message("*** someone remove us from their list: $data"); + $this->debug_message("*** someone remove us from their list: $data"); } break; - + case 'MSG': // randomly, we get MSG notification from server // NS: <<< MSG Hotmail Hotmail {size} @@ -3137,32 +2402,32 @@ class MSN { } } if ($ignore) { - $this->log_message("*** ingnore MSG for: $line"); + $this->debug_message("*** ingnore MSG for: $line"); break; } if ($maildata == '') { - $this->log_message("*** ingnore MSG not for OIM"); + $this->debug_message("*** ingnore MSG not for OIM"); break; } - $this->re_login = false; + $re_login = false; if (strcasecmp($maildata, 'too-large') == 0) { - $this->log_message("*** large mail-data, need to get the data via SOAP"); + $this->debug_message("*** large mail-data, need to get the data via SOAP"); $maildata = $this->getOIM_maildata(); if ($maildata === false) { - $this->log_message("*** can't get mail-data via SOAP"); + $this->debug_message("*** can't get mail-data via SOAP"); // maybe we need to re-login again $aTickets = $this->get_passport_ticket(); if (!$aTickets || !is_array($aTickets)) { // failed to login? ignore it - $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + $this->debug_message("*** can't re-login, something wrong here, ignore this OIM"); break; } - $this->re_login = true; + $re_login = true; $this->ticket = $aTickets; - $this->log_message("**** get new ticket, try it again"); + $this->debug_message("*** get new ticket, try it again"); $maildata = $this->getOIM_maildata(); if ($maildata === false) { - $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM"); + $this->debug_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM"); break; } } @@ -3180,7 +2445,7 @@ class MSN { $p = substr($p, $end); } if (count($aOIMs) == 0) { - $this->log_message("*** ingnore empty OIM"); + $this->debug_message("*** ingnore empty OIM"); break; } foreach ($aOIMs as $maildata) { @@ -3195,7 +2460,7 @@ class MSN { // N: sender alias preg_match('#(.*)#', $maildata, $matches); if (count($matches) == 0) { - $this->log_message("*** ingnore OIM maildata without type"); + $this->debug_message("*** ingnore OIM maildata without type"); continue; } $oim_type = $matches[1]; @@ -3205,13 +2470,13 @@ class MSN { $network = 1; preg_match('#(.*)#', $maildata, $matches); if (count($matches) == 0) { - $this->log_message("*** ingnore OIM maildata without sender"); + $this->debug_message("*** ingnore OIM maildata without sender"); continue; } $oim_sender = $matches[1]; preg_match('#(.*)#', $maildata, $matches); if (count($matches) == 0) { - $this->log_message("*** ingnore OIM maildata without msgid"); + $this->debug_message("*** ingnore OIM maildata without msgid"); continue; } $oim_msgid = $matches[1]; @@ -3219,37 +2484,37 @@ class MSN { $oim_size = (count($matches) == 0) ? 0 : $matches[1]; preg_match('#(.*)#', $maildata, $matches); $oim_time = (count($matches) == 0) ? 0 : $matches[1]; - $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); + $this->debug_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); $sMsg = $this->getOIM_message($oim_msgid); if ($sMsg === false) { - $this->log_message("*** can't get OIM, msgid = $oim_msgid"); - if ($this->re_login) { - $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + $this->debug_message("*** can't get OIM, msgid = $oim_msgid"); + if ($re_login) { + $this->debug_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); continue; } $aTickets = $this->get_passport_ticket(); if (!$aTickets || !is_array($aTickets)) { // failed to login? ignore it - $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); + $this->debug_message("*** can't re-login, something wrong here, ignore this OIM"); continue; } - $this->re_login = true; + $re_login = true; $this->ticket = $aTickets; - $this->log_message("**** get new ticket, try it again"); + $this->debug_message("*** get new ticket, try it again"); $sMsg = $this->getOIM_message($oim_msgid); if ($sMsg === false) { - $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + $this->debug_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); continue; } } - $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg"); - + $this->debug_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg"); + //$this->ReceivedMessage($oim_sender,$sMsg,$network,true); $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true)); } } break; - + case 'UBM': // randomly, we get UBM, this is the message from other network, like Yahoo! // NS: <<< UBM {email} $network $type {size} @@ -3283,15 +2548,15 @@ class MSN { } if($ignore) { - $this->log_message("*** ingnore from $from_email: $line"); + $this->debug_message("*** ingnore from $from_email: $line"); break; } - $this->log_message("*** MSG from $from_email (network: $network): $sMsg"); + $this->debug_message("*** MSG from $from_email (network: $network): $sMsg"); //$this->ReceivedMessage($from_email,$sMsg,$network,false); $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false)); } break; - + case 'UBX': // randomly, we get UBX notification from server // NS: <<< UBX email {network} {size} @@ -3300,7 +2565,7 @@ class MSN { if (is_numeric($size) && $size > 0) $this->ns_readdata($size); break; - + case 'CHL': // randomly, we'll get challenge from server // NS: <<< CHL 0 {code} @@ -3310,7 +2575,7 @@ class MSN { // NS: >>> fingerprint $this->ns_writeln("QRY $this->id $this->prod_id 32"); $this->ns_writedata($fingerprint); - $this->ns_writeln("CHG $this->id NLN $this->clientid"); + $this->ns_writeln("CHG $this->id NLN $this->clientid"); if($this->PhotoStickerFile!==false) $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); break; @@ -3319,7 +2584,7 @@ class MSN { // ignore it // change our status to online first break; - + case 'XFR': // sometimes, NS will redirect to another NS // MSNP9 @@ -3341,7 +2606,7 @@ class MSN { foreach($this->MessageQueue as $User => $Message) { //$this->ChildProcess[$ChildPid] - $this->log_message("*** XFR SB $User"); + $this->debug_message("*** XFR SB $User"); $pid=pcntl_fork(); if($pid) { @@ -3351,20 +2616,20 @@ class MSN { } elseif($pid==-1) { - $this->log_message("*** Fork Error $User"); + $this->debug_message("*** Fork Error $User"); break; } else { //Child Process - $this->log_message("*** Child Process Start for $User"); + $this->debug_message("*** Child Process Start for $User"); unset($Message['XFRSent']); unset($Message['ReqTime']); $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message); if ($bSBresult === false) { // error for switchboard - $this->log_message("!!! error for sending message to ".$User); + $this->debug_message("!!! error for sending message to ".$User); } die; } @@ -3375,20 +2640,16 @@ class MSN { $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage); if ($bSBresult === false) { // error for switchboard - $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]); + $this->debug_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]); $aOfflineUsers[] = $aMSNUsers[$nCurrentUser]; }*/ break; case 'QNG': // NS: <<< QNG {time} @list(/* QNG */, $ping_wait) = @explode(' ', $data); - //if ($this->ping_wait == 0) $this->ping_wait = 50; - //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping; - //Mod by Ricky Set Online - $this->callHandler('Pong', $ping_wait); break; - + case 'RNG': if($this->PhotoStickerFile!==false) $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); @@ -3396,15 +2657,15 @@ class MSN { $this->ns_writeln("CHG $this->id NLN $this->clientid"); // someone is trying to talk to us // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0 - $this->log_message("NS: <<< RNG $data"); + $this->debug_message("NS: <<< RNG $data"); @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data); @list($sb_ip, $sb_port) = @explode(':', $server); if($this->IsIgnoreMail($email)) { - $this->log_message("*** Ignore RNG from $email"); + $this->debug_message("*** Ignore RNG from $email"); break; } - $this->log_message("*** RING from $email, $sb_ip:$sb_port"); + $this->debug_message("*** RING from $email, $sb_ip:$sb_port"); $this->addContact($email,1,$email, true); $pid=pcntl_fork(); if($pid) @@ -3415,13 +2676,13 @@ class MSN { } elseif($pid==-1) { - $this->log_message("*** Fork Error $User"); + $this->debug_message("*** Fork Error $User"); break; } else { //Child Process - $this->log_message("*** Ring Child Process Start for $User"); + $this->debug_message("*** Ring Child Process Start for $User"); $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email); die; } @@ -3429,104 +2690,131 @@ class MSN { case 'OUT': // force logout from NS // NS: <<< OUT xxx - $this->log_message("*** LOGOUT from NS"); + $this->debug_message("*** LOGOUT from NS"); return $this->NsLogout(); - + default: $code = substr($data,0,3); if (is_numeric($code)) { $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; $this->debug_message("*** NS: $this->error"); - + return $this->NsLogout(); } break; } } } - + /** * Read and handle incoming command/message from * a switchboard session socket */ - public function sbReceive() { - + private function sbReceive() { + + } + + /** + * Checks for new data and calls appropriate methods + * + * This method is usually called in an infinite loop to keep checking for new data + * + * @return void + */ + public function receive() { + //First, get an array of sockets that have data that is ready to be read + $ready = array(); + $ready = $this->getSockets(); + $numrdy = stream_select($ready, $w = NULL, $x = NULL,NULL); + + //Now that we've waited for something, go through the $ready + //array and read appropriately + + for($i = 0;$iNSfp) { + $this->nsReceive(); + } else { + $this->sbReceive($socket); + } + } } /** * Send a request for a switchboard session - * @param $to Target email for switchboard session + * @param String $to Target email for switchboard session */ private function reqSBSession($to) { - $this->log_message("*** Request SB for $to"); + $this->debug_message("*** Request SB for $to"); $this->ns_writeln("XFR $this->id SB"); - + // Add to the queue of those waiting for a switchboard session reponse $this->switchBoardSessions[$to] = array('socket' => NULL, 'id' => 1, 'lastActive' => NULL, 'joined' => false, 'XFRReqTime' => time()); $this->waitingForXFR[] = &$this->switchBoardSessions[$to]; } - + /** * Following an XFR or RNG, connect to the switchboard session - * @param $mode Mode, either 'Active' (in the case of XFR) or 'Passive' (in the case or RNG) - * @param $ip IP of Switchboard - * @param $port Port of Switchboard - * @param $to User on other end of Switchboard - * @param $param Array of parameters - 'cki', 'ticket', 'sid' - * @return Whether successful + * + * @param string $mode Mode, either 'Active' (in the case of XFR) or 'Passive' (in the case or RNG) + * @param string $ip IP of Switchboard + * @param integer $port Port of Switchboard + * @param string $to User on other end of Switchboard + * @param array $param Array of parameters - 'cki', 'ticket', 'sid' + * @return boolean true if successful */ private function connectToSBSession($mode, $ip, $port, $to, $param) { $this->debug_message("*** SB: try to connect to switchboard server $ip:$port"); - + $this->switchBoardSessions[$to]['socket'] = @fsockopen($ip, $port, $errno, $errstr, 5); $socket = $this->switchBoardSessions[$to]['socket']; if(!$socket) { $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr"); return false; } - $this->switchBoardSockets[$socket] = $socket; - + $this->switchBoardSockets[(int) $socket] = $socket; + stream_set_timeout($socket, $this->SBStreamTimeout); - + $id = &$this->switchBoardSessions[$to]['id']; - + if($mode == 'Active') { $cki_code = $param['cki']; - + // SB: >>> USR {id} {user} {cki} $this->sb_writeln($socket, $id, "USR $id $this->user $cki_code"); } else { // Passive $ticket = $param['ticket']; $sid = $param['sid']; - + // SB: >>> ANS {id} {user} {ticket} {session_id} $this->sb_writeln($socket, $id, "ANS $id $this->user $ticket $sid"); } - + $this->switchBoardSessions[$to]['lastActive'] = time(); } - + /** * Send a message via an existing SB session - * @param $message Message - * @param $to Recipient for message - * @return Whether successful + * + * @param string $to Recipient for message + * @param string $message Message + * @return boolean true on success */ - private function sendMessageViaSB($message, $to) { + private function sendMessageViaSB($to, $message) { if(socketcheck($this->switchBoardSessions[$to]['socket'])) { $this->reqSBSession($to); return false; } - + if(!$this->switchBoardSessions[$to]['joined']) { // If our participant has not joined the session yet we can't message them! return false; } - + $id = &$this->switchBoardSessions[$to]['id']; $socket = $this->switchBoardSessions[$to]['socket']; - + $aMessage = $this->getMessage($Message); //CheckEmotion... $MsnObjDefine=$this->GetMsnObjDefine($aMessage); @@ -3542,17 +2830,17 @@ class MSN { // TODO handle failure during write to socket $this->sb_writeln($socket, $id, "MSG $id N $len"); $this->sb_writedata($socket, $aMessage); - + // Don't close the SB session, we might as well leave it open - + return true; } - + /** - * - * @param $to - * @param $sMessage - * @param $lockkey + * Send offline message + * @param string $to Intended recipient + * @param string $sMessage Message + * @param string $lockkey Lock key */ private function sendOIM($to, $sMessage, $lockkey) { $XML = ' @@ -3657,65 +2945,74 @@ X-OIM-Sequence-Num: 1 } return array('challenge' => $challenge, 'auth_policy' => $auth_policy); } - + /** * Send a message to a user on another network + * * @param $message Message * @param $to Intended recipient * @param $network Network + * @return void */ private function sendOtherNetworkMessage($message, $to, $network) { - $message=$this->getMessage($nessage, $network); + $message = $this->getMessage($message, $network); $len = strlen($message); $this->ns_writeln("UUM $this->id $to $network 1 $len"); $this->ns_writedata($Message); - $this->log_message("*** sent to $to (network: $network):\n$Message"); + $this->debug_message("*** Sent to $to (network: $network):\n$Message"); } - + /** * Send a message - * @param $message Message - * @param $to To address in form user@host.com@network - * where network is 1 for MSN, 32 for Yahoo - * and 'Offline' for offline messages + * + * @param string $to To address in form user@host.com(@network) + * where network is 1 for MSN, 32 for Yahoo + * and 'Offline' for offline messages + * @param string $message Message */ - public function sendMessage($message, $to) { + public function sendMessage($to, $message) { if($message != '') { - list($name,$host,$network)=explode('@',$to); - $network=$network==''?1:$network; - - if($network === 1 && $this->switchBoardSessions[$to]['socket'] != NULL && time()-$this->switchBoardSessions[$to]['lastActive'] < $this->SBIdleTimeout) { + list($name, $host, $network) = explode('@', $to); + $network = $network == '' ? 1 : $network; + + if ($network === 1 && $this->switchBoardSessions[$to]['socket'] !== NULL) { $recipient = $name . $host; - $this->debug_message("*** Sending Message to $recipient using existing SB session"); - return $this->sendMessageViaSB($message, $recipient); - } elseif($network == 'Offline') { + $this->debug_message("*** Attempting to send message to $recipient using existing SB session"); + + if ($this->sendMessageViaSB($message, $recipient)) { + $this->debug_message('*** Message sent successfully'); + return true; + } else { + $this->debug_message('*** Message sending failed, requesting new SB session'); + $this->reqSBSession($to); + return false; + } + } elseif ($network == 'Offline') { //Send OIM //FIXME: 修正Send OIM - $lockkey=''; - for ($i = 0; $i < $this->oim_try; $i++) - { - if(($oim_result = $this->sendOIM($To, $Message, $lockkey))===true) break; + $lockkey = ''; + $re_login = false; + for ($i = 0; $i < $this->oim_try; $i++) { + if (($oim_result = $this->sendOIM($to, $message, $lockkey)) === true) break; if (is_array($oim_result) && $oim_result['challenge'] !== false) { // need challenge lockkey - $this->log_message("*** we need a new challenge code for ".$oim_result['challenge']); + $this->debug_message("*** Need challenge code for ".$oim_result['challenge']); $lockkey = $this->getChallenge($oim_result['challenge']); continue; } - if ($oim_result === false || $oim_result['auth_policy'] !== false) - { - if ($this->re_login) - { - $this->log_message("*** can't send OIM, but we already re-login again, so ignore this OIM"); - break; + if ($oim_result === false || $oim_result['auth_policy'] !== false) { + if ($re_login) { + $this->debug_message("*** Can't send OIM, but we already re-logged-in again, so ignore this OIM"); + return true; } - $this->log_message("*** can't send OIM, maybe ticket expired, try to login again"); - // maybe we need to re-login again - if(!$this->get_passport_ticket()) - { - $this->log_message("*** can't re-login, something wrong here, ignore this OIM"); - break; + $this->debug_message("*** Can't send OIM, maybe ticket expired, trying to login again"); + + // Maybe we need to re-login again + if (!$this->get_passport_ticket()) { + $this->debug_message("*** Can't re-login, something went wrong here, ignore this OIM"); + return false; } - $this->log_message("**** get new ticket, try it again"); + $this->debug_message("*** Getting new ticket and trying again"); continue; } } @@ -3727,11 +3024,10 @@ X-OIM-Sequence-Num: 1 } return true; } - + //FIXME Not sure if this is needed? private function endSBSession($socket) { - if (feof($socket)) - { + if (feof($socket)) { // lost connection? error? try OIM later @fclose($socket); return false; @@ -3741,76 +3037,95 @@ X-OIM-Sequence-Num: 1 @fclose($socket); return true; } - + /** * Sends a ping command - * + * * Should be called about every 50 seconds + * + * @return void */ public function sendPing() { // NS: >>> PNG $this->ns_writeln("PNG"); } - + + /** + * Methods to return sockets / check socket status + */ + /** * Get the NS socket + * + * @return resource NS socket */ public function getNSSocket() { return $this->NSfp; } - + /** * Get the Switchboard sockets currently in use + * + * @return array Array of Switchboard sockets */ public function getSBSockets() { return $this->switchBoardSockets; } - + /** * Get all the sockets currently in use + * + * @return array Array of socket resources */ public function getSockets() { return array_merge($this->NSfp, $this->switchBoardSockets); } - - /** + + /** * Checks socket for end of file * - * @access public - * @param Resource $socket Socket to check - * @return boolean true if end of file (socket) + * @param resource $socket Socket to check + * @return boolean true if end of file (socket) */ private static function socketcheck($socket){ $info = stream_get_meta_data($socket); return $info['eof']; } - + + /** + * Methods to add / call callbacks + */ + /** * Calls User Handler * * Calls registered handler for a specific event. - * - * @param String $event Command (event) name (Rvous etc) - * @param String $data Raw message from server + * + * @param string $event Command (event) name (Rvous etc) + * @param array $data Data * @see registerHandler * @return void */ - private function callHandler($event, $data) { + private function callHandler($event, $data = NULL) { if (isset($this->myEventHandlers[$event])) { - call_user_func($this->myEventHandlers[$event], $data); + if ($data !== NULL) { + call_user_func($this->myEventHandlers[$event], $data); + } else { + call_user_func($this->myEventHandlers[$event]); + } } } - - /** + + /** * Registers a user handler - * + * * Handler List * IMIn, Pong, ConnectFailed, Reconnect * - * @param String $event Event name - * @param String $handler User function to call + * @param string $event Event name + * @param string $handler User function to call * @see callHandler - * @return boolean Returns true if successful + * @return boolean true if successful */ public function registerHandler($event, $handler) { if (is_callable($handler)) { diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php index b0540c46e5..8f436bdff8 100644 --- a/plugins/Msn/msnmanager.php +++ b/plugins/Msn/msnmanager.php @@ -1,158 +1,183 @@ -. - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - -/** - * AIM background connection manager for AIM-using queue handlers, - * allowing them to send outgoing messages on the right connection. - * - * Input is handled during socket select loop, keepalive pings during idle. - * Any incoming messages will be handled. - * - * In a multi-site queuedaemon.php run, one connection will be instantiated - * for each site being handled by the current process that has XMPP enabled. - */ - -class MsnManager extends ImManager -{ - public $conn = null; - - protected $lastping = null; - - private $pingInterval; - - /** - * Initialize connection to server. - * @return boolean true on success - */ - public function start($master) - { - if(parent::start($master)) - { - $this->connect(); - return true; - }else{ - return false; - } - } - - public function getSockets() - { - $this->connect(); - if($this->conn){ - return $this->conn->getSockets(); - }else{ - return array(); - } - } - - /** - * Idle processing for io manager's execution loop. - * Send keepalive pings to server. - */ - public function idle($timeout=0) - { - $now = time(); - if (empty($this->lastping) || $now - $this->lastping > $pingInterval) { - $this->send_ping(); - } - } - - /** - * Process MSN events that have come in over the wire. - * @param resource $socket - */ - public function handleInput($socket) - { - common_log(LOG_DEBUG, "Servicing the MSN queue."); - $this->stats('msn_process'); - $this->conn->receive(); - } - - function connect() - { - if (!$this->conn) { - $this->conn=new MSN(array( - 'user' => $this->plugin->user, - 'password' => $this->plugin->password, - 'alias' => $this->plugin->nickname, - 'psm' => 'Send me a message to post a notice', - 'debug' => true - ) - ); - $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message')); - $this->conn->registerHandler('Pong', array($this, 'update_ping_time')); - $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed')); - $this->conn->registerHandler('Reconnect', array($this, 'handle_reconnect')); - $this->conn->signon(); - $this->lastping = time(); - } - return $this->conn; - } - - function send_ping() { - $this->connect(); - if (!$this->conn) { - return false; - } - - $now = time(); - - $this->conn->sendPing(); - $this->lastping = $now; - return true; - } - - /** - * Update the time till the next ping - * @param $data Time till next ping - */ - function update_ping_time($data) { - $pingInterval = $data; - } - - function handle_msn_message($data) - { - $this->plugin->enqueue_incoming_raw($data); - return true; - } - - function handle_connect_failed($data) { - common_log(LOG_NOTICE, 'MSN connect failed, retrying'); - } - - function handle_reconnect($data) { - common_log(LOG_NOTICE, 'MSN reconnecting'); - } - - function send_raw_message($data) - { - $this->connect(); - if (!$this->conn) { - return false; - } - $this->conn->sflapSend($data[0],$data[1],$data[2],$data[3]); - - // Sending a command updates the time till next ping - $this->lastping = time(); - $this->pingInterval = 50; - return true; - } -} +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +/** + * MSN background connection manager for MSN-using queue handlers, + * allowing them to send outgoing messages on the right connection. + * + * Input is handled during socket select loop, keepalive pings during idle. + * Any incoming messages will be handled. + * + * In a multi-site queuedaemon.php run, one connection will be instantiated + * for each site being handled by the current process that has MSN enabled. + */ + +class MsnManager extends ImManager { + public $conn = null; + private $lastping = null; + private $pingInterval; + + /** + * Initialise connection to server. + * + * @return boolean true on success + */ + public function start($master) { + if (parent::start($master)) { + $this->connect(); + return true; + } else { + return false; + } + } + + /** + * Return any open sockets that the run loop should listen + * for input on. + * + * @return array Array of socket resources + */ + public function getSockets() { + $this->connect(); + if ($this->conn) { + return $this->conn->getSockets(); + } else { + return array(); + } + } + + /** + * Idle processing for io manager's execution loop. + * Send keepalive pings to server. + * + * @return void + */ + public function idle($timeout = 0) { + if (empty($this->lastping) || time() - $this->lastping > $this->pingInterval) { + $this->send_ping(); + } + } + + /** + * Process MSN events that have come in over the wire. + * + * @param resource $socket Socket ready + * @return void + */ + public function handleInput($socket) { + common_log(LOG_DEBUG, 'Servicing the MSN queue.'); + $this->stats('msn_process'); + $this->conn->receive(); + } + + /** + * Initiate connection + * + * @return void + */ + function connect() { + if (!$this->conn) { + $this->conn = new MSN(array('user' => $this->plugin->user, + 'password' => $this->plugin->password, + 'alias' => $this->plugin->nickname, + 'psm' => 'Send me a message to post a notice', + 'debug' => true)); + $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message')); + $this->conn->registerHandler('Pong', array($this, 'update_ping_time')); + $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed')); + $this->conn->registerHandler('Reconnect', array($this, 'handle_reconnect')); + $this->conn->signon(); + $this->lastping = time(); + } + return $this->conn; + } + + /** + * Called by the idle process to send a ping + * when necessary + * + * @return void + */ + private function send_ping() { + $this->connect(); + if (!$this->conn) { + return false; + } + + $this->conn->sendPing(); + $this->lastping = time(); + return true; + } + + /** + * Update the time till the next ping + * @param $data Time till next ping + */ + private function update_ping_time($data) { + $pingInterval = $data; + } + + /** + * Called via a callback when a message is received + * + * Passes it back to the queuing system + * + * @param array $data Data + */ + private function handle_msn_message($data) { + $this->plugin->enqueue_incoming_raw($data); + return true; + } + + /** + * Called by callback to log failure during connect + * + * @param void $data Not used (there to keep callback happy) + */ + function handle_connect_failed($data) { + common_log(LOG_NOTICE, 'MSN connect failed, retrying'); + } + + /** + * Called by callback to log reconnection + * + * @param void $data Not used (there to keep callback happy) + */ + function handle_reconnect($data) { + common_log(LOG_NOTICE, 'MSN reconnecting'); + } + + function send_raw_message($data) { + $this->connect(); + if (!$this->conn) { + return false; + } + + if (!$this->conn->sendMessage($data['to'], $data['message'])) { + return false; + } + + // Sending a command updates the time till next ping + $this->lastping = time(); + $this->pingInterval = 50; + return true; + } +} From 327ed5b87e492380bc651ed03159ae7cd3a4a493 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 14 Jun 2010 15:51:49 -0400 Subject: [PATCH 260/730] fix URL regex for tags to use UTF-8 --- lib/router.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/router.php b/lib/router.php index f2b2b845f2..fec229c9b6 100644 --- a/lib/router.php +++ b/lib/router.php @@ -263,7 +263,7 @@ class Router $m->connect('tag', array('action' => 'publictagcloud')); $m->connect('tag/:tag/rss', array('action' => 'tagrss'), - array('tag' => '[a-zA-Z0-9]+')); + array('tag' => '[\pL\pN_\-\.]{1,64}')); $m->connect('tag/:tag', array('action' => 'tag'), array('tag' => '[\pL\pN_\-\.]{1,64}')); @@ -749,12 +749,12 @@ class Router $m->connect('tag/:tag/rss', array('action' => 'userrss', 'nickname' => $nickname), - array('tag' => '[a-zA-Z0-9]+')); + array('tag' => '[\pL\pN_\-\.]{1,64}')); $m->connect('tag/:tag', array('action' => 'showstream', 'nickname' => $nickname), - array('tag' => '[a-zA-Z0-9]+')); + array('tag' => '[\pL\pN_\-\.]{1,64}')); $m->connect('rsd.xml', array('action' => 'rsd', @@ -815,12 +815,12 @@ class Router $m->connect(':nickname/tag/:tag/rss', array('action' => 'userrss'), array('nickname' => '[a-zA-Z0-9]{1,64}'), - array('tag' => '[a-zA-Z0-9]+')); + array('tag' => '[\pL\pN_\-\.]{1,64}')); $m->connect(':nickname/tag/:tag', array('action' => 'showstream'), array('nickname' => '[a-zA-Z0-9]{1,64}'), - array('tag' => '[a-zA-Z0-9]+')); + array('tag' => '[\pL\pN_\-\.]{1,64}')); $m->connect(':nickname/rsd.xml', array('action' => 'rsd'), From 27e8cfd360323cdfed1562c87740464d8bac502b Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Tue, 15 Jun 2010 20:51:04 +0100 Subject: [PATCH 261/730] Adaptation of library almost complete. Bot now signs in correctly when launched using startdaemons.sh --- plugins/Msn/MsnPlugin.php | 23 +- plugins/Msn/extlib/phpmsnclass/msn.class.php | 1760 +++++++++--------- plugins/Msn/msnmanager.php | 15 +- 3 files changed, 871 insertions(+), 927 deletions(-) diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php index 9a9e703986..8452f15220 100644 --- a/plugins/Msn/MsnPlugin.php +++ b/plugins/Msn/MsnPlugin.php @@ -91,11 +91,8 @@ class MsnPlugin extends ImPlugin { */ function validate($screenname) { //TODO Correct this for MSN screennames - if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) { - return true; - }else{ - return false; - } + //if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) { + return true; } /** @@ -109,7 +106,7 @@ class MsnPlugin extends ImPlugin { $dir = dirname(__FILE__); switch ($cls) { - case 'Msn': + case 'MSN': require_once(INSTALLDIR.'/plugins/Msn/extlib/phpmsnclass/msn.class.php'); return false; case 'MsnManager': @@ -179,12 +176,14 @@ class MsnPlugin extends ImPlugin { } function onPluginVersion(&$versions) { - $versions[] = array('name' => 'MSN', - 'version' => STATUSNET_VERSION, - 'author' => 'Luke Fitzgerald', - 'homepage' => 'http://status.net/wiki/Plugin:MSN', - 'rawdescription' => - _m('The MSN plugin allows users to send and receive notices over the MSN network.')); + $versions[] = array( + 'name' => 'MSN', + 'version' => STATUSNET_VERSION, + 'author' => 'Luke Fitzgerald', + 'homepage' => 'http://status.net/wiki/Plugin:MSN', + 'rawdescription' => + _m('The MSN plugin allows users to send and receive notices over the MSN network.') + ); return true; } } diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 9b087ac792..6146bd1c5a 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -37,7 +37,7 @@ class MSN { private $update_pending; private $PhotoStickerFile=false; private $Emotions=false; - private $ReqSBXFRTimeout=60; + private $XFRReqTimeout=60; private $LastPing; private $ping_wait=50; private $SBIdleTimeout=10; @@ -47,7 +47,6 @@ class MSN { private $ABAuthHeader; private $ABService; private $Contacts; - private $IgnoreList; private $server = 'messenger.hotmail.com'; private $port = 1863; @@ -81,10 +80,6 @@ class MSN { public $oim_try = 3; - public $log_file = ''; - - public $log_path = false; - public $font_fn = 'Arial'; public $font_co = '333333'; public $font_ef = ''; @@ -100,8 +95,27 @@ class MSN { private $aContactList = array(); private $aADL = array(); + + /** + * Holds session information indexed by screenname if + * session has no socket or socket if socket present + * + * @var array + */ private $switchBoardSessions = array(); - private $switchBoardSockets = array(); + + /** + * Holds sockets indexed by screenname + * + * @var array + */ + private $switchBoardSessionLookup = array(); + + /** + * Holds references to sessions waiting for XFR + * + * @var array + */ private $waitingForXFR = array(); /** @@ -127,8 +141,7 @@ class MSN { * @param integer $client_id Client id (hexadecimal) * @return MSN */ - public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C) - { + public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C) { $this->user = $Configs['user']; $this->password = $Configs['password']; $this->alias = isset($Configs['alias']) ? $Configs['alias'] : ''; @@ -137,7 +150,7 @@ class MSN { $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true; $this->PhotoStickerFile=isset($Configs['PhotoSticker']) ? $Configs['PhotoSticker'] : false; - if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) { + if ($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) { foreach($this->Emotions as $EmotionFilePath) $this->MsnObj($EmotionFilePath,$Type=2); } @@ -169,36 +182,31 @@ class MSN { $this->ABService=new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl',array('trace' => 1)); } - private function Array2SoapVar($Array,$ReturnSoapVarObj=true,$TypeName=null,$TypeNameSpace=null) - { - $ArrayString=''; - foreach($Array as $Key => $Val) - { - if($Key{0}==':') continue; - $Attrib=''; - if(is_array($Val[':'])) - { - foreach($Val[':'] as $AttribName => $AttribVal) - $Attrib.=" $AttribName='$AttribVal'"; + private function Array2SoapVar($Array, $ReturnSoapVarObj = true, $TypeName = null, $TypeNameSpace = null) { + $ArrayString = ''; + foreach($Array as $Key => $Val) { + if ($Key{0} == ':') continue; + $Attrib = ''; + if (is_array($Val[':'])) { + foreach ($Val[':'] as $AttribName => $AttribVal) + $Attrib .= " $AttribName='$AttribVal'"; } - if($Key{0}=='!') - { + if ($Key{0} == '!') { //List Type Define - $Key=substr($Key,1); - foreach($Val as $ListKey => $ListVal) - { - if($ListKey{0}==':') continue; - if(is_array($ListVal)) $ListVal=$this->Array2SoapVar($ListVal,false); - elseif(is_bool($ListVal)) $ListVal=$ListVal?'true':'false'; - $ArrayString.="<$Key$Attrib>$ListVal"; + $Key = substr($Key,1); + foreach ($Val as $ListKey => $ListVal) { + if ($ListKey{0} == ':') continue; + if (is_array($ListVal)) $ListVal = $this->Array2SoapVar($ListVal, false); + elseif (is_bool($ListVal)) $ListVal = $ListVal ? 'true' : 'false'; + $ArrayString .= "<$Key$Attrib>$ListVal"; } continue; } - if(is_array($Val)) $Val=$this->Array2SoapVar($Val,false); - elseif(is_bool($Val)) $Val=$Val?'true':'false'; - $ArrayString.="<$Key$Attrib>$Val"; + if (is_array($Val)) $Val = $this->Array2SoapVar($Val, false); + elseif (is_bool($Val)) $Val = $Val ? 'true' : 'false'; + $ArrayString .= "<$Key$Attrib>$Val"; } - if($ReturnSoapVarObj) return new SoapVar($ArrayString,XSD_ANYXML,$TypeName,$TypeNameSpace); + if ($ReturnSoapVarObj) return new SoapVar($ArrayString, XSD_ANYXML, $TypeName, $TypeNameSpace); return $ArrayString; } @@ -208,8 +216,7 @@ class MSN { * @param string $url URL string (Optional) * @return mixed Array of tickets or false on failure */ - private function get_passport_ticket($url = '') - { + private function get_passport_ticket($url = '') { $user = $this->user; $password = htmlspecialchars($this->password); @@ -310,8 +317,8 @@ class MSN { '; - $this->debug_message("*** URL: $passport_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); + //$this->debug_message("*** URL: $passport_url"); + //$this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); curl_setopt($curl, CURLOPT_URL, $passport_url); if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); @@ -323,33 +330,33 @@ class MSN { $data = curl_exec($curl); $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + //$this->debug_message("*** Get Result:\n$data"); if ($http_code != 200) { - // sometimes, rediret to another URL + // sometimes, redirect to another URL // MSNP15 //psf:Redirect //https://msnia.login.live.com/pp450/RST.srf //Authentication Failure if (strpos($data, 'psf:Redirect') === false) { - $this->debug_message("*** Can't get passport ticket! http code = $http_code"); + $this->debug_message("*** Could not get passport ticket! http code = $http_code"); return false; } preg_match("#(.*)#", $data, $matches); if (count($matches) == 0) { - $this->debug_message("*** redirect, but can't get redirect URL!"); + $this->debug_message('*** Redirected, but could not get redirect URL!'); return false; } $redirect_url = $matches[1]; if ($redirect_url == $passport_url) { - $this->debug_message("*** redirect, but redirect to same URL!"); + $this->debug_message('*** Redirected, but to same URL!'); return false; } - $this->debug_message("*** redirect to $redirect_url"); + $this->debug_message("*** Redirected to $redirect_url"); return $this->get_passport_ticket($redirect_url); } - // sometimes, rediret to another URL, also return 200 + // sometimes, redirect to another URL, also return 200 // MSNP15 //psf:Redirect //https://msnia.login.live.com/pp450/RST.srf @@ -359,10 +366,10 @@ class MSN { if (count($matches) != 0) { $redirect_url = $matches[1]; if ($redirect_url == $passport_url) { - $this->debug_message("*** redirect, but redirect to same URL!"); + $this->debug_message('*** Redirected, but to same URL!'); return false; } - $this->debug_message("*** redirect to $redirect_url"); + $this->debug_message("*** Redirected to $redirect_url"); return $this->get_passport_ticket($redirect_url); } } @@ -397,7 +404,7 @@ class MSN { // no ticket found! if (count($matches) == 0) { - $this->debug_message("*** Can't get passport ticket!"); + $this->debug_message('*** Could not get passport ticket!'); return false; } @@ -437,94 +444,100 @@ class MSN { 'space_ticket' => html_entity_decode($matches[11]), 'storage_ticket' => html_entity_decode($matches[13]) ); - $this->ticket=$aTickets; - $this->debug_message(var_export($aTickets, true)); - $ABAuthHeaderArray=array( - 'ABAuthHeader'=>array( - ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'ManagedGroupRequest'=>false, - 'TicketToken'=>htmlspecialchars($this->ticket['contact_ticket']), + $this->ticket = $aTickets; + //$this->debug_message(var_export($aTickets, true)); + $ABAuthHeaderArray = array( + 'ABAuthHeader' => array( + ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), + 'ManagedGroupRequest' => false, + 'TicketToken' => htmlspecialchars($this->ticket['contact_ticket']), ) ); - $this->ABAuthHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook","ABAuthHeader", $this->Array2SoapVar($ABAuthHeaderArray)); + $this->ABAuthHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABAuthHeader', $this->Array2SoapVar($ABAuthHeaderArray)); return $aTickets; } - private function UpdateContacts() - { - $ABApplicationHeaderArray=array( - 'ABApplicationHeader'=>array( - ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'ApplicationId'=>'CFE80F9D-180F-4399-82AB-413F33A1FA11', - 'IsMigration'=>false, - 'PartnerScenario'=>'ContactSave' + /** + * Fetch contact list + * + * @return boolean true on success + */ + private function UpdateContacts() { + $ABApplicationHeaderArray = array( + 'ABApplicationHeader' => array( + ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), + 'ApplicationId' => 'CFE80F9D-180F-4399-82AB-413F33A1FA11', + 'IsMigration' => false, + 'PartnerScenario' => 'ContactSave' ) ); - $ABApplicationHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook",'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray)); - $ABFindAllArray=array( - 'ABFindAll'=>array( - ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'abId'=>'00000000-0000-0000-0000-000000000000', - 'abView'=>'Full', - 'lastChange'=>'0001-01-01T00:00:00.0000000-08:00', + $ABApplicationHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray)); + $ABFindAllArray = array( + 'ABFindAll' => array( + ':' => array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'abId' => '00000000-0000-0000-0000-000000000000', + 'abView' => 'Full', + 'lastChange' => '0001-01-01T00:00:00.0000000-08:00', ) ); - $ABFindAll=new SoapParam($this->Array2SoapVar($ABFindAllArray),'ABFindAll'); - $this->ABService->__setSoapHeaders(array($ABApplicationHeader,$this->ABAuthHeader)); - $this->Contacts=array(); - try - { - $this->debug_message("*** Update Contacts..."); - $Result=$this->ABService->ABFindAll($ABFindAll); - $this->debug_message("*** Result:\n".print_r($Result,true)."\n".$this->ABService->__getLastResponse()); + $ABFindAll = new SoapParam($this->Array2SoapVar($ABFindAllArray), 'ABFindAll'); + $this->ABService->__setSoapHeaders(array($ABApplicationHeader, $this->ABAuthHeader)); + $this->Contacts = array(); + try { + $this->debug_message('*** Updating Contacts...'); + $Result = $this->ABService->ABFindAll($ABFindAll); + $this->debug_message("*** Result:\n".print_r($Result, true)."\n".$this->ABService->__getLastResponse()); foreach($Result->ABFindAllResult->contacts->Contact as $Contact) - $this->Contacts[$Contact->contactInfo->passportName]=$Contact; - } - catch(Exception $e) - { + $this->Contacts[$Contact->contactInfo->passportName] = $Contact; + } catch(Exception $e) { $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); return false; } return true; } - private function addContact($email, $network, $display = '', $sendADL = false) - { + /** + * Add contact + * + * @param string $email + * @param integer $network + * @param string $display + * @param boolean $sendADL + * @return boolean true on success + */ + private function addContact($email, $network, $display = '', $sendADL = false) { if ($network != 1) return true; - if(isset($this->Contacts[$email])) return true; + if (isset($this->Contacts[$email])) return true; - $ABContactAddArray=array( - 'ABContactAdd'=>array( - ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'abId'=>'00000000-0000-0000-0000-000000000000', - 'contacts'=>array( - 'Contact'=>array( - ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'contactInfo'=>array( - 'contactType'=>'LivePending', - 'passportName'=>$email, - 'isMessengerUser'=>true, - 'MessengerMemberInfo'=>array( - 'DisplayName'=>$email + $ABContactAddArray = array( + 'ABContactAdd' => array( + ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), + 'abId' => '00000000-0000-0000-0000-000000000000', + 'contacts' => array( + 'Contact' => array( + ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), + 'contactInfo' => array( + 'contactType' => 'LivePending', + 'passportName' => $email, + 'isMessengerUser' => true, + 'MessengerMemberInfo' => array( + 'DisplayName' => $email ) ) ) ), - 'options'=>array( - 'EnableAllowListManagement'=>true + 'options' => array( + 'EnableAllowListManagement' => true ) ) ); - $ABContactAdd=new SoapParam($this->Array2SoapVar($ABContactAddArray),'ABContactAdd'); - try - { - $this->debug_message("*** Add Contacts $email..."); + $ABContactAdd = new SoapParam($this->Array2SoapVar($ABContactAddArray), 'ABContactAdd'); + try { + $this->debug_message("*** Adding Contact $email..."); $this->ABService->ABContactAdd($ABContactAdd); - } - catch(Exception $e) - { - $this->debug_message("*** Add Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); + } catch(Exception $e) { + $this->debug_message("*** Add Contact Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); return false; } if ($sendADL && !feof($this->NSfp)) { @@ -533,6 +546,7 @@ class MSN { $str = ''; $len = strlen($str); // NS: >>> ADL {id} {size} + //TODO introduce error checking $this->ns_writeln("ADL $this->id $len"); $this->ns_writedata($str); } @@ -541,8 +555,15 @@ class MSN { return true; } - function delMemberFromList($memberID, $email, $network, $list) - { + /** + * Remove contact from list + * + * @param integer $memberID + * @param string $email + * @param integer $network + * @param string $list + */ + function delMemberFromList($memberID, $email, $network, $list) { if ($network != 1 && $network != 32) return true; if ($memberID === false) return true; $user = $email; @@ -632,8 +653,8 @@ class MSN { 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' ); - $this->debug_message("*** URL: $this->delmember_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); + //$this->debug_message("*** URL: $this->delmember_url"); + //$this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); curl_setopt($curl, CURLOPT_URL, $this->delmember_url); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); @@ -646,29 +667,35 @@ class MSN { $data = curl_exec($curl); $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + //$this->debug_message("*** Get Result:\n$data"); if ($http_code != 200) { preg_match('#(.*)(.*)#', $data, $matches); if (count($matches) == 0) { - $this->debug_message("*** can't delete member (network: $network) $email ($memberID) to $list"); + $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list"); return false; } $faultcode = trim($matches[1]); $faultstring = trim($matches[2]); if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) { - $this->debug_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring"); + $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, error code: $faultcode, $faultstring"); return false; } - $this->debug_message("*** delete member (network: $network) $email ($memberID) from $list, not exist"); + $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, not present in list"); return true; } - $this->debug_message("*** delete member (network: $network) $email ($memberID) from $list"); + $this->debug_message("*** Member successfully deleted (network: $network) $email ($memberID) from $list list"); return true; } - function addMemberToList($email, $network, $list) - { + /** + * Add contact to list + * + * @param string $email + * @param integer $network + * @param string $list + */ + function addMemberToList($email, $network, $list) { if ($network != 1 && $network != 32) return true; $ticket = htmlspecialchars($this->ticket['contact_ticket']); $user = $email; @@ -763,8 +790,8 @@ class MSN { 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' ); - $this->debug_message("*** URL: $this->addmember_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); + //$this->debug_message("*** URL: $this->addmember_url"); + //$this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); curl_setopt($curl, CURLOPT_URL, $this->addmember_url); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); @@ -777,29 +804,33 @@ class MSN { $data = curl_exec($curl); $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + //$this->debug_message("*** Get Result:\n$data"); if ($http_code != 200) { preg_match('#(.*)(.*)#', $data, $matches); if (count($matches) == 0) { - $this->debug_message("*** can't add member (network: $network) $email to $list"); + $this->debug_message("*** Could not add member (network: $network) $email to $list list"); return false; } $faultcode = trim($matches[1]); $faultstring = trim($matches[2]); if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) { - $this->debug_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring"); + $this->debug_message("*** Could not add member (network: $network) $email to $list list, error code: $faultcode, $faultstring"); return false; } - $this->debug_message("*** add member (network: $network) $email to $list, already exist!"); + $this->debug_message("*** Could not add member (network: $network) $email to $list list, already present"); return true; } - $this->debug_message("*** add member (network: $network) $email to $list"); + $this->debug_message("*** Member successfully added (network: $network) $email to $list list"); return true; } - function getMembershipList($returnData=false) - { + /** + * Get membership lists + * + * @param mixed $returnData Membership list or false on failure + */ + function getMembershipList($returnData = false) { $ticket = htmlspecialchars($this->ticket['contact_ticket']); $XML = ' debug_message("*** URL: $this->membership_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); + //$this->debug_message("*** URL: $this->membership_url"); + //$this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); curl_setopt($curl, CURLOPT_URL, $this->membership_url); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); @@ -850,8 +881,8 @@ class MSN { $data = curl_exec($curl); $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); - if($http_code != 200) return false; + //$this->debug_message("*** Get Result:\n$data"); + if ($http_code != 200) return false; $p = $data; $aMemberships = array(); while (1) { @@ -924,7 +955,7 @@ class MSN { @list($u_name, $u_domain) = @explode('@', $email); if ($u_domain == NULL) continue; $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id; - $this->debug_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)"); + $this->debug_message("*** Adding new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)"); } } } @@ -933,6 +964,7 @@ class MSN { /** * Connect to the NS server + * * @param String $user Username * @param String $password Password * @param String $redirect_server Redirect server @@ -942,21 +974,19 @@ class MSN { private function connect($user, $password, $redirect_server = '', $redirect_port = 1863) { $this->id = 1; if ($redirect_server === '') { - $this->NSfp = @fsockopen($this->server, $this->port, $errno, $errstr, 5); + $this->NSfp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout); if (!$this->NSfp) { - $this->error = "Can't connect to $this->server:$this->port, error => $errno, $errstr"; + $this->error = "!!! Could not connect to $this->server:$this->port, error => $errno, $errstr"; return false; } } else { - $this->NSfp = @fsockopen($redirect_server, $redirect_port, $errno, $errstr, 5); + $this->NSfp = @fsockopen($redirect_server, $redirect_port, $errno, $errstr, $this->timeout); if (!$this->NSfp) { - $this->error = "Can't connect to $redirect_server:$redirect_port, error => $errno, $errstr"; + $this->error = "!!! Could not connect to $redirect_server:$redirect_port, error => $errno, $errstr"; return false; } } - - stream_set_timeout($this->NSfp, $this->timeout); $this->authed = false; // MSNP9 // NS: >> VER {id} MSNP9 CVR0 @@ -965,8 +995,7 @@ class MSN { $this->ns_writeln("VER $this->id $this->protocol CVR0"); $start_tm = time(); - while (!self::socketcheck($this->NSfp)) - { + while (!self::socketcheck($this->NSfp)) { $data = $this->ns_readln(); // no data? if ($data === false) { @@ -975,7 +1004,6 @@ class MSN { $this->ns_writeln("OUT"); @fclose($this->NSfp); $this->error = 'Timeout, maybe protocol changed!'; - $this->debug_message("*** $this->error"); return false; } @@ -1024,7 +1052,6 @@ class MSN { $this->ns_writeln("OUT"); @fclose($this->NSfp); $this->error = 'Passport authenticated fail!'; - $this->debug_message("*** $this->error"); return false; } @@ -1045,19 +1072,17 @@ class MSN { // MSNP15 // NS: <<< XFR {id} NS {server} U D @list(/* XFR */, /* id */, $Type, $server, /* ... */) = @explode(' ', $data); - if($Type!='NS') break; + if ($Type!='NS') break; @list($ip, $port) = @explode(':', $server); // this connection will close after XFR @fclose($this->NSfp); - $this->NSfp = @fsockopen($ip, $port, $errno, $errstr, 5); + $this->NSfp = @fsockopen($ip, $port, $errno, $errstr, $this->timeout); if (!$this->NSfp) { $this->error = "Can't connect to $ip:$port, error => $errno, $errstr"; - $this->debug_message("*** $this->error"); return false; } - stream_set_timeout($this->NSfp, $this->timeout); // MSNP9 // NS: >> VER {id} MSNP9 CVR0 // MSNP15 @@ -1071,7 +1096,7 @@ class MSN { @list(/* GCF */, /* 0 */, $size,) = @explode(' ', $data); // we don't need the data, just read it and drop if (is_numeric($size) && $size > 0) - $this->ns_readdata($size); + $this->ns_readdata($size); break; default: @@ -1082,7 +1107,6 @@ class MSN { $this->ns_writeln("OUT"); @fclose($this->NSfp); $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; - $this->debug_message("*** $this->error"); return false; } // unknown response from server, just ignore it @@ -1098,23 +1122,26 @@ class MSN { * @return void */ public function signon() { - $this->debug_message("*** try to connect to MSN network"); + /* FIXME Don't implement the signon as a loop or we could hang + * the queue handler! */ + $this->debug_message('*** Trying to connect to MSN network'); - while(true) { - while(!$this->connect($this->user, $this->password)) { - $this->signonFailure("!!! Can't connect to server: $this->error"); - } - if($this->UpdateContacts() === false) { - $this->signonFailure('!!! Update contacts failed'); + while (true) { + // Connect + if (!$this->connect($this->user, $this->password)) { + $this->signonFailure("!!! Could not connect to server: $this->error"); continue; } - $this->LastPing=time(); - $start_tm = time(); - $ping_tm = time(); - if(($this->aContactList = $this->getMembershipList()) === false) { + + // Update contacts + if ($this->UpdateContacts() === false) continue; + + // Get membership lists + if (($this->aContactList = $this->getMembershipList()) === false) { $this->signonFailure('!!! Get membership list failed'); continue; } + if ($this->update_pending) { if (is_array($this->aContactList)) { $pending = 'Pending'; @@ -1206,15 +1233,15 @@ class MSN { //$MsnObj=$this->PhotoStckObj(); // NS: >>> CHG {id} {status} {clientid} {msnobj} $this->ns_writeln("CHG $this->id NLN $this->clientid"); - if($this->PhotoStickerFile!==false) + if ($this->PhotoStickerFile !== false) $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); // NS: >>> UUX {id} length $str = ''.htmlspecialchars($this->psm).''; $len = strlen($str); $this->ns_writeln("UUX $this->id $len"); $this->ns_writedata($str); - if(!socketcheck($this->NSfp)) { - $this->debug_message("*** connected, wait for command"); + if (!self::socketcheck($this->NSfp)) { + $this->debug_message('*** Connected, waiting for commands'); break; } else { $this->NSRetryWait($this->retry_wait); @@ -1262,10 +1289,15 @@ class MSN { return base64_encode($blob); } + /** + * Get OIM mail data + * + * @return string mail data or false on failure + */ function getOIM_maildata() { preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches); if (count($matches) == 0) { - $this->debug_message('*** no web ticket?'); + $this->debug_message('*** No web ticket?'); return false; } $t = htmlspecialchars($matches[1]); @@ -1291,8 +1323,8 @@ class MSN { 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' ); - $this->debug_message("*** URL: $this->oim_maildata_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); + //$this->debug_message("*** URL: $this->oim_maildata_url"); + //$this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); curl_setopt($curl, CURLOPT_URL, $this->oim_maildata_url); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); @@ -1305,26 +1337,32 @@ class MSN { $data = curl_exec($curl); $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + //$this->debug_message("*** Get Result:\n$data"); if ($http_code != 200) { - $this->debug_message("*** Can't get OIM maildata! http code: $http_code"); + $this->debug_message("*** Could not get OIM maildata! http code: $http_code"); return false; } // See #XML_Data preg_match('#]*)>(.*)#', $data, $matches); if (count($matches) == 0) { - $this->debug_message("*** Can't get OIM maildata"); - return ''; + $this->debug_message('*** Could not get OIM maildata'); + return false; } return $matches[2]; } + /** + * Fetch OIM message with given id + * + * @param string $msgid + * @return string Message or false on failure + */ function getOIM_message($msgid) { preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches); if (count($matches) == 0) { - $this->debug_message('*** no web ticket?'); + $this->debug_message('*** No web ticket?'); return false; } $t = htmlspecialchars($matches[1]); @@ -1355,8 +1393,8 @@ class MSN { 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' ); - $this->debug_message("*** URL: $this->oim_read_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); + //$this->debug_message("*** URL: $this->oim_read_url"); + //$this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); curl_setopt($curl, CURLOPT_URL, $this->oim_read_url); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); @@ -1369,7 +1407,7 @@ class MSN { $data = curl_exec($curl); $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + //$this->debug_message("*** Get Result:\n$data"); if ($http_code != 200) { $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code"); @@ -1403,7 +1441,7 @@ class MSN { $sOIM .= $line; } $sMsg = base64_decode($sOIM); - $this->debug_message("*** we get OIM ($msgid): $sMsg"); + //$this->debug_message("*** we get OIM ($msgid): $sMsg"); // delete OIM $XML = ' @@ -1431,8 +1469,8 @@ class MSN { 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' ); - $this->debug_message("*** URL: $this->oim_del_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); + //$this->debug_message("*** URL: $this->oim_del_url"); + //$this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); curl_setopt($curl, CURLOPT_URL, $this->oim_del_url); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); @@ -1445,15 +1483,20 @@ class MSN { $data = curl_exec($curl); $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); + //$this->debug_message("*** Get Result:\n$data"); if ($http_code != 200) - $this->debug_message("*** Can't delete OIM: $msgid, http code = $http_code"); + $this->debug_message("*** Could not delete OIM: $msgid, http code = $http_code"); else $this->debug_message("*** OIM ($msgid) deleted"); return $sMsg; } + /** + * Log out and close the NS connection + * + * @return void + */ private function NSLogout() { if (is_resource($this->NSfp) && !feof($this->NSfp)) { // logout now @@ -1461,18 +1504,27 @@ class MSN { $this->ns_writeln("OUT"); fclose($this->NSfp); $this->NSfp = false; - $this->debug_message("*** logout now!"); + $this->debug_message("*** Logged out"); } - } + /** + * Sleep for the given number of seconds + * + * @param integer $wait Number of seconds to sleep for + */ private function NSRetryWait($wait) { - $this->debug_message("*** wait for $Wait seconds"); + $this->debug_message("*** Sleeping for $wait seconds before retrying"); sleep($wait); } - function getChallenge($code) - { + /** + * Generate challenge response + * + * @param string $code + * @return string challenge response code + */ + function getChallenge($code) { // MSNP15 // http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges // Step 1: The MD5 Hash @@ -1546,514 +1598,23 @@ class MSN { return $hash; } - private function getMessage($sMessage, $network = 1) - { + /** + * Generate the data to send a message + * + * @param string $sMessage Message + * @param integer $network Network + */ + private function getMessage($sMessage, $network = 1) { $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n"; $msg_header_len = strlen($msg_header); if ($network == 1) $maxlen = $this->max_msn_message_len - $msg_header_len; else $maxlen = $this->max_yahoo_message_len - $msg_header_len; - $sMessage=str_replace("\r", '', $sMessage); - $msg=substr($sMessage,0,$maxlen); + $sMessage = str_replace("\r", '', $sMessage); + $msg = substr($sMessage, 0, $maxlen); return $msg_header.$msg; } - /** - * - * @param $Action 連線模式 'Active' => 主動傳送訊息,'Passive' => 接收訊息 - * @param $Param - * @return boolean - */ - private function DoSwitchBoard($Action,$Param) - { - $SessionEnd=false; - $Joined=false; - $this->id=1; - $LastActive=time(); - stream_set_timeout($this->SBfp, $this->SBStreamTimeout); - switch($Action) - { - case 'Active': - $cki_code=$Param['cki']; - $user=$Param['user']; - $this->SwitchBoardMessageQueue=$Param['Msg']; - // SB: >>> USR {id} {user} {cki} - $this->SB_writeln("USR $this->id $this->user $cki_code"); - $this->SwitchBoardSessionUser=$user; - break; - case 'Passive': - $ticket=$Param['ticket']; - $sid=$Param['sid']; - $user=$Param['user']; - // SB: >>> ANS {id} {user} {ticket} {session_id} - $this->SB_writeln("ANS $this->id $this->user $ticket $sid"); - $this->SwitchBoardSessionUser=$user; - break; - default: - return false; - } - while((!feof($this->SBfp))&&(!$SessionEnd)) - { - $data = $this->SB_readln(); - if($this->kill_me) - { - $this->debug_message("*** SB Okay, kill me now!"); - break; - } - if($data === false) - { - if(time()-$LastActive > $this->SBIdleTimeout) - { - $this->debug_message("*** SB Idle Timeout!"); - break; - } - if(!$Joined) continue; - foreach($this->SwitchBoardMessageQueue as $Message) - { - if($Message=='') continue; - $aMessage = $this->getMessage($Message); - //CheckEmotion... - $MsnObjDefine=$this->GetMsnObjDefine($aMessage); - if($MsnObjDefine!=='') - { - $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine"; - $len = strlen($SendString); - $this->SB_writeln("MSG $this->id N $len"); - $this->SB_writedata($SendString); - $this->id++; - } - $len = strlen($aMessage); - $this->SB_writeln("MSG $this->id N $len"); - $this->SB_writedata($aMessage); - } - $this->SwitchBoardMessageQueue=array(); - if(!$this->IsIgnoreMail($user)) $LastActive = time(); - continue; - } - $code = substr($data, 0, 3); - switch($code) - { - case 'IRO': - // SB: <<< IRO {id} {rooster} {roostercount} {email} {alias} {clientid} - @list(/* IRO */, /* id */, $cur_num, $total, $email, $alias, $clientid) = @explode(' ', $data); - $this->debug_message("*** $email join us"); - $Joined=true; - break; - case 'BYE': - $this->debug_message("*** Quit for BYE"); - $SessionEnd=true; - break; - case 'USR': - // SB: <<< USR {id} OK {user} {alias} - // we don't need the data, just ignore it - // request user to join this switchboard - // SB: >>> CAL {id} {user} - $this->SB_writeln("CAL $this->id $user"); - break; - case 'CAL': - // SB: <<< CAL {id} RINGING {?} - // we don't need this, just ignore, and wait for other response - $this->id++; - break; - case 'JOI': - // SB: <<< JOI {user} {alias} {clientid?} - // someone join us - // we don't need the data, just ignore it - // no more user here - $Joined=true; - break; - case 'MSG': - // SB: <<< MSG {email} {alias} {len} - @list(/* MSG */, $from_email, /* alias */, $len, ) = @explode(' ', $data); - $len = trim($len); - $data = $this->SB_readdata($len); - $aLines = @explode("\n", $data); - $header = true; - $ignore = false; - $is_p2p = false; - $sMsg = ''; - foreach ($aLines as $line) - { - $line = rtrim($line); - if ($header) { - if ($line === '') { - $header = false; - continue; - } - if (strncasecmp($line, 'TypingUser:', 11) == 0) { - // typing notification, just ignore - $ignore = true; - break; - } - if (strncasecmp($line, 'Chunk:', 6) == 0) { - // we don't handle any split message, just ignore - $ignore = true; - break; - } - if (strncasecmp($line, 'Content-Type: application/x-msnmsgrp2p', 38) == 0) { - // p2p message, ignore it, but we need to send acknowledgement for it... - $is_p2p = true; - $p = strstr($data, "\n\n"); - $sMsg = ''; - if ($p === false) { - $p = strstr($data, "\r\n\r\n"); - if ($p !== false) - $sMsg = substr($p, 4); - } - else - $sMsg = substr($p, 2); - break; - } - if (strncasecmp($line, 'Content-Type: application/x-', 28) == 0) { - // ignore all application/x-... message - // for example: - // application/x-ms-ink => ink message - $ignore = true; - break; - } - if (strncasecmp($line, 'Content-Type: text/x-', 21) == 0) { - // ignore all text/x-... message - // for example: - // text/x-msnmsgr-datacast => nudge, voice clip.... - // text/x-mms-animemoticon => customized animemotion word - $ignore = true; - break; - } - continue; - } - if ($sMsg !== '') - $sMsg .= "\n"; - $sMsg .= $line; - } - if ($ignore) - { - $this->debug_message("*** ingnore from $from_email: $line"); - break; - } - if ($is_p2p) - { - // we will ignore any p2p message after sending acknowledgement - $ignore = true; - $len = strlen($sMsg); - $this->debug_message("*** p2p message from $from_email, size $len"); - // header = 48 bytes - // content >= 0 bytes - // footer = 4 bytes - // so it need to >= 52 bytes - /*if ($len < 52) { - $this->debug_message("*** p2p: size error, less than 52!"); - break; - }*/ - $aDwords = @unpack("V12dword", $sMsg); - if (!is_array($aDwords)) { - $this->debug_message("*** p2p: header unpack error!"); - break; - } - $this->debug_message("*** p2p: dump received message:\n".$this->dump_binary($sMsg)); - $hdr_SessionID = $aDwords['dword1']; - $hdr_Identifier = $aDwords['dword2']; - $hdr_DataOffsetLow = $aDwords['dword3']; - $hdr_DataOffsetHigh = $aDwords['dword4']; - $hdr_TotalDataSizeLow = $aDwords['dword5']; - $hdr_TotalDataSizeHigh = $aDwords['dword6']; - $hdr_MessageLength = $aDwords['dword7']; - $hdr_Flag = $aDwords['dword8']; - $hdr_AckID = $aDwords['dword9']; - $hdr_AckUID = $aDwords['dword10']; - $hdr_AckSizeLow = $aDwords['dword11']; - $hdr_AckSizeHigh = $aDwords['dword12']; - $this->debug_message("*** p2p: header SessionID = $hdr_SessionID"); - $this->debug_message("*** p2p: header Inentifier = $hdr_Identifier"); - $this->debug_message("*** p2p: header Data Offset Low = $hdr_DataOffsetLow"); - $this->debug_message("*** p2p: header Data Offset High = $hdr_DataOffsetHigh"); - $this->debug_message("*** p2p: header Total Data Size Low = $hdr_TotalDataSizeLow"); - $this->debug_message("*** p2p: header Total Data Size High = $hdr_TotalDataSizeHigh"); - $this->debug_message("*** p2p: header MessageLength = $hdr_MessageLength"); - $this->debug_message("*** p2p: header Flag = $hdr_Flag"); - $this->debug_message("*** p2p: header AckID = $hdr_AckID"); - $this->debug_message("*** p2p: header AckUID = $hdr_AckUID"); - $this->debug_message("*** p2p: header AckSize Low = $hdr_AckSizeLow"); - $this->debug_message("*** p2p: header AckSize High = $hdr_AckSizeHigh"); - if($hdr_Flag==2) { - //This is an ACK from SB ignore.... - $this->debug_message("*** p2p: //This is an ACK from SB ignore....:\n"); - break; - } - $MsgBody=$this->linetoArray(substr($sMsg,48,-4)); - $this->debug_message("*** p2p: body".print_r($MsgBody,true)); - if(($MsgBody['EUF-GUID']=='{A4268EEC-FEC5-49E5-95C3-F126696BDBF6}')&&($PictureFilePath=$this->GetPictureFilePath($MsgBody['Context']))) - { - while(true) - { - if($this->SB_readln()===false) break; - } - $this->debug_message("*** p2p: Inv hdr:\n".$this->dump_binary(substr($sMsg,0,48))); - preg_match('/{([0-9A-F\-]*)}/i',$MsgBody['Via'],$Matches); - $BranchGUID=$Matches[1]; - //it's an invite to send a display picture. - $new_id = ~$hdr_Identifier; - $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID, - $new_id, - 0, 0, - $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, - 0, - 2, - $hdr_Identifier, - $hdr_AckID, - $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh); - $footer = pack("L", 0); - $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer"; - $len = strlen($message); - $this->SB_writeln("MSG $this->id D $len"); - $this->SB_writedata($message); - $this->debug_message("*** p2p: send display picture acknowledgement for $hdr_SessionID"); - $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message)); - $this->SB_readln();//Read ACK; - $this->debug_message("*** p2p: Invite ACK Hdr:\n".$this->dump_binary($hdr)); - $new_id-=3; - //Send 200 OK message - $MessageContent="SessionID: ".$MsgBody['SessionID']."\r\n\r\n".pack("C", 0); - $MessagePayload= - "MSNSLP/1.0 200 OK\r\n". - "To: \r\n". - "From: user.">\r\n". - "Via: ".$MsgBody['Via']."\r\n". - "CSeq: ".($MsgBody['CSeq']+1)."\r\n". - "Call-ID: ".$MsgBody['Call-ID']."\r\n". - "Max-Forwards: 0\r\n". - "Content-Type: application/x-msnmsgr-sessionreqbody\r\n". - "Content-Length: ".strlen($MessageContent)."\r\n\r\n". - $MessageContent; - $hdr_TotalDataSizeLow=strlen($MessagePayload); - $hdr_TotalDataSizeHigh=0; - $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID, - $new_id, - 0, 0, - $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, - strlen($MessagePayload), - 0, - rand(), - 0, - 0,0); - - $message = - "MIME-Version: 1.0\r\n". - "Content-Type: application/x-msnmsgrp2p\r\n". - "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer"; - $this->SB_writeln("MSG $this->id D ".strlen($message)); - $this->SB_writedata($message); - $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message)); - $this->SB_readln();//Read ACK; - - $this->debug_message("*** p2p: 200 ok:\n".$this->dump_binary($hdr)); - //send Data preparation message - //send 4 null bytes as data - $hdr_TotalDataSizeLow=4; - $hdr_TotalDataSizeHigh=0; - $new_id++; - $hdr = pack("LLLLLLLLLLLL", - $MsgBody['SessionID'], - $new_id, - 0, 0, - $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, - $hdr_TotalDataSizeLow, - 0, - rand(), - 0, - 0,0); - $message = - "MIME-Version: 1.0\r\n". - "Content-Type: application/x-msnmsgrp2p\r\n". - "P2P-Dest: $from_email\r\n\r\n$hdr".pack('L',0)."$footer"; - $this->SB_writeln("MSG $this->id D ".strlen($message)); - $this->SB_writedata($message); - $this->debug_message("*** p2p: dump send Data preparation message:\n".$this->dump_binary($message)); - $this->debug_message("*** p2p: Data Prepare Hdr:\n".$this->dump_binary($hdr)); - $this->SB_readln();//Read ACK; - - //send Data Content.. - $footer=pack('N',1); - $new_id++; - $FileSize=filesize($PictureFilePath); - if($hTitle=fopen($PictureFilePath,'rb')) - { - $Offset=0; - //$new_id++; - while(!feof($hTitle)) - { - $FileContent=fread($hTitle,1024); - $FileContentSize=strlen($FileContent); - $hdr = pack("LLLLLLLLLLLL", - $MsgBody['SessionID'], - $new_id, - $Offset, 0, - $FileSize,0, - $FileContentSize, - 0x20, - rand(), - 0, - 0,0 - ); - $message = - "MIME-Version: 1.0\r\n". - "Content-Type: application/x-msnmsgrp2p\r\n". - "P2P-Dest: $from_email\r\n\r\n$hdr$FileContent$footer"; - $this->SB_writeln("MSG $this->id D ".strlen($message)); - $this->SB_writedata($message); - $this->debug_message("*** p2p: dump send Data Content message $Offset / $FileSize :\n".$this->dump_binary($message)); - $this->debug_message("*** p2p: Data Content Hdr:\n".$this->dump_binary($hdr)); - //$this->SB_readln();//Read ACK; - $Offset+=$FileContentSize; - } - } - //Send Bye - /* - $MessageContent="\r\n".pack("C", 0); - $MessagePayload= - "BYE MSNMSGR:MSNSLP/1.0\r\n". - "To: \r\n". - "From: user.">\r\n". - "Via: MSNSLP/1.0/TLP ;branch={".$BranchGUID."}\r\n". - "CSeq: 0\r\n". - "Call-ID: ".$MsgBody['Call-ID']."\r\n". - "Max-Forwards: 0\r\n". - "Content-Type: application/x-msnmsgr-sessionclosebody\r\n". - "Content-Length: ".strlen($MessageContent)."\r\n\r\n".$MessageContent; - $footer=pack('N',0); - $hdr_TotalDataSizeLow=strlen($MessagePayload); - $hdr_TotalDataSizeHigh=0; - $new_id++; - $hdr = pack("LLLLLLLLLLLL", - 0, - $new_id, - 0, 0, - $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, - 0, - 0, - rand(), - 0, - 0,0); - $message = - "MIME-Version: 1.0\r\n". - "Content-Type: application/x-msnmsgrp2p\r\n". - "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer"; - $this->SB_writeln("MSG $id D ".strlen($message)); - $id++; - $this->SB_writedata($message); - $this->debug_message("*** p2p: dump send BYE message :\n".$this->dump_binary($message)); - */ - break; - } - //TODO: - //if ($hdr_Flag == 2) { - // just send ACK... - // $this->SB_writeln("ACK $id"); - // break; - //} - if ($hdr_SessionID == 4) { - // ignore? - $this->debug_message("*** p2p: ignore flag 4"); - break; - } - $finished = false; - if ($hdr_TotalDataSizeHigh == 0) { - // only 32 bites size - if (($hdr_MessageLength + $hdr_DataOffsetLow) == $hdr_TotalDataSizeLow) - $finished = true; - } - else { - // we won't accept any file transfer - // so I think we won't get any message size need to use 64 bits - // 64 bits size here, can't count directly... - $totalsize = base_convert(sprintf("%X%08X", $hdr_TotalDataSizeHigh, $hdr_TotalDataSizeLow), 16, 10); - $dataoffset = base_convert(sprintf("%X%08X", $hdr_DataOffsetHigh, $hdr_DataOffsetLow), 16, 10); - $messagelength = base_convert(sprintf("%X", $hdr_MessageLength), 16, 10); - $now_size = bcadd($dataoffset, $messagelength); - if (bccomp($now_size, $totalsize) >= 0) - $finished = true; - } - if (!$finished) { - // ignore not finished split packet - $this->debug_message("*** p2p: ignore split packet, not finished"); - break; - } - //$new_id = ~$hdr_Identifier; - /* - $new_id++; - $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID, - $new_id, - 0, 0, - $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, - 0, - 2, - $hdr_Identifier, - $hdr_AckID, - $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh); - $footer = pack("L", 0); - $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer"; - $len = strlen($message); - $this->SB_writeln("MSG $id D $len"); - $id++; - $this->SB_writedata($message); - $this->debug_message("*** p2p: send acknowledgement for $hdr_SessionID"); - $this->debug_message("*** p2p: dump sent message:\n".$this->dump_binary($hdr.$footer)); - */ - break; - } - $this->debug_message("*** MSG from $from_email: $sMsg"); - $this->ReceivedMessage($from_email,$sMsg,$network,false); - break; - case '217': - $this->debug_message("*** User $user is offline. Try OIM."); - foreach($this->SwitchBoardMessageQueue as $Message) - $this->SendMessage($Message,"$user@Offline"); - $SessionEnd=true; - break; - default: - if (is_numeric($code)) - { - $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; - $this->debug_message("*** SB: $this->error"); - $SessionEnd=true; - } - break; - } - if(!$this->IsIgnoreMail($user)) $LastActive = time(); - } - if (feof($this->SBfp)) - { - // lost connection? error? try OIM later - @fclose($this->SBfp); - return false; - } - $this->SB_writeln("OUT"); - @fclose($this->SBfp); - return true; - } - /*private function switchboard_control($ip, $port, $cki_code, $user, $Messages) - { - $this->SwitchBoardProcess=1; - $this->debug_message("*** SB: try to connect to switchboard server $ip:$port"); - $this->SBfp = @fsockopen($ip, $port, $errno, $errstr, 5); - if (!$this->SBfp) - { - $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr"); - return false; - } - return $this->DoSwitchBoard('Active',array('cki'=>$cki_code, 'user'=>$user,'Msg'=>$Messages)); - } - private function switchboard_ring($ip, $port, $sid, $ticket,$user) - { - $this->SwitchBoardProcess=2; - $this->debug_message("*** SB: try to connect to switchboard server $ip:$port"); - $this->SBfp = @fsockopen($ip, $port, $errno, $errstr, 5); - if (!$this->SBfp) - { - $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr"); - return false; - } - return $this->DoSwitchBoard('Passive',array('sid'=>$sid,'user'=>$user,'ticket'=>$ticket)); - }*/ // read data for specified size private function ns_readdata($size) { @@ -2098,8 +1659,8 @@ class MSN { private function sb_readdata($socket, $size) { $data = ''; $count = 0; - while (!feof($this->SBfp)) { - $buf = @fread($this->SBfp, $size - $count); + while (!feof($socket)) { + $buf = @fread($socket, $size - $count); $data .= $buf; $count += strlen($buf); if ($count >= $size) break; @@ -2137,7 +1698,7 @@ class MSN { // show debug information function debug_message($str) { if (!$this->debug) return; - if($this->debug===STDOUT) echo $str."\n"; + if ($this->debug===STDOUT) echo $str."\n"; /*$fname=MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msn_'.strftime('%Y%m%d').'.debug'; $fp = fopen($fname, 'at'); if ($fp) { @@ -2184,55 +1745,54 @@ class MSN { */ private function MsnObj($FilePath,$Type=3) { - if(!($FileSize=filesize($FilePath))) return ''; - $Location=md5($FilePath); - $Friendly=md5($FilePath.$Type); - if(isset($this->MsnObjMap[$Location])) return $this->MsnObjMap[$Location]; - $sha1d=base64_encode(sha1(file_get_contents($FilePath),true)); - $sha1c=base64_encode(sha1("Creator".$this->user."Size$FileSize"."Type$Type"."Location$Location"."Friendly".$Friendly."SHA1D$sha1d",true)); - $this->MsnObjArray[$Location]=$FilePath; - $MsnObj=''; - $this->MsnObjMap[$Location]=$MsnObj; + if (!($FileSize=filesize($FilePath))) return ''; + $Location = md5($FilePath); + $Friendly = md5($FilePath.$Type); + if (isset($this->MsnObjMap[$Location])) return $this->MsnObjMap[$Location]; + $sha1d = base64_encode(sha1(file_get_contents($FilePath), true)); + $sha1c = base64_encode(sha1("Creator".$this->user."Size$FileSize"."Type$Type"."Location$Location"."Friendly".$Friendly."SHA1D$sha1d",true)); + $this->MsnObjArray[$Location] = $FilePath; + $MsnObj = ''; + $this->MsnObjMap[$Location] = $MsnObj; $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n"); return $MsnObj; } private function linetoArray($lines) { - $lines=str_replace("\r",'',$lines); - $lines=explode("\n",$lines); - foreach($lines as $line) { - if(!isset($line{3})) continue; - list($Key,$Val)=explode(':',$line); - $Data[trim($Key)]=trim($Val); + $lines = str_replace("\r", '', $lines); + $lines = explode("\n", $lines); + foreach ($lines as $line) { + if (!isset($line{3})) continue; + list($Key,$Val) = explode(':', $line); + $Data[trim($Key)] = trim($Val); } return $Data; } - private function GetPictureFilePath($Context) - { - $MsnObj=base64_decode($Context); - if(preg_match('/location="(.*?)"/i',$MsnObj,$Match)) - $location=$Match[1]; + private function GetPictureFilePath($Context) { + $MsnObj = base64_decode($Context); + if (preg_match('/location="(.*?)"/i', $MsnObj, $Match)) + $location = $Match[1]; $this->debug_message("*** p2p: PictureFile[$location] ::All".print_r($this->MsnObjArray,true)."\n"); - if($location&&(isset($this->MsnObjArray[$location]))) - return $this->MsnObjArray[$location]; + if ($location && isset($this->MsnObjArray[$location])) + return $this->MsnObjArray[$location]; return false; } - private function GetMsnObjDefine($Message) - { - $DefineString=''; - if(is_array($this->Emotions)) - foreach($this->Emotions as $Pattern => $FilePath) - { - if(strpos($Message,$Pattern)!==false) - $DefineString.="$Pattern\t".$this->MsnObj($FilePath,2)."\t"; - } + private function GetMsnObjDefine($Message) { + $DefineString = ''; + if (is_array($this->Emotions)) + foreach ($this->Emotions as $Pattern => $FilePath) { + if (strpos($Message, $Pattern)!==false) + $DefineString .= "$Pattern\t".$this->MsnObj($FilePath, 2)."\t"; + } return $DefineString; } /** * Read and handle incoming command from NS + * + * @return void */ private function nsReceive() { // Sign in again if not signed in or socket failed @@ -2244,15 +1804,14 @@ class MSN { } $data = $this->ns_readln(); - if($data === false) { + if ($data === false) { // There was no data / an error when reading from the socket so reconnect $this->callHandler('Reconnect'); $this->NSRetryWait($this->retry_wait); $this->signon(); return; } else { - switch (substr($data,0,3)) - { + switch (substr($data, 0, 3)) { case 'SBS': // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us // NS: <<< SBS 0 null @@ -2274,67 +1833,63 @@ class MSN { case 'LST': // NS: <<< LST {email} {alias} 11 0 - @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data); + @list(/* LST */, $email, /* alias */,) = @explode(' ', $data); @list($u_name, $u_domain) = @explode('@', $email); if (!isset($this->aContactList[$u_domain][$u_name][1])) { $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow'; - $this->debug_message("*** add to our contact list: $u_name@$u_domain"); + $this->debug_message("*** Added to contact list: $u_name@$u_domain"); } break; case 'ADL': - // randomly, we get ADL command, someome add us to their contact list for MSNP15 + // randomly, we get ADL command, someone add us to their contact list for MSNP15 // NS: <<< ADL 0 {size} @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) - { + if (is_numeric($size) && $size > 0) { $data = $this->ns_readdata($size); preg_match('##', $data, $matches); - if (is_array($matches) && count($matches) > 0) - { + if (is_array($matches) && count($matches) > 0) { $u_domain = $matches[1]; $u_name = $matches[2]; $network = $matches[4]; if (isset($this->aContactList[$u_domain][$u_name][$network])) - $this->debug_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain"); + $this->debug_message("*** Someone (network: $network) added us to their list (but already in our list): $u_name@$u_domain"); else { $re_login = false; $cnt = 0; - foreach (array('Allow', 'Reverse') as $list) - { - if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) - { + foreach (array('Allow', 'Reverse') as $list) { + if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { if ($re_login) { - $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list"); continue; } $aTickets = $this->get_passport_ticket(); if (!$aTickets || !is_array($aTickets)) { // failed to login? ignore it - $this->debug_message("*** can't re-login, something wrong here"); - $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + $this->debug_message("*** Could not re-login, something wrong here"); + $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list"); continue; } $re_login = true; $this->ticket = $aTickets; - $this->debug_message("**** get new ticket, try it again"); - if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) - { - $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list"); + $this->debug_message("**** Got new ticket, trying again"); + if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { + $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list"); continue; } } $this->aContactList[$u_domain][$u_name][$network][$list] = false; $cnt++; } - $this->debug_message("*** someone (network: $network) add us to their list: $u_name@$u_domain"); + $this->debug_message("*** Someone (network: $network) added us to their list: $u_name@$u_domain"); } $str = ''; $len = strlen($str); + + $this->callHandler('AddedToList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network)); } else - $this->debug_message("*** someone add us to their list: $data"); - $this->AddUsToMemberList($u_name.'@'.$u_domain, $network); + $this->debug_message("*** Someone added us to their list: $data"); } break; @@ -2342,29 +1897,29 @@ class MSN { // randomly, we get RML command, someome remove us to their contact list for MSNP15 // NS: <<< RML 0 {size} @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) - { + if (is_numeric($size) && $size > 0) { $data = $this->ns_readdata($size); preg_match('##', $data, $matches); - if (is_array($matches) && count($matches) > 0) - { + if (is_array($matches) && count($matches) > 0) { $u_domain = $matches[1]; $u_name = $matches[2]; $network = $matches[4]; - if (isset($this->aContactList[$u_domain][$u_name][$network])) - { + if (isset($this->aContactList[$u_domain][$u_name][$network])) { $aData = $this->aContactList[$u_domain][$u_name][$network]; + foreach ($aData as $list => $id) - $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list); + $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list); + unset($this->aContactList[$u_domain][$u_name][$network]); - $this->debug_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain"); + $this->debug_message("*** Someone (network: $network) removed us from their list: $u_name@$u_domain"); } else - $this->debug_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain"); - $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network); + $this->debug_message("*** Someone (network: $network) removed us from their list (but not in our list): $u_name@$u_domain"); + + $this->callHandler('RemovedFromList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network)); } else - $this->debug_message("*** someone remove us from their list: $data"); + $this->debug_message("*** Someone removed us from their list: $data"); } break; @@ -2386,8 +1941,7 @@ class MSN { continue; } if (strncasecmp($line, 'Content-Type:', 13) == 0) { - if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && - strpos($line, 'text/x-msmsgsoimnotification') === false) { + if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && strpos($line, 'text/x-msmsgsoimnotification') === false) { // we just need text/x-msmsgsinitialmdatanotification // or text/x-msmsgsoimnotification $ignore = true; @@ -2402,32 +1956,33 @@ class MSN { } } if ($ignore) { - $this->debug_message("*** ingnore MSG for: $line"); + $this->debug_message("*** Ignoring MSG for: $line"); break; } if ($maildata == '') { - $this->debug_message("*** ingnore MSG not for OIM"); + $this->debug_message("*** Ignoring MSG not for OIM"); break; } $re_login = false; if (strcasecmp($maildata, 'too-large') == 0) { - $this->debug_message("*** large mail-data, need to get the data via SOAP"); + $this->debug_message("*** Large mail-data, need to get the data via SOAP"); $maildata = $this->getOIM_maildata(); if ($maildata === false) { - $this->debug_message("*** can't get mail-data via SOAP"); + $this->debug_message("*** Could not get mail-data via SOAP"); + // maybe we need to re-login again $aTickets = $this->get_passport_ticket(); if (!$aTickets || !is_array($aTickets)) { // failed to login? ignore it - $this->debug_message("*** can't re-login, something wrong here, ignore this OIM"); + $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM"); break; } $re_login = true; $this->ticket = $aTickets; - $this->debug_message("*** get new ticket, try it again"); + $this->debug_message("*** Got new ticket, trying again"); $maildata = $this->getOIM_maildata(); if ($maildata === false) { - $this->debug_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM"); + $this->debug_message("*** Could not get mail-data via SOAP, and re-login already attempted, ignoring this OIM"); break; } } @@ -2445,7 +2000,7 @@ class MSN { $p = substr($p, $end); } if (count($aOIMs) == 0) { - $this->debug_message("*** ingnore empty OIM"); + $this->debug_message("*** Ignoring empty OIM"); break; } foreach ($aOIMs as $maildata) { @@ -2460,23 +2015,23 @@ class MSN { // N: sender alias preg_match('#(.*)#', $maildata, $matches); if (count($matches) == 0) { - $this->debug_message("*** ingnore OIM maildata without type"); + $this->debug_message("*** Ignoring OIM maildata without type"); continue; } $oim_type = $matches[1]; if ($oim_type = 13) - $network = 32; + $network = 32; else - $network = 1; + $network = 1; preg_match('#(.*)#', $maildata, $matches); if (count($matches) == 0) { - $this->debug_message("*** ingnore OIM maildata without sender"); + $this->debug_message("*** Ignoring OIM maildata without sender"); continue; } $oim_sender = $matches[1]; preg_match('#(.*)#', $maildata, $matches); if (count($matches) == 0) { - $this->debug_message("*** ingnore OIM maildata without msgid"); + $this->debug_message("*** Ignoring OIM maildata without msgid"); continue; } $oim_msgid = $matches[1]; @@ -2484,18 +2039,18 @@ class MSN { $oim_size = (count($matches) == 0) ? 0 : $matches[1]; preg_match('#(.*)#', $maildata, $matches); $oim_time = (count($matches) == 0) ? 0 : $matches[1]; - $this->debug_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); + $this->debug_message("*** OIM received from $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); $sMsg = $this->getOIM_message($oim_msgid); if ($sMsg === false) { - $this->debug_message("*** can't get OIM, msgid = $oim_msgid"); + $this->debug_message("*** Could not get OIM, msgid = $oim_msgid"); if ($re_login) { - $this->debug_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM"); continue; } $aTickets = $this->get_passport_ticket(); if (!$aTickets || !is_array($aTickets)) { // failed to login? ignore it - $this->debug_message("*** can't re-login, something wrong here, ignore this OIM"); + $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM"); continue; } $re_login = true; @@ -2503,13 +2058,11 @@ class MSN { $this->debug_message("*** get new ticket, try it again"); $sMsg = $this->getOIM_message($oim_msgid); if ($sMsg === false) { - $this->debug_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM"); + $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM"); continue; } } $this->debug_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg"); - - //$this->ReceivedMessage($oim_sender,$sMsg,$network,true); $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true)); } } @@ -2519,8 +2072,7 @@ class MSN { // randomly, we get UBM, this is the message from other network, like Yahoo! // NS: <<< UBM {email} $network $type {size} @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) - { + if (is_numeric($size) && $size > 0) { $data = $this->ns_readdata($size); $aLines = @explode("\n", $data); $header = true; @@ -2546,13 +2098,11 @@ class MSN { $sMsg .= $str; } } - if($ignore) - { - $this->debug_message("*** ingnore from $from_email: $line"); + if ($ignore) { + $this->debug_message("*** Ignoring message from $from_email: $line"); break; } $this->debug_message("*** MSG from $from_email (network: $network): $sMsg"); - //$this->ReceivedMessage($from_email,$sMsg,$network,false); $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false)); } break; @@ -2563,7 +2113,7 @@ class MSN { @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data); // we don't need the notification data, so just ignore it if (is_numeric($size) && $size > 0) - $this->ns_readdata($size); + $this->ns_readdata($size); break; case 'CHL': @@ -2576,7 +2126,7 @@ class MSN { $this->ns_writeln("QRY $this->id $this->prod_id 32"); $this->ns_writedata($fingerprint); $this->ns_writeln("CHG $this->id NLN $this->clientid"); - if($this->PhotoStickerFile!==false) + if ($this->PhotoStickerFile !== false) $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); break; case 'CHG': @@ -2601,41 +2151,10 @@ class MSN { $this->NSLogout(); continue; } - if(count($this->MessageQueue)) - { - foreach($this->MessageQueue as $User => $Message) - { - //$this->ChildProcess[$ChildPid] - $this->debug_message("*** XFR SB $User"); - $pid=pcntl_fork(); - if($pid) - { - //Parrent Process - $this->ChildProcess[$pid]=$User; - break; - } - elseif($pid==-1) - { - $this->debug_message("*** Fork Error $User"); - break; - } - else - { - //Child Process - $this->debug_message("*** Child Process Start for $User"); - unset($Message['XFRSent']); - unset($Message['ReqTime']); + + $this->debug_message("NS: <<< XFR SB"); + $user = array_shift($this->waitingForXFR); $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message); - if ($bSBresult === false) - { - // error for switchboard - $this->debug_message("!!! error for sending message to ".$User); - } - die; - } - } - unset($this->MessageQueue[$User]); - } /* $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage); if ($bSBresult === false) { @@ -2651,7 +2170,7 @@ class MSN { break; case 'RNG': - if($this->PhotoStickerFile!==false) + if ($this->PhotoStickerFile !== false) $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); else $this->ns_writeln("CHG $this->id NLN $this->clientid"); @@ -2660,32 +2179,9 @@ class MSN { $this->debug_message("NS: <<< RNG $data"); @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data); @list($sb_ip, $sb_port) = @explode(':', $server); - if($this->IsIgnoreMail($email)) - { - $this->debug_message("*** Ignore RNG from $email"); - break; - } $this->debug_message("*** RING from $email, $sb_ip:$sb_port"); - $this->addContact($email,1,$email, true); - $pid=pcntl_fork(); - if($pid) - { - //Parrent Process - $this->ChildProcess[$pid]='RNG'; - break; - } - elseif($pid==-1) - { - $this->debug_message("*** Fork Error $User"); - break; - } - else - { - //Child Process - $this->debug_message("*** Ring Child Process Start for $User"); - $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email); - die; - } + $this->addContact($email, 1, $email, true); + $this->connectToSBSession('Passive', $sb_ip, $sb_port, $email, array('sid' => $sid, 'ticket' => $ticket)); break; case 'OUT': // force logout from NS @@ -2710,8 +2206,428 @@ class MSN { * Read and handle incoming command/message from * a switchboard session socket */ - private function sbReceive() { + private function sbReceive($socket) { + $intsocket = (int) $socket; + $session = &$this->switchBoardSessions[$intsocket]; + if (feof($socket)) { + // Unset session lookup value + unset($this->switchBoardSessionLookup[$session['to']]); + + // Unset session itself + unset($this->switchBoardSessions[$intsocket]); + return; + } + + $id = &$session['id']; + + $data = $this->sb_readln($socket); + $code = substr($data, 0, 3); + switch($code) { + case 'IRO': + // SB: <<< IRO {id} {rooster} {roostercount} {email} {alias} {clientid} + @list(/* IRO */, /* id */, $cur_num, $total, $email, $alias, $clientid) = @explode(' ', $data); + $this->debug_message("*** $email joined session"); + $session['joined'] = true; + break; + case 'BYE': + $this->debug_message("*** Quit for BYE"); + $this->endSBSession(); + break; + case 'USR': + // SB: <<< USR {id} OK {user} {alias} + // we don't need the data, just ignore it + // request user to join this switchboard + // SB: >>> CAL {id} {user} + $this->sb_writeln($socket, $id, "CAL $this->id $user"); + break; + case 'CAL': + // SB: <<< CAL {id} RINGING {?} + // we don't need this, just ignore, and wait for other response + $session['id']++; + break; + case 'JOI': + // SB: <<< JOI {user} {alias} {clientid?} + // someone join us + // we don't need the data, just ignore it + // no more user here + $session['joined'] = true; + break; + case 'MSG': + // SB: <<< MSG {email} {alias} {len} + @list(/* MSG */, $from_email, /* alias */, $len, ) = @explode(' ', $data); + $len = trim($len); + $data = $this->sb_readdata($socket, $len); + $aLines = @explode("\n", $data); + $header = true; + $ignore = false; + $is_p2p = false; + $sMsg = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + if (strncasecmp($line, 'TypingUser:', 11) == 0) { + // typing notification, just ignore + $ignore = true; + break; + } + if (strncasecmp($line, 'Chunk:', 6) == 0) { + // we don't handle any split message, just ignore + $ignore = true; + break; + } + if (strncasecmp($line, 'Content-Type: application/x-msnmsgrp2p', 38) == 0) { + // p2p message, ignore it, but we need to send acknowledgement for it... + $is_p2p = true; + $p = strstr($data, "\n\n"); + $sMsg = ''; + if ($p === false) { + $p = strstr($data, "\r\n\r\n"); + if ($p !== false) + $sMsg = substr($p, 4); + } + else + $sMsg = substr($p, 2); + break; + } + if (strncasecmp($line, 'Content-Type: application/x-', 28) == 0) { + // ignore all application/x-... message + // for example: + // application/x-ms-ink => ink message + $ignore = true; + break; + } + if (strncasecmp($line, 'Content-Type: text/x-', 21) == 0) { + // ignore all text/x-... message + // for example: + // text/x-msnmsgr-datacast => nudge, voice clip.... + // text/x-mms-animemoticon => customized animemotion word + $ignore = true; + break; + } + continue; + } + if ($sMsg !== '') + $sMsg .= "\n"; + $sMsg .= $line; + } + if ($ignore) { + $this->debug_message("*** Ignoring SB data from $from_email: $line"); + break; + } + if ($is_p2p) { + // we will ignore any p2p message after sending acknowledgement + $ignore = true; + $len = strlen($sMsg); + $this->debug_message("*** p2p message from $from_email, size $len"); + // header = 48 bytes + // content >= 0 bytes + // footer = 4 bytes + // so it need to >= 52 bytes + /*if ($len < 52) { + $this->debug_message("*** p2p: size error, less than 52!"); + break; + }*/ + $aDwords = @unpack("V12dword", $sMsg); + if (!is_array($aDwords)) { + $this->debug_message("*** p2p: header unpack error!"); + break; + } + $this->debug_message("*** p2p: dump received message:\n".$this->dump_binary($sMsg)); + $hdr_SessionID = $aDwords['dword1']; + $hdr_Identifier = $aDwords['dword2']; + $hdr_DataOffsetLow = $aDwords['dword3']; + $hdr_DataOffsetHigh = $aDwords['dword4']; + $hdr_TotalDataSizeLow = $aDwords['dword5']; + $hdr_TotalDataSizeHigh = $aDwords['dword6']; + $hdr_MessageLength = $aDwords['dword7']; + $hdr_Flag = $aDwords['dword8']; + $hdr_AckID = $aDwords['dword9']; + $hdr_AckUID = $aDwords['dword10']; + $hdr_AckSizeLow = $aDwords['dword11']; + $hdr_AckSizeHigh = $aDwords['dword12']; + $this->debug_message("*** p2p: header SessionID = $hdr_SessionID"); + $this->debug_message("*** p2p: header Inentifier = $hdr_Identifier"); + $this->debug_message("*** p2p: header Data Offset Low = $hdr_DataOffsetLow"); + $this->debug_message("*** p2p: header Data Offset High = $hdr_DataOffsetHigh"); + $this->debug_message("*** p2p: header Total Data Size Low = $hdr_TotalDataSizeLow"); + $this->debug_message("*** p2p: header Total Data Size High = $hdr_TotalDataSizeHigh"); + $this->debug_message("*** p2p: header MessageLength = $hdr_MessageLength"); + $this->debug_message("*** p2p: header Flag = $hdr_Flag"); + $this->debug_message("*** p2p: header AckID = $hdr_AckID"); + $this->debug_message("*** p2p: header AckUID = $hdr_AckUID"); + $this->debug_message("*** p2p: header AckSize Low = $hdr_AckSizeLow"); + $this->debug_message("*** p2p: header AckSize High = $hdr_AckSizeHigh"); + if ($hdr_Flag == 2) { + //This is an ACK from SB ignore.... + $this->debug_message("*** p2p: //This is an ACK from SB ignore....:\n"); + break; + } + $MsgBody = $this->linetoArray(substr($sMsg, 48, -4)); + $this->debug_message("*** p2p: body".print_r($MsgBody, true)); + if (($MsgBody['EUF-GUID']=='{A4268EEC-FEC5-49E5-95C3-F126696BDBF6}')&&($PictureFilePath=$this->GetPictureFilePath($MsgBody['Context']))) { + while (true) { + if ($this->sb_readln($socket) === false) break; + } + $this->debug_message("*** p2p: Inv hdr:\n".$this->dump_binary(substr($sMsg, 0, 48))); + preg_match('/{([0-9A-F\-]*)}/i', $MsgBody['Via'], $Matches); + $BranchGUID = $Matches[1]; + //it's an invite to send a display picture. + $new_id = ~$hdr_Identifier; + $hdr = pack( + "LLLLLLLLLLLL", $hdr_SessionID, + $new_id, + 0, 0, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, + 0, + 2, + $hdr_Identifier, + $hdr_AckID, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh + ); + $footer = pack("L", 0); + $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer"; + $len = strlen($message); + $this->sb_writeln($socket, $id, "MSG $this->id D $len"); + $this->sb_writedata($socket, $message); + $this->debug_message("*** p2p: send display picture acknowledgement for $hdr_SessionID"); + $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message)); + $this->sb_readln($socket); // Read ACK; + $this->debug_message("*** p2p: Invite ACK Hdr:\n".$this->dump_binary($hdr)); + $new_id -= 3; + //Send 200 OK message + $MessageContent="SessionID: ".$MsgBody['SessionID']."\r\n\r\n".pack("C", 0); + $MessagePayload= + "MSNSLP/1.0 200 OK\r\n". + "To: \r\n". + "From: user.">\r\n". + "Via: ".$MsgBody['Via']."\r\n". + "CSeq: ".($MsgBody['CSeq']+1)."\r\n". + "Call-ID: ".$MsgBody['Call-ID']."\r\n". + "Max-Forwards: 0\r\n". + "Content-Type: application/x-msnmsgr-sessionreqbody\r\n". + "Content-Length: ".strlen($MessageContent)."\r\n\r\n". + $MessageContent; + $hdr_TotalDataSizeLow=strlen($MessagePayload); + $hdr_TotalDataSizeHigh=0; + $hdr = pack( + "LLLLLLLLLLLL", $hdr_SessionID, + $new_id, + 0, 0, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, + strlen($MessagePayload), + 0, + rand(), + 0, + 0, 0 + ); + + $message = + "MIME-Version: 1.0\r\n". + "Content-Type: application/x-msnmsgrp2p\r\n". + "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer"; + $this->sb_writeln($socket, $id, "MSG $this->id D ".strlen($message)); + $this->sb_writedata($socket, $message); + $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message)); + $this->sb_readln($socket); // Read ACK; + + $this->debug_message("*** p2p: 200 ok:\n".$this->dump_binary($hdr)); + // send data preparation message + // send 4 null bytes as data + $hdr_TotalDataSizeLow = 4; + $hdr_TotalDataSizeHigh = 0 ; + $new_id++; + $hdr = pack( + "LLLLLLLLLLLL", + $MsgBody['SessionID'], + $new_id, + 0, 0, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, + $hdr_TotalDataSizeLow, + 0, + rand(), + 0, + 0, 0 + ); + $message = + "MIME-Version: 1.0\r\n". + "Content-Type: application/x-msnmsgrp2p\r\n". + "P2P-Dest: $from_email\r\n\r\n$hdr".pack('L', 0)."$footer"; + $this->sb_writeln($socket, $id, "MSG $this->id D ".strlen($message)); + $this->sb_writedata($socket, $message); + $this->debug_message("*** p2p: dump send Data preparation message:\n".$this->dump_binary($message)); + $this->debug_message("*** p2p: Data Prepare Hdr:\n".$this->dump_binary($hdr)); + $this->sb_readln($socket); // Read ACK; + + // send Data Content.. + $footer=pack('N',1); + $new_id++; + $FileSize=filesize($PictureFilePath); + if ($hTitle=fopen($PictureFilePath,'rb')) { + $Offset = 0; + //$new_id++; + while (!feof($hTitle)) { + $FileContent = fread($hTitle, 1024); + $FileContentSize = strlen($FileContent); + $hdr = pack( + "LLLLLLLLLLLL", + $MsgBody['SessionID'], + $new_id, + $Offset, 0, + $FileSize, 0, + $FileContentSize, + 0x20, + rand(), + 0, + 0, 0 + ); + $message = + "MIME-Version: 1.0\r\n". + "Content-Type: application/x-msnmsgrp2p\r\n". + "P2P-Dest: $from_email\r\n\r\n$hdr$FileContent$footer"; + $this->sb_writeln($socket, $id, "MSG $this->id D ".strlen($message)); + $this->sb_writedata($socket, $message); + $this->debug_message("*** p2p: dump send Data Content message $Offset / $FileSize :\n".$this->dump_binary($message)); + $this->debug_message("*** p2p: Data Content Hdr:\n".$this->dump_binary($hdr)); + //$this->SB_readln($socket);//Read ACK; + $Offset += $FileContentSize; + } + } + //Send Bye + /* + $MessageContent="\r\n".pack("C", 0); + $MessagePayload= + "BYE MSNMSGR:MSNSLP/1.0\r\n". + "To: \r\n". + "From: user.">\r\n". + "Via: MSNSLP/1.0/TLP ;branch={".$BranchGUID."}\r\n". + "CSeq: 0\r\n". + "Call-ID: ".$MsgBody['Call-ID']."\r\n". + "Max-Forwards: 0\r\n". + "Content-Type: application/x-msnmsgr-sessionclosebody\r\n". + "Content-Length: ".strlen($MessageContent)."\r\n\r\n".$MessageContent; + $footer=pack('N',0); + $hdr_TotalDataSizeLow=strlen($MessagePayload); + $hdr_TotalDataSizeHigh=0; + $new_id++; + $hdr = pack("LLLLLLLLLLLL", + 0, + $new_id, + 0, 0, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, + 0, + 0, + rand(), + 0, + 0,0); + $message = + "MIME-Version: 1.0\r\n". + "Content-Type: application/x-msnmsgrp2p\r\n". + "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer"; + $this->sb_writeln($socket, $id, "MSG $id D ".strlen($message)); + $id++; + $this->sb_writedata($socket, $message); + $this->debug_message("*** p2p: dump send BYE message :\n".$this->dump_binary($message)); + */ + break; + } + //TODO: + //if ($hdr_Flag == 2) { + // just send ACK... + // $this->sb_writeln($socket, $id, "ACK $id"); + // break; + //} + if ($hdr_SessionID == 4) { + // ignore? + $this->debug_message("*** p2p: ignore flag 4"); + break; + } + $finished = false; + if ($hdr_TotalDataSizeHigh == 0) { + // only 32 bites size + if (($hdr_MessageLength + $hdr_DataOffsetLow) == $hdr_TotalDataSizeLow) + $finished = true; + } + else { + // we won't accept any file transfer + // so I think we won't get any message size need to use 64 bits + // 64 bits size here, can't count directly... + $totalsize = base_convert(sprintf("%X%08X", $hdr_TotalDataSizeHigh, $hdr_TotalDataSizeLow), 16, 10); + $dataoffset = base_convert(sprintf("%X%08X", $hdr_DataOffsetHigh, $hdr_DataOffsetLow), 16, 10); + $messagelength = base_convert(sprintf("%X", $hdr_MessageLength), 16, 10); + $now_size = bcadd($dataoffset, $messagelength); + if (bccomp($now_size, $totalsize) >= 0) + $finished = true; + } + if (!$finished) { + // ignore not finished split packet + $this->debug_message("*** p2p: ignore split packet, not finished"); + break; + } + //$new_id = ~$hdr_Identifier; + /* + $new_id++; + $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID, + $new_id, + 0, 0, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh, + 0, + 2, + $hdr_Identifier, + $hdr_AckID, + $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh); + $footer = pack("L", 0); + $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer"; + $len = strlen($message); + $this->sb_writeln($socket, $id, "MSG $id D $len"); + $id++; + $this->sb_writedata($socket, $message); + $this->debug_message("*** p2p: send acknowledgement for $hdr_SessionID"); + $this->debug_message("*** p2p: dump sent message:\n".$this->dump_binary($hdr.$footer)); + */ + break; + } + $this->debug_message("*** MSG from $from_email: $sMsg"); + $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false)); + break; + case '217': + $this->debug_message("*** User $user is offline. Trying OIM."); + $session['offline'] = true; + break; + default: + if (is_numeric($code)) { + $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; + $this->debug_message("*** SB: $this->error"); + $sessionEnd=true; + } + break; + } + } + + /** + * Called when we want to end a switchboard session + * or a switchboard session ends + * + * @param resource $socket Socket + * @param boolean $killsession Whether to delete the session + * @return void + */ + private function endSBSession($socket, $killsession = false) { + if (!self::socketcheck($socket)) { + $this->sb_writeln($socket, $fake = 0, 'OUT'); + } + @fclose($socket); + + // Unset session lookup value + $intsocket = (int) $socket; + unset($this->switchBoardSessionLookup[$this->switchBoardSessions[$intsocket]['to']]); + + // Unset session itself + unset($this->switchBoardSessions[$intsocket]); } /** @@ -2722,16 +2638,16 @@ class MSN { * @return void */ public function receive() { - //First, get an array of sockets that have data that is ready to be read + // First, get an array of sockets that have data that is ready to be read $ready = array(); $ready = $this->getSockets(); - $numrdy = stream_select($ready, $w = NULL, $x = NULL,NULL); + $numrdy = stream_select($ready, $w = NULL, $x = NULL, NULL); - //Now that we've waited for something, go through the $ready - //array and read appropriately + // Now that we've waited for something, go through the $ready + // array and read appropriately - for($i = 0;$iNSfp) { + foreach ($ready as $socket) { + if ($socket == $this->NSfp) { $this->nsReceive(); } else { $this->sbReceive($socket); @@ -2741,21 +2657,29 @@ class MSN { /** * Send a request for a switchboard session - * @param String $to Target email for switchboard session + * + * @param string $to Target email for switchboard session */ private function reqSBSession($to) { $this->debug_message("*** Request SB for $to"); $this->ns_writeln("XFR $this->id SB"); // Add to the queue of those waiting for a switchboard session reponse - $this->switchBoardSessions[$to] = array('socket' => NULL, 'id' => 1, 'lastActive' => NULL, 'joined' => false, 'XFRReqTime' => time()); + $this->switchBoardSessions[$to] = array( + 'to' => $to, + 'socket' => NULL, + 'id' => 1, + 'joined' => false, + 'offline' => false, + 'XFRReqTime' => time() + ); $this->waitingForXFR[] = &$this->switchBoardSessions[$to]; } /** * Following an XFR or RNG, connect to the switchboard session * - * @param string $mode Mode, either 'Active' (in the case of XFR) or 'Passive' (in the case or RNG) + * @param string $mode Mode, either 'Active' (in the case of XFR) or 'Passive' (in the case of RNG) * @param string $ip IP of Switchboard * @param integer $port Port of Switchboard * @param string $to User on other end of Switchboard @@ -2763,21 +2687,35 @@ class MSN { * @return boolean true if successful */ private function connectToSBSession($mode, $ip, $port, $to, $param) { - $this->debug_message("*** SB: try to connect to switchboard server $ip:$port"); + $this->debug_message("*** SB: Trying to connect to switchboard server $ip:$port"); - $this->switchBoardSessions[$to]['socket'] = @fsockopen($ip, $port, $errno, $errstr, 5); - $socket = $this->switchBoardSessions[$to]['socket']; - if(!$socket) { + $socket = @fsockopen($ip, $port, $errno, $errstr, $this->timeout); + if (!$socket) { $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr"); return false; } - $this->switchBoardSockets[(int) $socket] = $socket; - stream_set_timeout($socket, $this->SBStreamTimeout); + // Store the socket in the lookup array + $this->switchBoardSessionLookup[$to] = $socket; - $id = &$this->switchBoardSessions[$to]['id']; + // Store the socket in the sessions array + $intsocket = (int) $socket; + $this->switchBoardSessions[$to] = array( + 'to' => $to, + 'socket' => $socket, + 'id' => 1, + 'joined' => false, + 'offline' => false, + 'XFRReqTime' => time() + ); - if($mode == 'Active') { + // Change the index of the session to the socket + $this->switchBoardSessions[$intsocket] = $this->switchBoardSessions[$to]; + unset($this->switchBoardSessions[$to]); + + $id = &$this->switchBoardSessions[$intsocket]['id']; + + if ($mode == 'Active') { $cki_code = $param['cki']; // SB: >>> USR {id} {user} {cki} @@ -2790,8 +2728,6 @@ class MSN { // SB: >>> ANS {id} {user} {ticket} {session_id} $this->sb_writeln($socket, $id, "ANS $id $this->user $ticket $sid"); } - - $this->switchBoardSessions[$to]['lastActive'] = time(); } /** @@ -2802,24 +2738,23 @@ class MSN { * @return boolean true on success */ private function sendMessageViaSB($to, $message) { - if(socketcheck($this->switchBoardSessions[$to]['socket'])) { - $this->reqSBSession($to); + $socket = $this->switchBoardSessionLookup[$to]; + if (self::socketcheck($socket)) { return false; } - if(!$this->switchBoardSessions[$to]['joined']) { + if (!$this->switchBoardSessions[$to]['joined']) { // If our participant has not joined the session yet we can't message them! return false; } - $id = &$this->switchBoardSessions[$to]['id']; - $socket = $this->switchBoardSessions[$to]['socket']; + $intsocket = (int) $socket; + $id = &$this->switchBoardSessions[$intsocket]['id']; $aMessage = $this->getMessage($Message); //CheckEmotion... $MsnObjDefine=$this->GetMsnObjDefine($aMessage); - if($MsnObjDefine !== '') - { + if ($MsnObjDefine !== '') { $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine"; $len = strlen($SendString); // TODO handle failure during write to socket @@ -2838,9 +2773,11 @@ class MSN { /** * Send offline message + * * @param string $to Intended recipient * @param string $sMessage Message * @param string $lockkey Lock key + * @return mixed true on success or error data */ private function sendOIM($to, $sMessage, $lockkey) { $XML = ' @@ -2949,17 +2886,19 @@ X-OIM-Sequence-Num: 1 /** * Send a message to a user on another network * - * @param $message Message - * @param $to Intended recipient - * @param $network Network + * @param string $to Intended recipient + * @param string $message Message + * @param integer $network Network * @return void */ - private function sendOtherNetworkMessage($message, $to, $network) { + private function sendOtherNetworkMessage($to, $message, $network) { $message = $this->getMessage($message, $network); $len = strlen($message); + // TODO Introduce error checking for message sending $this->ns_writeln("UUM $this->id $to $network 1 $len"); $this->ns_writedata($Message); $this->debug_message("*** Sent to $to (network: $network):\n$Message"); + return true; } /** @@ -2971,21 +2910,35 @@ X-OIM-Sequence-Num: 1 * @param string $message Message */ public function sendMessage($to, $message) { - if($message != '') { + if ($message != '') { list($name, $host, $network) = explode('@', $to); $network = $network == '' ? 1 : $network; + $recipient = $name.$host; - if ($network === 1 && $this->switchBoardSessions[$to]['socket'] !== NULL) { - $recipient = $name . $host; - $this->debug_message("*** Attempting to send message to $recipient using existing SB session"); - - if ($this->sendMessageViaSB($message, $recipient)) { - $this->debug_message('*** Message sent successfully'); - return true; - } else { - $this->debug_message('*** Message sending failed, requesting new SB session'); - $this->reqSBSession($to); + if ($network === 1) { + if (!isset($this->switchBoardSessionLookup[$recipient]) && (!isset($this->switchBoardSessions[$recipient]) + || time() - $this->switchBoardSessions[$recipient]['XFRReqTime'] > $this->XFRReqTimeout)) { + $this->debug_message("*** No existing SB session or request has timed out"); + $this->reqSBSession($recipient); return false; + } else { + $socket = $this->switchBoardSessionLookup[$to]; + if ($this->switchBoardSessions[(int) $socket]['offline']) { + $this->debug_message("*** Contact ($recipient) offline, sending OIM"); + $this->endSBSession($socket); + return $this->sendMessage($recipient.'@Offline', $message); + } else { + $this->debug_message("*** Attempting to send message to $recipient using existing SB session"); + + if ($this->sendMessageViaSB($recipient, $message)) { + $this->debug_message('*** Message sent successfully'); + return true; + } else { + $this->debug_message('*** Message sending failed, requesting new SB session'); + $this->reqSBSession($to); + return false; + } + } } } elseif ($network == 'Offline') { //Send OIM @@ -2993,7 +2946,7 @@ X-OIM-Sequence-Num: 1 $lockkey = ''; $re_login = false; for ($i = 0; $i < $this->oim_try; $i++) { - if (($oim_result = $this->sendOIM($to, $message, $lockkey)) === true) break; + if (($oim_result = $this->sendOIM($recipient, $message, $lockkey)) === true) break; if (is_array($oim_result) && $oim_result['challenge'] !== false) { // need challenge lockkey $this->debug_message("*** Need challenge code for ".$oim_result['challenge']); @@ -3002,14 +2955,14 @@ X-OIM-Sequence-Num: 1 } if ($oim_result === false || $oim_result['auth_policy'] !== false) { if ($re_login) { - $this->debug_message("*** Can't send OIM, but we already re-logged-in again, so ignore this OIM"); - return true; + $this->debug_message("*** Can't send OIM, but we already re-logged-in again, so returning false"); + return false; } $this->debug_message("*** Can't send OIM, maybe ticket expired, trying to login again"); // Maybe we need to re-login again if (!$this->get_passport_ticket()) { - $this->debug_message("*** Can't re-login, something went wrong here, ignore this OIM"); + $this->debug_message("*** Can't re-login, something went wrong here, returning false"); return false; } $this->debug_message("*** Getting new ticket and trying again"); @@ -3017,27 +2970,13 @@ X-OIM-Sequence-Num: 1 } } } else { - $this->debug_message("*** Not MSN network or no existing SB session"); - $this->reqSBSession($to); - return false; + // Other network + return $this->sendOtherNetworkMessage($recipient, $message, $network); } } return true; } - //FIXME Not sure if this is needed? - private function endSBSession($socket) { - if (feof($socket)) { - // lost connection? error? try OIM later - @fclose($socket); - return false; - } - $fake = 0; - $this->sb_writeln($socket, $fake, "OUT"); - @fclose($socket); - return true; - } - /** * Sends a ping command * @@ -3069,7 +3008,7 @@ X-OIM-Sequence-Num: 1 * @return array Array of Switchboard sockets */ public function getSBSockets() { - return $this->switchBoardSockets; + return $this->switchBoardSessionLookup; } /** @@ -3078,7 +3017,7 @@ X-OIM-Sequence-Num: 1 * @return array Array of socket resources */ public function getSockets() { - return array_merge($this->NSfp, $this->switchBoardSockets); + return array_merge(array($this->NSfp), $this->switchBoardSessionLookup); } /** @@ -3120,7 +3059,8 @@ X-OIM-Sequence-Num: 1 * Registers a user handler * * Handler List - * IMIn, Pong, ConnectFailed, Reconnect + * IMIn, Pong, ConnectFailed, Reconnect, + * AddedToList, RemovedFromList * * @param string $event Event name * @param string $handler User function to call diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php index 8f436bdff8..5b04995c18 100644 --- a/plugins/Msn/msnmanager.php +++ b/plugins/Msn/msnmanager.php @@ -95,11 +95,15 @@ class MsnManager extends ImManager { */ function connect() { if (!$this->conn) { - $this->conn = new MSN(array('user' => $this->plugin->user, - 'password' => $this->plugin->password, - 'alias' => $this->plugin->nickname, - 'psm' => 'Send me a message to post a notice', - 'debug' => true)); + $this->conn = new MSN( + array( + 'user' => $this->plugin->user, + 'password' => $this->plugin->password, + 'alias' => $this->plugin->nickname, + 'psm' => 'Send me a message to post a notice', + 'debug' => true + ) + ); $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message')); $this->conn->registerHandler('Pong', array($this, 'update_ping_time')); $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed')); @@ -124,6 +128,7 @@ class MsnManager extends ImManager { $this->conn->sendPing(); $this->lastping = time(); + $this->pingInterval = 50; return true; } From 4ee2c12507b046e048ff023b94872cbbe9bde9a4 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 15 Jun 2010 17:04:15 -0400 Subject: [PATCH 262/730] Use presence of IM plugins to decide if "IM" menu option should be shown in Connect --- lib/connectsettingsaction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php index b9c14799e0..c3a88be552 100644 --- a/lib/connectsettingsaction.php +++ b/lib/connectsettingsaction.php @@ -105,7 +105,7 @@ class ConnectSettingsNav extends Widget # action => array('prompt', 'title') $menu = array(); - if (common_config('xmpp', 'enabled')) { + if (Event::handle('GetImTransports', array(&$transports))) { $menu['imsettings'] = array(_('IM'), _('Updates by instant messenger (IM)')); From d41298950b9c2d05067d71f6b2ab3315c6330489 Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Wed, 16 Jun 2010 00:04:59 +0100 Subject: [PATCH 263/730] Added validate regexp and a few more comments --- plugins/Msn/MsnPlugin.php | 29 ++++++++++++++++++----------- plugins/Msn/msnmanager.php | 3 +++ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php index 8452f15220..f00333d728 100644 --- a/plugins/Msn/MsnPlugin.php +++ b/plugins/Msn/MsnPlugin.php @@ -58,7 +58,7 @@ class MsnPlugin extends ImPlugin { * * @return string Name of service */ - function getDisplayName() { + public function getDisplayName() { return _m('MSN'); } @@ -68,7 +68,7 @@ class MsnPlugin extends ImPlugin { * @param string $screenname screenname to normalize * @return string an equivalent screenname in normalized form */ - function normalize($screenname) { + public function normalize($screenname) { $screenname = str_replace(" ","", $screenname); return strtolower($screenname); } @@ -78,7 +78,7 @@ class MsnPlugin extends ImPlugin { * * @return string Screenname */ - function daemon_screenname() { + public function daemon_screenname() { return $this->user; } @@ -86,20 +86,21 @@ class MsnPlugin extends ImPlugin { * Validate (ensure the validity of) a screenname * * @param string $screenname screenname to validate - * * @return boolean */ - function validate($screenname) { - //TODO Correct this for MSN screennames - //if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) { - return true; + public function validate($screenname) { + // RFC 2822 (simplified) regexp + if(preg_match('/[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i', $screenname)) { + return true; + } else { + return false; + } } /** * Load related modules when needed * * @param string $cls Name of the class to be loaded - * * @return boolean hook value; true means continue processing, false means stop. */ public function onAutoload($cls) { @@ -159,7 +160,7 @@ class MsnPlugin extends ImPlugin { /** * Initialize plugin * - * @return void + * @return boolean */ public function initialize() { if (!isset($this->user)) { @@ -175,7 +176,13 @@ class MsnPlugin extends ImPlugin { return true; } - function onPluginVersion(&$versions) { + /** + * Get plugin information + * + * @param array $versions array to insert information into + * @return void + */ + public function onPluginVersion(&$versions) { $versions[] = array( 'name' => 'MSN', 'version' => STATUSNET_VERSION, diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php index 5b04995c18..66152f0d2a 100644 --- a/plugins/Msn/msnmanager.php +++ b/plugins/Msn/msnmanager.php @@ -146,6 +146,7 @@ class MsnManager extends ImManager { * Passes it back to the queuing system * * @param array $data Data + * @return void */ private function handle_msn_message($data) { $this->plugin->enqueue_incoming_raw($data); @@ -156,6 +157,7 @@ class MsnManager extends ImManager { * Called by callback to log failure during connect * * @param void $data Not used (there to keep callback happy) + * @return void */ function handle_connect_failed($data) { common_log(LOG_NOTICE, 'MSN connect failed, retrying'); @@ -165,6 +167,7 @@ class MsnManager extends ImManager { * Called by callback to log reconnection * * @param void $data Not used (there to keep callback happy) + * @return void */ function handle_reconnect($data) { common_log(LOG_NOTICE, 'MSN reconnecting'); From 2d883eed893f4c7178030c032b518444b43eeabe Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Wed, 16 Jun 2010 01:22:52 +0100 Subject: [PATCH 264/730] Reordered methods and changed properties to constants as needed --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 3086 +++++++++--------- 1 file changed, 1572 insertions(+), 1514 deletions(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 6146bd1c5a..1e8d7e0f1f 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -1,49 +1,66 @@ user = $Configs['user']; $this->password = $Configs['password']; $this->alias = isset($Configs['alias']) ? $Configs['alias'] : ''; @@ -179,789 +175,13 @@ class MSN { = 0x7000800C; */ $this->clientid = $client_id; - $this->ABService=new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl',array('trace' => 1)); - } - - private function Array2SoapVar($Array, $ReturnSoapVarObj = true, $TypeName = null, $TypeNameSpace = null) { - $ArrayString = ''; - foreach($Array as $Key => $Val) { - if ($Key{0} == ':') continue; - $Attrib = ''; - if (is_array($Val[':'])) { - foreach ($Val[':'] as $AttribName => $AttribVal) - $Attrib .= " $AttribName='$AttribVal'"; - } - if ($Key{0} == '!') { - //List Type Define - $Key = substr($Key,1); - foreach ($Val as $ListKey => $ListVal) { - if ($ListKey{0} == ':') continue; - if (is_array($ListVal)) $ListVal = $this->Array2SoapVar($ListVal, false); - elseif (is_bool($ListVal)) $ListVal = $ListVal ? 'true' : 'false'; - $ArrayString .= "<$Key$Attrib>$ListVal"; - } - continue; - } - if (is_array($Val)) $Val = $this->Array2SoapVar($Val, false); - elseif (is_bool($Val)) $Val = $Val ? 'true' : 'false'; - $ArrayString .= "<$Key$Attrib>$Val"; - } - if ($ReturnSoapVarObj) return new SoapVar($ArrayString, XSD_ANYXML, $TypeName, $TypeNameSpace); - return $ArrayString; + $this->ABService = new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl', array('trace' => 1)); } /** - * Get Passport ticket - * - * @param string $url URL string (Optional) - * @return mixed Array of tickets or false on failure - */ - private function get_passport_ticket($url = '') { - $user = $this->user; - $password = htmlspecialchars($this->password); - - if ($url === '') - $passport_url = $this->passport_url; - else - $passport_url = $url; - - $XML = ' - -
- - {7108E71A-9926-4FCB-BCC9-9A9D3F32E423} - 4 - 1 - - AQAAAAIAAABsYwQAAAAxMDMz - - - - '.$user.' - '.$password.' - - -
- - - - http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue - - - http://Passport.NET/tb - - - - - http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue - - - messengerclear.live.com - - - - - - http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue - - - messenger.msn.com - - - - - - http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue - - - contacts.msn.com - - - - - - http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue - - - messengersecure.live.com - - - - - - http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue - - - spaces.live.com - - - - - - http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue - - - storage.msn.com - - - - - - -'; - - //$this->debug_message("*** URL: $passport_url"); - //$this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $passport_url); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - //$this->debug_message("*** Get Result:\n$data"); - - if ($http_code != 200) { - // sometimes, redirect to another URL - // MSNP15 - //psf:Redirect - //https://msnia.login.live.com/pp450/RST.srf - //Authentication Failure - if (strpos($data, 'psf:Redirect') === false) { - $this->debug_message("*** Could not get passport ticket! http code = $http_code"); - return false; - } - preg_match("#(.*)#", $data, $matches); - if (count($matches) == 0) { - $this->debug_message('*** Redirected, but could not get redirect URL!'); - return false; - } - $redirect_url = $matches[1]; - if ($redirect_url == $passport_url) { - $this->debug_message('*** Redirected, but to same URL!'); - return false; - } - $this->debug_message("*** Redirected to $redirect_url"); - return $this->get_passport_ticket($redirect_url); - } - - // sometimes, redirect to another URL, also return 200 - // MSNP15 - //psf:Redirect - //https://msnia.login.live.com/pp450/RST.srf - //Authentication Failure - if (strpos($data, 'psf:Redirect') !== false) { - preg_match("#(.*)#", $data, $matches); - if (count($matches) != 0) { - $redirect_url = $matches[1]; - if ($redirect_url == $passport_url) { - $this->debug_message('*** Redirected, but to same URL!'); - return false; - } - $this->debug_message("*** Redirected to $redirect_url"); - return $this->get_passport_ticket($redirect_url); - } - } - - // no Redurect faultcode or URL - // we should get the ticket here - - // we need ticket and secret code - // RST1: messengerclear.live.com - // t=tick&p= - // binary secret - // RST2: messenger.msn.com - // t=tick - // RST3: contacts.msn.com - // t=tick&p= - // RST4: messengersecure.live.com - // t=tick&p= - // RST5: spaces.live.com - // t=tick&p= - // RST6: storage.msn.com - // t=tick&p= - preg_match("#". - "(.*)(.*)". - "(.*)(.*)". - "(.*)(.*)". - "(.*)(.*)". - "(.*)(.*)". - "(.*)(.*)". - "(.*)(.*)". - "#", - $data, $matches); - - // no ticket found! - if (count($matches) == 0) { - $this->debug_message('*** Could not get passport ticket!'); - return false; - } - - //$this->debug_message(var_export($matches, true)); - // matches[0]: all data - // matches[1]: RST1 (messengerclear.live.com) ticket - // matches[2]: ... - // matches[3]: RST1 (messengerclear.live.com) binary secret - // matches[4]: ... - // matches[5]: RST2 (messenger.msn.com) ticket - // matches[6]: ... - // matches[7]: RST3 (contacts.msn.com) ticket - // matches[8]: ... - // matches[9]: RST4 (messengersecure.live.com) ticket - // matches[10]: ... - // matches[11]: RST5 (spaces.live.com) ticket - // matches[12]: ... - // matches[13]: RST6 (storage.live.com) ticket - // matches[14]: ... - - // so - // ticket => $matches[1] - // secret => $matches[3] - // web_ticket => $matches[5] - // contact_ticket => $matches[7] - // oim_ticket => $matches[9] - // space_ticket => $matches[11] - // storage_ticket => $matches[13] - - // yes, we get ticket - $aTickets = array( - 'ticket' => html_entity_decode($matches[1]), - 'secret' => html_entity_decode($matches[3]), - 'web_ticket' => html_entity_decode($matches[5]), - 'contact_ticket' => html_entity_decode($matches[7]), - 'oim_ticket' => html_entity_decode($matches[9]), - 'space_ticket' => html_entity_decode($matches[11]), - 'storage_ticket' => html_entity_decode($matches[13]) - ); - $this->ticket = $aTickets; - //$this->debug_message(var_export($aTickets, true)); - $ABAuthHeaderArray = array( - 'ABAuthHeader' => array( - ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), - 'ManagedGroupRequest' => false, - 'TicketToken' => htmlspecialchars($this->ticket['contact_ticket']), - ) - ); - $this->ABAuthHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABAuthHeader', $this->Array2SoapVar($ABAuthHeaderArray)); - return $aTickets; - } - - /** - * Fetch contact list - * - * @return boolean true on success - */ - private function UpdateContacts() { - $ABApplicationHeaderArray = array( - 'ABApplicationHeader' => array( - ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), - 'ApplicationId' => 'CFE80F9D-180F-4399-82AB-413F33A1FA11', - 'IsMigration' => false, - 'PartnerScenario' => 'ContactSave' - ) - ); - - $ABApplicationHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray)); - $ABFindAllArray = array( - 'ABFindAll' => array( - ':' => array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), - 'abId' => '00000000-0000-0000-0000-000000000000', - 'abView' => 'Full', - 'lastChange' => '0001-01-01T00:00:00.0000000-08:00', - ) - ); - $ABFindAll = new SoapParam($this->Array2SoapVar($ABFindAllArray), 'ABFindAll'); - $this->ABService->__setSoapHeaders(array($ABApplicationHeader, $this->ABAuthHeader)); - $this->Contacts = array(); - try { - $this->debug_message('*** Updating Contacts...'); - $Result = $this->ABService->ABFindAll($ABFindAll); - $this->debug_message("*** Result:\n".print_r($Result, true)."\n".$this->ABService->__getLastResponse()); - foreach($Result->ABFindAllResult->contacts->Contact as $Contact) - $this->Contacts[$Contact->contactInfo->passportName] = $Contact; - } catch(Exception $e) { - $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); - return false; - } - return true; - } - - /** - * Add contact - * - * @param string $email - * @param integer $network - * @param string $display - * @param boolean $sendADL - * @return boolean true on success - */ - private function addContact($email, $network, $display = '', $sendADL = false) { - if ($network != 1) return true; - if (isset($this->Contacts[$email])) return true; - - $ABContactAddArray = array( - 'ABContactAdd' => array( - ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), - 'abId' => '00000000-0000-0000-0000-000000000000', - 'contacts' => array( - 'Contact' => array( - ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), - 'contactInfo' => array( - 'contactType' => 'LivePending', - 'passportName' => $email, - 'isMessengerUser' => true, - 'MessengerMemberInfo' => array( - 'DisplayName' => $email - ) - ) - ) - ), - 'options' => array( - 'EnableAllowListManagement' => true - ) - ) - ); - $ABContactAdd = new SoapParam($this->Array2SoapVar($ABContactAddArray), 'ABContactAdd'); - try { - $this->debug_message("*** Adding Contact $email..."); - $this->ABService->ABContactAdd($ABContactAdd); - } catch(Exception $e) { - $this->debug_message("*** Add Contact Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); - return false; - } - if ($sendADL && !feof($this->NSfp)) { - @list($u_name, $u_domain) = @explode('@', $email); - foreach (array('1', '2') as $l) { - $str = ''; - $len = strlen($str); - // NS: >>> ADL {id} {size} - //TODO introduce error checking - $this->ns_writeln("ADL $this->id $len"); - $this->ns_writedata($str); - } - } - $this->UpdateContacts(); - return true; - } - - /** - * Remove contact from list - * - * @param integer $memberID - * @param string $email - * @param integer $network - * @param string $list - */ - function delMemberFromList($memberID, $email, $network, $list) { - if ($network != 1 && $network != 32) return true; - if ($memberID === false) return true; - $user = $email; - $ticket = htmlspecialchars($this->ticket['contact_ticket']); - if ($network == 1) - $XML = ' - - - - 996CDE1E-AA53-4477-B943-2BE802EA6166 - false - ContactMsgrAPI - - - false - '.$ticket.' - - - - - - 0 - Messenger - - - - - '.$list.' - - - Passport - '.$memberID.' - Accepted - - - - - - -'; - else - $XML = ' - - - - 996CDE1E-AA53-4477-B943-2BE802EA6166 - false - ContactMsgrAPI - - - false - '.$ticket.' - - - - - - 0 - Messenger - - - - - '.$list.' - - - Email - '.$memberID.' - Accepted - - - - - - -'; - - $header_array = array( - 'SOAPAction: '.$this->delmember_soap, - 'Content-Type: text/xml; charset=utf-8', - 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' - ); - - //$this->debug_message("*** URL: $this->delmember_url"); - //$this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->delmember_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - //$this->debug_message("*** Get Result:\n$data"); - - if ($http_code != 200) { - preg_match('#(.*)(.*)#', $data, $matches); - if (count($matches) == 0) { - $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list"); - return false; - } - $faultcode = trim($matches[1]); - $faultstring = trim($matches[2]); - if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) { - $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, error code: $faultcode, $faultstring"); - return false; - } - $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, not present in list"); - return true; - } - $this->debug_message("*** Member successfully deleted (network: $network) $email ($memberID) from $list list"); - return true; - } - - /** - * Add contact to list - * - * @param string $email - * @param integer $network - * @param string $list - */ - function addMemberToList($email, $network, $list) { - if ($network != 1 && $network != 32) return true; - $ticket = htmlspecialchars($this->ticket['contact_ticket']); - $user = $email; - - if ($network == 1) - $XML = ' - - - - 996CDE1E-AA53-4477-B943-2BE802EA6166 - false - ContactMsgrAPI - - - false - '.$ticket.' - - - - - - 0 - Messenger - - - - - '.$list.' - - - Passport - Accepted - '.$user.' - - - - - - -'; - else - $XML = ' - - - - 996CDE1E-AA53-4477-B943-2BE802EA6166 - false - ContactMsgrAPI - - - false - '.$ticket.' - - - - - - 0 - Messenger - - - - - '.$list.' - - - Email - Accepted - '.$user.' - - - MSN.IM.BuddyType - 32:YAHOO - - - - - - - - -'; - $header_array = array( - 'SOAPAction: '.$this->addmember_soap, - 'Content-Type: text/xml; charset=utf-8', - 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' - ); - - //$this->debug_message("*** URL: $this->addmember_url"); - //$this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->addmember_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - //$this->debug_message("*** Get Result:\n$data"); - - if ($http_code != 200) { - preg_match('#(.*)(.*)#', $data, $matches); - if (count($matches) == 0) { - $this->debug_message("*** Could not add member (network: $network) $email to $list list"); - return false; - } - $faultcode = trim($matches[1]); - $faultstring = trim($matches[2]); - if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) { - $this->debug_message("*** Could not add member (network: $network) $email to $list list, error code: $faultcode, $faultstring"); - return false; - } - $this->debug_message("*** Could not add member (network: $network) $email to $list list, already present"); - return true; - } - $this->debug_message("*** Member successfully added (network: $network) $email to $list list"); - return true; - } - - /** - * Get membership lists - * - * @param mixed $returnData Membership list or false on failure - */ - function getMembershipList($returnData = false) { - $ticket = htmlspecialchars($this->ticket['contact_ticket']); - $XML = ' - - - - 996CDE1E-AA53-4477-B943-2BE802EA6166 - false - Initial - - - false - '.$ticket.' - - - - - - - Messenger - Invitation - SocialNetwork - Space - Profile - - - - -'; - $header_array = array( - 'SOAPAction: '.$this->membership_soap, - 'Content-Type: text/xml; charset=utf-8', - 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' - ); - //$this->debug_message("*** URL: $this->membership_url"); - //$this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->membership_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - //$this->debug_message("*** Get Result:\n$data"); - if ($http_code != 200) return false; - $p = $data; - $aMemberships = array(); - while (1) { - //$this->debug_message("search p = $p"); - $start = strpos($p, ''); - $end = strpos($p, ''); - if ($start === false || $end === false || $start > $end) break; - //$this->debug_message("start = $start, end = $end"); - $end += 13; - $sMembership = substr($p, $start, $end - $start); - $aMemberships[] = $sMembership; - //$this->debug_message("add sMembership = $sMembership"); - $p = substr($p, $end); - } - //$this->debug_message("aMemberships = ".var_export($aMemberships, true)); - - $aContactList = array(); - foreach ($aMemberships as $sMembership) { - //$this->debug_message("sMembership = $sMembership"); - if (isset($matches)) unset($matches); - preg_match('#(.*)#', $sMembership, $matches); - if (count($matches) == 0) continue; - $sMemberRole = $matches[1]; - //$this->debug_message("MemberRole = $sMemberRole"); - if ($sMemberRole != 'Allow' && $sMemberRole != 'Reverse' && $sMemberRole != 'Pending') continue; - $p = $sMembership; - if (isset($aMembers)) unset($aMembers); - $aMembers = array(); - while (1) { - //$this->debug_message("search p = $p"); - $start = strpos($p, 'debug_message("add sMember = $sMember"); - $p = substr($p, $end); - } - //$this->debug_message("aMembers = ".var_export($aMembers, true)); - foreach ($aMembers as $sMember) { - //$this->debug_message("sMember = $sMember"); - if (isset($matches)) unset($matches); - preg_match('##', $sMember, $matches); - if (count($matches) == 0) continue; - $sMemberType = $matches[1]; - //$this->debug_message("MemberType = $sMemberType"); - $network = -1; - preg_match('#(.*)#', $sMember, $matches); - if (count($matches) == 0) continue; - $id = $matches[1]; - if ($sMemberType == 'PassportMember') { - if (strpos($sMember, 'Passport') === false) continue; - $network = 1; - preg_match('#(.*)#', $sMember, $matches); - } - else if ($sMemberType == 'EmailMember') { - if (strpos($sMember, 'Email') === false) continue; - // Value is 32: or 32:YAHOO - preg_match('#MSN.IM.BuddyType(.*):(.*)#', $sMember, $matches); - if (count($matches) == 0) continue; - if ($matches[1] != 32) continue; - $network = 32; - preg_match('#(.*)#', $sMember, $matches); - } - if ($network == -1) continue; - if (count($matches) > 0) { - $email = $matches[1]; - @list($u_name, $u_domain) = @explode('@', $email); - if ($u_domain == NULL) continue; - $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id; - $this->debug_message("*** Adding new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)"); - } - } - } - return $aContactList; - } - + * Signon methods + */ + /** * Connect to the NS server * @@ -992,10 +212,10 @@ class MSN { // NS: >> VER {id} MSNP9 CVR0 // MSNP15 // NS: >>> VER {id} MSNP15 CVR0 - $this->ns_writeln("VER $this->id $this->protocol CVR0"); + $this->ns_writeln("VER $this->id ".PROTOCOL.' CVR0'); $start_tm = time(); - while (!self::socketcheck($this->NSfp)) { + while (!socketcheck($this->NSfp)) { $data = $this->ns_readln(); // no data? if ($data === false) { @@ -1018,7 +238,7 @@ class MSN { // MSNP15 // NS: <<< VER {id} MSNP15 CVR0 // NS: >>> CVR {id} 0x0409 winnt 5.1 i386 MSMSGS 8.1.0178 msmsgs {user} - $this->ns_writeln("CVR $this->id 0x0409 winnt 5.1 i386 MSMSGS $this->buildver msmsgs $user"); + $this->ns_writeln("CVR $this->id 0x0409 winnt 5.1 i386 MSMSGS ".BUILDVER." msmsgs $user"); break; case 'CVR': @@ -1028,7 +248,7 @@ class MSN { // MSNP15 // NS: <<< CVR {id} {ver_list} {download_serve} .... // NS: >>> USR {id} SSO I {user} - $this->ns_writeln("USR $this->id $this->login_method I $user"); + $this->ns_writeln("USR $this->id ".LOGIN_METHOD." I $user"); break; case 'USR': @@ -1061,7 +281,7 @@ class MSN { $login_code = $this->generateLoginBLOB($secret, $nonce); // NS: >>> USR {id} SSO S {ticket} {login_code} - $this->ns_writeln("USR $this->id $this->login_method S $ticket $login_code"); + $this->ns_writeln("USR $this->id ".LOGIN_METHOD." S $ticket $login_code"); $this->authed = true; break; @@ -1087,7 +307,7 @@ class MSN { // NS: >> VER {id} MSNP9 CVR0 // MSNP15 // NS: >>> VER {id} MSNP15 CVR0 - $this->ns_writeln("VER $this->id $this->protocol CVR0"); + $this->ns_writeln("VER $this->id ".PROTOCOL.' CVR0'); break; case 'GCF': @@ -1240,7 +460,7 @@ class MSN { $len = strlen($str); $this->ns_writeln("UUX $this->id $len"); $this->ns_writedata($str); - if (!self::socketcheck($this->NSfp)) { + if (!socketcheck($this->NSfp)) { $this->debug_message('*** Connected, waiting for commands'); break; } else { @@ -1253,6 +473,7 @@ class MSN { * Called if there is an error during signon * * @param string $message Error message to log + * @return void */ private function signonFailure($message) { $this->debug_message($message); @@ -1260,244 +481,12 @@ class MSN { $this->NSRetryWait($this->retry_wait); } - function derive_key($key, $magic) { - $hash1 = mhash(MHASH_SHA1, $magic, $key); - $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key); - $hash3 = mhash(MHASH_SHA1, $hash1, $key); - $hash4 = mhash(MHASH_SHA1, $hash3.$magic, $key); - return $hash2.substr($hash4, 0, 4); - } - - function generateLoginBLOB($key, $challenge) { - $key1 = base64_decode($key); - $key2 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY HASH'); - $key3 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY ENCRYPTION'); - - // get hash of challenge using key2 - $hash = mhash(MHASH_SHA1, $challenge, $key2); - - // get 8 bytes random data - $iv = substr(base64_encode(rand(1000,9999).rand(1000,9999)), 2, 8); - - $cipher = mcrypt_cbc(MCRYPT_3DES, $key3, $challenge."\x08\x08\x08\x08\x08\x08\x08\x08", MCRYPT_ENCRYPT, $iv); - - $blob = pack('LLLLLLL', 28, 1, 0x6603, 0x8004, 8, 20, 72); - $blob .= $iv; - $blob .= $hash; - $blob .= $cipher; - - return base64_encode($blob); - } - - /** - * Get OIM mail data - * - * @return string mail data or false on failure - */ - function getOIM_maildata() { - preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches); - if (count($matches) == 0) { - $this->debug_message('*** No web ticket?'); - return false; - } - $t = htmlspecialchars($matches[1]); - $p = htmlspecialchars($matches[2]); - $XML = ' - - - - '.$t.' -

'.$p.'

- - - - - -'; - - $header_array = array( - 'SOAPAction: '.$this->oim_maildata_soap, - 'Content-Type: text/xml; charset=utf-8', - 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' - ); - - //$this->debug_message("*** URL: $this->oim_maildata_url"); - //$this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->oim_maildata_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - //$this->debug_message("*** Get Result:\n$data"); - - if ($http_code != 200) { - $this->debug_message("*** Could not get OIM maildata! http code: $http_code"); - return false; - } - - // See #XML_Data - preg_match('#]*)>(.*)#', $data, $matches); - if (count($matches) == 0) { - $this->debug_message('*** Could not get OIM maildata'); - return false; - } - return $matches[2]; - } - - /** - * Fetch OIM message with given id - * - * @param string $msgid - * @return string Message or false on failure - */ - function getOIM_message($msgid) { - preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches); - if (count($matches) == 0) { - $this->debug_message('*** No web ticket?'); - return false; - } - $t = htmlspecialchars($matches[1]); - $p = htmlspecialchars($matches[2]); - - // read OIM - $XML = ' - - - - '.$t.' -

'.$p.'

- - - - - '.$msgid.' - false - - -'; - - $header_array = array( - 'SOAPAction: '.$this->oim_read_soap, - 'Content-Type: text/xml; charset=utf-8', - 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' - ); - - //$this->debug_message("*** URL: $this->oim_read_url"); - //$this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->oim_read_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - //$this->debug_message("*** Get Result:\n$data"); - - if ($http_code != 200) { - $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code"); - return false; - } - - // why can't use preg_match('#(.*)#', $data, $matches)? - // multi-lines? - $start = strpos($data, ''); - $end = strpos($data, ''); - if ($start === false || $end === false || $start > $end) { - $this->debug_message("*** Can't get OIM: $msgid"); - return false; - } - $lines = substr($data, $start + 18, $end - $start); - $aLines = @explode("\n", $lines); - $header = true; - $ignore = false; - $sOIM = ''; - foreach ($aLines as $line) { - $line = rtrim($line); - if ($header) { - if ($line === '') { - $header = false; - continue; - } - continue; - } - // stop at empty lines - if ($line === '') break; - $sOIM .= $line; - } - $sMsg = base64_decode($sOIM); - //$this->debug_message("*** we get OIM ($msgid): $sMsg"); - - // delete OIM - $XML = ' - - - - '.$t.' -

'.$p.'

- - - - - - '.$msgid.' - - - -'; - - $header_array = array( - 'SOAPAction: '.$this->oim_del_soap, - 'Content-Type: text/xml; charset=utf-8', - 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' - ); - - //$this->debug_message("*** URL: $this->oim_del_url"); - //$this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->oim_del_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - //$this->debug_message("*** Get Result:\n$data"); - - if ($http_code != 200) - $this->debug_message("*** Could not delete OIM: $msgid, http code = $http_code"); - else - $this->debug_message("*** OIM ($msgid) deleted"); - return $sMsg; - } - /** * Log out and close the NS connection * * @return void */ - private function NSLogout() { + private function nsLogout() { if (is_resource($this->NSfp) && !feof($this->NSfp)) { // logout now // NS: >>> OUT @@ -1509,286 +498,9 @@ class MSN { } /** - * Sleep for the given number of seconds - * - * @param integer $wait Number of seconds to sleep for - */ - private function NSRetryWait($wait) { - $this->debug_message("*** Sleeping for $wait seconds before retrying"); - sleep($wait); - } - - /** - * Generate challenge response - * - * @param string $code - * @return string challenge response code - */ - function getChallenge($code) { - // MSNP15 - // http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges - // Step 1: The MD5 Hash - $md5Hash = md5($code.$this->prod_key); - $aMD5 = @explode("\0", chunk_split($md5Hash, 8, "\0")); - for ($i = 0; $i < 4; $i++) { - $aMD5[$i] = implode('', array_reverse(@explode("\0", chunk_split($aMD5[$i], 2, "\0")))); - $aMD5[$i] = (0 + base_convert($aMD5[$i], 16, 10)) & 0x7FFFFFFF; - } - - // Step 2: A new string - $chl_id = $code.$this->prod_id; - $chl_id .= str_repeat('0', 8 - (strlen($chl_id) % 8)); - - $aID = @explode("\0", substr(chunk_split($chl_id, 4, "\0"), 0, -1)); - for ($i = 0; $i < count($aID); $i++) { - $aID[$i] = implode('', array_reverse(@explode("\0", chunk_split($aID[$i], 1, "\0")))); - $aID[$i] = 0 + base_convert(bin2hex($aID[$i]), 16, 10); - } - - // Step 3: The 64 bit key - $magic_num = 0x0E79A9C1; - $str7f = 0x7FFFFFFF; - $high = 0; - $low = 0; - for ($i = 0; $i < count($aID); $i += 2) { - $temp = $aID[$i]; - $temp = bcmod(bcmul($magic_num, $temp), $str7f); - $temp = bcadd($temp, $high); - $temp = bcadd(bcmul($aMD5[0], $temp), $aMD5[1]); - $temp = bcmod($temp, $str7f); - - $high = $aID[$i+1]; - $high = bcmod(bcadd($high, $temp), $str7f); - $high = bcadd(bcmul($aMD5[2], $high), $aMD5[3]); - $high = bcmod($high, $str7f); - - $low = bcadd(bcadd($low, $high), $temp); - } - - $high = bcmod(bcadd($high, $aMD5[1]), $str7f); - $low = bcmod(bcadd($low, $aMD5[3]), $str7f); - - $new_high = bcmul($high & 0xFF, 0x1000000); - $new_high = bcadd($new_high, bcmul($high & 0xFF00, 0x100)); - $new_high = bcadd($new_high, bcdiv($high & 0xFF0000, 0x100)); - $new_high = bcadd($new_high, bcdiv($high & 0xFF000000, 0x1000000)); - // we need integer here - $high = 0+$new_high; - - $new_low = bcmul($low & 0xFF, 0x1000000); - $new_low = bcadd($new_low, bcmul($low & 0xFF00, 0x100)); - $new_low = bcadd($new_low, bcdiv($low & 0xFF0000, 0x100)); - $new_low = bcadd($new_low, bcdiv($low & 0xFF000000, 0x1000000)); - // we need integer here - $low = 0+$new_low; - - // we just use 32 bits integer, don't need the key, just high/low - // $key = bcadd(bcmul($high, 0x100000000), $low); - - // Step 4: Using the key - $md5Hash = md5($code.$this->prod_key); - $aHash = @explode("\0", chunk_split($md5Hash, 8, "\0")); - - $hash = ''; - $hash .= sprintf("%08x", (0 + base_convert($aHash[0], 16, 10)) ^ $high); - $hash .= sprintf("%08x", (0 + base_convert($aHash[1], 16, 10)) ^ $low); - $hash .= sprintf("%08x", (0 + base_convert($aHash[2], 16, 10)) ^ $high); - $hash .= sprintf("%08x", (0 + base_convert($aHash[3], 16, 10)) ^ $low); - - return $hash; - } - - /** - * Generate the data to send a message - * - * @param string $sMessage Message - * @param integer $network Network - */ - private function getMessage($sMessage, $network = 1) { - $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n"; - $msg_header_len = strlen($msg_header); - if ($network == 1) - $maxlen = $this->max_msn_message_len - $msg_header_len; - else - $maxlen = $this->max_yahoo_message_len - $msg_header_len; - $sMessage = str_replace("\r", '', $sMessage); - $msg = substr($sMessage, 0, $maxlen); - return $msg_header.$msg; - } - - // read data for specified size - private function ns_readdata($size) { - $data = ''; - $count = 0; - while (!feof($this->NSfp)) { - $buf = @fread($this->NSfp, $size - $count); - $data .= $buf; - $count += strlen($buf); - if ($count >= $size) break; - } - $this->debug_message("NS: data ($size/$count) <<<\n$data"); - return $data; - } - - // read one line - private function ns_readln() { - $data = @fgets($this->NSfp, 4096); - if ($data !== false) { - $data = trim($data); - $this->debug_message("NS: <<< $data"); - } - return $data; - } - - // write to server, append \r\n, also increase id - private function ns_writeln($data) { - @fwrite($this->NSfp, $data."\r\n"); - $this->debug_message("NS: >>> $data"); - $this->id++; - return; - } - - // write data to server - private function ns_writedata($data) { - @fwrite($this->NSfp, $data); - $this->debug_message("NS: >>> $data"); - return; - } - - // read data for specified size for SB - private function sb_readdata($socket, $size) { - $data = ''; - $count = 0; - while (!feof($socket)) { - $buf = @fread($socket, $size - $count); - $data .= $buf; - $count += strlen($buf); - if ($count >= $size) break; - } - $this->debug_message("SB: data ($size/$count) <<<\n$data"); - return $data; - } - - // read one line for SB - private function sb_readln($socket) { - $data = @fgets($socket, 4096); - if ($data !== false) { - $data = trim($data); - $this->debug_message("SB: <<< $data"); - } - return $data; - } - - // write to server for SB, append \r\n, also increase id - // switchboard server only accept \r\n, it will lost connection if just \n only - private function sb_writeln($socket, &$id, $data) { - @fwrite($socket, $data."\r\n"); - $this->debug_message("SB: >>> $data"); - $id++; - return; - } - - // write data to server - private function sb_writedata($socket, $data) { - @fwrite($socket, $data); - $this->debug_message("SB: >>> $data"); - return; - } - - // show debug information - function debug_message($str) { - if (!$this->debug) return; - if ($this->debug===STDOUT) echo $str."\n"; - /*$fname=MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msn_'.strftime('%Y%m%d').'.debug'; - $fp = fopen($fname, 'at'); - if ($fp) { - fputs($fp, strftime('%m/%d/%y %H:%M:%S').' ['.posix_getpid().'] '.$str."\n"); - fclose($fp); - return; - }*/ - // still show debug information, if we can't open log_file - echo $str."\n"; - return; - } - - function dump_binary($str) { - $buf = ''; - $a_str = ''; - $h_str = ''; - $len = strlen($str); - for ($i = 0; $i < $len; $i++) { - if (($i % 16) == 0) { - if ($buf !== '') { - $buf .= "$h_str $a_str\n"; - } - $buf .= sprintf("%04X:", $i); - $a_str = ''; - $h_str = ''; - } - $ch = ord($str[$i]); - if ($ch < 32) - $a_str .= '.'; - else - $a_str .= chr($ch); - $h_str .= sprintf(" %02X", $ch); - } - if ($h_str !== '') - $buf .= "$h_str $a_str\n"; - return $buf; - } - - /** - * - * @param $FilePath 圖檔路徑 - * @param $Type 檔案類型 3=>大頭貼,2表情圖案 - * @return array + * NS and SB command handling methods */ - private function MsnObj($FilePath,$Type=3) - { - if (!($FileSize=filesize($FilePath))) return ''; - $Location = md5($FilePath); - $Friendly = md5($FilePath.$Type); - if (isset($this->MsnObjMap[$Location])) return $this->MsnObjMap[$Location]; - $sha1d = base64_encode(sha1(file_get_contents($FilePath), true)); - $sha1c = base64_encode(sha1("Creator".$this->user."Size$FileSize"."Type$Type"."Location$Location"."Friendly".$Friendly."SHA1D$sha1d",true)); - $this->MsnObjArray[$Location] = $FilePath; - $MsnObj = ''; - $this->MsnObjMap[$Location] = $MsnObj; - $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n"); - return $MsnObj; - } - - private function linetoArray($lines) { - $lines = str_replace("\r", '', $lines); - $lines = explode("\n", $lines); - foreach ($lines as $line) { - if (!isset($line{3})) continue; - list($Key,$Val) = explode(':', $line); - $Data[trim($Key)] = trim($Val); - } - return $Data; - } - - private function GetPictureFilePath($Context) { - $MsnObj = base64_decode($Context); - if (preg_match('/location="(.*?)"/i', $MsnObj, $Match)) - $location = $Match[1]; - $this->debug_message("*** p2p: PictureFile[$location] ::All".print_r($this->MsnObjArray,true)."\n"); - if ($location && isset($this->MsnObjArray[$location])) - return $this->MsnObjArray[$location]; - return false; - } - - private function GetMsnObjDefine($Message) { - $DefineString = ''; - if (is_array($this->Emotions)) - foreach ($this->Emotions as $Pattern => $FilePath) { - if (strpos($Message, $Pattern)!==false) - $DefineString .= "$Pattern\t".$this->MsnObj($FilePath, 2)."\t"; - } - return $DefineString; - } - + /** * Read and handle incoming command from NS * @@ -1796,7 +508,7 @@ class MSN { */ private function nsReceive() { // Sign in again if not signed in or socket failed - if (!is_resource($this->NSfp) || self::socketcheck($this->NSfp)) { + if (!is_resource($this->NSfp) || socketcheck($this->NSfp)) { $this->callHandler('Reconnect'); $this->NSRetryWait($this->retry_wait); $this->signon(); @@ -2123,7 +835,7 @@ class MSN { $fingerprint = $this->getChallenge($chl_code); // NS: >>> QRY {id} {product_id} 32 // NS: >>> fingerprint - $this->ns_writeln("QRY $this->id $this->prod_id 32"); + $this->ns_writeln("QRY $this->id ".PROD_ID.' 32'); $this->ns_writedata($fingerprint); $this->ns_writeln("CHG $this->id NLN $this->clientid"); if ($this->PhotoStickerFile !== false) @@ -2148,7 +860,7 @@ class MSN { if ($server_type != 'SB') { // maybe exit? // this connection will close after XFR - $this->NSLogout(); + $this->nsLogout(); continue; } @@ -2187,7 +899,7 @@ class MSN { // force logout from NS // NS: <<< OUT xxx $this->debug_message("*** LOGOUT from NS"); - return $this->NsLogout(); + return $this->nsLogout(); default: $code = substr($data,0,3); @@ -2195,7 +907,7 @@ class MSN { $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; $this->debug_message("*** NS: $this->error"); - return $this->NsLogout(); + return $this->nsLogout(); } break; } @@ -2608,28 +1320,6 @@ class MSN { } } - /** - * Called when we want to end a switchboard session - * or a switchboard session ends - * - * @param resource $socket Socket - * @param boolean $killsession Whether to delete the session - * @return void - */ - private function endSBSession($socket, $killsession = false) { - if (!self::socketcheck($socket)) { - $this->sb_writeln($socket, $fake = 0, 'OUT'); - } - @fclose($socket); - - // Unset session lookup value - $intsocket = (int) $socket; - unset($this->switchBoardSessionLookup[$this->switchBoardSessions[$intsocket]['to']]); - - // Unset session itself - unset($this->switchBoardSessions[$intsocket]); - } - /** * Checks for new data and calls appropriate methods * @@ -2655,6 +1345,10 @@ class MSN { } } + /** + * Switchboard related methods + */ + /** * Send a request for a switchboard session * @@ -2729,6 +1423,28 @@ class MSN { $this->sb_writeln($socket, $id, "ANS $id $this->user $ticket $sid"); } } + + /** + * Called when we want to end a switchboard session + * or a switchboard session ends + * + * @param resource $socket Socket + * @param boolean $killsession Whether to delete the session + * @return void + */ + private function endSBSession($socket, $killsession = false) { + if (!socketcheck($socket)) { + $this->sb_writeln($socket, $fake = 0, 'OUT'); + } + @fclose($socket); + + // Unset session lookup value + $intsocket = (int) $socket; + unset($this->switchBoardSessionLookup[$this->switchBoardSessions[$intsocket]['to']]); + + // Unset session itself + unset($this->switchBoardSessions[$intsocket]); + } /** * Send a message via an existing SB session @@ -2739,7 +1455,7 @@ class MSN { */ private function sendMessageViaSB($to, $message) { $socket = $this->switchBoardSessionLookup[$to]; - if (self::socketcheck($socket)) { + if (socketcheck($socket)) { return false; } @@ -2771,118 +1487,6 @@ class MSN { return true; } - /** - * Send offline message - * - * @param string $to Intended recipient - * @param string $sMessage Message - * @param string $lockkey Lock key - * @return mixed true on success or error data - */ - private function sendOIM($to, $sMessage, $lockkey) { - $XML = ' - - - - - - - http://messenger.msn.com - 1 - - - - text - MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: base64 -X-OIM-Message-Type: OfflineMessage -X-OIM-Run-Id: {DAB68CFA-38C9-449B-945E-38AFA51E50A7} -X-OIM-Sequence-Num: 1 - -'.chunk_split(base64_encode($sMessage)).' - - -'; - - $header_array = array( - 'SOAPAction: '.$this->oim_send_soap, - 'Content-Type: text/xml', - 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')' - ); - - $this->debug_message("*** URL: $this->oim_send_url"); - $this->debug_message("*** Sending SOAP:\n$XML"); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->oim_send_url); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); - if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); - curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); - $data = curl_exec($curl); - $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - $this->debug_message("*** Get Result:\n$data"); - - if ($http_code == 200) { - $this->debug_message("*** OIM sent for $to"); - return true; - } - - $challenge = false; - $auth_policy = false; - // the lockkey is invalid, authenticated fail, we need challenge it again - // 364763969 - preg_match("#(.*)#", $data, $matches); - if (count($matches) != 0) { - // yes, we get new LockKeyChallenge - $challenge = $matches[2]; - $this->debug_message("*** OIM need new challenge ($challenge) for $to"); - } - // auth policy error - // MBI_SSL - preg_match("#(.*)#", $data, $matches); - if (count($matches) != 0) { - $auth_policy = $matches[2]; - $this->debug_message("*** OIM need new auth policy ($auth_policy) for $to"); - } - if ($auth_policy === false && $challenge === false) { - //q0:AuthenticationFailed - preg_match("#(.*)#", $data, $matches); - if (count($matches) == 0) { - // no error, we assume the OIM is sent - $this->debug_message("*** OIM sent for $to"); - return true; - } - $err_code = $matches[2]; - //Exception of type 'System.Web.Services.Protocols.SoapException' was thrown. - preg_match("#(.*)#", $data, $matches); - if (count($matches) > 0) - $err_msg = $matches[1]; - else - $err_msg = ''; - $this->debug_message("*** OIM failed for $to"); - $this->debug_message("*** OIM Error code: $err_code"); - $this->debug_message("*** OIM Error Message: $err_msg"); - return false; - } - return array('challenge' => $challenge, 'auth_policy' => $auth_policy); - } - /** * Send a message to a user on another network * @@ -2978,37 +1582,1001 @@ X-OIM-Sequence-Num: 1 } /** - * Sends a ping command + * OIM methods + */ + + /** + * Get OIM mail data + * + * @return string mail data or false on failure + */ + function getOIM_maildata() { + preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches); + if (count($matches) == 0) { + $this->debug_message('*** No web ticket?'); + return false; + } + $t = htmlspecialchars($matches[1]); + $p = htmlspecialchars($matches[2]); + $XML = ' + + + + '.$t.' +

'.$p.'

+ + + + + +'; + + $header_array = array( + 'SOAPAction: '.OIM_MAILDATA_SOAP, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')' + ); + + $this->debug_message('*** URL: '.OIM_MAILDATA_URL); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, OIM_MAILDATA_URL); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + $this->debug_message("*** Could not get OIM maildata! http code: $http_code"); + return false; + } + + // See #XML_Data + preg_match('#]*)>(.*)#', $data, $matches); + if (count($matches) == 0) { + $this->debug_message('*** Could not get OIM maildata'); + return false; + } + return $matches[2]; + } + + /** + * Fetch OIM message with given id + * + * @param string $msgid + * @return string Message or false on failure + */ + function getOIM_message($msgid) { + preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches); + if (count($matches) == 0) { + $this->debug_message('*** No web ticket?'); + return false; + } + $t = htmlspecialchars($matches[1]); + $p = htmlspecialchars($matches[2]); + + // read OIM + $XML = ' + + + + '.$t.' +

'.$p.'

+ + + + + '.$msgid.' + false + + +'; + + $header_array = array( + 'SOAPAction: '.OIM_READ_SOAP, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')' + ); + + $this->debug_message('*** URL: '.OIM_READ_URL); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, OIM_READ_URL); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code"); + return false; + } + + // why can't use preg_match('#(.*)#', $data, $matches)? + // multi-lines? + $start = strpos($data, ''); + $end = strpos($data, ''); + if ($start === false || $end === false || $start > $end) { + $this->debug_message("*** Can't get OIM: $msgid"); + return false; + } + $lines = substr($data, $start + 18, $end - $start); + $aLines = @explode("\n", $lines); + $header = true; + $ignore = false; + $sOIM = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + continue; + } + // stop at empty lines + if ($line === '') break; + $sOIM .= $line; + } + $sMsg = base64_decode($sOIM); + //$this->debug_message("*** we get OIM ($msgid): $sMsg"); + + // delete OIM + $XML = ' + + + + '.$t.' +

'.$p.'

+ + + + + + '.$msgid.' + + + +'; + + $header_array = array( + 'SOAPAction: '.OIM_DEL_SOAP, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')' + ); + + $this->debug_message('*** URL: '.OIM_DEL_URL); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, OIM_DEL_URL); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) + $this->debug_message("*** Could not delete OIM: $msgid, http code = $http_code"); + else + $this->debug_message("*** OIM ($msgid) deleted"); + return $sMsg; + } + + /** + * Send offline message * - * Should be called about every 50 seconds + * @param string $to Intended recipient + * @param string $sMessage Message + * @param string $lockkey Lock key + * @return mixed true on success or error data + */ + private function sendOIM($to, $sMessage, $lockkey) { + $XML = ' + + + + + + + http://messenger.msn.com + 1 + + + + text + MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: base64 +X-OIM-Message-Type: OfflineMessage +X-OIM-Run-Id: {DAB68CFA-38C9-449B-945E-38AFA51E50A7} +X-OIM-Sequence-Num: 1 + +'.chunk_split(base64_encode($sMessage)).' + + +'; + + $header_array = array( + 'SOAPAction: '.OIM_SEND_SOAP, + 'Content-Type: text/xml', + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')' + ); + + $this->debug_message('*** URL: '.OIM_SEND_URL); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, OIM_SEND_URL); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code == 200) { + $this->debug_message("*** OIM sent for $to"); + return true; + } + + $challenge = false; + $auth_policy = false; + // the lockkey is invalid, authenticated fail, we need challenge it again + // 364763969 + preg_match("#(.*)#", $data, $matches); + if (count($matches) != 0) { + // yes, we get new LockKeyChallenge + $challenge = $matches[2]; + $this->debug_message("*** OIM need new challenge ($challenge) for $to"); + } + // auth policy error + // MBI_SSL + preg_match("#(.*)#", $data, $matches); + if (count($matches) != 0) { + $auth_policy = $matches[2]; + $this->debug_message("*** OIM need new auth policy ($auth_policy) for $to"); + } + if ($auth_policy === false && $challenge === false) { + //q0:AuthenticationFailed + preg_match("#(.*)#", $data, $matches); + if (count($matches) == 0) { + // no error, we assume the OIM is sent + $this->debug_message("*** OIM sent for $to"); + return true; + } + $err_code = $matches[2]; + //Exception of type 'System.Web.Services.Protocols.SoapException' was thrown. + preg_match("#(.*)#", $data, $matches); + if (count($matches) > 0) + $err_msg = $matches[1]; + else + $err_msg = ''; + $this->debug_message("*** OIM failed for $to"); + $this->debug_message("*** OIM Error code: $err_code"); + $this->debug_message("*** OIM Error Message: $err_msg"); + return false; + } + return array('challenge' => $challenge, 'auth_policy' => $auth_policy); + } + + /** + * Contact / Membership list methods + */ + + /** + * Fetch contact list + * + * @return boolean true on success + */ + private function UpdateContacts() { + $ABApplicationHeaderArray = array( + 'ABApplicationHeader' => array( + ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), + 'ApplicationId' => 'CFE80F9D-180F-4399-82AB-413F33A1FA11', + 'IsMigration' => false, + 'PartnerScenario' => 'ContactSave' + ) + ); + + $ABApplicationHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray)); + $ABFindAllArray = array( + 'ABFindAll' => array( + ':' => array('xmlns'=>'http://www.msn.com/webservices/AddressBook'), + 'abId' => '00000000-0000-0000-0000-000000000000', + 'abView' => 'Full', + 'lastChange' => '0001-01-01T00:00:00.0000000-08:00', + ) + ); + $ABFindAll = new SoapParam($this->Array2SoapVar($ABFindAllArray), 'ABFindAll'); + $this->ABService->__setSoapHeaders(array($ABApplicationHeader, $this->ABAuthHeader)); + $this->Contacts = array(); + try { + $this->debug_message('*** Updating Contacts...'); + $Result = $this->ABService->ABFindAll($ABFindAll); + $this->debug_message("*** Result:\n".print_r($Result, true)."\n".$this->ABService->__getLastResponse()); + foreach($Result->ABFindAllResult->contacts->Contact as $Contact) + $this->Contacts[$Contact->contactInfo->passportName] = $Contact; + } catch(Exception $e) { + $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); + return false; + } + return true; + } + + /** + * Add contact + * + * @param string $email + * @param integer $network + * @param string $display + * @param boolean $sendADL + * @return boolean true on success + */ + private function addContact($email, $network, $display = '', $sendADL = false) { + if ($network != 1) return true; + if (isset($this->Contacts[$email])) return true; + + $ABContactAddArray = array( + 'ABContactAdd' => array( + ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), + 'abId' => '00000000-0000-0000-0000-000000000000', + 'contacts' => array( + 'Contact' => array( + ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), + 'contactInfo' => array( + 'contactType' => 'LivePending', + 'passportName' => $email, + 'isMessengerUser' => true, + 'MessengerMemberInfo' => array( + 'DisplayName' => $email + ) + ) + ) + ), + 'options' => array( + 'EnableAllowListManagement' => true + ) + ) + ); + $ABContactAdd = new SoapParam($this->Array2SoapVar($ABContactAddArray), 'ABContactAdd'); + try { + $this->debug_message("*** Adding Contact $email..."); + $this->ABService->ABContactAdd($ABContactAdd); + } catch(Exception $e) { + $this->debug_message("*** Add Contact Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage()); + return false; + } + if ($sendADL && !feof($this->NSfp)) { + @list($u_name, $u_domain) = @explode('@', $email); + foreach (array('1', '2') as $l) { + $str = ''; + $len = strlen($str); + // NS: >>> ADL {id} {size} + //TODO introduce error checking + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); + } + } + $this->UpdateContacts(); + return true; + } + + /** + * Remove contact from list + * + * @param integer $memberID + * @param string $email + * @param integer $network + * @param string $list + */ + function delMemberFromList($memberID, $email, $network, $list) { + if ($network != 1 && $network != 32) return true; + if ($memberID === false) return true; + $user = $email; + $ticket = htmlspecialchars($this->ticket['contact_ticket']); + if ($network == 1) + $XML = ' + + + + 996CDE1E-AA53-4477-B943-2BE802EA6166 + false + ContactMsgrAPI + + + false + '.$ticket.' + + + + + + 0 + Messenger + + + + + '.$list.' + + + Passport + '.$memberID.' + Accepted + + + + + + +'; + else + $XML = ' + + + + 996CDE1E-AA53-4477-B943-2BE802EA6166 + false + ContactMsgrAPI + + + false + '.$ticket.' + + + + + + 0 + Messenger + + + + + '.$list.' + + + Email + '.$memberID.' + Accepted + + + + + + +'; + + $header_array = array( + 'SOAPAction: '.DELMEMBER_SOAP, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' + ); + + $this->debug_message('*** URL: '.DELMEMBER_URL); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, DELMEMBER_URL); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + preg_match('#(.*)(.*)#', $data, $matches); + if (count($matches) == 0) { + $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list"); + return false; + } + $faultcode = trim($matches[1]); + $faultstring = trim($matches[2]); + if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) { + $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, error code: $faultcode, $faultstring"); + return false; + } + $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, not present in list"); + return true; + } + $this->debug_message("*** Member successfully deleted (network: $network) $email ($memberID) from $list list"); + return true; + } + + /** + * Add contact to list + * + * @param string $email + * @param integer $network + * @param string $list + */ + function addMemberToList($email, $network, $list) { + if ($network != 1 && $network != 32) return true; + $ticket = htmlspecialchars($this->ticket['contact_ticket']); + $user = $email; + + if ($network == 1) + $XML = ' + + + + 996CDE1E-AA53-4477-B943-2BE802EA6166 + false + ContactMsgrAPI + + + false + '.$ticket.' + + + + + + 0 + Messenger + + + + + '.$list.' + + + Passport + Accepted + '.$user.' + + + + + + +'; + else + $XML = ' + + + + 996CDE1E-AA53-4477-B943-2BE802EA6166 + false + ContactMsgrAPI + + + false + '.$ticket.' + + + + + + 0 + Messenger + + + + + '.$list.' + + + Email + Accepted + '.$user.' + + + MSN.IM.BuddyType + 32:YAHOO + + + + + + + + +'; + $header_array = array( + 'SOAPAction: '.ADDMEMBER_SOAP, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' + ); + + $this->debug_message('*** URL: '.ADDMEMBER_URL); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, ADDMEMBER_URL); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + preg_match('#(.*)(.*)#', $data, $matches); + if (count($matches) == 0) { + $this->debug_message("*** Could not add member (network: $network) $email to $list list"); + return false; + } + $faultcode = trim($matches[1]); + $faultstring = trim($matches[2]); + if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) { + $this->debug_message("*** Could not add member (network: $network) $email to $list list, error code: $faultcode, $faultstring"); + return false; + } + $this->debug_message("*** Could not add member (network: $network) $email to $list list, already present"); + return true; + } + $this->debug_message("*** Member successfully added (network: $network) $email to $list list"); + return true; + } + + /** + * Get membership lists + * + * @param mixed $returnData Membership list or false on failure + */ + function getMembershipList($returnData = false) { + $ticket = htmlspecialchars($this->ticket['contact_ticket']); + $XML = ' + + + + 996CDE1E-AA53-4477-B943-2BE802EA6166 + false + Initial + + + false + '.$ticket.' + + + + + + + Messenger + Invitation + SocialNetwork + Space + Profile + + + + +'; + $header_array = array( + 'SOAPAction: '.MEMBERSHIP_SOAP, + 'Content-Type: text/xml; charset=utf-8', + 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' + ); + $this->debug_message('*** URL: '.MEMBERSHIP_URL); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, MEMBERSHIP_URL); + curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) return false; + $p = $data; + $aMemberships = array(); + while (1) { + //$this->debug_message("search p = $p"); + $start = strpos($p, ''); + $end = strpos($p, ''); + if ($start === false || $end === false || $start > $end) break; + //$this->debug_message("start = $start, end = $end"); + $end += 13; + $sMembership = substr($p, $start, $end - $start); + $aMemberships[] = $sMembership; + //$this->debug_message("add sMembership = $sMembership"); + $p = substr($p, $end); + } + //$this->debug_message("aMemberships = ".var_export($aMemberships, true)); + + $aContactList = array(); + foreach ($aMemberships as $sMembership) { + //$this->debug_message("sMembership = $sMembership"); + if (isset($matches)) unset($matches); + preg_match('#(.*)#', $sMembership, $matches); + if (count($matches) == 0) continue; + $sMemberRole = $matches[1]; + //$this->debug_message("MemberRole = $sMemberRole"); + if ($sMemberRole != 'Allow' && $sMemberRole != 'Reverse' && $sMemberRole != 'Pending') continue; + $p = $sMembership; + if (isset($aMembers)) unset($aMembers); + $aMembers = array(); + while (1) { + //$this->debug_message("search p = $p"); + $start = strpos($p, 'debug_message("add sMember = $sMember"); + $p = substr($p, $end); + } + //$this->debug_message("aMembers = ".var_export($aMembers, true)); + foreach ($aMembers as $sMember) { + //$this->debug_message("sMember = $sMember"); + if (isset($matches)) unset($matches); + preg_match('##', $sMember, $matches); + if (count($matches) == 0) continue; + $sMemberType = $matches[1]; + //$this->debug_message("MemberType = $sMemberType"); + $network = -1; + preg_match('#(.*)#', $sMember, $matches); + if (count($matches) == 0) continue; + $id = $matches[1]; + if ($sMemberType == 'PassportMember') { + if (strpos($sMember, 'Passport') === false) continue; + $network = 1; + preg_match('#(.*)#', $sMember, $matches); + } + else if ($sMemberType == 'EmailMember') { + if (strpos($sMember, 'Email') === false) continue; + // Value is 32: or 32:YAHOO + preg_match('#MSN.IM.BuddyType(.*):(.*)#', $sMember, $matches); + if (count($matches) == 0) continue; + if ($matches[1] != 32) continue; + $network = 32; + preg_match('#(.*)#', $sMember, $matches); + } + if ($network == -1) continue; + if (count($matches) > 0) { + $email = $matches[1]; + @list($u_name, $u_domain) = @explode('@', $email); + if ($u_domain == NULL) continue; + $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id; + $this->debug_message("*** Adding new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)"); + } + } + } + return $aContactList; + } + + /** + * MsnObj related methods + */ + + /** * + * @param $FilePath 圖檔路徑 + * @param $Type 檔案類型 3=>大頭貼,2表情圖案 + * @return array + */ + private function MsnObj($FilePath, $Type = 3) { + if (!($FileSize=filesize($FilePath))) return ''; + $Location = md5($FilePath); + $Friendly = md5($FilePath.$Type); + if (isset($this->MsnObjMap[$Location])) return $this->MsnObjMap[$Location]; + $sha1d = base64_encode(sha1(file_get_contents($FilePath), true)); + $sha1c = base64_encode(sha1("Creator".$this->user."Size$FileSize"."Type$Type"."Location$Location"."Friendly".$Friendly."SHA1D$sha1d", true)); + $this->MsnObjArray[$Location] = $FilePath; + $MsnObj = ''; + $this->MsnObjMap[$Location] = $MsnObj; + $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n"); + return $MsnObj; + } + + private function GetPictureFilePath($Context) { + $MsnObj = base64_decode($Context); + if (preg_match('/location="(.*?)"/i', $MsnObj, $Match)) + $location = $Match[1]; + $this->debug_message("*** p2p: PictureFile[$location] ::All".print_r($this->MsnObjArray,true)."\n"); + if ($location && isset($this->MsnObjArray[$location])) + return $this->MsnObjArray[$location]; + return false; + } + + private function GetMsnObjDefine($Message) { + $DefineString = ''; + if (is_array($this->Emotions)) + foreach ($this->Emotions as $Pattern => $FilePath) { + if (strpos($Message, $Pattern) !== false) + $DefineString .= "$Pattern\t".$this->MsnObj($FilePath, 2)."\t"; + } + return $DefineString; + } + + /** + * Socket methods + */ + + /** + * Read data of specified size from NS socket + * + * @param integer $size Size to read + * @return string Data read + */ + private function ns_readdata($size) { + $data = ''; + $count = 0; + while (!feof($this->NSfp)) { + $buf = @fread($this->NSfp, $size - $count); + $data .= $buf; + $count += strlen($buf); + if ($count >= $size) break; + } + $this->debug_message("NS: data ($size/$count) <<<\n$data"); + return $data; + } + + /** + * Read line from the NS socket + * + * @return string Data read + */ + private function ns_readln() { + $data = @fgets($this->NSfp, 4096); + if ($data !== false) { + $data = trim($data); + $this->debug_message("NS: <<< $data"); + } + return $data; + } + + /** + * Write line to NS socket + * + * Also increments id + * + * @param string $data Line to write to socket * @return void */ - public function sendPing() { - // NS: >>> PNG - $this->ns_writeln("PNG"); + private function ns_writeln($data) { + @fwrite($this->NSfp, $data."\r\n"); + $this->debug_message("NS: >>> $data"); + $this->id++; } /** - * Methods to return sockets / check socket status - */ - - /** - * Get the NS socket - * - * @return resource NS socket + * Write data to NS socket + * + * @param string $data Data to write to socket + * @return void */ - public function getNSSocket() { - return $this->NSfp; + private function ns_writedata($data) { + @fwrite($this->NSfp, $data); + $this->debug_message("NS: >>> $data"); } /** - * Get the Switchboard sockets currently in use - * - * @return array Array of Switchboard sockets + * Read data of specified size from given SB socket + * + * @param resource $socket SB socket + * @param integer $size Size to read + * @return string Data read */ - public function getSBSockets() { - return $this->switchBoardSessionLookup; + private function sb_readdata($socket, $size) { + $data = ''; + $count = 0; + while (!feof($socket)) { + $buf = @fread($socket, $size - $count); + $data .= $buf; + $count += strlen($buf); + if ($count >= $size) break; + } + $this->debug_message("SB: data ($size/$count) <<<\n$data"); + return $data; + } + + /** + * Read line from given SB socket + * + * @param resource $socket SB Socket + * @return string Line read + */ + private function sb_readln($socket) { + $data = @fgets($socket, 4096); + if ($data !== false) { + $data = trim($data); + $this->debug_message("SB: <<< $data"); + } + return $data; + } + + /** + * Write line to given SB socket + * + * Also increments id + * + * @param resource $socket SB socket + * @param integer $id Reference to SB id + * @param string $data Line to write + * @return void + */ + private function sb_writeln($socket, &$id, $data) { + @fwrite($socket, $data."\r\n"); + $this->debug_message("SB: >>> $data"); + $id++; + } + + /** + * Write data to given SB socket + * + * @param resource $socket SB socket + * @param $data Data to write to socket + * @return void + */ + private function sb_writedata($socket, $data) { + @fwrite($socket, $data); + $this->debug_message("SB: >>> $data"); } /** @@ -3030,7 +2598,451 @@ X-OIM-Sequence-Num: 1 $info = stream_get_meta_data($socket); return $info['eof']; } + + /** + * Key generation methods + */ + + private function derive_key($key, $magic) { + $hash1 = mhash(MHASH_SHA1, $magic, $key); + $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key); + $hash3 = mhash(MHASH_SHA1, $hash1, $key); + $hash4 = mhash(MHASH_SHA1, $hash3.$magic, $key); + return $hash2.substr($hash4, 0, 4); + } + private function generateLoginBLOB($key, $challenge) { + $key1 = base64_decode($key); + $key2 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY HASH'); + $key3 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY ENCRYPTION'); + + // get hash of challenge using key2 + $hash = mhash(MHASH_SHA1, $challenge, $key2); + + // get 8 bytes random data + $iv = substr(base64_encode(rand(1000,9999).rand(1000,9999)), 2, 8); + + $cipher = mcrypt_cbc(MCRYPT_3DES, $key3, $challenge."\x08\x08\x08\x08\x08\x08\x08\x08", MCRYPT_ENCRYPT, $iv); + + $blob = pack('LLLLLLL', 28, 1, 0x6603, 0x8004, 8, 20, 72); + $blob .= $iv; + $blob .= $hash; + $blob .= $cipher; + + return base64_encode($blob); + } + + /** + * Generate challenge response + * + * @param string $code + * @return string challenge response code + */ + private function getChallenge($code) { + // MSNP15 + // http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges + // Step 1: The MD5 Hash + $md5Hash = md5($code.PROD_KEY); + $aMD5 = @explode("\0", chunk_split($md5Hash, 8, "\0")); + for ($i = 0; $i < 4; $i++) { + $aMD5[$i] = implode('', array_reverse(@explode("\0", chunk_split($aMD5[$i], 2, "\0")))); + $aMD5[$i] = (0 + base_convert($aMD5[$i], 16, 10)) & 0x7FFFFFFF; + } + + // Step 2: A new string + $chl_id = $code.PROD_ID; + $chl_id .= str_repeat('0', 8 - (strlen($chl_id) % 8)); + + $aID = @explode("\0", substr(chunk_split($chl_id, 4, "\0"), 0, -1)); + for ($i = 0; $i < count($aID); $i++) { + $aID[$i] = implode('', array_reverse(@explode("\0", chunk_split($aID[$i], 1, "\0")))); + $aID[$i] = 0 + base_convert(bin2hex($aID[$i]), 16, 10); + } + + // Step 3: The 64 bit key + $magic_num = 0x0E79A9C1; + $str7f = 0x7FFFFFFF; + $high = 0; + $low = 0; + for ($i = 0; $i < count($aID); $i += 2) { + $temp = $aID[$i]; + $temp = bcmod(bcmul($magic_num, $temp), $str7f); + $temp = bcadd($temp, $high); + $temp = bcadd(bcmul($aMD5[0], $temp), $aMD5[1]); + $temp = bcmod($temp, $str7f); + + $high = $aID[$i+1]; + $high = bcmod(bcadd($high, $temp), $str7f); + $high = bcadd(bcmul($aMD5[2], $high), $aMD5[3]); + $high = bcmod($high, $str7f); + + $low = bcadd(bcadd($low, $high), $temp); + } + + $high = bcmod(bcadd($high, $aMD5[1]), $str7f); + $low = bcmod(bcadd($low, $aMD5[3]), $str7f); + + $new_high = bcmul($high & 0xFF, 0x1000000); + $new_high = bcadd($new_high, bcmul($high & 0xFF00, 0x100)); + $new_high = bcadd($new_high, bcdiv($high & 0xFF0000, 0x100)); + $new_high = bcadd($new_high, bcdiv($high & 0xFF000000, 0x1000000)); + // we need integer here + $high = 0+$new_high; + + $new_low = bcmul($low & 0xFF, 0x1000000); + $new_low = bcadd($new_low, bcmul($low & 0xFF00, 0x100)); + $new_low = bcadd($new_low, bcdiv($low & 0xFF0000, 0x100)); + $new_low = bcadd($new_low, bcdiv($low & 0xFF000000, 0x1000000)); + // we need integer here + $low = 0+$new_low; + + // we just use 32 bits integer, don't need the key, just high/low + // $key = bcadd(bcmul($high, 0x100000000), $low); + + // Step 4: Using the key + $md5Hash = md5($code.PROD_KEY); + $aHash = @explode("\0", chunk_split($md5Hash, 8, "\0")); + + $hash = ''; + $hash .= sprintf("%08x", (0 + base_convert($aHash[0], 16, 10)) ^ $high); + $hash .= sprintf("%08x", (0 + base_convert($aHash[1], 16, 10)) ^ $low); + $hash .= sprintf("%08x", (0 + base_convert($aHash[2], 16, 10)) ^ $high); + $hash .= sprintf("%08x", (0 + base_convert($aHash[3], 16, 10)) ^ $low); + + return $hash; + } + + /** + * Utility methods + */ + + private function Array2SoapVar($Array, $ReturnSoapVarObj = true, $TypeName = null, $TypeNameSpace = null) { + $ArrayString = ''; + foreach($Array as $Key => $Val) { + if ($Key{0} == ':') continue; + $Attrib = ''; + if (is_array($Val[':'])) { + foreach ($Val[':'] as $AttribName => $AttribVal) + $Attrib .= " $AttribName = '$AttribVal'"; + } + if ($Key{0} == '!') { + //List Type Define + $Key = substr($Key,1); + foreach ($Val as $ListKey => $ListVal) { + if ($ListKey{0} == ':') continue; + if (is_array($ListVal)) $ListVal = $this->Array2SoapVar($ListVal, false); + elseif (is_bool($ListVal)) $ListVal = $ListVal ? 'true' : 'false'; + $ArrayString .= "<$Key$Attrib>$ListVal"; + } + continue; + } + if (is_array($Val)) $Val = $this->Array2SoapVar($Val, false); + elseif (is_bool($Val)) $Val = $Val ? 'true' : 'false'; + $ArrayString .= "<$Key$Attrib>$Val"; + } + if ($ReturnSoapVarObj) return new SoapVar($ArrayString, XSD_ANYXML, $TypeName, $TypeNameSpace); + return $ArrayString; + } + + private function linetoArray($lines) { + $lines = str_replace("\r", '', $lines); + $lines = explode("\n", $lines); + foreach ($lines as $line) { + if (!isset($line{3})) continue; + list($Key, $Val) = explode(':', $line); + $Data[trim($Key)] = trim($Val); + } + return $Data; + } + + /** + * Get Passport ticket + * + * @param string $url URL string (Optional) + * @return mixed Array of tickets or false on failure + */ + private function get_passport_ticket($url = '') { + $user = $this->user; + $password = htmlspecialchars($this->password); + + if ($url === '') + $passport_url = PASSPORT_URL; + else + $passport_url = $url; + + $XML = ' + +
+ + {7108E71A-9926-4FCB-BCC9-9A9D3F32E423} + 4 + 1 + + AQAAAAIAAABsYwQAAAAxMDMz + + + + '.$user.' + '.$password.' + + +
+ + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + http://Passport.NET/tb + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + messengerclear.live.com + + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + messenger.msn.com + + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + contacts.msn.com + + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + messengersecure.live.com + + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + spaces.live.com + + + + + + http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue + + + storage.msn.com + + + + + + +'; + + $this->debug_message("*** URL: $passport_url"); + $this->debug_message("*** Sending SOAP:\n$XML"); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $passport_url); + if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $XML); + $data = curl_exec($curl); + $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + curl_close($curl); + $this->debug_message("*** Get Result:\n$data"); + + if ($http_code != 200) { + // sometimes, redirect to another URL + // MSNP15 + //psf:Redirect + //https://msnia.login.live.com/pp450/RST.srf + //Authentication Failure + if (strpos($data, 'psf:Redirect') === false) { + $this->debug_message("*** Could not get passport ticket! http code = $http_code"); + return false; + } + preg_match("#(.*)#", $data, $matches); + if (count($matches) == 0) { + $this->debug_message('*** Redirected, but could not get redirect URL!'); + return false; + } + $redirect_url = $matches[1]; + if ($redirect_url == $passport_url) { + $this->debug_message('*** Redirected, but to same URL!'); + return false; + } + $this->debug_message("*** Redirected to $redirect_url"); + return $this->get_passport_ticket($redirect_url); + } + + // sometimes, redirect to another URL, also return 200 + // MSNP15 + //psf:Redirect + //https://msnia.login.live.com/pp450/RST.srf + //Authentication Failure + if (strpos($data, 'psf:Redirect') !== false) { + preg_match("#(.*)#", $data, $matches); + if (count($matches) != 0) { + $redirect_url = $matches[1]; + if ($redirect_url == $passport_url) { + $this->debug_message('*** Redirected, but to same URL!'); + return false; + } + $this->debug_message("*** Redirected to $redirect_url"); + return $this->get_passport_ticket($redirect_url); + } + } + + // no Redurect faultcode or URL + // we should get the ticket here + + // we need ticket and secret code + // RST1: messengerclear.live.com + // t=tick&p= + // binary secret + // RST2: messenger.msn.com + // t=tick + // RST3: contacts.msn.com + // t=tick&p= + // RST4: messengersecure.live.com + // t=tick&p= + // RST5: spaces.live.com + // t=tick&p= + // RST6: storage.msn.com + // t=tick&p= + preg_match("#". + "(.*)(.*)". + "(.*)(.*)". + "(.*)(.*)". + "(.*)(.*)". + "(.*)(.*)". + "(.*)(.*)". + "(.*)(.*)". + "#", + $data, $matches); + + // no ticket found! + if (count($matches) == 0) { + $this->debug_message('*** Could not get passport ticket!'); + return false; + } + + //$this->debug_message(var_export($matches, true)); + // matches[0]: all data + // matches[1]: RST1 (messengerclear.live.com) ticket + // matches[2]: ... + // matches[3]: RST1 (messengerclear.live.com) binary secret + // matches[4]: ... + // matches[5]: RST2 (messenger.msn.com) ticket + // matches[6]: ... + // matches[7]: RST3 (contacts.msn.com) ticket + // matches[8]: ... + // matches[9]: RST4 (messengersecure.live.com) ticket + // matches[10]: ... + // matches[11]: RST5 (spaces.live.com) ticket + // matches[12]: ... + // matches[13]: RST6 (storage.live.com) ticket + // matches[14]: ... + + // so + // ticket => $matches[1] + // secret => $matches[3] + // web_ticket => $matches[5] + // contact_ticket => $matches[7] + // oim_ticket => $matches[9] + // space_ticket => $matches[11] + // storage_ticket => $matches[13] + + // yes, we get ticket + $aTickets = array( + 'ticket' => html_entity_decode($matches[1]), + 'secret' => html_entity_decode($matches[3]), + 'web_ticket' => html_entity_decode($matches[5]), + 'contact_ticket' => html_entity_decode($matches[7]), + 'oim_ticket' => html_entity_decode($matches[9]), + 'space_ticket' => html_entity_decode($matches[11]), + 'storage_ticket' => html_entity_decode($matches[13]) + ); + $this->ticket = $aTickets; + //$this->debug_message(var_export($aTickets, true)); + $ABAuthHeaderArray = array( + 'ABAuthHeader' => array( + ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'), + 'ManagedGroupRequest' => false, + 'TicketToken' => htmlspecialchars($this->ticket['contact_ticket']), + ) + ); + $this->ABAuthHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABAuthHeader', $this->Array2SoapVar($ABAuthHeaderArray)); + return $aTickets; + } + + /** + * Generate the data to send a message + * + * @param string $sMessage Message + * @param integer $network Network + * @return string Message data + */ + private function getMessage($sMessage, $network = 1) { + $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n"; + $msg_header_len = strlen($msg_header); + if ($network == 1) + $maxlen = $this->max_msn_message_len - $msg_header_len; + else + $maxlen = $this->max_yahoo_message_len - $msg_header_len; + $sMessage = str_replace("\r", '', $sMessage); + $msg = substr($sMessage, 0, $maxlen); + return $msg_header.$msg; + } + + /** + * Sleep for the given number of seconds + * + * @param integer $wait Number of seconds to sleep for + */ + private function NSRetryWait($wait) { + $this->debug_message("*** Sleeping for $wait seconds before retrying"); + sleep($wait); + } + + /** + * Sends a ping command + * + * Should be called about every 50 seconds + * + * @return void + */ + public function sendPing() { + // NS: >>> PNG + $this->ns_writeln("PNG"); + } + /** * Methods to add / call callbacks */ @@ -3075,4 +3087,50 @@ X-OIM-Sequence-Num: 1 return false; } } + + /** + * Debugging methods + */ + + /** + * Print message if debugging is enabled + * + * @param string $str Message to print + */ + private function debug_message($str) { + if (!$this->debug) return; + echo $str."\n"; + } + + /** + * Dump binary data + * + * @param string $str Data string + * @return Binary data + */ + private function dump_binary($str) { + $buf = ''; + $a_str = ''; + $h_str = ''; + $len = strlen($str); + for ($i = 0; $i < $len; $i++) { + if (($i % 16) == 0) { + if ($buf !== '') { + $buf .= "$h_str $a_str\n"; + } + $buf .= sprintf("%04X:", $i); + $a_str = ''; + $h_str = ''; + } + $ch = ord($str[$i]); + if ($ch < 32) + $a_str .= '.'; + else + $a_str .= chr($ch); + $h_str .= sprintf(" %02X", $ch); + } + if ($h_str !== '') + $buf .= "$h_str $a_str\n"; + return $buf; + } } From d52f6d5aeaa820e44beadf397dd5c0f15e0d33e7 Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Wed, 16 Jun 2010 01:24:28 +0100 Subject: [PATCH 265/730] Removed unnecessary else statement --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 726 +++++++++---------- 1 file changed, 363 insertions(+), 363 deletions(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 1e8d7e0f1f..af9a45e49d 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -522,395 +522,395 @@ class MSN { $this->NSRetryWait($this->retry_wait); $this->signon(); return; - } else { - switch (substr($data, 0, 3)) { - case 'SBS': - // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us - // NS: <<< SBS 0 null - break; + } + + switch (substr($data, 0, 3)) { + case 'SBS': + // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us + // NS: <<< SBS 0 null + break; - case 'RFS': - // FIXME: - // NS: <<< RFS ??? - // refresh ADL, so we re-send it again - if (is_array($this->aADL)) { - foreach ($this->aADL as $str) { - $len = strlen($str); - // NS: >>> ADL {id} {size} - $this->ns_writeln("ADL $this->id $len"); - $this->ns_writedata($str); - } + case 'RFS': + // FIXME: + // NS: <<< RFS ??? + // refresh ADL, so we re-send it again + if (is_array($this->aADL)) { + foreach ($this->aADL as $str) { + $len = strlen($str); + // NS: >>> ADL {id} {size} + $this->ns_writeln("ADL $this->id $len"); + $this->ns_writedata($str); } - break; + } + break; - case 'LST': - // NS: <<< LST {email} {alias} 11 0 - @list(/* LST */, $email, /* alias */,) = @explode(' ', $data); - @list($u_name, $u_domain) = @explode('@', $email); - if (!isset($this->aContactList[$u_domain][$u_name][1])) { - $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow'; - $this->debug_message("*** Added to contact list: $u_name@$u_domain"); - } - break; + case 'LST': + // NS: <<< LST {email} {alias} 11 0 + @list(/* LST */, $email, /* alias */,) = @explode(' ', $data); + @list($u_name, $u_domain) = @explode('@', $email); + if (!isset($this->aContactList[$u_domain][$u_name][1])) { + $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow'; + $this->debug_message("*** Added to contact list: $u_name@$u_domain"); + } + break; - case 'ADL': - // randomly, we get ADL command, someone add us to their contact list for MSNP15 - // NS: <<< ADL 0 {size} - @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) { - $data = $this->ns_readdata($size); - preg_match('##', $data, $matches); - if (is_array($matches) && count($matches) > 0) { - $u_domain = $matches[1]; - $u_name = $matches[2]; - $network = $matches[4]; - if (isset($this->aContactList[$u_domain][$u_name][$network])) - $this->debug_message("*** Someone (network: $network) added us to their list (but already in our list): $u_name@$u_domain"); - else { - $re_login = false; - $cnt = 0; - foreach (array('Allow', 'Reverse') as $list) { + case 'ADL': + // randomly, we get ADL command, someone add us to their contact list for MSNP15 + // NS: <<< ADL 0 {size} + @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) { + $data = $this->ns_readdata($size); + preg_match('##', $data, $matches); + if (is_array($matches) && count($matches) > 0) { + $u_domain = $matches[1]; + $u_name = $matches[2]; + $network = $matches[4]; + if (isset($this->aContactList[$u_domain][$u_name][$network])) + $this->debug_message("*** Someone (network: $network) added us to their list (but already in our list): $u_name@$u_domain"); + else { + $re_login = false; + $cnt = 0; + foreach (array('Allow', 'Reverse') as $list) { + if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { + if ($re_login) { + $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list"); + continue; + } + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->debug_message("*** Could not re-login, something wrong here"); + $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list"); + continue; + } + $re_login = true; + $this->ticket = $aTickets; + $this->debug_message("**** Got new ticket, trying again"); if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { - if ($re_login) { - $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list"); - continue; - } - $aTickets = $this->get_passport_ticket(); - if (!$aTickets || !is_array($aTickets)) { - // failed to login? ignore it - $this->debug_message("*** Could not re-login, something wrong here"); - $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list"); - continue; - } - $re_login = true; - $this->ticket = $aTickets; - $this->debug_message("**** Got new ticket, trying again"); - if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) { - $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list"); - continue; - } - } - $this->aContactList[$u_domain][$u_name][$network][$list] = false; - $cnt++; - } - $this->debug_message("*** Someone (network: $network) added us to their list: $u_name@$u_domain"); - } - $str = ''; - $len = strlen($str); - - $this->callHandler('AddedToList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network)); - } - else - $this->debug_message("*** Someone added us to their list: $data"); - } - break; - - case 'RML': - // randomly, we get RML command, someome remove us to their contact list for MSNP15 - // NS: <<< RML 0 {size} - @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) { - $data = $this->ns_readdata($size); - preg_match('##', $data, $matches); - if (is_array($matches) && count($matches) > 0) { - $u_domain = $matches[1]; - $u_name = $matches[2]; - $network = $matches[4]; - if (isset($this->aContactList[$u_domain][$u_name][$network])) { - $aData = $this->aContactList[$u_domain][$u_name][$network]; - - foreach ($aData as $list => $id) - $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list); - - unset($this->aContactList[$u_domain][$u_name][$network]); - $this->debug_message("*** Someone (network: $network) removed us from their list: $u_name@$u_domain"); - } - else - $this->debug_message("*** Someone (network: $network) removed us from their list (but not in our list): $u_name@$u_domain"); - - $this->callHandler('RemovedFromList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network)); - } - else - $this->debug_message("*** Someone removed us from their list: $data"); - } - break; - - case 'MSG': - // randomly, we get MSG notification from server - // NS: <<< MSG Hotmail Hotmail {size} - @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) { - $data = $this->ns_readdata($size); - $aLines = @explode("\n", $data); - $header = true; - $ignore = false; - $maildata = ''; - foreach ($aLines as $line) { - $line = rtrim($line); - if ($header) { - if ($line === '') { - $header = false; - continue; - } - if (strncasecmp($line, 'Content-Type:', 13) == 0) { - if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && strpos($line, 'text/x-msmsgsoimnotification') === false) { - // we just need text/x-msmsgsinitialmdatanotification - // or text/x-msmsgsoimnotification - $ignore = true; - break; + $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list"); + continue; } } - continue; - } - if (strncasecmp($line, 'Mail-Data:', 10) == 0) { - $maildata = trim(substr($line, 10)); - break; + $this->aContactList[$u_domain][$u_name][$network][$list] = false; + $cnt++; } + $this->debug_message("*** Someone (network: $network) added us to their list: $u_name@$u_domain"); } - if ($ignore) { - $this->debug_message("*** Ignoring MSG for: $line"); - break; - } - if ($maildata == '') { - $this->debug_message("*** Ignoring MSG not for OIM"); - break; - } - $re_login = false; - if (strcasecmp($maildata, 'too-large') == 0) { - $this->debug_message("*** Large mail-data, need to get the data via SOAP"); - $maildata = $this->getOIM_maildata(); - if ($maildata === false) { - $this->debug_message("*** Could not get mail-data via SOAP"); + $str = ''; + $len = strlen($str); - // maybe we need to re-login again - $aTickets = $this->get_passport_ticket(); - if (!$aTickets || !is_array($aTickets)) { - // failed to login? ignore it - $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM"); - break; - } - $re_login = true; - $this->ticket = $aTickets; - $this->debug_message("*** Got new ticket, trying again"); - $maildata = $this->getOIM_maildata(); - if ($maildata === false) { - $this->debug_message("*** Could not get mail-data via SOAP, and re-login already attempted, ignoring this OIM"); - break; - } - } - } - // could be a lots of ..., so we can't use preg_match here - $p = $maildata; - $aOIMs = array(); - while (1) { - $start = strpos($p, ''); - $end = strpos($p, ''); - if ($start === false || $end === false || $start > $end) break; - $end += 4; - $sOIM = substr($p, $start, $end - $start); - $aOIMs[] = $sOIM; - $p = substr($p, $end); - } - if (count($aOIMs) == 0) { - $this->debug_message("*** Ignoring empty OIM"); - break; - } - foreach ($aOIMs as $maildata) { - // T: 11 for MSN, 13 for Yahoo - // S: 6 for MSN, 7 for Yahoo - // RT: the datetime received by server - // RS: already read or not - // SZ: size of message - // E: sender - // I: msgid - // F: always 00000000-0000-0000-0000-000000000009 - // N: sender alias - preg_match('#(.*)#', $maildata, $matches); - if (count($matches) == 0) { - $this->debug_message("*** Ignoring OIM maildata without type"); - continue; - } - $oim_type = $matches[1]; - if ($oim_type = 13) - $network = 32; - else - $network = 1; - preg_match('#(.*)#', $maildata, $matches); - if (count($matches) == 0) { - $this->debug_message("*** Ignoring OIM maildata without sender"); - continue; - } - $oim_sender = $matches[1]; - preg_match('#(.*)#', $maildata, $matches); - if (count($matches) == 0) { - $this->debug_message("*** Ignoring OIM maildata without msgid"); - continue; - } - $oim_msgid = $matches[1]; - preg_match('#(.*)#', $maildata, $matches); - $oim_size = (count($matches) == 0) ? 0 : $matches[1]; - preg_match('#(.*)#', $maildata, $matches); - $oim_time = (count($matches) == 0) ? 0 : $matches[1]; - $this->debug_message("*** OIM received from $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); - $sMsg = $this->getOIM_message($oim_msgid); - if ($sMsg === false) { - $this->debug_message("*** Could not get OIM, msgid = $oim_msgid"); - if ($re_login) { - $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM"); - continue; - } - $aTickets = $this->get_passport_ticket(); - if (!$aTickets || !is_array($aTickets)) { - // failed to login? ignore it - $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM"); - continue; - } - $re_login = true; - $this->ticket = $aTickets; - $this->debug_message("*** get new ticket, try it again"); - $sMsg = $this->getOIM_message($oim_msgid); - if ($sMsg === false) { - $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM"); - continue; - } - } - $this->debug_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg"); - $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true)); - } + $this->callHandler('AddedToList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network)); } - break; + else + $this->debug_message("*** Someone added us to their list: $data"); + } + break; - case 'UBM': - // randomly, we get UBM, this is the message from other network, like Yahoo! - // NS: <<< UBM {email} $network $type {size} - @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data); - if (is_numeric($size) && $size > 0) { - $data = $this->ns_readdata($size); - $aLines = @explode("\n", $data); - $header = true; - $ignore = false; - $sMsg = ''; - foreach ($aLines as $line) { - $line = rtrim($line); - if ($header) { - if ($line === '') { - $header = false; - continue; - } - if (strncasecmp($line, 'TypingUser:', 11) == 0) { + case 'RML': + // randomly, we get RML command, someome remove us to their contact list for MSNP15 + // NS: <<< RML 0 {size} + @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) { + $data = $this->ns_readdata($size); + preg_match('##', $data, $matches); + if (is_array($matches) && count($matches) > 0) { + $u_domain = $matches[1]; + $u_name = $matches[2]; + $network = $matches[4]; + if (isset($this->aContactList[$u_domain][$u_name][$network])) { + $aData = $this->aContactList[$u_domain][$u_name][$network]; + + foreach ($aData as $list => $id) + $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list); + + unset($this->aContactList[$u_domain][$u_name][$network]); + $this->debug_message("*** Someone (network: $network) removed us from their list: $u_name@$u_domain"); + } + else + $this->debug_message("*** Someone (network: $network) removed us from their list (but not in our list): $u_name@$u_domain"); + + $this->callHandler('RemovedFromList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network)); + } + else + $this->debug_message("*** Someone removed us from their list: $data"); + } + break; + + case 'MSG': + // randomly, we get MSG notification from server + // NS: <<< MSG Hotmail Hotmail {size} + @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) { + $data = $this->ns_readdata($size); + $aLines = @explode("\n", $data); + $header = true; + $ignore = false; + $maildata = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + if (strncasecmp($line, 'Content-Type:', 13) == 0) { + if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && strpos($line, 'text/x-msmsgsoimnotification') === false) { + // we just need text/x-msmsgsinitialmdatanotification + // or text/x-msmsgsoimnotification $ignore = true; break; } - continue; - } - $aSubLines = @explode("\r", $line); - foreach ($aSubLines as $str) { - if ($sMsg !== '') - $sMsg .= "\n"; - $sMsg .= $str; } + continue; } - if ($ignore) { - $this->debug_message("*** Ignoring message from $from_email: $line"); + if (strncasecmp($line, 'Mail-Data:', 10) == 0) { + $maildata = trim(substr($line, 10)); break; } - $this->debug_message("*** MSG from $from_email (network: $network): $sMsg"); - $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false)); } - break; + if ($ignore) { + $this->debug_message("*** Ignoring MSG for: $line"); + break; + } + if ($maildata == '') { + $this->debug_message("*** Ignoring MSG not for OIM"); + break; + } + $re_login = false; + if (strcasecmp($maildata, 'too-large') == 0) { + $this->debug_message("*** Large mail-data, need to get the data via SOAP"); + $maildata = $this->getOIM_maildata(); + if ($maildata === false) { + $this->debug_message("*** Could not get mail-data via SOAP"); - case 'UBX': - // randomly, we get UBX notification from server - // NS: <<< UBX email {network} {size} - @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data); - // we don't need the notification data, so just ignore it - if (is_numeric($size) && $size > 0) - $this->ns_readdata($size); - break; + // maybe we need to re-login again + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM"); + break; + } + $re_login = true; + $this->ticket = $aTickets; + $this->debug_message("*** Got new ticket, trying again"); + $maildata = $this->getOIM_maildata(); + if ($maildata === false) { + $this->debug_message("*** Could not get mail-data via SOAP, and re-login already attempted, ignoring this OIM"); + break; + } + } + } + // could be a lots of ..., so we can't use preg_match here + $p = $maildata; + $aOIMs = array(); + while (1) { + $start = strpos($p, ''); + $end = strpos($p, ''); + if ($start === false || $end === false || $start > $end) break; + $end += 4; + $sOIM = substr($p, $start, $end - $start); + $aOIMs[] = $sOIM; + $p = substr($p, $end); + } + if (count($aOIMs) == 0) { + $this->debug_message("*** Ignoring empty OIM"); + break; + } + foreach ($aOIMs as $maildata) { + // T: 11 for MSN, 13 for Yahoo + // S: 6 for MSN, 7 for Yahoo + // RT: the datetime received by server + // RS: already read or not + // SZ: size of message + // E: sender + // I: msgid + // F: always 00000000-0000-0000-0000-000000000009 + // N: sender alias + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->debug_message("*** Ignoring OIM maildata without type"); + continue; + } + $oim_type = $matches[1]; + if ($oim_type = 13) + $network = 32; + else + $network = 1; + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->debug_message("*** Ignoring OIM maildata without sender"); + continue; + } + $oim_sender = $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + if (count($matches) == 0) { + $this->debug_message("*** Ignoring OIM maildata without msgid"); + continue; + } + $oim_msgid = $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + $oim_size = (count($matches) == 0) ? 0 : $matches[1]; + preg_match('#(.*)#', $maildata, $matches); + $oim_time = (count($matches) == 0) ? 0 : $matches[1]; + $this->debug_message("*** OIM received from $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size"); + $sMsg = $this->getOIM_message($oim_msgid); + if ($sMsg === false) { + $this->debug_message("*** Could not get OIM, msgid = $oim_msgid"); + if ($re_login) { + $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM"); + continue; + } + $aTickets = $this->get_passport_ticket(); + if (!$aTickets || !is_array($aTickets)) { + // failed to login? ignore it + $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM"); + continue; + } + $re_login = true; + $this->ticket = $aTickets; + $this->debug_message("*** get new ticket, try it again"); + $sMsg = $this->getOIM_message($oim_msgid); + if ($sMsg === false) { + $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM"); + continue; + } + } + $this->debug_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg"); + $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true)); + } + } + break; - case 'CHL': - // randomly, we'll get challenge from server - // NS: <<< CHL 0 {code} - @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data); - $fingerprint = $this->getChallenge($chl_code); - // NS: >>> QRY {id} {product_id} 32 - // NS: >>> fingerprint - $this->ns_writeln("QRY $this->id ".PROD_ID.' 32'); - $this->ns_writedata($fingerprint); + case 'UBM': + // randomly, we get UBM, this is the message from other network, like Yahoo! + // NS: <<< UBM {email} $network $type {size} + @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data); + if (is_numeric($size) && $size > 0) { + $data = $this->ns_readdata($size); + $aLines = @explode("\n", $data); + $header = true; + $ignore = false; + $sMsg = ''; + foreach ($aLines as $line) { + $line = rtrim($line); + if ($header) { + if ($line === '') { + $header = false; + continue; + } + if (strncasecmp($line, 'TypingUser:', 11) == 0) { + $ignore = true; + break; + } + continue; + } + $aSubLines = @explode("\r", $line); + foreach ($aSubLines as $str) { + if ($sMsg !== '') + $sMsg .= "\n"; + $sMsg .= $str; + } + } + if ($ignore) { + $this->debug_message("*** Ignoring message from $from_email: $line"); + break; + } + $this->debug_message("*** MSG from $from_email (network: $network): $sMsg"); + $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false)); + } + break; + + case 'UBX': + // randomly, we get UBX notification from server + // NS: <<< UBX email {network} {size} + @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data); + // we don't need the notification data, so just ignore it + if (is_numeric($size) && $size > 0) + $this->ns_readdata($size); + break; + + case 'CHL': + // randomly, we'll get challenge from server + // NS: <<< CHL 0 {code} + @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data); + $fingerprint = $this->getChallenge($chl_code); + // NS: >>> QRY {id} {product_id} 32 + // NS: >>> fingerprint + $this->ns_writeln("QRY $this->id ".PROD_ID.' 32'); + $this->ns_writedata($fingerprint); + $this->ns_writeln("CHG $this->id NLN $this->clientid"); + if ($this->PhotoStickerFile !== false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + break; + case 'CHG': + // NS: <<< CHG {id} {status} {code} + // ignore it + // change our status to online first + break; + + case 'XFR': + // sometimes, NS will redirect to another NS + // MSNP9 + // NS: <<< XFR {id} NS {server} 0 {server} + // MSNP15 + // NS: <<< XFR {id} NS {server} U D + // for normal switchboard XFR + // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0 + @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data); + @list($ip, $port) = @explode(':', $server); + if ($server_type != 'SB') { + // maybe exit? + // this connection will close after XFR + $this->nsLogout(); + continue; + } + + $this->debug_message("NS: <<< XFR SB"); + $user = array_shift($this->waitingForXFR); + $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message); + /* + $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage); + if ($bSBresult === false) { + // error for switchboard + $this->debug_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]); + $aOfflineUsers[] = $aMSNUsers[$nCurrentUser]; + }*/ + break; + case 'QNG': + // NS: <<< QNG {time} + @list(/* QNG */, $ping_wait) = @explode(' ', $data); + $this->callHandler('Pong', $ping_wait); + break; + + case 'RNG': + if ($this->PhotoStickerFile !== false) + $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); + else $this->ns_writeln("CHG $this->id NLN $this->clientid"); - if ($this->PhotoStickerFile !== false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); - break; - case 'CHG': - // NS: <<< CHG {id} {status} {code} - // ignore it - // change our status to online first - break; + // someone is trying to talk to us + // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0 + $this->debug_message("NS: <<< RNG $data"); + @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data); + @list($sb_ip, $sb_port) = @explode(':', $server); + $this->debug_message("*** RING from $email, $sb_ip:$sb_port"); + $this->addContact($email, 1, $email, true); + $this->connectToSBSession('Passive', $sb_ip, $sb_port, $email, array('sid' => $sid, 'ticket' => $ticket)); + break; + case 'OUT': + // force logout from NS + // NS: <<< OUT xxx + $this->debug_message("*** LOGOUT from NS"); + return $this->nsLogout(); - case 'XFR': - // sometimes, NS will redirect to another NS - // MSNP9 - // NS: <<< XFR {id} NS {server} 0 {server} - // MSNP15 - // NS: <<< XFR {id} NS {server} U D - // for normal switchboard XFR - // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0 - @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data); - @list($ip, $port) = @explode(':', $server); - if ($server_type != 'SB') { - // maybe exit? - // this connection will close after XFR - $this->nsLogout(); - continue; - } + default: + $code = substr($data,0,3); + if (is_numeric($code)) { + $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; + $this->debug_message("*** NS: $this->error"); - $this->debug_message("NS: <<< XFR SB"); - $user = array_shift($this->waitingForXFR); - $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message); - /* - $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage); - if ($bSBresult === false) { - // error for switchboard - $this->debug_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]); - $aOfflineUsers[] = $aMSNUsers[$nCurrentUser]; - }*/ - break; - case 'QNG': - // NS: <<< QNG {time} - @list(/* QNG */, $ping_wait) = @explode(' ', $data); - $this->callHandler('Pong', $ping_wait); - break; - - case 'RNG': - if ($this->PhotoStickerFile !== false) - $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile))); - else - $this->ns_writeln("CHG $this->id NLN $this->clientid"); - // someone is trying to talk to us - // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0 - $this->debug_message("NS: <<< RNG $data"); - @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data); - @list($sb_ip, $sb_port) = @explode(':', $server); - $this->debug_message("*** RING from $email, $sb_ip:$sb_port"); - $this->addContact($email, 1, $email, true); - $this->connectToSBSession('Passive', $sb_ip, $sb_port, $email, array('sid' => $sid, 'ticket' => $ticket)); - break; - case 'OUT': - // force logout from NS - // NS: <<< OUT xxx - $this->debug_message("*** LOGOUT from NS"); return $this->nsLogout(); - - default: - $code = substr($data,0,3); - if (is_numeric($code)) { - $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List"; - $this->debug_message("*** NS: $this->error"); - - return $this->nsLogout(); - } - break; - } + } + break; } } From 956b24f05d93f05afe1c5071a5d9798c849efecc Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Wed, 16 Jun 2010 01:30:44 +0100 Subject: [PATCH 266/730] Access constants and static methods properly ;) --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 86 ++++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index af9a45e49d..5c1a83940b 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -212,10 +212,10 @@ class MSN { // NS: >> VER {id} MSNP9 CVR0 // MSNP15 // NS: >>> VER {id} MSNP15 CVR0 - $this->ns_writeln("VER $this->id ".PROTOCOL.' CVR0'); + $this->ns_writeln("VER $this->id ".self::PROTOCOL.' CVR0'); $start_tm = time(); - while (!socketcheck($this->NSfp)) { + while (!self::socketcheck($this->NSfp)) { $data = $this->ns_readln(); // no data? if ($data === false) { @@ -238,7 +238,7 @@ class MSN { // MSNP15 // NS: <<< VER {id} MSNP15 CVR0 // NS: >>> CVR {id} 0x0409 winnt 5.1 i386 MSMSGS 8.1.0178 msmsgs {user} - $this->ns_writeln("CVR $this->id 0x0409 winnt 5.1 i386 MSMSGS ".BUILDVER." msmsgs $user"); + $this->ns_writeln("CVR $this->id 0x0409 winnt 5.1 i386 MSMSGS ".self::BUILDVER." msmsgs $user"); break; case 'CVR': @@ -248,7 +248,7 @@ class MSN { // MSNP15 // NS: <<< CVR {id} {ver_list} {download_serve} .... // NS: >>> USR {id} SSO I {user} - $this->ns_writeln("USR $this->id ".LOGIN_METHOD." I $user"); + $this->ns_writeln("USR $this->id ".self::LOGIN_METHOD." I $user"); break; case 'USR': @@ -281,7 +281,7 @@ class MSN { $login_code = $this->generateLoginBLOB($secret, $nonce); // NS: >>> USR {id} SSO S {ticket} {login_code} - $this->ns_writeln("USR $this->id ".LOGIN_METHOD." S $ticket $login_code"); + $this->ns_writeln("USR $this->id ".self::LOGIN_METHOD." S $ticket $login_code"); $this->authed = true; break; @@ -307,7 +307,7 @@ class MSN { // NS: >> VER {id} MSNP9 CVR0 // MSNP15 // NS: >>> VER {id} MSNP15 CVR0 - $this->ns_writeln("VER $this->id ".PROTOCOL.' CVR0'); + $this->ns_writeln("VER $this->id ".self::PROTOCOL.' CVR0'); break; case 'GCF': @@ -460,7 +460,7 @@ class MSN { $len = strlen($str); $this->ns_writeln("UUX $this->id $len"); $this->ns_writedata($str); - if (!socketcheck($this->NSfp)) { + if (!self::socketcheck($this->NSfp)) { $this->debug_message('*** Connected, waiting for commands'); break; } else { @@ -508,7 +508,7 @@ class MSN { */ private function nsReceive() { // Sign in again if not signed in or socket failed - if (!is_resource($this->NSfp) || socketcheck($this->NSfp)) { + if (!is_resource($this->NSfp) || self::socketcheck($this->NSfp)) { $this->callHandler('Reconnect'); $this->NSRetryWait($this->retry_wait); $this->signon(); @@ -836,7 +836,7 @@ class MSN { $fingerprint = $this->getChallenge($chl_code); // NS: >>> QRY {id} {product_id} 32 // NS: >>> fingerprint - $this->ns_writeln("QRY $this->id ".PROD_ID.' 32'); + $this->ns_writeln("QRY $this->id ".self::PROD_ID.' 32'); $this->ns_writedata($fingerprint); $this->ns_writeln("CHG $this->id NLN $this->clientid"); if ($this->PhotoStickerFile !== false) @@ -1433,7 +1433,7 @@ class MSN { * @return void */ private function endSBSession($socket, $killsession = false) { - if (!socketcheck($socket)) { + if (!self::socketcheck($socket)) { $this->sb_writeln($socket, $fake = 0, 'OUT'); } @fclose($socket); @@ -1455,7 +1455,7 @@ class MSN { */ private function sendMessageViaSB($to, $message) { $socket = $this->switchBoardSessionLookup[$to]; - if (socketcheck($socket)) { + if (self::socketcheck($socket)) { return false; } @@ -1614,15 +1614,15 @@ class MSN { '; $header_array = array( - 'SOAPAction: '.OIM_MAILDATA_SOAP, + 'SOAPAction: '.self::OIM_MAILDATA_SOAP, 'Content-Type: text/xml; charset=utf-8', - 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')' + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.self::BUILDVER.')' ); - $this->debug_message('*** URL: '.OIM_MAILDATA_URL); + $this->debug_message('*** URL: '.self::OIM_MAILDATA_URL); $this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, OIM_MAILDATA_URL); + curl_setopt($curl, CURLOPT_URL, self::OIM_MAILDATA_URL); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); @@ -1684,15 +1684,15 @@ class MSN { '; $header_array = array( - 'SOAPAction: '.OIM_READ_SOAP, + 'SOAPAction: '.self::OIM_READ_SOAP, 'Content-Type: text/xml; charset=utf-8', - 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')' + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.self::BUILDVER.')' ); - $this->debug_message('*** URL: '.OIM_READ_URL); + $this->debug_message('*** URL: '.self::OIM_READ_URL); $this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, OIM_READ_URL); + curl_setopt($curl, CURLOPT_URL, self::OIM_READ_URL); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); @@ -1760,15 +1760,15 @@ class MSN { '; $header_array = array( - 'SOAPAction: '.OIM_DEL_SOAP, + 'SOAPAction: '.self::OIM_DEL_SOAP, 'Content-Type: text/xml; charset=utf-8', - 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')' + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.self::BUILDVER.')' ); - $this->debug_message('*** URL: '.OIM_DEL_URL); + $this->debug_message('*** URL: '.self::OIM_DEL_URL); $this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, OIM_DEL_URL); + curl_setopt($curl, CURLOPT_URL, self::OIM_DEL_URL); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); @@ -1807,11 +1807,11 @@ class MSN { xml:lang="zh-TW" proxy="MSNMSGR" xmlns="http://messenger.msn.com/ws/2004/09/oim/" - msnpVer="'.PROTOCOL.'" - buildVer="'.BUILDVER.'"/> + msnpVer="'.self::PROTOCOL.'" + buildVer="'.self::BUILDVER.'"/> @@ -1834,15 +1834,15 @@ X-OIM-Sequence-Num: 1 '; $header_array = array( - 'SOAPAction: '.OIM_SEND_SOAP, + 'SOAPAction: '.self::OIM_SEND_SOAP, 'Content-Type: text/xml', - 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')' + 'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.self::BUILDVER.')' ); - $this->debug_message('*** URL: '.OIM_SEND_URL); + $this->debug_message('*** URL: '.self::OIM_SEND_URL); $this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, OIM_SEND_URL); + curl_setopt($curl, CURLOPT_URL, self::OIM_SEND_URL); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); @@ -2095,15 +2095,15 @@ X-OIM-Sequence-Num: 1 '; $header_array = array( - 'SOAPAction: '.DELMEMBER_SOAP, + 'SOAPAction: '.self::DELMEMBER_SOAP, 'Content-Type: text/xml; charset=utf-8', 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' ); - $this->debug_message('*** URL: '.DELMEMBER_URL); + $this->debug_message('*** URL: '.self::DELMEMBER_URL); $this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, DELMEMBER_URL); + curl_setopt($curl, CURLOPT_URL, self::DELMEMBER_URL); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); @@ -2232,15 +2232,15 @@ X-OIM-Sequence-Num: 1 '; $header_array = array( - 'SOAPAction: '.ADDMEMBER_SOAP, + 'SOAPAction: '.self::ADDMEMBER_SOAP, 'Content-Type: text/xml; charset=utf-8', 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' ); - $this->debug_message('*** URL: '.ADDMEMBER_URL); + $this->debug_message('*** URL: '.self::ADDMEMBER_URL); $this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, ADDMEMBER_URL); + curl_setopt($curl, CURLOPT_URL, self::ADDMEMBER_URL); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); @@ -2310,14 +2310,14 @@ X-OIM-Sequence-Num: 1 '; $header_array = array( - 'SOAPAction: '.MEMBERSHIP_SOAP, + 'SOAPAction: '.self::MEMBERSHIP_SOAP, 'Content-Type: text/xml; charset=utf-8', 'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)' ); - $this->debug_message('*** URL: '.MEMBERSHIP_URL); + $this->debug_message('*** URL: '.self::MEMBERSHIP_URL); $this->debug_message("*** Sending SOAP:\n$XML"); $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, MEMBERSHIP_URL); + curl_setopt($curl, CURLOPT_URL, self::MEMBERSHIP_URL); curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); @@ -2642,7 +2642,7 @@ X-OIM-Sequence-Num: 1 // MSNP15 // http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges // Step 1: The MD5 Hash - $md5Hash = md5($code.PROD_KEY); + $md5Hash = md5($code.self::PROD_KEY); $aMD5 = @explode("\0", chunk_split($md5Hash, 8, "\0")); for ($i = 0; $i < 4; $i++) { $aMD5[$i] = implode('', array_reverse(@explode("\0", chunk_split($aMD5[$i], 2, "\0")))); @@ -2650,7 +2650,7 @@ X-OIM-Sequence-Num: 1 } // Step 2: A new string - $chl_id = $code.PROD_ID; + $chl_id = $code.self::PROD_ID; $chl_id .= str_repeat('0', 8 - (strlen($chl_id) % 8)); $aID = @explode("\0", substr(chunk_split($chl_id, 4, "\0"), 0, -1)); @@ -2700,7 +2700,7 @@ X-OIM-Sequence-Num: 1 // $key = bcadd(bcmul($high, 0x100000000), $low); // Step 4: Using the key - $md5Hash = md5($code.PROD_KEY); + $md5Hash = md5($code.self::PROD_KEY); $aHash = @explode("\0", chunk_split($md5Hash, 8, "\0")); $hash = ''; @@ -2766,7 +2766,7 @@ X-OIM-Sequence-Num: 1 $password = htmlspecialchars($this->password); if ($url === '') - $passport_url = PASSPORT_URL; + $passport_url = self::PASSPORT_URL; else $passport_url = $url; From 62a7f102757d51eab83134621763deeb313847ce Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Wed, 16 Jun 2010 01:43:55 +0100 Subject: [PATCH 267/730] $killsession parameter not needed - we'll kill the session later anyway --- plugins/Msn/extlib/phpmsnclass/msn.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 5c1a83940b..74a7e3eec1 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -1432,7 +1432,7 @@ class MSN { * @param boolean $killsession Whether to delete the session * @return void */ - private function endSBSession($socket, $killsession = false) { + private function endSBSession($socket) { if (!self::socketcheck($socket)) { $this->sb_writeln($socket, $fake = 0, 'OUT'); } From 0b2bbd20aa015f5d9d48c4264f56e13324346b4a Mon Sep 17 00:00:00 2001 From: Luke Fitzgerald Date: Wed, 16 Jun 2010 01:55:39 +0100 Subject: [PATCH 268/730] Added Phergie PHP IRC library --- plugins/Irc/extlib/phergie/.gitignore | 2 + plugins/Irc/extlib/phergie/LICENSE | 27 + .../Irc/extlib/phergie/Phergie/Autoload.php | 84 ++ plugins/Irc/extlib/phergie/Phergie/Bot.php | 390 +++++++ plugins/Irc/extlib/phergie/Phergie/Config.php | 170 ++++ .../phergie/Phergie/Config/Exception.php | 44 + .../Irc/extlib/phergie/Phergie/Connection.php | 359 +++++++ .../phergie/Phergie/Connection/Exception.php | 44 + .../phergie/Phergie/Connection/Handler.php | 130 +++ .../phergie/Phergie/Driver/Abstract.php | 301 ++++++ .../phergie/Phergie/Driver/Exception.php | 49 + .../extlib/phergie/Phergie/Driver/Streams.php | 696 +++++++++++++ .../extlib/phergie/Phergie/Event/Abstract.php | 62 ++ .../extlib/phergie/Phergie/Event/Command.php | 62 ++ .../phergie/Phergie/Event/Exception.php | 38 + .../extlib/phergie/Phergie/Event/Handler.php | 174 ++++ .../extlib/phergie/Phergie/Event/Request.php | 450 +++++++++ .../extlib/phergie/Phergie/Event/Response.php | 953 ++++++++++++++++++ .../Irc/extlib/phergie/Phergie/Exception.php | 33 + .../Irc/extlib/phergie/Phergie/Hostmask.php | 217 ++++ .../phergie/Phergie/Hostmask/Exception.php | 37 + .../phergie/Phergie/Plugin/Abstract.php | 582 +++++++++++ .../Irc/extlib/phergie/Phergie/Plugin/Acl.php | 92 ++ .../extlib/phergie/Phergie/Plugin/AltNick.php | 95 ++ .../phergie/Phergie/Plugin/AudioScrobbler.php | 191 ++++ .../phergie/Phergie/Plugin/AutoJoin.php | 69 ++ .../phergie/Phergie/Plugin/BeerScore.php | 156 +++ .../extlib/phergie/Phergie/Plugin/Cache.php | 106 ++ .../extlib/phergie/Phergie/Plugin/Command.php | 134 +++ .../extlib/phergie/Phergie/Plugin/Ctcp.php | 91 ++ .../extlib/phergie/Phergie/Plugin/Daddy.php | 60 ++ .../phergie/Phergie/Plugin/Exception.php | 113 +++ .../extlib/phergie/Phergie/Plugin/Google.php | 375 +++++++ .../extlib/phergie/Phergie/Plugin/Handler.php | 412 ++++++++ .../extlib/phergie/Phergie/Plugin/Help.php | 250 +++++ .../extlib/phergie/Phergie/Plugin/Http.php | 275 +++++ .../phergie/Phergie/Plugin/Http/Response.php | 228 +++++ .../phergie/Phergie/Plugin/Invisible.php | 44 + .../extlib/phergie/Phergie/Plugin/Join.php | 56 + .../extlib/phergie/Phergie/Plugin/Part.php | 55 + .../Irc/extlib/phergie/Phergie/Plugin/Php.php | 88 ++ .../phergie/Phergie/Plugin/Php/Source.php | 46 + .../Phergie/Plugin/Php/Source/Local.php | 203 ++++ .../extlib/phergie/Phergie/Plugin/Ping.php | 162 +++ .../extlib/phergie/Phergie/Plugin/Pong.php | 44 + .../phergie/Phergie/Plugin/Prioritize.php | 99 ++ .../extlib/phergie/Phergie/Plugin/Puppet.php | 89 ++ .../extlib/phergie/Phergie/Plugin/Quit.php | 60 ++ .../extlib/phergie/Phergie/Plugin/Remind.php | 360 +++++++ .../phergie/Phergie/Plugin/TerryChay.php | 109 ++ .../Phergie/Plugin/TheFuckingWeather.php | 150 +++ .../extlib/phergie/Phergie/Plugin/Time.php | 72 ++ .../extlib/phergie/Phergie/Plugin/Twitter.php | 223 ++++ .../Phergie/Plugin/Twitter/laconica.class.php | 41 + .../Phergie/Plugin/Twitter/twitter.class.php | 287 ++++++ .../Irc/extlib/phergie/Phergie/Plugin/Url.php | 739 ++++++++++++++ .../Phergie/Plugin/Url/Shorten/Abstract.php | 41 + .../Phergie/Plugin/Url/Shorten/Trim.php | 44 + .../phergie/Phergie/Plugin/UserInfo.php | 413 ++++++++ .../phergie/Phergie/Process/Abstract.php | 130 +++ .../extlib/phergie/Phergie/Process/Async.php | 161 +++ .../phergie/Phergie/Process/Exception.php | 33 + .../phergie/Phergie/Process/Standard.php | 61 ++ .../phergie/Phergie/Tools/LogViewer/INSTALL | 24 + .../phergie/Phergie/Tools/LogViewer/index.php | 368 +++++++ .../Irc/extlib/phergie/Phergie/Tools/README | 6 + .../extlib/phergie/Phergie/Ui/Abstract.php | 116 +++ .../Irc/extlib/phergie/Phergie/Ui/Console.php | 223 ++++ .../Irc/extlib/phergie/PhergiePackageTask.php | 110 ++ plugins/Irc/extlib/phergie/README | 11 + plugins/Irc/extlib/phergie/Settings.php.dist | 97 ++ .../Tests/Phergie/Plugin/HandlerTest.php | 461 +++++++++ .../phergie/Tests/Phergie/Plugin/Mock.php | 49 + .../phergie/Tests/Phergie/Plugin/PingTest.php | 175 ++++ .../phergie/Tests/Phergie/Plugin/PongTest.php | 74 ++ .../Tests/Phergie/Plugin/TerryChayTest.php | 99 ++ .../phergie/Tests/Phergie/Plugin/TestCase.php | 207 ++++ .../TestNonInstantiablePluginFromFile.php | 43 + .../Irc/extlib/phergie/Tests/TestHelper.php | 26 + plugins/Irc/extlib/phergie/Tests/phpunit.xml | 26 + plugins/Irc/extlib/phergie/build.xml | 298 ++++++ plugins/Irc/extlib/phergie/phergie.bat | 14 + plugins/Irc/extlib/phergie/phergie.php | 54 + 83 files changed, 13842 insertions(+) create mode 100644 plugins/Irc/extlib/phergie/.gitignore create mode 100644 plugins/Irc/extlib/phergie/LICENSE create mode 100755 plugins/Irc/extlib/phergie/Phergie/Autoload.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Bot.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Config.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Config/Exception.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Connection.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Connection/Handler.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Driver/Abstract.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Event/Abstract.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Event/Command.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Event/Exception.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Event/Handler.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Event/Request.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Event/Response.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Exception.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Hostmask.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Hostmask/Exception.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/AltNick.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/AudioScrobbler.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/AutoJoin.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/BeerScore.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Cache.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Ctcp.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Invisible.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Join.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Part.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source/Local.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Pong.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Prioritize.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Puppet.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Time.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter/laconica.class.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter/twitter.class.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Abstract.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Trim.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/UserInfo.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Process/Async.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Process/Exception.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Process/Standard.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Tools/LogViewer/INSTALL create mode 100755 plugins/Irc/extlib/phergie/Phergie/Tools/LogViewer/index.php create mode 100755 plugins/Irc/extlib/phergie/Phergie/Tools/README create mode 100644 plugins/Irc/extlib/phergie/Phergie/Ui/Abstract.php create mode 100644 plugins/Irc/extlib/phergie/Phergie/Ui/Console.php create mode 100644 plugins/Irc/extlib/phergie/PhergiePackageTask.php create mode 100644 plugins/Irc/extlib/phergie/README create mode 100755 plugins/Irc/extlib/phergie/Settings.php.dist create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php create mode 100755 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/Mock.php create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PingTest.php create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PongTest.php create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TerryChayTest.php create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestCase.php create mode 100755 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestNonInstantiablePluginFromFile.php create mode 100644 plugins/Irc/extlib/phergie/Tests/TestHelper.php create mode 100644 plugins/Irc/extlib/phergie/Tests/phpunit.xml create mode 100644 plugins/Irc/extlib/phergie/build.xml create mode 100644 plugins/Irc/extlib/phergie/phergie.bat create mode 100755 plugins/Irc/extlib/phergie/phergie.php diff --git a/plugins/Irc/extlib/phergie/.gitignore b/plugins/Irc/extlib/phergie/.gitignore new file mode 100644 index 0000000000..553fe8e258 --- /dev/null +++ b/plugins/Irc/extlib/phergie/.gitignore @@ -0,0 +1,2 @@ +Settings.php +*.db diff --git a/plugins/Irc/extlib/phergie/LICENSE b/plugins/Irc/extlib/phergie/LICENSE new file mode 100644 index 0000000000..d7d23420ac --- /dev/null +++ b/plugins/Irc/extlib/phergie/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2010, Phergie Development Team +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +Neither the name of the Phergie Development Team nor the names of its +contributors may be used to endorse or promote products derived from this +software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/plugins/Irc/extlib/phergie/Phergie/Autoload.php b/plugins/Irc/extlib/phergie/Phergie/Autoload.php new file mode 100755 index 0000000000..b03fe2ae10 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Autoload.php @@ -0,0 +1,84 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Autoloader for Phergie classes. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Autoload +{ + /** + * Constructor to add the base Phergie path to the include_path. + * + * @return void + */ + public function __construct() + { + $path = dirname(__FILE__); + $includePath = get_include_path(); + $includePathList = explode(PATH_SEPARATOR, $includePath); + if (!in_array($path, $includePathList)) { + self::addPath($path); + } + } + + /** + * Autoload callback for loading class files. + * + * @param string $class Class to load + * + * @return void + */ + public function load($class) + { + if (substr($class, 0, 8) == 'Phergie_') { + $class = substr($class, 8); + } + include str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php'; + } + + /** + * Registers an instance of this class as an autoloader. + * + * @return void + */ + public static function registerAutoloader() + { + spl_autoload_register(array(new self, 'load')); + } + + /** + * Add a path to the include path. + * + * @param string $path Path to add + * + * @return void + */ + public static function addPath($path) + { + set_include_path($path . PATH_SEPARATOR . get_include_path()); + } +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Bot.php b/plugins/Irc/extlib/phergie/Phergie/Bot.php new file mode 100755 index 0000000000..153bd55905 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Bot.php @@ -0,0 +1,390 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Composite class for other components to represent the bot. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Bot +{ + /** + * Current version of Phergie + */ + const VERSION = '2.0.1'; + + /** + * Current driver instance + * + * @var Phergie_Driver_Abstract + */ + protected $driver; + + /** + * Current configuration instance + * + * @var Phergie_Config + */ + protected $config; + + /** + * Current connection handler instance + * + * @var Phergie_Connection_Handler + */ + protected $connections; + + /** + * Current plugin handler instance + * + * @var Phergie_Plugin_Handler + */ + protected $plugins; + + /** + * Current event handler instance + * + * @var Phergie_Event_Handler + */ + protected $events; + + /** + * Current end-user interface instance + * + * @var Phergie_Ui_Abstract + */ + protected $ui; + + /** + * Current processor instance + * + * @var Phergie_Process_Abstract + */ + protected $processor; + + /** + * Returns a driver instance, creating one of the default class if + * none has been set. + * + * @return Phergie_Driver_Abstract + */ + public function getDriver() + { + if (empty($this->driver)) { + // Check if a driver has been defined in the configuration to use + // as the default + $config = $this->getConfig(); + if (isset($config['driver'])) { + $class = 'Phergie_Driver_' . ucfirst($config['driver']); + } else { + // Otherwise default to the Streams driver. + $class = 'Phergie_Driver_Streams'; + } + + $this->driver = new $class; + } + return $this->driver; + } + + /** + * Sets the driver instance to use. + * + * @param Phergie_Driver_Abstract $driver Driver instance + * + * @return Phergie_Bot Provides a fluent interface + */ + public function setDriver(Phergie_Driver_Abstract $driver) + { + $this->driver = $driver; + return $this; + } + + /** + * Sets the configuration to use. + * + * @param Phergie_Config $config Configuration instance + * + * @return Phergie_Runner_Abstract Provides a fluent interface + */ + public function setConfig(Phergie_Config $config) + { + $this->config = $config; + return $this; + } + + /** + * Returns the entire configuration in use or the value of a specific + * configuration setting. + * + * @param string $index Optional index of a specific configuration + * setting for which the corresponding value should be returned + * @param mixed $default Value to return if no match is found for $index + * + * @return mixed Value corresponding to $index or the entire + * configuration if $index is not specified + */ + public function getConfig($index = null, $default = null) + { + if (empty($this->config)) { + $this->config = new Phergie_Config; + $this->config->read('Settings.php'); + } + if ($index !== null) { + if (isset($this->config[$index])) { + return $this->config[$index]; + } else { + return $default; + } + } + return $this->config; + } + + /** + * Returns a plugin handler instance, creating it if it does not already + * exist and using a default class if none has been set. + * + * @return Phergie_Plugin_Handler + */ + public function getPluginHandler() + { + if (empty($this->plugins)) { + $this->plugins = new Phergie_Plugin_Handler( + $this->getConfig(), + $this->getEventHandler() + ); + } + return $this->plugins; + } + + /** + * Sets the plugin handler instance to use. + * + * @param Phergie_Plugin_Handler $handler Plugin handler instance + * + * @return Phergie_Bot Provides a fluent interface + */ + public function setPluginHandler(Phergie_Plugin_Handler $handler) + { + $this->plugins = $handler; + return $this; + } + + /** + * Returns an event handler instance, creating it if it does not already + * exist and using a default class if none has been set. + * + * @return Phergie_Event_Handler + */ + public function getEventHandler() + { + if (empty($this->events)) { + $this->events = new Phergie_Event_Handler; + } + return $this->events; + } + + /** + * Sets the event handler instance to use. + * + * @param Phergie_Event_Handler $handler Event handler instance + * + * @return Phergie_Bot Provides a fluent interface + */ + public function setEventHandler(Phergie_Event_Handler $handler) + { + $this->events = $handler; + return $this; + } + + /** + * Returns a connection handler instance, creating it if it does not + * already exist and using a default class if none has been set. + * + * @return Phergie_Connection_Handler + */ + public function getConnectionHandler() + { + if (empty($this->connections)) { + $this->connections = new Phergie_Connection_Handler; + } + return $this->connections; + } + + /** + * Sets the connection handler instance to use. + * + * @param Phergie_Connection_Handler $handler Connection handler instance + * + * @return Phergie_Bot Provides a fluent interface + */ + public function setConnectionHandler(Phergie_Connection_Handler $handler) + { + $this->connections = $handler; + return $this; + } + + /** + * Returns an end-user interface instance, creating it if it does not + * already exist and using a default class if none has been set. + * + * @return Phergie_Ui_Abstract + */ + public function getUi() + { + if (empty($this->ui)) { + $this->ui = new Phergie_Ui_Console; + } + return $this->ui; + } + + /** + * Sets the end-user interface instance to use. + * + * @param Phergie_Ui_Abstract $ui End-user interface instance + * + * @return Phergie_Bot Provides a fluent interface + */ + public function setUi(Phergie_Ui_Abstract $ui) + { + $this->ui = $ui; + return $this; + } + + /** + * Returns a processer instance, creating one if none exists. + * + * @return Phergie_Process_Abstract + */ + public function getProcessor() + { + if (empty($this->processor)) { + $class = 'Phergie_Process_Standard'; + + $type = $this->getConfig('processor'); + if (!empty($type)) { + $class = 'Phergie_Process_' . ucfirst($type); + } + + $this->processor = new $class( + $this, + $this->getConfig('processor.options', array()) + ); + } + return $this->processor; + } + + /** + * Sets the processer instance to use. + * + * @param Phergie_Process_Abstract $processor Processer instance + * + * @return Phergie_Bot Provides a fluent interface + */ + public function setProcessor(Phergie_Process_Abstract $processor) + { + $this->processor = $processor; + return $this; + } + + /** + * Loads plugins into the plugin handler. + * + * @return void + */ + protected function loadPlugins() + { + $config = $this->getConfig(); + $plugins = $this->getPluginHandler(); + $ui = $this->getUi(); + + $plugins->setAutoload($config['plugins.autoload']); + foreach ($config['plugins'] as $name) { + try { + $plugin = $plugins->addPlugin($name); + $ui->onPluginLoad($name); + } catch (Phergie_Plugin_Exception $e) { + $ui->onPluginFailure($name, $e->getMessage()); + if (!empty($plugin)) { + $plugins->removePlugin($plugin); + } + } + } + } + + /** + * Configures and establishes connections to IRC servers. + * + * @return void + */ + protected function loadConnections() + { + $config = $this->getConfig(); + $driver = $this->getDriver(); + $connections = $this->getConnectionHandler(); + $plugins = $this->getPluginHandler(); + $ui = $this->getUi(); + + foreach ($config['connections'] as $data) { + $connection = new Phergie_Connection($data); + $connections->addConnection($connection); + + $ui->onConnect($data['host']); + $driver->setConnection($connection)->doConnect(); + $plugins->setConnection($connection); + $plugins->onConnect(); + } + } + + /** + * Establishes server connections and initiates an execution loop to + * continuously receive and process events. + * + * @return Phergie_Bot Provides a fluent interface + */ + public function run() + { + set_time_limit(0); + + $timezone = $this->getConfig('timezone', 'UTC'); + date_default_timezone_set($timezone); + + $ui = $this->getUi(); + $ui->setEnabled($this->getConfig('ui.enabled')); + + $this->loadPlugins(); + $this->loadConnections(); + + $processor = $this->getProcessor(); + + $connections = $this->getConnectionHandler(); + while (count($connections)) { + $processor->handleEvents(); + } + + $ui->onShutdown(); + + return $this; + } +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Config.php b/plugins/Irc/extlib/phergie/Phergie/Config.php new file mode 100755 index 0000000000..f011db2365 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Config.php @@ -0,0 +1,170 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Reads from and writes to PHP configuration files and provides access to + * the settings they contain. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Config implements ArrayAccess +{ + /** + * Mapping of configuration file paths to an array of names of settings + * they contain + * + * @var array + */ + protected $files = array(); + + /** + * Mapping of setting names to their current corresponding values + * + * @var array + */ + protected $settings = array(); + + /** + * Includes a specified PHP configuration file and incorporates its + * return value (which should be an associative array) into the current + * configuration settings. + * + * @param string $file Path to the file to read + * + * @return Phergie_Config Provides a fluent interface + * @throws Phergie_Config_Exception + */ + public function read($file) + { + if (!(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' + && file_exists($file)) + && !is_executable($file) + ) { + throw new Phergie_Config_Exception( + 'Path "' . $file . '" does not reference an executable file', + Phergie_Config_Exception::ERR_FILE_NOT_EXECUTABLE + ); + } + + $settings = include $file; + if (!is_array($settings)) { + throw new Phergie_Config_Exception( + 'File "' . $file . '" does not return an array', + Phergie_Config_Exception::ERR_ARRAY_NOT_RETURNED + ); + } + + $this->files[$file] = array_keys($settings); + $this->settings += $settings; + + return $this; + } + + /** + * Writes the values of the current configuration settings back to their + * originating files. + * + * @return Phergie_Config Provides a fluent interface + */ + public function write() + { + foreach ($this->files as $file => &$settings) { + $values = array(); + foreach ($settings as $setting) { + $values[$setting] = $this->settings[$setting]; + } + $source = 'settings[$offset]); + } + + /** + * Returns the value of a configuration setting. + * + * @param string $offset Configuration setting name + * + * @return mixed Configuration setting value or NULL if it is not + * assigned a value + * @see ArrayAccess::offsetGet() + */ + public function offsetGet($offset) + { + if (isset($this->settings[$offset])) { + $value = &$this->settings[$offset]; + } else { + $value = null; + } + + return $value; + } + + /** + * Sets the value of a configuration setting. + * + * @param string $offset Configuration setting name + * @param mixed $value New setting value + * + * @return void + * @see ArrayAccess::offsetSet() + */ + public function offsetSet($offset, $value) + { + $this->settings[$offset] = $value; + } + + /** + * Removes the value set for a configuration setting. + * + * @param string $offset Configuration setting name + * + * @return void + * @see ArrayAccess::offsetUnset() + */ + public function offsetUnset($offset) + { + unset($this->settings[$offset]); + + foreach ($this->files as $file => $settings) { + $key = array_search($offset, $settings); + if ($key !== false) { + unset($this->files[$file][$key]); + } + } + } +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Config/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Config/Exception.php new file mode 100644 index 0000000000..fb646c10c1 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Config/Exception.php @@ -0,0 +1,44 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Exception related to configuration. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Config_Exception extends Phergie_Exception +{ + /** + * Error indicating that an attempt was made to read a configuration + * file that could not be executed + */ + const ERR_FILE_NOT_EXECUTABLE = 1; + + /** + * Error indicating that a read configuration file does not return an + * array + */ + const ERR_ARRAY_NOT_RETURNED = 2; +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection.php b/plugins/Irc/extlib/phergie/Phergie/Connection.php new file mode 100755 index 0000000000..80f91e8da5 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Connection.php @@ -0,0 +1,359 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Data structure for connection metadata. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Connection +{ + /** + * Host to which the client will connect + * + * @var string + */ + protected $host; + + /** + * Port on which the client will connect, defaults to the standard IRC + * port + * + * @var int + */ + protected $port; + + /** + * Transport for the connection, defaults to tcp but can be set to ssl + * or variations thereof to connect over SSL + * + * @var string + */ + protected $transport; + + /** + * Nick that the client will use + * + * @var string + */ + protected $nick; + + /** + * Username that the client will use + * + * @var string + */ + protected $username; + + /** + * Realname that the client will use + * + * @var string + */ + protected $realname; + + /** + * Password that the client will use + * + * @var string + */ + protected $password; + + /** + * Hostmask for the connection + * + * @var Phergie_Hostmask + */ + protected $hostmask; + + /** + * Constructor to initialize instance properties. + * + * @param array $options Optional associative array of property values + * to initialize + * + * @return void + */ + public function __construct(array $options = array()) + { + $this->transport = 'tcp'; + + $this->setOptions($options); + } + + /** + * Emits an error related to a required connection setting does not have + * value set for it. + * + * @param string $setting Name of the setting + * + * @return void + */ + protected function checkSetting($setting) + { + if (empty($this->$setting)) { + throw new Phergie_Connection_Exception( + 'Required connection setting "' . $setting . '" missing', + Phergie_Connection_Exception::ERR_REQUIRED_SETTING_MISSING + ); + } + } + + /** + * Returns a hostmask that uniquely identifies the connection. + * + * @return string + */ + public function getHostmask() + { + if (empty($this->hostmask)) { + $this->hostmask = new Phergie_Hostmask( + $this->nick, + $this->username, + $this->host + ); + } + + return $this->hostmask; + } + + /** + * Sets the host to which the client will connect. + * + * @param string $host Hostname + * + * @return Phergie_Connection Provides a fluent interface + */ + public function setHost($host) + { + if (empty($this->host)) { + $this->host = (string) $host; + } + + return $this; + } + + /** + * Returns the host to which the client will connect if it is set or + * emits an error if it is not set. + * + * @return string + */ + public function getHost() + { + $this->checkSetting('host'); + + return $this->host; + } + + /** + * Sets the port on which the client will connect. + * + * @param int $port Port + * + * @return Phergie_Connection Provides a fluent interface + */ + public function setPort($port) + { + if (empty($this->port)) { + $this->port = (int) $port; + } + + return $this; + } + + /** + * Returns the port on which the client will connect. + * + * @return int + */ + public function getPort() + { + if (empty($this->port)) { + $this->port = 6667; + } + + return $this->port; + } + + /** + * Sets the transport for the connection to use. + * + * @param string $transport Transport (ex: tcp, ssl, etc.) + * + * @return Phergie_Connection Provides a fluent interface + */ + public function setTransport($transport) + { + $this->transport = (string) $transport; + + if (!in_array($this->transport, stream_get_transports())) { + throw new Phergie_Connection_Exception( + 'Transport ' . $this->transport . ' is not supported', + Phergie_Connection_Exception::TRANSPORT_NOT_SUPPORTED + ); + } + + return $this; + } + + /** + * Returns the transport in use by the connection. + * + * @return string Transport (ex: tcp, ssl, etc.) + */ + public function getTransport() + { + return $this->transport; + } + + /** + * Sets the nick that the client will use. + * + * @param string $nick Nickname + * + * @return Phergie_Connection Provides a fluent interface + */ + public function setNick($nick) + { + if (empty($this->nick)) { + $this->nick = (string) $nick; + } + + return $this; + } + + /** + * Returns the nick that the client will use. + * + * @return string + */ + public function getNick() + { + $this->checkSetting('nick'); + + return $this->nick; + } + + /** + * Sets the username that the client will use. + * + * @param string $username Username + * + * @return Phergie_Connection Provides a fluent interface + */ + public function setUsername($username) + { + if (empty($this->username)) { + $this->username = (string) $username; + } + + return $this; + } + + /** + * Returns the username that the client will use. + * + * @return string + */ + public function getUsername() + { + $this->checkSetting('username'); + + return $this->username; + } + + /** + * Sets the realname that the client will use. + * + * @param string $realname Real name + * + * @return Phergie_Connection Provides a fluent interface + */ + public function setRealname($realname) + { + if (empty($this->realname)) { + $this->realname = (string) $realname; + } + + return $this; + } + + /** + * Returns the realname that the client will use. + * + * @return string + */ + public function getRealname() + { + $this->checkSetting('realname'); + + return $this->realname; + } + + /** + * Sets the password that the client will use. + * + * @param string $password Password + * + * @return Phergie_Connection Provides a fluent interface + */ + public function setPassword($password) + { + if (empty($this->password)) { + $this->password = (string) $password; + } + + return $this; + } + + /** + * Returns the password that the client will use. + * + * @return string + */ + public function getPassword() + { + return $this->password; + } + + /** + * Sets multiple connection settings using an array. + * + * @param array $options Associative array of setting names mapped to + * corresponding values + * + * @return Phergie_Connection Provides a fluent interface + */ + public function setOptions(array $options) + { + foreach ($options as $option => $value) { + $method = 'set' . ucfirst($option); + if (method_exists($this, $method)) { + $this->$method($value); + } + } + } +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php new file mode 100644 index 0000000000..a750e1d860 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php @@ -0,0 +1,44 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Exception related to a connection to an IRC server. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Connection_Exception extends Phergie_Exception +{ + /** + * Error indicating that an operation was attempted requiring a value + * for a specific configuration setting, but none was set + */ + const ERR_REQUIRED_SETTING_MISSING = 1; + + /** + * Error indicating that a connection is configured to use a transport, + * but that transport is not supported by the current PHP installation + */ + const ERR_TRANSPORT_NOT_SUPPORTED = 2; +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Connection/Handler.php new file mode 100644 index 0000000000..e9aeddcd3e --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Connection/Handler.php @@ -0,0 +1,130 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Handles connections initiated by the bot. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Connection_Handler implements Countable, IteratorAggregate +{ + /** + * Map of connections indexed by hostmask + * + * @var array + */ + protected $connections; + + /** + * Constructor to initialize storage for connections. + * + * @return void + */ + public function __construct() + { + $this->connections = array(); + } + + /** + * Adds a connection to the connection list. + * + * @param Phergie_Connection $connection Connection to add + * + * @return Phergie_Connection_Handler Provides a fluent interface + */ + public function addConnection(Phergie_Connection $connection) + { + $this->connections[(string) $connection->getHostmask()] = $connection; + return $this; + } + + /** + * Removes a connection from the connection list. + * + * @param Phergie_Connection|string $connection Instance or hostmask for + * the connection to remove + * + * @return Phergie_Connection_Handler Provides a fluent interface + */ + public function removeConnection($connection) + { + if ($connection instanceof Phergie_Connection) { + $hostmask = (string) $connection->getHostmask(); + } elseif (is_string($connection) + && isset($this->connections[$connection])) { + $hostmask = $connection; + } else { + return $this; + } + unset($this->connections[$hostmask]); + return $this; + } + + /** + * Returns the number of connections in the list. + * + * @return int Number of connections + */ + public function count() + { + return count($this->connections); + } + + /** + * Returns an iterator for the connection list. + * + * @return ArrayIterator + */ + public function getIterator() + { + return new ArrayIterator($this->connections); + } + + /** + * Returns a list of specified connection objects. + * + * @param array|string $keys One or more hostmasks identifying the + * connections to return + * + * @return array List of Phergie_Connection objects corresponding to the + * specified hostmask(s) + */ + public function getConnections($keys) + { + $connections = array(); + + if (!is_array($keys)) { + $keys = array($keys); + } + + foreach ($keys as $key) { + if (isset($this->connections[$key])) { + $connections[] = $this->connections[$key]; + } + } + + return $connections; + } +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Abstract.php new file mode 100755 index 0000000000..62736620d4 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Abstract.php @@ -0,0 +1,301 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Base class for drivers which handle issuing client commands to the IRC + * server and converting responses into usable data objects. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +abstract class Phergie_Driver_Abstract +{ + /** + * Currently active connection + * + * @var Phergie_Connection + */ + protected $connection; + + /** + * Sets the currently active connection. + * + * @param Phergie_Connection $connection Active connection + * + * @return Phergie_Driver_Abstract Provides a fluent interface + */ + public function setConnection(Phergie_Connection $connection) + { + $this->connection = $connection; + + return $this; + } + + /** + * Returns the currently active connection. + * + * @return Phergie_Connection + * @throws Phergie_Driver_Exception + */ + public function getConnection() + { + if (empty($this->connection)) { + throw new Phergie_Driver_Exception( + 'Operation requires an active connection, but none is set', + Phergie_Driver_Exception::ERR_NO_ACTIVE_CONNECTION + ); + } + + return $this->connection; + } + + /** + * Returns an event if one has been received from the server. + * + * @return Phergie_Event_Interface|null Event instance if an event has + * been received, NULL otherwise + */ + public abstract function getEvent(); + + /** + * Initiates a connection with the server. + * + * @return void + */ + public abstract function doConnect(); + + /** + * Terminates the connection with the server. + * + * @param string $reason Reason for connection termination (optional) + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_1_6 + */ + public abstract function doQuit($reason = null); + + /** + * Joins a channel. + * + * @param string $channels Comma-delimited list of channels to join + * @param string $keys Optional comma-delimited list of channel keys + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_1 + */ + public abstract function doJoin($channels, $keys = null); + + /** + * Leaves a channel. + * + * @param string $channels Comma-delimited list of channels to leave + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_2 + */ + public abstract function doPart($channels); + + /** + * Invites a user to an invite-only channel. + * + * @param string $nick Nick of the user to invite + * @param string $channel Name of the channel + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_7 + */ + public abstract function doInvite($nick, $channel); + + /** + * Obtains a list of nicks of users in specified channels. + * + * @param string $channels Comma-delimited list of one or more channels + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_5 + */ + public abstract function doNames($channels); + + /** + * Obtains a list of channel names and topics. + * + * @param string $channels Comma-delimited list of one or more channels + * to which the response should be restricted + * (optional) + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_6 + */ + public abstract function doList($channels = null); + + /** + * Retrieves or changes a channel topic. + * + * @param string $channel Name of the channel + * @param string $topic New topic to assign (optional) + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_4 + */ + public abstract function doTopic($channel, $topic = null); + + /** + * Retrieves or changes a channel or user mode. + * + * @param string $target Channel name or user nick + * @param string $mode New mode to assign (optional) + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_3 + */ + public abstract function doMode($target, $mode = null); + + /** + * Changes the client nick. + * + * @param string $nick New nick to assign + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_1_2 + */ + public abstract function doNick($nick); + + /** + * Retrieves information about a nick. + * + * @param string $nick Nick + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_5_2 + */ + public abstract function doWhois($nick); + + /** + * Sends a message to a nick or channel. + * + * @param string $target Channel name or user nick + * @param string $text Text of the message to send + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_4_1 + */ + public abstract function doPrivmsg($target, $text); + + /** + * Sends a notice to a nick or channel. + * + * @param string $target Channel name or user nick + * @param string $text Text of the notice to send + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_4_2 + */ + public abstract function doNotice($target, $text); + + /** + * Kicks a user from a channel. + * + * @param string $nick Nick of the user + * @param string $channel Channel name + * @param string $reason Reason for the kick (optional) + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_8 + */ + public abstract function doKick($nick, $channel, $reason = null); + + /** + * Responds to a server test of client responsiveness. + * + * @param string $daemon Daemon from which the original request originates + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_6_3 + */ + public abstract function doPong($daemon); + + /** + * Sends a CTCP ACTION (/me) command to a nick or channel. + * + * @param string $target Channel name or user nick + * @param string $text Text of the action to perform + * + * @return void + * @link http://www.invlogic.com/irc/ctcp.html#4.4 + */ + public abstract function doAction($target, $text); + + /** + * Sends a CTCP PING request to a user. + * + * @param string $nick User nick + * @param string $hash Hash to use in the handshake + * + * @return void + * @link http://www.invlogic.com/irc/ctcp.html#4.2 + */ + public abstract function doPing($nick, $hash); + + /** + * Sends a CTCP VERSION request or response to a user. + * + * @param string $nick User nick + * @param string $version Version string to send for a response + * + * @return void + * @link http://www.invlogic.com/irc/ctcp.html#4.1 + */ + public abstract function doVersion($nick, $version = null); + + /** + * Sends a CTCP TIME request to a user. + * + * @param string $nick User nick + * @param string $time Time string to send for a response + * + * @return void + * @link http://www.invlogic.com/irc/ctcp.html#4.6 + */ + public abstract function doTime($nick, $time = null); + + /** + * Sends a CTCP FINGER request to a user. + * + * @param string $nick User nick + * @param string $finger Finger string to send for a response + * + * @return void + * @link http://www.irchelp.org/irchelp/rfc/ctcpspec.html + */ + public abstract function doFinger($nick, $finger = null); + + /** + * Sends a raw command to the server. + * + * @param string $command Command string to send + * + * @return void + */ + public abstract function doRaw($command); +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php new file mode 100755 index 0000000000..c405522292 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php @@ -0,0 +1,49 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Exception related to driver operations. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Driver_Exception extends Phergie_Exception +{ + /** + * Error indicating that an operation was requested requiring an active + * connection before one had been set + */ + const ERR_NO_ACTIVE_CONNECTION = 1; + + /** + * Error indicating that an operation was requested requiring an active + * connection where one had been set but not initiated + */ + const ERR_NO_INITIATED_CONNECTION = 2; + + /** + * Error indicating that an attempt to initiate a connection failed + */ + const ERR_CONNECTION_ATTEMPT_FAILED = 3; +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php new file mode 100755 index 0000000000..8fe53aaa2f --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php @@ -0,0 +1,696 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Driver that uses the sockets wrapper of the streams extension for + * communicating with the server and handles formatting and parsing of + * events using PHP. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Driver_Streams extends Phergie_Driver_Abstract +{ + /** + * Socket handlers + * + * @var array + */ + protected $sockets = array(); + + /** + * Reference to the currently active socket handler + * + * @var resource + */ + protected $socket; + + /** + * Amount of time in seconds to wait to receive an event each time the + * socket is polled + * + * @var float + */ + protected $timeout = 0.1; + + /** + * Handles construction of command strings and their transmission to the + * server. + * + * @param string $command Command to send + * @param string|array $args Optional string or array of sequential + * arguments + * + * @return string Command string that was sent + * @throws Phergie_Driver_Exception + */ + protected function send($command, $args = '') + { + // Require an open socket connection to continue + if (empty($this->socket)) { + throw new Phergie_Driver_Exception( + 'doConnect() must be called first', + Phergie_Driver_Exception::ERR_NO_INITIATED_CONNECTION + ); + } + + // Add the command + $buffer = strtoupper($command); + + // Add arguments + if (!empty($args)) { + + // Apply formatting if arguments are passed in as an array + if (is_array($args)) { + $end = count($args) - 1; + $args[$end] = ':' . $args[$end]; + $args = implode(' ', $args); + } + + $buffer .= ' ' . $args; + } + + // Transmit the command over the socket connection + fwrite($this->socket, $buffer . "\r\n"); + + // Return the command string that was transmitted + return $buffer; + } + + /** + * Overrides the parent class to set the currently active socket handler + * when the active connection is changed. + * + * @param Phergie_Connection $connection Active connection + * + * @return Phergie_Driver_Streams Provides a fluent interface + */ + public function setConnection(Phergie_Connection $connection) + { + // Set the active socket handler + $hostmask = (string) $connection->getHostmask(); + if (!empty($this->sockets[$hostmask])) { + $this->socket = $this->sockets[$hostmask]; + } + + // Set the active connection + return parent::setConnection($connection); + } + + /** + * Returns a list of hostmasks corresponding to sockets with data to read. + * + * @param int $sec Length of time to wait for new data (seconds) + * @param int $usec Length of time to wait for new data (microseconds) + * + * @return array List of hostmasks or an empty array if none were found + * to have data to read + */ + public function getActiveReadSockets($sec = 0, $usec = 200000) + { + $read = $this->sockets; + $write = null; + $error = null; + $active = array(); + + if (count($this->sockets) > 0) { + $number = stream_select($read, $write, $error, $sec, $usec); + if ($number > 0) { + foreach ($read as $item) { + $active[] = array_search($item, $this->sockets); + } + } + } + + return $active; + } + + /** + * Sets the amount of time to wait for a new event each time the socket + * is polled. + * + * @param float $timeout Amount of time in seconds + * + * @return Phergie_Driver_Streams Provides a fluent interface + */ + public function setTimeout($timeout) + { + $timeout = (float) $timeout; + if ($timeout) { + $this->timeout = $timeout; + } + return $this; + } + + /** + * Returns the amount of time to wait for a new event each time the + * socket is polled. + * + * @return float Amount of time in seconds + */ + public function getTimeout() + { + return $this->timeout; + } + + /** + * Supporting method to parse event argument strings where the last + * argument may contain a colon. + * + * @param string $args Argument string to parse + * @param int $count Optional maximum number of arguments + * + * @return array Array of argument values + */ + protected function parseArguments($args, $count = -1) + { + return preg_split('/ :?/S', $args, $count); + } + + /** + * Listens for an event on the current connection. + * + * @return Phergie_Event_Interface|null Event instance if an event was + * received, NULL otherwise + */ + public function getEvent() + { + // Check for a new event on the current connection + $buffer = fgets($this->socket, 512); + + // If no new event was found, return NULL + if (empty($buffer)) { + return null; + } + + // Strip the trailing newline from the buffer + $buffer = rtrim($buffer); + + // If the event is from the server... + if (substr($buffer, 0, 1) != ':') { + + // Parse the command and arguments + list($cmd, $args) = array_pad(explode(' ', $buffer, 2), 2, null); + + } else { + // If the event could be from the server or a user... + + // Parse the server hostname or user hostmask, command, and arguments + list($prefix, $cmd, $args) + = array_pad(explode(' ', ltrim($buffer, ':'), 3), 3, null); + if (strpos($prefix, '@') !== false) { + $hostmask = Phergie_Hostmask::fromString($prefix); + } + } + + // Parse the event arguments depending on the event type + $cmd = strtolower($cmd); + switch ($cmd) { + case 'names': + case 'nick': + case 'quit': + case 'ping': + case 'join': + case 'error': + $args = array(ltrim($args, ':')); + break; + + case 'privmsg': + case 'notice': + $ctcp = substr(strstr($args, ':'), 1); + if (substr($ctcp, 0, 1) === "\x01" && substr($ctcp, -1) === "\x01") { + $ctcp = substr($ctcp, 1, -1); + $reply = ($cmd == 'notice'); + list($cmd, $args) = array_pad(explode(' ', $ctcp, 2), 2, null); + $cmd = strtolower($cmd); + switch ($cmd) { + case 'version': + case 'time': + case 'finger': + if ($reply) { + $args = $ctcp; + } + break; + case 'ping': + if ($reply) { + $cmd .= 'Response'; + } else { + $cmd = 'ctcpPing'; + } + break; + case 'action': + $args = array($this->getConnection()->getNick(), $args); + break; + + default: + $cmd = 'ctcp'; + if ($reply) { + $cmd .= 'Response'; + } + $args = array($this->getConnection()->getNick(), $ctcp); + break; + } + } else { + $args = $this->parseArguments($args, 2); + } + break; + + case 'oper': + case 'topic': + case 'mode': + $args = $this->parseArguments($args); + break; + + case 'part': + case 'kill': + case 'invite': + $args = $this->parseArguments($args, 2); + break; + + case 'kick': + $args = $this->parseArguments($args, 3); + break; + + // Remove the target from responses + default: + $args = substr($args, strpos($args, ' ') + 1); + break; + } + + // Create, populate, and return an event object + if (ctype_digit($cmd)) { + $event = new Phergie_Event_Response; + $event + ->setCode($cmd) + ->setDescription($args); + } else { + $event = new Phergie_Event_Request; + $event + ->setType($cmd) + ->setArguments($args); + if (isset($hostmask)) { + $event->setHostmask($hostmask); + } + } + $event->setRawData($buffer); + return $event; + } + + /** + * Initiates a connection with the server. + * + * @return void + */ + public function doConnect() + { + // Listen for input indefinitely + set_time_limit(0); + + // Get connection information + $connection = $this->getConnection(); + $hostname = $connection->getHost(); + $port = $connection->getPort(); + $password = $connection->getPassword(); + $username = $connection->getUsername(); + $nick = $connection->getNick(); + $realname = $connection->getRealname(); + $transport = $connection->getTransport(); + + // Establish and configure the socket connection + $remote = $transport . '://' . $hostname . ':' . $port; + $this->socket = @stream_socket_client($remote, $errno, $errstr); + if (!$this->socket) { + throw new Phergie_Driver_Exception( + 'Unable to connect: socket error ' . $errno . ' ' . $errstr, + Phergie_Driver_Exception::ERR_CONNECTION_ATTEMPT_FAILED + ); + } + + $seconds = (int) $this->timeout; + $microseconds = ($this->timeout - $seconds) * 1000000; + stream_set_timeout($this->socket, $seconds, $microseconds); + + // Send the password if one is specified + if (!empty($password)) { + $this->send('PASS', $password); + } + + // Send user information + $this->send( + 'USER', + array( + $username, + $hostname, + $hostname, + $realname + ) + ); + + $this->send('NICK', $nick); + + // Add the socket handler to the internal array for socket handlers + $this->sockets[(string) $connection->getHostmask()] = $this->socket; + } + + /** + * Terminates the connection with the server. + * + * @param string $reason Reason for connection termination (optional) + * + * @return void + */ + public function doQuit($reason = null) + { + // Send a QUIT command to the server + $this->send('QUIT', $reason); + + // Terminate the socket connection + fclose($this->socket); + + // Remove the socket from the internal socket list + unset($this->sockets[(string) $this->getConnection()->getHostmask()]); + } + + /** + * Joins a channel. + * + * @param string $channels Comma-delimited list of channels to join + * @param string $keys Optional comma-delimited list of channel keys + * + * @return void + */ + public function doJoin($channels, $keys = null) + { + $args = array($channels); + + if (!empty($keys)) { + $args[] = $keys; + } + + $this->send('JOIN', $args); + } + + /** + * Leaves a channel. + * + * @param string $channels Comma-delimited list of channels to leave + * + * @return void + */ + public function doPart($channels) + { + $this->send('PART', $channels); + } + + /** + * Invites a user to an invite-only channel. + * + * @param string $nick Nick of the user to invite + * @param string $channel Name of the channel + * + * @return void + */ + public function doInvite($nick, $channel) + { + $this->send('INVITE', array($nick, $channel)); + } + + /** + * Obtains a list of nicks of usrs in currently joined channels. + * + * @param string $channels Comma-delimited list of one or more channels + * + * @return void + */ + public function doNames($channels) + { + $this->send('NAMES', $channels); + } + + /** + * Obtains a list of channel names and topics. + * + * @param string $channels Comma-delimited list of one or more channels + * to which the response should be restricted + * (optional) + * + * @return void + */ + public function doList($channels = null) + { + $this->send('LIST', $channels); + } + + /** + * Retrieves or changes a channel topic. + * + * @param string $channel Name of the channel + * @param string $topic New topic to assign (optional) + * + * @return void + */ + public function doTopic($channel, $topic = null) + { + $args = array($channel); + + if (!empty($topic)) { + $args[] = $topic; + } + + $this->send('TOPIC', $args); + } + + /** + * Retrieves or changes a channel or user mode. + * + * @param string $target Channel name or user nick + * @param string $mode New mode to assign (optional) + * + * @return void + */ + public function doMode($target, $mode = null) + { + $args = array($target); + + if (!empty($mode)) { + $args[] = $mode; + } + + $this->send('MODE', $args); + } + + /** + * Changes the client nick. + * + * @param string $nick New nick to assign + * + * @return void + */ + public function doNick($nick) + { + $this->send('NICK', $nick); + } + + /** + * Retrieves information about a nick. + * + * @param string $nick Nick + * + * @return void + */ + public function doWhois($nick) + { + $this->send('WHOIS', $nick); + } + + /** + * Sends a message to a nick or channel. + * + * @param string $target Channel name or user nick + * @param string $text Text of the message to send + * + * @return void + */ + public function doPrivmsg($target, $text) + { + $this->send('PRIVMSG', array($target, $text)); + } + + /** + * Sends a notice to a nick or channel. + * + * @param string $target Channel name or user nick + * @param string $text Text of the notice to send + * + * @return void + */ + public function doNotice($target, $text) + { + $this->send('NOTICE', array($target, $text)); + } + + /** + * Kicks a user from a channel. + * + * @param string $nick Nick of the user + * @param string $channel Channel name + * @param string $reason Reason for the kick (optional) + * + * @return void + */ + public function doKick($nick, $channel, $reason = null) + { + $args = array($nick, $channel); + + if (!empty($reason)) { + $args[] = $response; + } + + $this->send('KICK', $args); + } + + /** + * Responds to a server test of client responsiveness. + * + * @param string $daemon Daemon from which the original request originates + * + * @return void + */ + public function doPong($daemon) + { + $this->send('PONG', $daemon); + } + + /** + * Sends a CTCP ACTION (/me) command to a nick or channel. + * + * @param string $target Channel name or user nick + * @param string $text Text of the action to perform + * + * @return void + */ + public function doAction($target, $text) + { + $buffer = rtrim('ACTION ' . $text); + + $this->doPrivmsg($target, chr(1) . $buffer . chr(1)); + } + + /** + * Sends a CTCP response to a user. + * + * @param string $nick User nick + * @param string $command Command to send + * @param string|array $args String or array of sequential arguments + * (optional) + * + * @return void + */ + protected function doCtcp($nick, $command, $args = null) + { + if (is_array($args)) { + $args = implode(' ', $args); + } + + $buffer = rtrim(strtoupper($command) . ' ' . $args); + + $this->doNotice($nick, chr(1) . $buffer . chr(1)); + } + + /** + * Sends a CTCP PING request or response (they are identical) to a user. + * + * @param string $nick User nick + * @param string $hash Hash to use in the handshake + * + * @return void + */ + public function doPing($nick, $hash) + { + $this->doCtcp($nick, 'PING', $hash); + } + + /** + * Sends a CTCP VERSION request or response to a user. + * + * @param string $nick User nick + * @param string $version Version string to send for a response + * + * @return void + */ + public function doVersion($nick, $version = null) + { + if ($version) { + $this->doCtcp($nick, 'VERSION', $version); + } else { + $this->doCtcp($nick, 'VERSION'); + } + } + + /** + * Sends a CTCP TIME request to a user. + * + * @param string $nick User nick + * @param string $time Time string to send for a response + * + * @return void + */ + public function doTime($nick, $time = null) + { + if ($time) { + $this->doCtcp($nick, 'TIME', $time); + } else { + $this->doCtcp($nick, 'TIME'); + } + } + + /** + * Sends a CTCP FINGER request to a user. + * + * @param string $nick User nick + * @param string $finger Finger string to send for a response + * + * @return void + */ + public function doFinger($nick, $finger = null) + { + if ($finger) { + $this->doCtcp($nick, 'FINGER', $finger); + } else { + $this->doCtcp($nick, 'FINGER'); + } + } + + /** + * Sends a raw command to the server. + * + * @param string $command Command string to send + * + * @return void + */ + public function doRaw($command) + { + $this->send('RAW', $command); + } +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Event/Abstract.php new file mode 100644 index 0000000000..54b035dc03 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Event/Abstract.php @@ -0,0 +1,62 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Base class for events. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +abstract class Phergie_Event_Abstract +{ + /** + * Event type, used for determining the callback to execute in response + * + * @var string + */ + protected $type; + + /** + * Returns the event type. + * + * @return string + */ + public function getType() + { + return $this->type; + } + + /** + * Sets the event type. + * + * @param string $type Event type + * + * @return Phergie_Event_Abstract Implements a fluent interface + */ + public function setType($type) + { + $this->type = (string) $type; + return $this; + } +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Command.php b/plugins/Irc/extlib/phergie/Phergie/Event/Command.php new file mode 100644 index 0000000000..5940636ba7 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Event/Command.php @@ -0,0 +1,62 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Event originating from a plugin for the bot. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Event_Command extends Phergie_Event_Request +{ + /** + * Reference to the plugin instance that created the event + * + * @var Phergie_Plugin_Abstract + */ + protected $plugin; + + /** + * Stores a reference to the plugin instance that created the event. + * + * @param Phergie_Plugin_Abstract $plugin Plugin instance + * + * @return Phergie_Event_Command Provides a fluent interface + */ + public function setPlugin(Phergie_Plugin_Abstract $plugin) + { + $this->plugin = $plugin; + return $this; + } + + /** + * Returns a reference to the plugin instance that created the event. + * + * @return Phergie_Plugin_Abstract + */ + public function getPlugin() + { + return $this->plugin; + } +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Event/Exception.php new file mode 100644 index 0000000000..6b094a810c --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Event/Exception.php @@ -0,0 +1,38 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Exception related to outgoing events. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Event_Exception extends Phergie_Exception +{ + /** + * Error indicating that an attempt was made to create an event of an + * unknown type + */ + const ERR_UNKNOWN_EVENT_TYPE = 1; +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Event/Handler.php new file mode 100644 index 0000000000..7df1fca35a --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Event/Handler.php @@ -0,0 +1,174 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Handles events initiated by plugins. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ +class Phergie_Event_Handler implements IteratorAggregate, Countable +{ + /** + * Current queue of events + * + * @var array + */ + protected $events; + + /** + * Constructor to initialize the event queue. + * + * @return void + */ + public function __construct() + { + $this->events = array(); + } + + /** + * Adds an event to the queue. + * + * @param Phergie_Plugin_Abstract $plugin Plugin originating the event + * @param string $type Event type, corresponding to a + * Phergie_Event_Command::TYPE_* constant + * @param array $args Optional event arguments + * + * @return Phergie_Event_Handler Provides a fluent interface + */ + public function addEvent(Phergie_Plugin_Abstract $plugin, $type, + array $args = array() + ) { + if (!defined('Phergie_Event_Command::TYPE_' . strtoupper($type))) { + throw new Phergie_Event_Exception( + 'Unknown event type "' . $type . '"', + Phergie_Event_Exception::ERR_UNKNOWN_EVENT_TYPE + ); + } + + $event = new Phergie_Event_Command; + $event + ->setPlugin($plugin) + ->setType($type) + ->setArguments($args); + + $this->events[] = $event; + + return $this; + } + + /** + * Returns the current event queue. + * + * @return array Enumerated array of Phergie_Event_Command objects + */ + public function getEvents() + { + return $this->events; + } + + /** + * Clears the event queue. + * + * @return Phergie_Event_Handler Provides a fluent interface + */ + public function clearEvents() + { + $this->events = array(); + return $this; + } + + /** + * Replaces the current event queue with a given queue of events. + * + * @param array $events Ordered list of objects of the class + * Phergie_Event_Command + * + * @return Phergie_Event_Handler Provides a fluent interface + */ + public function replaceEvents(array $events) + { + $this->events = $events; + return $this; + } + + /** + * Returns whether an event of the given type exists in the queue. + * + * @param string $type Event type from Phergie_Event_Request::TYPE_* + * constants + * + * @return bool TRUE if an event of the specified type exists in the + * queue, FALSE otherwise + */ + public function hasEventOfType($type) + { + foreach ($this->events as $event) { + if ($event->getType() == $type) { + return true; + } + } + return false; + } + + /** + * Returns a list of events of a specified type. + * + * @param string $type Event type from Phergie_Event_Request::TYPE_* + * constants + * + * @return array Array containing event instances of the specified type + * or an empty array if no such events were found + */ + public function getEventsOfType($type) + { + $events = array(); + foreach ($this->events as $event) { + if ($event->getType() == $type) { + $events[] = $event; + } + } + return $events; + } + + /** + * Returns an iterator for the current event queue. + * + * @return ArrayIterator + */ + public function getIterator() + { + return new ArrayIterator($this->events); + } + + /** + * Returns the number of events in the event queue + * + * @return int number of queued events + */ + public function count() + { + return count($this->events); + } +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Request.php b/plugins/Irc/extlib/phergie/Phergie/Event/Request.php new file mode 100755 index 0000000000..a559d9dbe5 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Event/Request.php @@ -0,0 +1,450 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Autonomous event originating from a user or the server. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + * @link http://www.irchelp.org/irchelp/rfc/chapter4.html + */ +class Phergie_Event_Request + extends Phergie_Event_Abstract + implements ArrayAccess +{ + /** + * Nick message event type + */ + const TYPE_NICK = 'nick'; + + /** + * Whois message event type + */ + const TYPE_WHOIS = 'whois'; + + /** + * Quit command event type + */ + const TYPE_QUIT = 'quit'; + + /** + * Join message event type + */ + const TYPE_JOIN = 'join'; + + /** + * Kick message event type + */ + const TYPE_KICK = 'kick'; + + /** + * Part message event type + */ + const TYPE_PART = 'part'; + + /** + * Invite message event type + */ + const TYPE_INVITE = 'invite'; + + /** + * Mode message event type + */ + const TYPE_MODE = 'mode'; + + /** + * Topic message event type + */ + const TYPE_TOPIC = 'topic'; + + /** + * Private message command event type + */ + const TYPE_PRIVMSG = 'privmsg'; + + /** + * Notice message event type + */ + const TYPE_NOTICE = 'notice'; + + /** + * Pong message event type + */ + const TYPE_PONG = 'pong'; + + /** + * CTCP ACTION command event type + */ + const TYPE_ACTION = 'action'; + + /** + * CTCP PING command event type + */ + const TYPE_PING = 'ping'; + + /** + * CTCP TIME command event type + */ + const TYPE_TIME = 'time'; + + /** + * CTCP VERSION command event type + */ + const TYPE_VERSION = 'version'; + + /** + * RAW message event type + */ + const TYPE_RAW = 'raw'; + + /** + * Mapping of event types to their named parameters + * + * @var array + */ + protected static $map = array( + + self::TYPE_QUIT => array( + 'message' => 0 + ), + + self::TYPE_JOIN => array( + 'channel' => 0 + ), + + self::TYPE_KICK => array( + 'channel' => 0, + 'user' => 1, + 'comment' => 2 + ), + + self::TYPE_PART => array( + 'channel' => 0, + 'message' => 1 + ), + + self::TYPE_INVITE => array( + 'nickname' => 0, + 'channel' => 1 + ), + + self::TYPE_MODE => array( + 'target' => 0, + 'mode' => 1, + 'limit' => 2, + 'user' => 3, + 'banmask' => 4 + ), + + self::TYPE_TOPIC => array( + 'channel' => 0, + 'topic' => 1 + ), + + self::TYPE_PRIVMSG => array( + 'receiver' => 0, + 'text' => 1 + ), + + self::TYPE_NOTICE => array( + 'nickname' => 0, + 'text' => 1 + ), + + self::TYPE_ACTION => array( + 'target' => 0, + 'action' => 1 + ), + + self::TYPE_RAW => array( + 'message' => 0 + ) + + ); + + /** + * Hostmask representing the originating user, if applicable + * + * @var Phergie_Hostmask + */ + protected $hostmask; + + /** + * Arguments included with the message + * + * @var array + */ + protected $arguments; + + /** + * Raw data sent by the server + * + * @var string + */ + protected $rawData; + + /** + * Sets the hostmask representing the originating user. + * + * @param Phergie_Hostmask $hostmask User hostmask + * + * @return Phergie_Event_Request Provides a fluent interface + */ + public function setHostmask(Phergie_Hostmask $hostmask) + { + $this->hostmask = $hostmask; + return $this; + } + + /** + * Returns the hostmask representing the originating user. + * + * @return Phergie_Event_Request|null Hostmask or NULL if none was set + */ + public function getHostmask() + { + return $this->hostmask; + } + + /** + * Sets the arguments for the request. + * + * @param array $arguments Request arguments + * + * @return Phergie_Event_Request Provides a fluent interface + */ + public function setArguments($arguments) + { + $this->arguments = $arguments; + return $this; + } + + /** + * Returns the arguments for the request. + * + * @return array + */ + public function getArguments() + { + return $this->arguments; + } + + /** + * Resolves an argument specification to an integer position. + * + * @param mixed $argument Integer position (starting from 0) or the + * equivalent string name of the argument from self::$map + * + * @return int|null Integer position of the argument or NULL if no + * corresponding argument was found + */ + protected function resolveArgument($argument) + { + if (isset($this->arguments[$argument])) { + return $argument; + } else { + $argument = strtolower($argument); + if (isset(self::$map[$this->type][$argument]) + && isset($this->arguments[self::$map[$this->type][$argument]]) + ) { + return self::$map[$this->type][$argument]; + } + } + return null; + } + + /** + * Returns a single specified argument for the request. + * + * @param mixed $argument Integer position (starting from 0) or the + * equivalent string name of the argument from self::$map + * + * @return string|null Argument value or NULL if none is set + */ + public function getArgument($argument) + { + $argument = $this->resolveArgument($argument); + if ($argument !== null) { + return $this->arguments[$argument]; + } + return null; + } + + /** + * Sets the raw buffer for the event. + * + * @param string $buffer Raw event buffer + * + * @return Phergie_Event_Request Provides a fluent interface + */ + public function setRawData($buffer) + { + $this->rawData = $buffer; + return $this; + } + + /** + * Returns the raw buffer sent from the server for the event. + * + * @return string + */ + public function getRawData() + { + return $this->rawData; + } + + /** + * Returns the nick of the user who originated the event. + * + * @return string + */ + public function getNick() + { + return $this->hostmask->getNick(); + } + + /** + * Returns the channel name if the event occurred in a channel or the + * user nick if the event was a private message directed at the bot by a + * user. + * + * @return string + */ + public function getSource() + { + if (substr($this->arguments[0], 0, 1) == '#') { + return $this->arguments[0]; + } + return $this->hostmask->getNick(); + } + + /** + * Returns whether or not the event occurred within a channel. + * + * @return TRUE if the event is in a channel, FALSE otherwise + */ + public function isInChannel() + { + return (substr($this->getSource(), 0, 1) == '#'); + } + + /** + * Returns whether or not the event originated from a user. + * + * @return TRUE if the event is from a user, FALSE otherwise + */ + public function isFromUser() + { + if (empty($this->hostmask)) { + return false; + } + $username = $this->hostmask->getUsername(); + return !empty($username); + } + + /** + * Returns whether or not the event originated from the server. + * + * @return TRUE if the event is from the server, FALSE otherwise + */ + public function isFromServer() + { + $username = $this->hostmask->getUsername(); + return empty($username); + } + + /** + * Provides access to named parameters via virtual "getter" methods. + * + * @param string $name Name of the method called + * @param array $arguments Arguments passed to the method (should always + * be empty) + * + * @return mixed Method return value + */ + public function __call($name, array $arguments) + { + if (!count($arguments) && substr($name, 0, 3) == 'get') { + return $this->getArgument(substr($name, 3)); + } + } + + /** + * Checks to see if an event argument is assigned a value. + * + * @param string|int $offset Argument name or position beginning from 0 + * + * @return bool TRUE if the argument has a value, FALSE otherwise + * @see ArrayAccess::offsetExists() + */ + public function offsetExists($offset) + { + return ($this->resolveArgument($offset) !== null); + } + + /** + * Returns the value of an event argument. + * + * @param string|int $offset Argument name or position beginning from 0 + * + * @return string|null Argument value or NULL if none is set + * @see ArrayAccess::offsetGet() + */ + public function offsetGet($offset) + { + return $this->getArgument($offset); + } + + /** + * Sets the value of an event argument. + * + * @param string|int $offset Argument name or position beginning from 0 + * @param string $value New argument value + * + * @return void + * @see ArrayAccess::offsetSet() + */ + public function offsetSet($offset, $value) + { + $offset = $this->resolveArgument($offset); + if ($offset !== null) { + $this->arguments[$offset] = $value; + } + } + + /** + * Removes the value set for an event argument. + * + * @param string|int $offset Argument name or position beginning from 0 + * + * @return void + * @see ArrayAccess::offsetUnset() + */ + public function offsetUnset($offset) + { + if ($offset = $this->resolveArgument($offset)) { + unset($this->arguments[$offset]); + } + } +} diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Response.php b/plugins/Irc/extlib/phergie/Phergie/Event/Response.php new file mode 100755 index 0000000000..097e2535e8 --- /dev/null +++ b/plugins/Irc/extlib/phergie/Phergie/Event/Response.php @@ -0,0 +1,953 @@ + + * @copyright 2008-2010 Phergie Development Team (http://phergie.org) + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + */ + +/** + * Event originating from the server in response to an event sent by the + * current client. + * + * @category Phergie + * @package Phergie + * @author Phergie Development Team + * @license http://phergie.org/license New BSD License + * @link http://pear.phergie.org/package/Phergie + * @link http://www.irchelp.org/irchelp/rfc/chapter6.html + */ +class Phergie_Event_Response extends Phergie_Event_Abstract +{ + /** + * No such nick/channel + * + * Used to indicate the nickname parameter supplied to a command is currently + * unused. + */ + const ERR_NOSUCHNICK = '401'; + + /** + * No such server + * + * Used to indicate the server name given currently doesn't exist. + */ + const ERR_NOSUCHSERVER = '402'; + + /** + * No such channel + * + * Used to indicate the given channel name is invalid. + */ + const ERR_NOSUCHCHANNEL = '403'; + + /** + * Cannot send to channel + * + * Sent to a user who is either (a) not on a channel which is mode +n or (b) not + * a chanop (or mode +v) on a channel which has mode +m set and is trying to send + * a PRIVMSG message to that channel. + */ + const ERR_CANNOTSENDTOCHAN = '404'; + + /** + * You have joined too many channels + * + * Sent to a user when they have joined the maximum number of allowed channels + * and they try to join another channel. + */ + const ERR_TOOMANYCHANNELS = '405'; + + /** + * There was no such nickname + * + * Returned by WHOWAS to indicate there is no history information for that + * nickname. + */ + const ERR_WASNOSUCHNICK = '406'; + + /** + * Duplicate recipients. No message delivered + * + * Returned to a client which is attempting to send PRIVMSG/NOTICE using the + * user@host destination format and for a user@host which has several + * occurrences. + */ + const ERR_TOOMANYTARGETS = '407'; + + /** + * No origin specified + * + * PING or PONG message missing the originator parameter which is required since + * these commands must work without valid prefixes. + */ + const ERR_NOORIGIN = '409'; + + /** + * No recipient given () + */ + const ERR_NORECIPIENT = '411'; + + /** + * No text to send + */ + const ERR_NOTEXTTOSEND = '412'; + + /** + * No toplevel domain specified + */ + const ERR_NOTOPLEVEL = '413'; + + /** + * Wildcard in toplevel domain + * + * 412 - 414 are returned by PRIVMSG to indicate that the message wasn't + * delivered for some reason. ERR_NOTOPLEVEL and ERR_WILDTOPLEVEL are errors that + * are returned when an invalid use of "PRIVMSG $" or "PRIVMSG #" + * is attempted. + */ + const ERR_WILDTOPLEVEL = '414'; + + /** + * Unknown command + * + * Returned to a registered client to indicate that the command sent is unknown + * by the server. + */ + const ERR_UNKNOWNCOMMAND = '421'; + + /** + * MOTD File is missing + * + * Server's MOTD file could not be opened by the server. + */ + const ERR_NOMOTD = '422'; + + /** + * No administrative info available + * + * Returned by a server in response to an ADMIN message when there is an error in + * finding the appropriate information. + */ + const ERR_NOADMININFO = '423'; + + /** + * File error doing on + * + * Generic error message used to report a failed file operation during the + * processing of a message. + */ + const ERR_FILEERROR = '424'; + + /** + * No nickname given + * + * Returned when a nickname parameter expected for a command and isn't found. + */ + const ERR_NONICKNAMEGIVEN = '431'; + + /** + * Erroneus nickname + * + * Returned after receiving a NICK message which contains characters which do not + * fall in the defined set. See section x.x.x for details on valid nicknames. + */ + const ERR_ERRONEUSNICKNAME = '432'; + + /** + * Nickname is already in use + * + * Returned when a NICK message is processed that results in an attempt to change + * to a currently existing nickname. + */ + const ERR_NICKNAMEINUSE = '433'; + + /** + * Nickname collision KILL + * + * Returned by a server to a client when it detects a nickname collision + * (registered of a NICK that already exists by another server). + */ + const ERR_NICKCOLLISION = '436'; + + /** + * They aren't on that channel + * + * Returned by the server to indicate that the target user of the command is not + * on the given channel. + */ + const ERR_USERNOTINCHANNEL = '441'; + + /** + * You're not on that channel + * + * Returned by the server whenever a client tries to perform a channel effecting + * command for which the client isn't a member. + */ + const ERR_NOTONCHANNEL = '442'; + + /** + * is already on channel + * + * Returned when a client tries to invite a user to a channel they are already + * on. + */ + const ERR_USERONCHANNEL = '443'; + + /** + * User not logged in + * + * Returned by the summon after a SUMMON command for a user was unable to be + * performed since they were not logged in. + */ + const ERR_NOLOGIN = '444'; + + /** + * SUMMON has been disabled + * + * Returned as a response to the SUMMON command. Must be returned by any server + * which does not implement it. + */ + const ERR_SUMMONDISABLED = '445'; + + /** + * USERS has been disabled + * + * Returned as a response to the USERS command. Must be returned by any server + * which does not implement it. + */ + const ERR_USERSDISABLED = '446'; + + /** + * You have not registered + * + * Returned by the server to indicate that the client must be registered before + * the server will allow it to be parsed in detail. + */ + const ERR_NOTREGISTERED = '451'; + + /** + * Not enough parameters + * + * Returned by the server by numerous commands to indicate to the client that it + * didn't supply enough parameters. + */ + const ERR_NEEDMOREPARAMS = '461'; + + /** + * You may not reregister + * + * Returned by the server to any link which tries to change part of the + * registered details (such as password or user details from second USER + * message). + */ + const ERR_ALREADYREGISTRED = '462'; + + /** + * Your host isn't among the privileged + * + * Returned to a client which attempts to register with a server which does not + * been setup to allow connections from the host the attempted connection is + * tried. + */ + const ERR_NOPERMFORHOST = '463'; + + /** + * Password incorrect + * + * Returned to indicate a failed attempt at registering a connection for which a + * password was required and was either not given or incorrect. + */ + const ERR_PASSWDMISMATCH = '464'; + + /** + * You are banned from this server + * + * Returned after an attempt to connect and register yourself with a server which + * has been setup to explicitly deny connections to you. + */ + const ERR_YOUREBANNEDCREEP = '465'; + + /** + * Channel key already set + */ + const ERR_KEYSET = '467'; + + /** + * Cannot join channel (+l) + */ + const ERR_CHANNELISFULL = '471'; + + /** + * is unknown mode char to me + */ + const ERR_UNKNOWNMODE = '472'; + + /** + * Cannot join channel (+i) + */ + const ERR_INVITEONLYCHAN = '473'; + + /** + * Cannot join channel (+b) + */ + const ERR_BANNEDFROMCHAN = '474'; + + /** + * Cannot join channel (+k) + */ + const ERR_BADCHANNELKEY = '475'; + + /** + * Permission Denied- You're not an IRC operator + * + * Any command requiring operator privileges to operate must return this error to + * indicate the attempt was unsuccessful. + */ + const ERR_NOPRIVILEGES = '481'; + + /** + * You're not channel operator + * + * Any command requiring 'chanop' privileges (such as MODE messages) must return + * this error if the client making the attempt is not a chanop on the specified + * channel. + */ + const ERR_CHANOPRIVSNEEDED = '482'; + + /** + * You cant kill a server! + * + * Any attempts to use the KILL command on a server are to be refused and this + * error returned directly to the client. + */ + const ERR_CANTKILLSERVER = '483'; + + /** + * No O-lines for your host + * + * If a client sends an OPER message and the server has not been configured to + * allow connections from the client's host as an operator, this error must be + * returned. + */ + const ERR_NOOPERHOST = '491'; + + /** + * Unknown MODE flag + * + * Returned by the server to indicate that a MODE message was sent with a + * nickname parameter and that the a mode flag sent was not recognized. + */ + const ERR_UMODEUNKNOWNFLAG = '501'; + + /** + * Cant change mode for other users + * + * Error sent to any user trying to view or change the user mode for a user other + * than themselves. + */ + const ERR_USERSDONTMATCH = '502'; + + /** + * Dummy reply number. Not used. + */ + const RPL_NONE = '300'; + + /** + * [{}] + * + * Reply format used by USERHOST to list replies to the query list. The reply + * string is composed as follows = ['*'] '=' <'+'|'-'> + * The '*' indicates whether the client has registered as an Operator. The '-' or + * '+' characters represent whether the client has set an AWAY message or not + * respectively. + */ + const RPL_USERHOST = '302'; + + /** + * [ {}] + * + * Reply format used by ISON to list replies to the query list. + */ + const RPL_ISON = '303'; + + /** + * + */ + const RPL_AWAY = '301'; + + /** + * You are no longer marked as being away + */ + const RPL_UNAWAY = '305'; + + /** + * You have been marked as being away + * + * These replies are used with the AWAY command (if allowed). RPL_AWAY is sent to + * any client sending a PRIVMSG to a client which is away. RPL_AWAY is only sent + * by the server to which the client is connected. Replies RPL_UNAWAY and + * RPL_NOWAWAY are sent when the client removes and sets an AWAY message. + */ + const RPL_NOWAWAY = '306'; + + /** + * * + */ + const RPL_WHOISUSER = '311'; + + /** + * + */ + const RPL_WHOISSERVER = '312'; + + /** + * is an IRC operator + */ + const RPL_WHOISOPERATOR = '313'; + + /** + * seconds idle + */ + const RPL_WHOISIDLE = '317'; + + /** + * End of /WHOIS list + */ + const RPL_ENDOFWHOIS = '318'; + + /** + * {[@|+]} + * + * Replies 311 - 313, 317 - 319 are all replies generated in response to a WHOIS + * message. Given that there are enough parameters present, the answering server + * must either formulate a reply out of the above numerics (if the query nick is + * found) or return an error reply. The '*' in RPL_WHOISUSER is there as the + * literal character and not as a wild card. For each reply set, only + * RPL_WHOISCHANNELS may appear more than once (for long lists of channel names). + * The '@' and '+' characters next to the channel name indicate whether a client + * is a channel operator or has been granted permission to speak on a moderated + * channel. The RPL_ENDOFWHOIS reply is used to mark the end of processing a + * WHOIS message. + */ + const RPL_WHOISCHANNELS = '319'; + + /** + * * + */ + const RPL_WHOWASUSER = '314'; + + /** + * End of WHOWAS + * + * When replying to a WHOWAS message, a server must use the replies + * RPL_WHOWASUSER, RPL_WHOISSERVER or ERR_WASNOSUCHNICK for each nickname in the + * presented list. At the end of all reply batches, there must be RPL_ENDOFWHOWAS + * (even if there was only one reply and it was an error). + */ + const RPL_ENDOFWHOWAS = '369'; + + /** + * Channel Users Name + */ + const RPL_LISTSTART = '321'; + + /** + * <# visible> + */ + const RPL_LIST = '322'; + + /** + * End of /LIST + * + * Replies RPL_LISTSTART, RPL_LIST, RPL_LISTEND mark the start, actual replies + * with data and end of the server's response to a LIST command. If there are no + * channels available to return, only the start and end reply must be sent. + */ + const RPL_LISTEND = '323'; + + /** + * + */ + const RPL_CHANNELMODEIS = '324'; + + /** + * No topic is set + */ + const RPL_NOTOPIC = '331'; + + /** + * + * + * When sending a TOPIC message to determine the channel topic, one of two + * replies is sent. If the topic is set, RPL_TOPIC is sent back else RPL_NOTOPIC. + */ + const RPL_TOPIC = '332'; + + /** + * + * + * Returned by the server to indicate that the attempted INVITE message was + * successful and is being passed onto the end client. + */ + const RPL_INVITING = '341'; + + /** + * Summoning user to IRC + * + * Returned by a server answering a SUMMON message to indicate that it is + * summoning that user. + */ + const RPL_SUMMONING = '342'; + + /** + * . + * + * Reply by the server showing its version details. The is the version + * of the software being used (including any patchlevel revisions) and the + * is used to indicate if the server is running in "debug mode". The + * "comments" field may contain any comments about the version or further version + * details. + */ + const RPL_VERSION = '351'; + + /** + * [*][@|+] + */ + const RPL_WHOREPLY = '352'; + + /** + * End of /WHO list + * + * The RPL_WHOREPLY and RPL_ENDOFWHO pair are used to answer a WHO message. The + * RPL_WHOREPLY is only sent if there is an appropriate match to the WHO query. + * If there is a list of parameters supplied with a WHO message, a RPL_ENDOFWHO + * must be sent after processing each list item with being the item. + */ + const RPL_ENDOFWHO = '315'; + + /** + * [[@|+] [[@|+] [...]]] + */ + const RPL_NAMREPLY = '353'; + + /** + * End of /NAMES list + * + * To reply to a NAMES message, a reply pair consisting of RPL_NAMREPLY and + * RPL_ENDOFNAMES is sent by the server back to the client. If there is no + * channel found as in the query, then only RPL_ENDOFNAMES is returned. The + * exception to this is when a NAMES message is sent with no parameters and all + * visible channels and contents are sent back in a series of RPL_NAMEREPLY + * messages with a RPL_ENDOFNAMES to mark the end. + */ + const RPL_ENDOFNAMES = '366'; + + /** + * + */ + const RPL_LINKS = '364'; + + /** + * End of /LINKS list + * + * In replying to the LINKS message, a server must send replies back using the + * RPL_LINKS numeric and mark the end of the list using an RPL_ENDOFLINKS reply.v + */ + const RPL_ENDOFLINKS = '365'; + + /** + * + */ + const RPL_BANLIST = '367'; + + /** + * End of channel ban list + * + * When listing the active 'bans' for a given channel, a server is required to + * send the list back using the RPL_BANLIST and RPL_ENDOFBANLIST messages. A + * separate RPL_BANLIST is sent for each active banid. After the banids have been + * listed (or if none present) a RPL_ENDOFBANLIST must be sent. + */ + const RPL_ENDOFBANLIST = '368'; + + /** + * + */ + const RPL_INFO = '371'; + + /** + * End of /INFO list + * + * A server responding to an INFO message is required to send all its 'info' in a + * series of RPL_INFO messages with a RPL_ENDOFINFO reply to indicate the end of + * the replies. + */ + const RPL_ENDOFINFO = '374'; + + /** + * - Message of the day - + */ + const RPL_MOTDSTART = '375'; + + /** + * - + */ + const RPL_MOTD = '372'; + + /** + * End of /MOTD command + * + * When responding to the MOTD message and the MOTD file is found, the file is + * displayed line by line, with each line no longer than 80 characters, using + * RPL_MOTD format replies. These should be surrounded by a RPL_MOTDSTART (before + * the RPL_MOTDs) and an RPL_ENDOFMOTD (after). + */ + const RPL_ENDOFMOTD = '376'; + + /** + * You are now an IRC operator + * + * RPL_YOUREOPER is sent back to a client which has just successfully issued an + * OPER message and gained operator status. + */ + const RPL_YOUREOPER = '381'; + + /** + * Rehashing + * + * If the REHASH option is used and an operator sends a REHASH message, an + * RPL_REHASHING is sent back to the operator. + */ + const RPL_REHASHING = '382'; + + /** + * + * + * When replying to the TIME message, a server must send the reply using the + * RPL_TIME format above. The string showing the time need only contain the + * correct day and time there. There is no further requirement for the time + * string. + */ + const RPL_TIME = '391'; + + /** + * UserID Terminal Host + */ + const RPL_USERSSTART = '392'; + + /** + * %-8s %-9s %-8s + */ + const RPL_USERS = '393'; + + /** + * End of users + */ + const RPL_ENDOFUSERS = '394'; + + /** + * Nobody logged in + * + * If the USERS message is handled by a server, the replies RPL_USERSTART, + * RPL_USERS, RPL_ENDOFUSERS and RPL_NOUSERS are used. RPL_USERSSTART must be + * sent first, following by either a sequence of RPL_USERS or a single + * RPL_NOUSER. Following this is RPL_ENDOFUSERS. + */ + const RPL_NOUSERS = '395'; + + /** + * Link + */ + const RPL_TRACELINK = '200'; + + /** + * Try. + */ + const RPL_TRACECONNECTING = '201'; + + /** + * H.S. + */ + const RPL_TRACEHANDSHAKE = '202'; + + /** + * ???? [] + */ + const RPL_TRACEUNKNOWN = '203'; + + /** + * Oper + */ + const RPL_TRACEOPERATOR = '204'; + + /** + * User + */ + const RPL_TRACEUSER = '205'; + + /** + * Serv S C @ + */ + const RPL_TRACESERVER = '206'; + + /** + * 0 + */ + const RPL_TRACENEWTYPE = '208'; + + /** + * File + * + * The RPL_TRACE* are all returned by the server in response to the TRACE + * message. How many are returned is dependent on the the TRACE message and + * whether it was sent by an operator or not. There is no predefined order for + * which occurs first. Replies RPL_TRACEUNKNOWN, RPL_TRACECONNECTING and + * RPL_TRACEHANDSHAKE are all used for connections which have not been fully + * established and are either unknown, still attempting to connect or in the + * process of completing the 'server handshake'. RPL_TRACELINK is sent by any + * server which handles a TRACE message and has to pass it on to another server. + * The list of RPL_TRACELINKs sent in response to a TRACE command traversing the + * IRC network should reflect the actual connectivity of the servers themselves + * along that path. RPL_TRACENEWTYPE is to be used for any connection which does + * not fit in the other categories but is being displayed anyway. + */ + const RPL_TRACELOG = '261'; + + /** + *